--- loncom/auth/londatecheck.pm 2005/04/25 21:41:37 1.11 +++ loncom/auth/londatecheck.pm 2017/12/22 02:00:53 1.14 @@ -1,5 +1,5 @@ # Checks contentopen/close settings disable subsequent PerlHandlers if not open -# $Id: londatecheck.pm,v 1.11 2005/04/25 21:41:37 albertel Exp $ +# $Id: londatecheck.pm,v 1.14 2017/12/22 02:00:53 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -28,6 +28,7 @@ use strict; package Apache::londatecheck; use Apache::lonnet; use Apache::lonlocal; +use Apache::loncommon(); use Apache::Constants qw(:common :http :methods); sub content_date_check { @@ -36,14 +37,14 @@ sub content_date_check { my $close=&Apache::lonnet::EXT('resource.0.contentclose',$symb); if ( (defined($open) && $open ne '' && time < $open) ) { return ('CLOSED',$open,$close, - '

'.&mt('Not open to be viewed').'

'. + '

'.&mt('Not open to be viewed').'

'. &mt("This resource currently isn't open. ". "It will be available at [_1].", &Apache::lonlocal::locallocaltime($open))); } if ( (defined($close) && $close ne '' && time > $close) ) { return ('CLOSED',$open,$close, - '

'.&mt('Not open to be viewed').'

'. + '

'.&mt('Not open to be viewed').'

'. &mt("This resource is no longer available to be viewed.")); } return ('OPEN',$open,$close); @@ -54,18 +55,24 @@ sub handler { if (&Apache::lonnet::allowed('bre',$r->uri) eq 'F') { return DECLINED; } + if (($r->uri =~ /ext\.tool$/) && + (&Apache::lonnet::EXT('resource.0.gradable',$env{'request.symb'}) =~ /^yes$/i)) { + return DECLINED; + } my ($status,$open,$close,$msg)=&content_date_check(); if ($status ne 'OPEN') { $r->set_handlers('PerlHandler'=>undef); &Apache::loncommon::content_type($r,'text/html'); $r->send_http_header; return OK if $r->header_only; - my $html=&Apache::lonxml::xmlbegin(); - $r->print($html.''.&mt("Not Open").''); - $r->print(&Apache::lonmenu::registerurl(1)); - $r->print(''.&Apache::structuretags::body_tag_start('web')); - $r->print($msg); - $r->print(&Apache::lonxml::xmlend().''); + my $start_page = + &Apache::loncommon::start_page('Not Open',undef, + {'bgcolor' => '#FFFFFF', + 'force_register' => 1,}); + my $end_page = + &Apache::loncommon::end_page({'discussion' => 1}); + $r->print($start_page.$msg.$end_page); + return OK; } return DECLINED;