--- loncom/auth/lonroles.pm 2000/09/06 14:25:17 1.5 +++ loncom/auth/lonroles.pm 2001/01/17 17:26:01 1.21 @@ -4,38 +4,122 @@ # (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,07/22,07/24,07/25,09/04,09/06 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, +# 01/15/01 Gerd Kortemeyer # package Apache::lonroles; use strict; use Apache::lonnet(); +use Apache::lonuserstate(); use Apache::Constants qw(:common); use Apache::File(); sub handler { + my $r = shift; + + my $now=time; + my $then=$ENV{'user.login.time'}; + my $envkey; + + +# ================================================================== Roles Init + + if ($ENV{'form.selectrole'}) { + &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; + if ($ENV{'form.'.$trolecode}) { + my ($tstart,$tend)=split(/\./,$ENV{$envkey}); + my $tstatus='is'; + if ($tstart) { + if ($tstart>$then) { + $tstatus='future'; + } + } + if ($tend) { + if ($tend<$then) { $tstatus='expired'; } + 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) { + 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 + $r->content_type('text/html'); $r->send_http_header; return OK if $r->header_only; -# ---------------------------------------------------------------- Print Header $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); + } -# -------------------------------------------------------- Generate Page Output +# ---------------------------------------------------------------- Who is this? + + my $advanced=0; + foreach $envkey (keys %ENV) { + if ($envkey=~/^user\.role\./) { + my ($dum1,$dum2,$role,@pwhere)=split(/\./,$envkey); + if ($role ne 'st') { $advanced=1; } + } + } +# -------------------------------------------------------- Generate Page Output +# --------------------------------------------------------------- Error Header? if ($error) { $r->print("

LON-CAPA Access Control

"); $r->print("
Access  : ".
@@ -45,24 +129,44 @@ ENDHEADER
     } else {
         $r->print("
LON-CAPA User Roles
");
     }
-
-    my $now=time;
-    my $then=$ENV{'user.login.time'};
-
+# -------------------------------------------------------- Choice or no choice?
     if ($nochoose) {
-	$r->print("
Assigned User Roles
\n");
+        if ($advanced) {
+	   $r->print("
Assigned User Roles
\n");
+        } else {
+           $r->print("
Sorry ...
\nThis resource might be part of");
+           if ($ENV{'request.course.id'}) {
+	       $r->print(' another');
+           } else {
+               $r->print(' a certain');
+           } 
+           $r->print(' course.');
+           return OK;
+        } 
     } else {
-        $r->print("
Select a User Role
\n");
-        $r->print('
');
+        if ($advanced) {
+           $r->print("
Select a User Role
\n");
+        } else {
+	   $r->print("
Enter a Course
\n");
+        }
+        if (($ENV{'REDIRECT_QUERY_STRING'}) && ($fn)) {
+    	    $fn.='?'.$ENV{'REDIRECT_QUERY_STRING'};
+        }
+        $r->print('');
+        $r->print('');
+        $r->print('');
     }
+# ----------------------------------------------------------------------- Table
+    $r->print('');
+    unless ($nochoose) { $r->print(''); }
+       $r->print(''.
+                 ''."\n");
 
-    $r->print('
 User RoleExtentStartEndRemark
'.
-              ''."\n");
-    my $envkey;
     foreach $envkey (sort keys %ENV) {
         if ($envkey=~/^user\.role\./) {
 	    my ($dum1,$dum2,$role,@pwhere)=split(/\./,$envkey);
             my $where=join('.',@pwhere);
+            my $trolecode=$role.'.'.$where;
             my ($tstart,$tend)=split(/\./,$ENV{$envkey});
             my $tremark='';
             my $tstatus='is';
@@ -77,9 +181,12 @@ 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) {
+		$tstatus='selected';
+            }
             my $tbg;
             if ($tstatus eq 'is') {
 		$tbg='#77FF77';
@@ -87,12 +194,15 @@ ENDHEADER
                 $tbg='#FFFF77';
             } elsif ($tstatus eq 'will') {
                 $tbg='#FFAA77';
-                $tremark.='Active at next login.';
+                $tremark.='Active at next login. ';
             } elsif ($tstatus eq 'expired') {
                 $tbg='#FF7777';
 	    } elsif ($tstatus eq 'will_not') {
                 $tbg='#AAFF77';
-                $tremark.='Expired after logout.';
+                $tremark.='Expired after logout. ';
+            } elsif ($tstatus eq 'selected') {
+                $tbg='#11CC55';
+                $tremark.='Currently selected. ';
             }
             my $trole;
             if ($role =~ /^cr\//) {
@@ -104,43 +214,87 @@ ENDHEADER
             }
             my $ttype;
             my $twhere;
-            my ($tres,$tdom,@trest)=split(/\//,$where);
-            if ($where=~/\.course$/) {
+            my ($tdom,$trest,$tsection)=
+               split(/\//,Apache::lonnet::declutter($where));
+            if ($trest) {
 		$ttype='Course';
-                $twhere=$tdom.'/'.join('/',@trest);
+                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;
+                    }
+                }
             } elsif ($tdom) {
                 $ttype='Domain';
                 $twhere=$tdom;
             } else {
                 $ttype='System';
-                $twhere='/';
+                $twhere='system wide';
             }
                
-            $r->print('');
+            unless ($nochoose) {
+		if ($tstatus eq 'is') {
+                    $r->print('');
+                } else {
+                    $r->print('');
+                }
+            }
+            $r->print(''."\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
'.$trole.''.
+            $r->print('
 '.$trole.''.
 		      $ttype.''.$twhere.''.$tpstart.
                       ''.$tpend.
                       ''.$tremark.' 
 No role specified'.
+                      ''.$tremark.' 
');
     unless ($nochoose) {
 	$r->print("
\n");
     }
-# ----------------------------------------------------------------- Priviledges
-
-    $r->print('
Priviledges
');
+# ------------------------------------------------------------ Priviledges Info
+  if ($advanced) {
+    $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 ($tres,$tdom,@trest)=split(/\//,$where);
-            if ($where=~/\.course$/) {
+            my ($tdom,$trest,$tsec)=
+               split(/\//,Apache::lonnet::declutter($where));
+            if ($trest) {
 		$ttype='Course';
-                $twhere=$tdom.'/'.join('/',@trest);
+                $twhere=$ENV{'course.'.$tdom.'_'.$trest.'.description'};
+                if ($tsec) {
+		    $twhere.=' (Section/Group: '.$tsec.')';
+                }
             } elsif ($tdom) {
                 $ttype='Domain';
                 $twhere=$tdom;
@@ -170,14 +324,7 @@ ENDHEADER
             $r->print('');
         }
     }
-
-# -------------------------------------------------------------- Debug - remove
-
-    $->print("
Debugging
\n");
-    
-    foreach $envkey (sort keys %ENV) {
-	$r->print("$envkey ---- $ENV{$envkey}
");
-    }
+  }
 
     $r->print("\n");
     return OK;