--- loncom/auth/lonroles.pm 2000/12/28 21:46:08 1.19 +++ loncom/auth/lonroles.pm 2001/05/25 19:38:42 1.25 @@ -6,8 +6,11 @@ # 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,10/28, -# 12/08,12/28 Gerd Kortemeyer -# +# 12/08,12/28, +# 01/15/01 Gerd Kortemeyer +# 02/27/01 Scott Harrison +# 03/02,05/03,05/25 Gerd Kortemeyer + package Apache::lonroles; use strict; @@ -55,22 +58,34 @@ sub handler { my ($cdom,$cnum,$csec)=split(/\//,$where); &Apache::lonnet::appenv('request.role' => $trolecode, 'request.course.sec' => $csec); - if ($cnum) { + if (($cnum) && ($role ne 'ca')) { my ($furl,$ferr)= &Apache::lonuserstate::readmap($cdom.'/'.$cnum); - if ($ENV{'form.orgurl'}) { + if (($ENV{'form.orgurl'}) && + ($ENV{'form.orgurl'}!~/^\/adm\/flip/)) { $r->internal_redirect($ENV{'form.orgurl'}); return OK; } else { - $r->internal_redirect($furl); - return OK; + $r->content_type('text/html'); + $r->send_http_header; + print (<Entering Course + + + + +Entering course ... + + +ENDREDIR + return OK; } } } } } } - } + } # =============================================================== No Roles Init @@ -84,6 +99,7 @@ sub handler { LON-CAPA User Roles + ENDHEADER # ------------------------------------------ Get Error Message from Environment @@ -114,6 +130,11 @@ ENDHEADER $r->print("Action : $msg\n
"); } else { $r->print("

LON-CAPA User Roles

"); + if ($ENV{'user.error.msg'}) { + $r->print( + '

You need to choose another user role or '. + 'enter a specific course for this function

'); + } } # -------------------------------------------------------- Choice or no choice? if ($nochoose) { @@ -166,8 +187,11 @@ ENDHEADER $tpstart=localtime($tstart); } if ($tend) { - if ($tend<$then) { $tstatus='expired'; } - if ($tend<$now) { $tstatus='will_not'; } + if ($tend<$then) { + $tstatus='expired'; + } elsif ($tend<$now) { + $tstatus='will_not'; + } $tpend=localtime($tend); } if ($ENV{'request.role'} eq $trolecode) { @@ -203,6 +227,11 @@ ENDHEADER my ($tdom,$trest,$tsection)= split(/\//,Apache::lonnet::declutter($where)); if ($trest) { + if ($role eq 'ca') { + $ttype='Construction Space'; + $twhere='User: '.$trest.'
Domain: '.$tdom; + $ENV{'course.'.$tdom.'_'.$trest.'.description'}='ca'; + } else { $ttype='Course'; if ($tsection) { $ttype.='
Section/Group: '.$tsection; @@ -219,6 +248,7 @@ ENDHEADER $ENV{'course.'.$tcourseid.'.description'}=$twhere; } } + } } elsif ($tdom) { $ttype='Domain'; $twhere=$tdom; @@ -263,9 +293,9 @@ ENDHEADER unless ($nochoose) { $r->print("\n"); } -# ------------------------------------------------------------ Priviledges Info +# ------------------------------------------------------------ Privileges Info if ($advanced) { - $r->print('

Current Priviledges

'); + $r->print('

Current Privileges

'); foreach $envkey (sort keys %ENV) { if ($envkey=~/^user\.priv\.$ENV{'request.role'}\./) { @@ -276,11 +306,16 @@ ENDHEADER my ($tdom,$trest,$tsec)= split(/\//,Apache::lonnet::declutter($where)); if ($trest) { + if ($ENV{'course.'.$tdom.'_'.$trest.'.description'} eq 'ca') { + $ttype='Construction Space'; + $twhere='User: '.$trest.', Domain: '.$tdom; + } else { $ttype='Course'; $twhere=$ENV{'course.'.$tdom.'_'.$trest.'.description'}; if ($tsec) { $twhere.=' (Section/Group: '.$tsec.')'; } + } } elsif ($tdom) { $ttype='Domain'; $twhere=$tdom;