--- loncom/auth/lonroles.pm	2000/10/26 18:54:11	1.13
+++ loncom/auth/lonroles.pm	2000/10/26 21:43:18	1.15
@@ -53,7 +53,7 @@ sub handler {
                    $where=~s/^\///;
                    my ($cdom,$cnum,$csec)=split(/\//,$where);
                    &Apache::lonnet::appenv('request.role' => $trolecode,
-                                           'request.sec'  => $csec);
+                                           'request.course.sec' => $csec);
                    if ($cnum) {
 		      &Apache::lonuserstate::readmap($cdom.'/'.$cnum);
                       if ($ENV{'form.orgurl'}) {
@@ -242,6 +242,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) {
@@ -249,19 +265,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};
+                if ($tsec) {
+		    $twhere.=' (Section/Group: '.$tsec.')';
+                }
             } elsif ($tdom) {
                 $ttype='Domain';
                 $twhere=$tdom;