--- loncom/auth/lonroles.pm 2000/09/30 19:19:34 1.8 +++ loncom/auth/lonroles.pm 2001/01/15 15:59:52 1.20 @@ -5,7 +5,9 @@ # 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 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 # package Apache::lonroles; @@ -16,29 +18,24 @@ use Apache::Constants qw(:common); use Apache::File(); sub handler { - my $r = shift; - $r->content_type('text/html'); - $r->send_http_header; - return OK if $r->header_only; -# ---------------------------------------------------------------- Print Header - $r->print(< - -LON-CAPA User Roles - - -ENDHEADER + my $r = shift; my $now=time; my $then=$ENV{'user.login.time'}; my $envkey; + # ================================================================== Roles Init if ($ENV{'form.selectrole'}) { - foreach $envkey (keys %ENV) { - if ($envkey=~/^user\.role\./) { + &Apache::lonnet::appenv("request.course.id" => '', + "request.course.fn" => '', + "request.course.uri" => '', + "request.course.sec" => '', + "request.role" => 'cm'); + foreach $envkey (keys %ENV) { + if ($envkey=~/^user\.role\./) { my ($dum1,$dum2,$role,@pwhere)=split(/\./,$envkey); my $where=join('.',@pwhere); my $trolecode=$role.'.'.$where; @@ -52,29 +49,63 @@ ENDHEADER } if ($tend) { if ($tend<$then) { $tstatus='expired'; } - if ($tend>$now) { $tstatus='will_not'; } + if ($tend<$now) { $tstatus='will_not'; } } if ($tstatus eq 'is') { - &Apache::lonnet::appenv('request.role' => $trolecode); - my ($cdom,$cnum)=split(/\//,$where); + $where=~s/^\///; + my ($cdom,$cnum,$csec)=split(/\//,$where); + &Apache::lonnet::appenv('request.role' => $trolecode, + 'request.course.sec' => $csec); if ($cnum) { - $r->print( &Apache::lonuserstate::readmap($where) ); + 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; + } } } } } } + } - $r->print('

Role not active

'); - return OK; - } + # =============================================================== No Roles Init + $r->content_type('text/html'); + $r->send_http_header; + return OK if $r->header_only; + + $r->print(< + +LON-CAPA User Roles + +ENDHEADER + # ------------------------------------------ Get Error Message from Environment my ($fn,$priv,$nochoose,$error,$msg)=split(/:/,$ENV{'user.error.msg'}); - $r->log_reason( - "$msg for $ENV{'user.name'} domain $ENV{'user.domain'} access $priv",$fn); + if ($ENV{'user.error.msg'}) { + $r->log_reason( + "$msg for $ENV{'user.name'} domain $ENV{'user.domain'} access $priv",$fn); + } # ---------------------------------------------------------------- Who is this? @@ -86,10 +117,6 @@ ENDHEADER } } -# ---------------------------------------------- Get cached course descriptions - - my %cdes=Apache::lonnet::dump('coursedescriptions'); - # -------------------------------------------------------- Generate Page Output # --------------------------------------------------------------- Error Header? if ($error) { @@ -121,19 +148,18 @@ ENDHEADER } else { $r->print("

Enter a Course

\n"); } - $r->print('
'); + if (($ENV{'REDIRECT_QUERY_STRING'}) && ($fn)) { + $fn.='?'.$ENV{'REDIRECT_QUERY_STRING'}; + } + $r->print(''); $r->print(''); $r->print(''); } # ----------------------------------------------------------------------- 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\./) { @@ -154,7 +180,7 @@ ENDHEADER } if ($tend) { if ($tend<$then) { $tstatus='expired'; } - if ($tend>$now) { $tstatus='will_not'; } + if ($tend<$now) { $tstatus='will_not'; } $tpend=localtime($tend); } if ($ENV{'request.role'} eq $trolecode) { @@ -174,7 +200,7 @@ ENDHEADER $tbg='#AAFF77'; $tremark.='Expired after logout. '; } elsif ($tstatus eq 'selected') { - $tbg='#33FF33'; + $tbg='#11CC55'; $tremark.='Currently selected. '; } my $trole; @@ -187,22 +213,25 @@ ENDHEADER } my $ttype; my $twhere; - my ($tdom,$trest)= + my ($tdom,$trest,$tsection)= split(/\//,Apache::lonnet::declutter($where)); if ($trest) { $ttype='Course'; - my $tcourseid=$tdom.'/'.$trest; - if ($cdes{$tcourseid}) { - $twhere=$cdes{$tcourseid}; + if ($tsection) { + $ttype.='
Section/Group: '.$tsection; + } + my $tcourseid=$tdom.'_'.$trest; + if ($ENV{'course.'.$tcourseid.'.description'}) { + $twhere=$ENV{'course.'.$tcourseid.'.description'}; } else { my %newhash=Apache::lonnet::coursedescription($tcourseid); if (%newhash) { $twhere=$newhash{'description'}; } else { $twhere='Currently not available'; + $ENV{'course.'.$tcourseid.'.description'}=$twhere; } - $cdes{$tcourseid}=$twhere; - } + } } elsif ($tdom) { $ttype='Domain'; $twhere=$tdom; @@ -226,6 +255,22 @@ ENDHEADER ''."\n"); } } + my $tremark=''; + if ($ENV{'request.role'} eq 'cm') { + $r->print(''); + $tremark='Currently selected.'; + } else { + $r->print(''); + } + unless ($nochoose) { + if ($ENV{'request.role'} ne 'cm') { + $r->print(''); + } else { + $r->print(''); + } + } + $r->print(''."\n"); $r->print('
 User RoleExtentStartEndRemark
Course
'.$tremark.' 
 No role specified'. + ''.$tremark.' 
'); unless ($nochoose) { @@ -233,19 +278,22 @@ ENDHEADER } # ------------------------------------------------------------ Priviledges Info if ($advanced) { - $r->print('

Priviledges

'); + $r->print('

Current Priviledges

'); foreach $envkey (sort keys %ENV) { - if ($envkey=~/^user\.priv\./) { - my ($dum1,$dum2,@pwhere)=split(/\./,$envkey); - my $where=join('.',@pwhere); + if ($envkey=~/^user\.priv\.$ENV{'request.role'}\./) { + my $where=$envkey; + $where=~s/^user\.priv\.$ENV{'request.role'}\.//; my $ttype; my $twhere; - my ($tdom,$trest)= + my ($tdom,$trest,$tsec)= split(/\//,Apache::lonnet::declutter($where)); if ($trest) { $ttype='Course'; - $twhere=$cdes{$tdom.'/'.$trest}; + $twhere=$ENV{'course.'.$tdom.'_'.$trest.'.description'}; + if ($tsec) { + $twhere.=' (Section/Group: '.$tsec.')'; + } } elsif ($tdom) { $ttype='Domain'; $twhere=$tdom; @@ -276,15 +324,6 @@ ENDHEADER } } } -# -------------------------------------------------------------- Debug - remove - - $->print("

Debugging

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