--- loncom/auth/lonroles.pm	2000/10/05 19:15:34	1.12
+++ loncom/auth/lonroles.pm	2000/12/08 15:52:43	1.17
@@ -5,7 +5,7 @@
 # 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 Gerd Kortemeyer
+# 09/04,09/06,09/28,09/29,09/30,10/2,10/5,10/26,10/28,12/08 Gerd Kortemeyer
 #
 package Apache::lonroles;
 
@@ -27,8 +27,13 @@ sub handler {
 # ================================================================== 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;
@@ -45,10 +50,12 @@ sub handler {
                   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) {
-		      &Apache::lonuserstate::readmap($where);
+		      &Apache::lonuserstate::readmap($cdom.'/'.$cnum);
                       if ($ENV{'form.orgurl'}) {
                          $r->internal_redirect($ENV{'form.orgurl'});
                          return OK;
@@ -92,10 +99,6 @@ ENDHEADER
         }
     }
 
-# ---------------------------------------------- Get cached course descriptions
-
-    my %cdes=Apache::lonnet::dump('coursedescriptions');
-
 # -------------------------------------------------------- Generate Page Output
 # --------------------------------------------------------------- Error Header?
     if ($error) {
@@ -127,6 +130,9 @@ ENDHEADER
         } else {
 	   $r->print("<h2>Enter a Course</h2>\n");
         }
+        if ($ENV{'REDIRECT_QUERY_STRING'}) {
+	    $fn.='?'.$ENV{'REDIRECT_QUERY_STRING'};
+        }
         $r->print('<form method=post action="'.(($fn)?$fn:$r->uri).'">');
         $r->print('<input type=hidden name=orgurl value="'.$fn.'">');
         $r->print('<input type=hidden name=selectrole value=1>');
@@ -193,22 +199,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.='<br>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;
@@ -232,6 +241,22 @@ ENDHEADER
                       '</td><td>'.$tremark.'&nbsp;</td></tr>'."\n");
         }
     }
+    my $tremark='';
+    if ($ENV{'request.role'} eq 'cm') {
+	$r->print('<tr bgcolor="#33FF33">');
+        $tremark='Currently selected.';
+    } else {
+        $r->print('<tr bgcolor="#77FF77">');
+    }
+    unless ($nochoose) {
+       if ($ENV{'request.role'} ne 'cm') {
+          $r->print('<td><input type=submit value=Select name="cm"></td>');
+       } else {
+          $r->print('<td>&nbsp;</td>');
+       }
+    }
+    $r->print('<td colspan=5>No role specified'.
+                      '</td><td>'.$tremark.'&nbsp;</td></tr>'."\n");
 
     $r->print('</table>');
     unless ($nochoose) {
@@ -239,19 +264,22 @@ ENDHEADER
     }
 # ------------------------------------------------------------ Priviledges Info
   if ($advanced) {
-    $r->print('<hr><h2>Priviledges</h2>');
+    $r->print('<hr><h2>Current Priviledges</h2>');
 
     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;