--- loncom/auth/lonroles.pm	2004/12/03 05:15:30	1.113
+++ loncom/auth/lonroles.pm	2005/03/03 07:32:49	1.117
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # User Roles Screen
 #
-# $Id: lonroles.pm,v 1.113 2004/12/03 05:15:30 raeburn Exp $
+# $Id: lonroles.pm,v 1.117 2005/03/03 07:32:49 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -224,9 +224,6 @@ ENDENTERKEY
 					   'request.role.domain' => $cdom,
 					   'request.course.sec'  => $csec);
                     my $tadv=0;
-		    if (&Apache::lonnet::allowed('adv') eq 'F') { $tadv=1; }
-		    &Apache::lonnet::appenv('request.role.adv'    => $tadv);
-
 		    my $msg=&mt('Entering course ...');
 
 		    if (($cnum) && ($role ne 'ca')) {
@@ -238,6 +235,8 @@ ENDENTERKEY
 			    if ( &Apache::lonnet::mod_perl_version() == 2 ) {
 				&Apache::lonnet::cleanenv();
 			    }
+			    if (&Apache::lonnet::allowed('adv') eq 'F') { $tadv=1; }
+			    &Apache::lonnet::appenv('request.role.adv'=>$tadv);
 			    $r->internal_redirect($dest);
 			    return OK;
 			} else {
@@ -250,6 +249,8 @@ ENDENTERKEY
 			 &mt('Could not initialize course at this time.').
 		    '</font></h1><h3>'.&mt('Please try again.').'</h3>'.$ferr;
 			    }
+			    if (&Apache::lonnet::allowed('adv') eq 'F') { $tadv=1; }
+			    &Apache::lonnet::appenv('request.role.adv'=>$tadv);
 
 			    # Check to see if the user is a CC entering a course 
 			    # for the first time
@@ -339,7 +340,7 @@ ENDHEADER
 	$r->print("<h1>LON-CAPA Access Control</h1>");
         $r->print("<hr><pre>Access  : ".
                   Apache::lonnet::plaintext($priv)."\n");
-        $r->print("Resource: $fn\n");
+        $r->print("Resource: ".&Apache::lonenc::check_encrypt($fn)."\n");
         $r->print("Action  : $msg\n</pre><hr>");
     } else {
         if ($ENV{'user.error.msg'}) {
@@ -376,14 +377,14 @@ ENDHEADER
     	    $fn.='?'.$ENV{'REDIRECT_QUERY_STRING'};
         }
         $r->print('<form method="post" name="rolechoice" action="'.(($fn)?$fn:$r->uri).'">');
-        $r->print('<input type=hidden name=orgurl value="'.$fn.'">');
-        $r->print('<input type=hidden name=selectrole value=1>');
+        $r->print('<input type="hidden" name="orgurl" value="'.$fn.'" />');
+        $r->print('<input type="hidden" name="selectrole" value="1" />');
     }
     if ($ENV{'user.adv'}) {
 	$r->print(
-	      '<br />'.&mt('Show all roles').': <input type="checkbox" name="showall"');
-	if ($ENV{'form.showall'}) { $r->print(' checked'); }
-	$r->print('><input type=submit value="'.&mt('Display').'">');
+	      '<br /><label>'.&mt('Show all roles').': <input type="checkbox" name="showall"');
+	if ($ENV{'form.showall'}) { $r->print(' checked="checked" '); }
+	$r->print(' /></label><input type="submit" value="'.&mt('Display').'" />');
     }
 
     my (%roletext,%sortrole,%roleclass);
@@ -605,6 +606,7 @@ ENDHEADER
 		      &mt('Recent Roles')."</td>");
 	    $r->print($output);
 	    $r->print("</tr>");
+            $doheaders ++;
 	}
     }
 
@@ -848,7 +850,7 @@ function verifyCoursePick(caller) {
             }
         }
         else {
-            alert("You must use the 'Select Course' link to open a separate pick course window which you can use to select the course you wish to enter");
+            alert("Please use the 'Select Course' link to open a separate pick course window where you may select the course you wish to enter.");
         }
     }
     else {