--- loncom/auth/lonroles.pm 2000/06/12 18:25:03 1.3 +++ loncom/auth/lonroles.pm 2000/07/25 15:40:11 1.4 @@ -4,7 +4,7 @@ # (Login Screen # 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 Gerd Kortemeyer +# 1/14,03/06,06/01,07/22,07/24,07/25 Gerd Kortemeyer # package Apache::lonroles; @@ -19,22 +19,6 @@ sub handler { $r->send_http_header; return OK if $r->header_only; -# --------------------------------------------------- Read Plain Text for Roles - - my $tabdir = $r->dir_config('lonTabDir'); - - my @rolesplain; - my %plain; - - { - my $idf=Apache::File->new("$tabdir/rolesplain.tab"); - @rolesplain=<$idf>; - } - map { - my ($short,$long)=split(/:/,$_); - $plain{$short}=$long; - } @rolesplain; - # ---------------------------------------------------------------- Print Header $r->print(< @@ -52,31 +36,146 @@ ENDHEADER if ($error) { $r->print("

LON-CAPA Access Control

"); - $r->print("
Access  : $plain{$priv}
");
-        $r->print("Resource: $fn
");
-        $r->print("Action  : $msg
"); + $r->print("
Access  : ".
+                  Apache::lonnet::plaintext($priv)."\n");
+        $r->print("Resource: $fn\n");
+        $r->print("Action  : $msg\n
"); $r->log_reason( "$msg for $ENV{'user.name'} domain $ENV{'user.domain'} access $priv",$fn); } else { $r->print("

LON-CAPA User Roles

"); } + my $now=time; + my $then=$ENV{'user.login.time'}; + if ($nochoose) { - $r->print("

Assigned User Roles

"); + $r->print("

Assigned User Roles

\n"); } else { $r->print("

Select a User Role

\n"); $r->print('
'); -$r->print('
'); } + + $r->print(''. + ''."\n"); my $envkey; foreach $envkey (sort keys %ENV) { - $r->print("$envkey ---- $ENV{$envkey}
"); if ($envkey=~/^user\.role\./) { - my ($dum1,$dum2,$role,$where)=split(/\./,$envkey); - $r->print("$plain{$role} for $where
"); + my ($dum1,$dum2,$role,@pwhere)=split(/\./,$envkey); + my $where=join('.',@pwhere); + my ($tstart,$tend)=split(/\./,$ENV{$envkey}); + my $tremark=''; + my $tstatus='is'; + my $tpstart=' '; + my $tpend=' '; + if ($tstart) { + if ($tstart>$then) { + $tstatus='future'; + if ($tstart<$now) { $tstatus='will'; } + } + $tpstart=localtime($tstart); + } + if ($tend) { + if ($tend<$then) { $tstatus='expired'; } + if ($tend>$now) { $tstatus='will_not'; } + $tpend=localtime($tend); + } + my $tbg; + if ($tstatus eq 'is') { + $tbg='#77FF77'; + } elsif ($tstatus eq 'future') { + $tbg='#FFFF77'; + } elsif ($tstatus eq 'will') { + $tbg='#FFAA77'; + $tremark.='Active at next login.'; + } elsif ($tstatus eq 'expired') { + $tbg='#FF7777'; + } elsif ($tstatus eq 'will_not') { + $tbg='#AAFF77'; + $tremark.='Expired after logout.'; + } + my $trole; + if ($role =~ /^cr\//) { + my ($rdummy,$rdomain,$rauthor,$rrole)=split(/\//,$role); + $tremark.='
Defined by '.$rauthor.' at '.$rdomain.'.'; + $trole=$rrole; + } else { + $trole=Apache::lonnet::plaintext($role); + } + my $ttype; + my $twhere; + my ($tres,$tdom,@trest)=split(/\//,$where); + if ($where=~/\.course$/) { + $ttype='Course'; + $twhere=$tdom.'/'.join('/',@trest); + } elsif ($tdom) { + $ttype='Domain'; + $twhere=$tdom; + } else { + $ttype='System'; + $twhere='/'; + } + + $r->print(''."\n"); + } + } + + $r->print('
User RoleExtentStartEndRemark
'.$trole.''. + $ttype.''.$twhere.''.$tpstart. + ''.$tpend. + ''.$tremark.' 
'); + unless ($nochoose) { + $r->print("\n"); + } +# ----------------------------------------------------------------- Priviledges + + $r->print('

Priviledges

'); + + foreach $envkey (sort keys %ENV) { + if ($envkey=~/^user\.priv\./) { + my ($dum1,$dum2,@pwhere)=split(/\./,$envkey); + my $where=join('.',@pwhere); + my $ttype; + my $twhere; + my ($tres,$tdom,@trest)=split(/\//,$where); + if ($where=~/\.course$/) { + $ttype='Course'; + $twhere=$tdom.'/'.join('/',@trest); + } elsif ($tdom) { + $ttype='Domain'; + $twhere=$tdom; + } else { + $ttype='System'; + $twhere='/'; + } + $r->print("\n

".$ttype.': '.$twhere.'

'); } } +# -------------------------------------------------------------- Debug - remove + + $->print("

Debugging

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