--- loncom/auth/lonroles.pm	2004/11/14 18:27:08	1.110
+++ loncom/auth/lonroles.pm	2005/03/03 07:16:44	1.116
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # User Roles Screen
 #
-# $Id: lonroles.pm,v 1.110 2004/11/14 18:27:08 raeburn Exp $
+# $Id: lonroles.pm,v 1.116 2005/03/03 07:16:44 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -84,10 +84,6 @@ sub handler {
     my $envkey;
     my %dcroles = ();
     my $numdc = &check_fordc(\%dcroles,$then);
-    my %recentroles;
-    if ($numdc > 0) {
-        %recentroles = &Apache::lonnet::dump(&recent_filename('roles'));
-    }
 
 # ================================================================== Roles Init
     if ($ENV{'form.selectrole'}) {
@@ -117,16 +113,6 @@ sub handler {
             }
         }
 
-# Check if user is a DC with courses in the recent list which need privs.
-#        if ($numdc > 0) {
-#            %recentroles = &Apache::lonnet::dump(&recent_filename('recent_roles'));
-#            foreach my $rolekey (keys %recentroles) {
-#                if ($rolekey =~ m-^user\.role.cc\./\w+/\w+$-) {
-#                    &check_privs($rolekey,$then,$now);
-#                }
-#            }
-#        }
-
         foreach $envkey (keys %ENV) {
             next if ($envkey!~/^user\.role\./);
             my ($where,$trolecode,$role,$tstatus,$tend,$tstart);
@@ -135,6 +121,13 @@ sub handler {
 		if ($tstatus eq 'is') {
 		    $where=~s/^\///;
 		    my ($cdom,$cnum,$csec)=split(/\//,$where);
+# store role if recent_role list being kept
+                    if ($ENV{'environment.recentroles'}) {
+			&Apache::lonhtmlcommon::store_recent('roles',
+							     $trolecode,' ');
+                    }
+
+
 # check for keyed access
 		    if (($role eq 'st') && 
                        ($ENV{'course.'.$cdom.'_'.$cnum.'.keyaccess'} eq 'yes')) {
@@ -269,16 +262,6 @@ ENDENTERKEY
 							  '.course.helper.not.run'}) {
 				$furl = "/adm/helper/course.initialization.helper";
 			    }
-                            # Check to see if the user is a DC selecting a course
-                            if (($numdc > 0) && ($role eq 'cc')) {
-                                my $formaction = '/adm/roles/';
-                                my ($dcdom,$pickedcourse) = split/_/,$courseid;
-                                if ($ENV{'user.role.dc./'.$dcdom.'/'}) {
-                                    &Apache::lonhtmlcommon::store_recent('roles',
-                                    $envkey,$formaction);
-                                }
-                            }
-                            #
                             # Send the user to the course they selected
                             &redirect_user($r,&mt('Entering Course'),
                                            $furl,$msg,
@@ -356,7 +339,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'}) {
@@ -393,14 +376,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);
@@ -556,7 +539,6 @@ ENDHEADER
 		    $sortkey=$role.$twhere;
                 }
  
-                $roletext.='<tr bgcolor='.$tbg.'>';
                 $roletext.=&build_roletext($trolecode,$tdom,$trest,$tstatus,$tryagain,$advanced,$tremark,$tbg,$tfont,$trole,$ttype,$twhere,$tpstart,$tpend,$nochoose,$button,$switchserver);
 		$roletext{$envkey}=$roletext;
 		if (!$sortkey) {$sortkey=$twhere."\0".$envkey;}
@@ -604,8 +586,32 @@ ENDHEADER
 	}
 	if ($haverole) { $doheaders++; }
     }
+
+    if ($ENV{'environment.recentroles'}) {
+        my %recent_roles =
+               &Apache::lonhtmlcommon::get_recent('roles',$ENV{'environment.recentrolesn'});
+	my $output='';
+	foreach (sort(keys(%recent_roles))) {
+	    if (defined($roletext{'user.role.'.$_})) {
+		$output.=$roletext{'user.role.'.$_};
+	    } elsif ($numdc > 0) {
+                unless ($_ =~/^error\:/) {
+                    $output.=&display_cc_role('user.role.'.$_);
+                }
+            } 
+	}
+	if ($output) {
+	    $r->print("<tr bgcolor='#BBffBB'><td align='center' colspan='7'>".
+		      &mt('Recent Roles')."</td>");
+	    $r->print($output);
+	    $r->print("</tr>");
+            $doheaders ++;
+	}
+    }
+
     if ($numdc > 0) {
-        &display_recent_roles($r,\%roletext,\%recentroles);
+        $r->print(&coursepick_jscript());
+        $r->print(&Apache::loncommon::coursebrowser_javascript());
     }
     foreach my $type ('Construction Space','Course','Domain','System') {
 	my $output;
@@ -622,7 +628,7 @@ ENDHEADER
 	if ($output) {
 	    if ($doheaders > 0) {
 		$r->print("<tr bgcolor='#BBffBB'>".
-			  "<td align='center' colspan='7'>".&mt($type)."</td>");
+			  "<td align='center' colspan='7'>".&mt($type)."</td></tr>");
 	    }
 	    $r->print($output);	
 	}
@@ -743,7 +749,7 @@ sub role_status {
 
 sub build_roletext {
     my ($trolecode,$tdom,$trest,$tstatus,$tryagain,$advanced,$tremark,$tbg,$tfont,$trole,$ttype,$twhere,$tpstart,$tpend,$nochoose,$button,$switchserver) = @_;
-    my $roletext='<tr bgcolor='.$tbg.'>';
+    my $roletext='<tr bgcolor="'.$tbg.'">';
     unless ($nochoose) {
         if (!$button) {
             if ($switchserver) {
@@ -818,26 +824,23 @@ sub check_fordc {
 
 sub courselink {
     my ($dcdom) = @_;
-    my $cb_jscript = &Apache::loncommon::coursebrowser_javascript($dcdom,$dcdom);
-    my $verify_script = &coursepick_jscript($dcdom);
     my $courseform=&Apache::loncommon::selectcourse_link
-                     ('rolechoice','dccourse_'.$dcdom,'dcdomain_'.$dcdom,'coursedesc_'.$dcdom);
+                     ('rolechoice','dccourse_'.$dcdom,'dcdomain_'.$dcdom,'coursedesc_'.$dcdom,$dcdom);
     my $hiddenitems = '<input type="hidden" name="dcdomain_'.$dcdom.'" value="'.$dcdom.'" />'.
                       '<input type="hidden" name="origdom_'.$dcdom.'" value="'.$dcdom.'" />'.
                       '<input type="hidden" name="dccourse_'.$dcdom.'" value="" />'.
                       '<input type="hidden" name="coursedesc_'.$dcdom.'" value="" />';
-    return $cb_jscript.$verify_script.$courseform.$hiddenitems;
+    return $courseform.$hiddenitems;
 }
 
 sub coursepick_jscript {
-    my ($dcdom) = @_;
     my $verify_script = <<"END";
 <script>
 function verifyCoursePick(caller) {
     var numbutton = getIndex(caller)
-    var pickedCourse = document.rolechoice.dccourse_$dcdom.value
-    var pickedDomain = document.rolechoice.dcdomain_$dcdom.value
-    if (document.rolechoice.dcdomain_$dcdom.value == document.rolechoice.origdom_$dcdom.value) {
+    var pickedCourse = document.rolechoice.elements[numbutton+4].value
+    var pickedDomain = document.rolechoice.elements[numbutton+2].value
+    if (document.rolechoice.elements[numbutton+2].value == document.rolechoice.elements[numbutton+3].value) {
         if (pickedCourse != '') {
             if (numbutton != -1) {
                 var courseTarget = "cc./"+pickedDomain+"/"+pickedCourse
@@ -846,7 +849,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 {
@@ -900,46 +903,34 @@ END
     return $process_pick;
 }
 
-sub display_recent_roles {
-    my ($r,$roletext,$recentroles)=@_;
+sub display_cc_role {
+    my $rolekey = shift;
+    my $roletext;
     my $advanced = $ENV{'user.adv'};
     my $tryagain = $ENV{'form.tryagain'};
-    my $numrecent = 0;
-    my $roledisplay = '<tr bgcolor="#BBffBB">'.
-                   '<td align="center" colspan="7">'.
-                   &mt('Recent courses accessed by DC').
-                    '</td></tr>'."\n";
-    foreach my $rolekey (sort keys %{$recentroles}) {
-        unless ($rolekey =~/^error\:/) {
-            unless ($$roletext{$rolekey}) {
-                if ($rolekey =~ m-^user\.role.cc\./(\w+)/(\w+)$-) {
-                    my $tcourseid = $1.'_'.$2;
-                    my $trolecode = 'cc./'.$1.'/'.$2;
-                    my $trole = Apache::lonnet::plaintext('cc');
-                    my $twhere;
-                    my $tbg='#77FF77';
-                    my $tfont='#003300';
-                    my %newhash=&Apache::lonnet::coursedescription($tcourseid);
-                    if (%newhash) {
-                        $twhere=$newhash{'description'}.
-                               ' <font size="-2">'.
-                               &Apache::loncommon::syllabuswrapper(&mt('Syllabus'),$2,$1,$tfont).
-                               '</font>';
-                    } else {
-                        $twhere=&mt('Currently not available');
-                        $ENV{'course.'.$tcourseid.'.description'}=$twhere;
-                    }
-                    $twhere.="<br />".&mt('Domain').":".$1;
-                    $$roletext{$rolekey} = &build_roletext($trolecode,$1,$2,'is',$tryagain,$advanced,'',$tbg,$tfont,$trole,&mt('Course'),$twhere,'','','',1,'');
-                }
+    unless ($rolekey =~/^error\:/) {
+        if ($rolekey =~ m-^user\.role.cc\./(\w+)/(\w+)$-) {
+            my $tcourseid = $1.'_'.$2;
+            my $trolecode = 'cc./'.$1.'/'.$2;
+            my $trole = Apache::lonnet::plaintext('cc');
+            my $twhere;
+            my $tbg='#77FF77';
+            my $tfont='#003300';
+            my %newhash=&Apache::lonnet::coursedescription($tcourseid);
+            if (%newhash) {
+                $twhere=$newhash{'description'}.
+                        ' <font size="-2">'.
+                        &Apache::loncommon::syllabuswrapper(&mt('Syllabus'),$2,$1,$tfont).
+                        '</font>';
+            } else {
+                $twhere=&mt('Currently not available');
+                $ENV{'course.'.$tcourseid.'.description'}=$twhere;
             }
-            $roledisplay.=$$roletext{$rolekey};
-            $numrecent ++;
+            $twhere.="<br />".&mt('Domain').":".$1;
+            $roletext = &build_roletext($trolecode,$1,$2,'is',$tryagain,$advanced,'',$tbg,$tfont,$trole,&mt('Course'),$twhere,'','','',1,'');
         }
     }
-    if ($numrecent > 0) {
-        $r->print("$roledisplay\n");
-    }
+    return $roletext;
 }
 
 sub allcourses_row {