--- loncom/auth/londatecheck.pm 2004/08/23 18:57:16 1.4
+++ loncom/auth/londatecheck.pm 2005/04/25 21:21:17 1.9
@@ -1,5 +1,5 @@
# Checks contentopen/close settings disable subsequent PerlHandlers if not open
-# $Id: londatecheck.pm,v 1.4 2004/08/23 18:57:16 albertel Exp $
+# $Id: londatecheck.pm,v 1.9 2005/04/25 21:21:17 albertel Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -26,12 +26,12 @@
use strict;
package Apache::londatecheck;
-use Apache::lonnet();
+use Apache::lonnet;
use Apache::lonlocal;
use Apache::Constants qw(:common :http :methods);
sub content_date_check {
- my $symb=$ENV{'request.symb'};
+ my $symb=$env{'request.symb'};
my $open=&Apache::lonnet::EXT('resource.0.contentopen',$symb);
my $close=&Apache::lonnet::EXT('resource.0.contentclose',$symb);
if ( (defined($open) && $open ne '' && time < $open) ) {
@@ -49,8 +49,8 @@ sub content_date_check {
sub handler {
my ($r)=@_;
- if (&Apache::lonnet::allowed('bre',$ENV{'request.filename'}) eq 'F') {
- return OK;
+ if (&Apache::lonnet::allowed('bre',$r->uri) eq 'F') {
+ return DECLINED;
}
my ($status,$open,$close,$msg)=&content_date_check();
if ($status ne 'OPEN') {
@@ -58,7 +58,7 @@ sub handler {
&Apache::loncommon::content_type($r,'text/html');
$r->send_http_header;
return OK if $r->header_only;
- $r->print('Go Away!');
+ $r->print(''.&mt("Not Open").'');
my $addentries=' onLoad="'.&Apache::lonmenu::loadevents().
'" onUnload="'.&Apache::lonmenu::unloadevents().'"';
$r->print(&Apache::lonmenu::registerurl(1));
@@ -68,7 +68,8 @@ sub handler {
$r->print($msg);
$r->print('');
+ return OK;
}
- return OK;
+ return DECLINED;
}
1;