--- loncom/auth/lonroles.pm 2000/12/08 15:52:43 1.17 +++ loncom/auth/lonroles.pm 2001/05/25 19:38:42 1.25 @@ -5,8 +5,12 @@ # 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,10/28,12/08 Gerd Kortemeyer -# +# 09/04,09/06,09/28,09/29,09/30,10/2,10/5,10/26,10/28, +# 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; @@ -47,25 +51,41 @@ 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/^\///; my ($cdom,$cnum,$csec)=split(/\//,$where); &Apache::lonnet::appenv('request.role' => $trolecode, 'request.course.sec' => $csec); - if ($cnum) { - &Apache::lonuserstate::readmap($cdom.'/'.$cnum); - if ($ENV{'form.orgurl'}) { + if (($cnum) && ($role ne 'ca')) { + my ($furl,$ferr)= + &Apache::lonuserstate::readmap($cdom.'/'.$cnum); + if (($ENV{'form.orgurl'}) && + ($ENV{'form.orgurl'}!~/^\/adm\/flip/)) { $r->internal_redirect($ENV{'form.orgurl'}); return OK; - } + } else { + $r->content_type('text/html'); + $r->send_http_header; + print (<Entering Course + + + + +Entering course ... + + +ENDREDIR + return OK; + } } } } } } - } + } # =============================================================== No Roles Init @@ -79,6 +99,7 @@ sub handler { LON-CAPA User Roles + ENDHEADER # ------------------------------------------ Get Error Message from Environment @@ -109,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) { @@ -130,8 +156,8 @@ ENDHEADER } else { $r->print("

Enter a Course

\n"); } - if ($ENV{'REDIRECT_QUERY_STRING'}) { - $fn.='?'.$ENV{'REDIRECT_QUERY_STRING'}; + if (($ENV{'REDIRECT_QUERY_STRING'}) && ($fn)) { + $fn.='?'.$ENV{'REDIRECT_QUERY_STRING'}; } $r->print('
'); $r->print(''); @@ -140,12 +166,8 @@ ENDHEADER # ----------------------------------------------------------------------- Table $r->print(''); unless ($nochoose) { $r->print(''); } - if ($advanced) { $r->print(''. ''."\n"); - } else { - $r->print(''."\n"); - } foreach $envkey (sort keys %ENV) { if ($envkey=~/^user\.role\./) { @@ -165,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) { @@ -186,7 +211,7 @@ ENDHEADER $tbg='#AAFF77'; $tremark.='Expired after logout. '; } elsif ($tstatus eq 'selected') { - $tbg='#33FF33'; + $tbg='#11CC55'; $tremark.='Currently selected. '; } my $trole; @@ -202,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; @@ -218,6 +248,7 @@ ENDHEADER $ENV{'course.'.$tcourseid.'.description'}=$twhere; } } + } } elsif ($tdom) { $ttype='Domain'; $twhere=$tdom; @@ -243,7 +274,7 @@ ENDHEADER } my $tremark=''; if ($ENV{'request.role'} eq 'cm') { - $r->print(''); + $r->print(''); $tremark='Currently selected.'; } else { $r->print(''); @@ -262,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'}\./) { @@ -275,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; @@ -310,15 +346,6 @@ ENDHEADER } } } -# -------------------------------------------------------------- Debug - remove - - $->print("

Debugging

\n"); - - foreach $envkey (sort keys %ENV) { - $r->print("$envkey ---- $ENV{$envkey}
"); - } - -# ------------------------------------------------------------------- End Debug $r->print("\n"); return OK;
 User RoleExtentStartEndRemark
Course