--- loncom/interface/slotrequest.pm 2006/03/07 21:37:29 1.50 +++ loncom/interface/slotrequest.pm 2006/03/21 16:03:19 1.53 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Handler for requesting to have slots added to a students record # -# $Id: slotrequest.pm,v 1.50 2006/03/07 21:37:29 albertel Exp $ +# $Id: slotrequest.pm,v 1.53 2006/03/21 16:03:19 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -54,14 +54,12 @@ sub fail { sub start_page { my ($r,$title)=@_; - my $html=&Apache::lonxml::xmlbegin(); - $r->print($html.''.&mt($title).''); - $r->print(&Apache::loncommon::bodytag($title)); + $r->print(&Apache::loncommon::start_page($title)); } sub end_page { my ($r)=@_; - $r->print(&Apache::loncommon::endbodytag().''); + $r->print(&Apache::loncommon::end_page()); } =pod @@ -550,6 +548,12 @@ sub allowed_slot { } &Apache::lonxml::debug("$slot_name type good"); + # reserve time not yet started + if ($slot->{'startreserve'} > time) { + return 0; + } + &Apache::lonxml::debug("$slot_name reserve good"); + my $userallowed=0; # its for a different set of users if (defined($slot->{'allowedsections'})) { @@ -572,6 +576,12 @@ sub allowed_slot { split(',',$slot->{'allowedusers'}))) { $userallowed=1; } + + if (!defined($slot->{'allowedusers'}) + && !defined($slot->{'allowedsections'})) { + $userallowed=1; + } + &Apache::lonxml::debug("$slot_name user is $userallowed"); return 0 if (!$userallowed);