--- loncom/auth/lonroles.pm	2000/09/06 14:25:17	1.5
+++ loncom/auth/lonroles.pm	2000/09/30 19:19:34	1.8
@@ -4,12 +4,14 @@
 # (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 Gerd Kortemeyer
 #
 package Apache::lonroles;
 
 use strict;
 use Apache::lonnet();
+use Apache::lonuserstate();
 use Apache::Constants qw(:common);
 use Apache::File();
 
@@ -28,14 +30,68 @@ sub handler {
 <body bgcolor="#FFFFFF">
 ENDHEADER
 
+    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\./) {
+	    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') {
+                   &Apache::lonnet::appenv('request.role' => $trolecode);
+                   my ($cdom,$cnum)=split(/\//,$where);
+                   if ($cnum) {
+		      $r->print( &Apache::lonuserstate::readmap($where) );
+                   }
+               }
+            } 
+	  }
+        }
+        
+        $r->print('<h1>Role not active</h1></body></html>');
+	return OK;
+    }
+# =============================================================== No Roles Init
+
 # ------------------------------------------ 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);
 
-# -------------------------------------------------------- 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; }
+        }
+    }
+
+# ---------------------------------------------- Get cached course descriptions
 
+    my %cdes=Apache::lonnet::dump('coursedescriptions');
+
+# -------------------------------------------------------- Generate Page Output
+# --------------------------------------------------------------- Error Header?
     if ($error) {
 	$r->print("<h1>LON-CAPA Access Control</h1>");
         $r->print("<hr><pre>Access  : ".
@@ -45,24 +101,45 @@ ENDHEADER
     } else {
         $r->print("<h1>LON-CAPA User Roles</h1>");
     }
-
-    my $now=time;
-    my $then=$ENV{'user.login.time'};
-
+# -------------------------------------------------------- Choice or no choice?
     if ($nochoose) {
-	$r->print("<h2>Assigned User Roles</h2>\n");
+        if ($advanced) {
+	   $r->print("<h2>Assigned User Roles</h2>\n");
+        } else {
+           $r->print("<h2>Sorry ...</h2>\nThis resource might be part of");
+           if ($ENV{'request.course.id'}) {
+	       $r->print(' another');
+           } else {
+               $r->print(' a certain');
+           } 
+           $r->print(' course.</body></html>');
+           return OK;
+        } 
+    } else {
+        if ($advanced) {
+           $r->print("<h2>Select a User Role</h2>\n");
+        } else {
+	   $r->print("<h2>Enter a Course</h2>\n");
+        }
+        $r->print('<form method=post action="'.$r->uri.'">');
+        $r->print('<input type=hidden name=orgurl value="'.$fn.'">');
+        $r->print('<input type=hidden name=selectrole value=1>');
+    }
+# ----------------------------------------------------------------------- Table
+    $r->print('<table><tr>');
+    unless ($nochoose) { $r->print('<th>&nbsp;</th>'); }
+    if ($advanced) {
+       $r->print('<th>User Role</th><th colspan=2>Extent</th>'.
+                 '<th>Start</th><th>End</th><th>Remark</th></tr>'."\n");
     } else {
-        $r->print("<h2>Select a User Role</h2>\n");
-        $r->print('<form method=get action="'.$fn.'">');
+	$r->print('<th>Course</th></tr>'."\n");
     }
 
-    $r->print('<table><tr><th>User Role</th><th colspan=2>Extent</th>'.
-              '<th>Start</th><th>End</th><th>Remark</th></tr>'."\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';
@@ -80,6 +157,9 @@ ENDHEADER
                 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 +167,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='#33FF33';
+                $tremark.='Currently selected. ';
             }
             my $trole;
             if ($role =~ /^cr\//) {
@@ -104,19 +187,40 @@ ENDHEADER
             }
             my $ttype;
             my $twhere;
-            my ($tres,$tdom,@trest)=split(/\//,$where);
-            if ($where=~/\.course$/) {
+            my ($tdom,$trest)=
+               split(/\//,Apache::lonnet::declutter($where));
+            if ($trest) {
 		$ttype='Course';
-                $twhere=$tdom.'/'.join('/',@trest);
+                my $tcourseid=$tdom.'/'.$trest;
+                if ($cdes{$tcourseid}) {
+		    $twhere=$cdes{$tcourseid};
+                } else {
+                    my %newhash=Apache::lonnet::coursedescription($tcourseid);
+                    if (%newhash) {
+			$twhere=$newhash{'description'};
+                    } else {
+                        $twhere='Currently not available';
+                    }
+                    $cdes{$tcourseid}=$twhere;
+                }     
             } elsif ($tdom) {
                 $ttype='Domain';
                 $twhere=$tdom;
             } else {
                 $ttype='System';
-                $twhere='/';
+                $twhere='system wide';
             }
                
-            $r->print('<tr bgcolor='.$tbg.'><td>'.$trole.'</td><td>'.
+            $r->print('<tr bgcolor='.$tbg.'>');
+            unless ($nochoose) {
+		if ($tstatus eq 'is') {
+                    $r->print('<td><input type=submit value=Select name="'.
+                              $trolecode.'"></td>');
+                } else {
+                    $r->print('<td>&nbsp;</td>');
+                }
+            }
+            $r->print('<td>'.$trole.'</td><td>'.
 		      $ttype.'</td><td>'.$twhere.'</td><td>'.$tpstart.
                       '</td><td>'.$tpend.
                       '</td><td>'.$tremark.'&nbsp;</td></tr>'."\n");
@@ -127,8 +231,8 @@ ENDHEADER
     unless ($nochoose) {
 	$r->print("</form>\n");
     }
-# ----------------------------------------------------------------- Priviledges
-
+# ------------------------------------------------------------ Priviledges Info
+  if ($advanced) {
     $r->print('<hr><h2>Priviledges</h2>');
 
     foreach $envkey (sort keys %ENV) {
@@ -137,10 +241,11 @@ ENDHEADER
             my $where=join('.',@pwhere);
             my $ttype;
             my $twhere;
-            my ($tres,$tdom,@trest)=split(/\//,$where);
-            if ($where=~/\.course$/) {
+            my ($tdom,$trest)=
+               split(/\//,Apache::lonnet::declutter($where));
+            if ($trest) {
 		$ttype='Course';
-                $twhere=$tdom.'/'.join('/',@trest);
+                $twhere=$cdes{$tdom.'/'.$trest};
             } elsif ($tdom) {
                 $ttype='Domain';
                 $twhere=$tdom;
@@ -170,7 +275,7 @@ ENDHEADER
             $r->print('</ul>');
         }
     }
-
+  }
 # -------------------------------------------------------------- Debug - remove
 
     $->print("<hr><h1>Debugging</h1><hr>\n");
@@ -179,6 +284,8 @@ ENDHEADER
 	$r->print("$envkey ---- $ENV{$envkey}<br>");
     }
 
+# ------------------------------------------------------------------- End Debug
+
     $r->print("</body></html>\n");
     return OK;
 } 

User Role	Extent		Start	End	Remark
'.$trole.'	'. + $r->print('
		'.$trole.'	'. $ttype.'	'.$twhere.'	'.$tpstart. '	'.$tpend. '	'.$tremark.'