--- loncom/auth/lonroles.pm 2000/10/26 20:10:47 1.14 +++ loncom/auth/lonroles.pm 2000/12/28 21:46:08 1.19 @@ -5,7 +5,8 @@ # 5/21/99,5/22,5/25,5/26,5/31,6/2,6/10,7/12,7/14 Gerd Kortemeyer) # 11/23 Gerd Kortemeyer) # 1/14,03/06,06/01,07/22,07/24,07/25, -# 09/04,09/06,09/28,09/29,09/30,10/2,10/5,10/26 Gerd Kortemeyer +# 09/04,09/06,09/28,09/29,09/30,10/2,10/5,10/26,10/28, +# 12/08,12/28 Gerd Kortemeyer # package Apache::lonroles; @@ -47,7 +48,7 @@ sub handler { } if ($tend) { if ($tend<$then) { $tstatus='expired'; } - if ($tend>$now) { $tstatus='will_not'; } + if ($tend<$now) { $tstatus='will_not'; } } if ($tstatus eq 'is') { $where=~s/^\///; @@ -55,11 +56,15 @@ sub handler { &Apache::lonnet::appenv('request.role' => $trolecode, 'request.course.sec' => $csec); if ($cnum) { - &Apache::lonuserstate::readmap($cdom.'/'.$cnum); + my ($furl,$ferr)= + &Apache::lonuserstate::readmap($cdom.'/'.$cnum); if ($ENV{'form.orgurl'}) { $r->internal_redirect($ENV{'form.orgurl'}); return OK; - } + } else { + $r->internal_redirect($furl); + return OK; + } } } } @@ -99,10 +104,6 @@ ENDHEADER } } -# ---------------------------------------------- Get cached course descriptions - - my %cdes=Apache::lonnet::dump('nohist_coursedescriptions'); - # -------------------------------------------------------- Generate Page Output # --------------------------------------------------------------- Error Header? if ($error) { @@ -134,6 +135,9 @@ ENDHEADER } else { $r->print("