--- loncom/auth/lonroles.pm	2006/06/02 13:58:37	1.153
+++ loncom/auth/lonroles.pm	2009/09/23 19:42:20	1.209.4.2
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # User Roles Screen
 #
-# $Id: lonroles.pm,v 1.153 2006/06/02 13:58:37 raeburn Exp $
+# $Id: lonroles.pm,v 1.209.4.2 2009/09/23 19:42:20 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -40,8 +40,10 @@ use Apache::lonhtmlcommon;
 use Apache::lonannounce;
 use Apache::lonlocal;
 use Apache::lonpageflip();
+use Apache::lonnavdisplay();
 use GDBM_File;
-use LONCAPA;
+use LONCAPA qw(:DEFAULT :match);
+use HTML::Entities;
  
 
 sub redirect_user {
@@ -53,8 +55,8 @@ sub redirect_user {
     my $swinfo=&Apache::lonmenu::rawconfig();
     my $navwindow;
     if ($launch_nav eq 'on') {
-	$navwindow.=&Apache::lonnavmaps::launch_win('now',undef,undef,
-						  ($url =~ m-^/adm/whatsnew-));
+	$navwindow.=&Apache::lonnavdisplay::launch_win('now',undef,undef,
+						       ($url =~ m-^/adm/whatsnew-));
     } else {
 	$navwindow.=&Apache::lonnavmaps::close();
     }
@@ -88,7 +90,7 @@ sub error_page {
 	      &Apache::lonmenu::rawconfig().'</script>'.
 	      '<p>'.&mt('The following problems occurred:').
 	      $error.
-	      '</p><br /><a href="'.$dest.'>'.&mt('Continue').'</a>'.
+	      '</p><br /><a href="'.$dest.'">'.&mt('Continue').'</a>'.
 	      &Apache::loncommon::end_page());
 }
 
@@ -105,29 +107,90 @@ sub handler {
 
 # ================================================================== Roles Init
     if ($env{'form.selectrole'}) {
+
+        my $locknum=&Apache::lonnet::get_locks();
+        if ($locknum) { return 409; }
+
         if ($env{'form.newrole'}) {
             $env{'form.'.$env{'form.newrole'}}=1;
 	}
 	if ($env{'request.course.id'}) {
+            # Check if user is CC trying to select a course role
+            if ($env{'form.switchrole'}) {
+                if (!defined($env{'user.role.'.$env{'form.switchrole'}})) {
+                    &adhoc_course_role($then);
+                }
+            }
 	    my %temp=('logout_'.$env{'request.course.id'} => time);
 	    &Apache::lonnet::put('email_status',\%temp);
 	    &Apache::lonnet::delenv('user.state.'.$env{'request.course.id'});
 	}
-	&Apache::lonnet::appenv("request.course.id"   => '',
-				"request.course.fn"   => '',
-				"request.course.uri"  => '',
-				"request.course.sec"  => '',
-				"request.role"        => 'cm',
-                                "request.role.adv"    => $env{'user.adv'},
-				"request.role.domain" => $env{'user.domain'});
-
-# Check if user is a DC trying to enter a course and needs privs to be created
+	&Apache::lonnet::appenv({"request.course.id"   => '',
+			 	 "request.course.fn"   => '',
+				 "request.course.uri"  => '',
+				 "request.course.sec"  => '',
+				 "request.role"        => 'cm',
+                                 "request.role.adv"    => $env{'user.adv'},
+				 "request.role.domain" => $env{'user.domain'}});
+# Check if user is a DC trying to enter a course or author space and needs privs to be created
         if ($numdc > 0) {
             foreach my $envkey (keys %env) {
+# Is this an ad-hoc CC-role?
                 if (my ($domain,$coursenum) =
-                                    ($envkey =~ m-^form\.cc\./(\w+)/(\w+)$-)) {
+		    ($envkey =~ m-^form\.cc\./($match_domain)/($match_courseid)$-)) {
                     if ($dcroles{$domain}) {
-                        &check_privs($domain,$coursenum,$then,$now);
+                        &check_privs($domain,$coursenum,$then,$now,'cc');
+                    }
+                    last;
+                }
+# Is this an ad-hoc CA-role?
+                if (my ($domain,$user) =
+		    ($envkey =~ m-^form\.ca\./($match_domain)/($match_username)$-)) {
+                    if (($domain eq $env{'user.domain'}) && ($user eq $env{'user.name'})) {
+                        delete($env{$envkey});
+                        $env{'form.au./'.$domain.'/'} = 1;
+                        my ($server_status,$home) = &check_author_homeserver($user,$domain);
+                        if ($server_status eq 'switchserver') {
+                            my $trolecode = 'au./'.$domain.'/';
+                            my $switchserver = '/adm/switchserver?otherserver='.$home.'&role='.$trolecode;
+                            $r->internal_redirect($switchserver);
+                        }
+                        last;
+                    }
+                    if (my ($castart,$caend) = ($env{'user.role.ca./'.$domain.'/'.$user} =~ /^(\d*)\.(\d*)$/)) {
+                        if (((($castart) && ($castart < $now)) || !$castart) && 
+                            ((!$caend) || (($caend) && ($caend > $now)))) {
+                            my ($server_status,$home) = &check_author_homeserver($user,$domain);
+                            if ($server_status eq 'switchserver') {
+                                my $trolecode = 'ca./'.$domain.'/'.$user;
+                                my $switchserver = '/adm/switchserver?otherserver='.$home.'&role='.$trolecode;
+                                $r->internal_redirect($switchserver);
+                            }
+                            last;
+                        }
+                    }
+                    # Check if author blocked ca-access
+                    my %blocked=&Apache::lonnet::get('environment',['domcoord.author'],$domain,$user);
+                    if ($blocked{'domcoord.author'} eq 'blocked') {
+                        delete($env{$envkey});
+                        $env{'user.error.msg'}=':::1:User '.$user.' in domain '.$domain.' blocked domain coordinator access';
+                        last;
+                    }
+                    if ($dcroles{$domain}) {
+                        my ($server_status,$home) = &check_author_homeserver($user,$domain);
+                        if (($server_status eq 'ok') || ($server_status eq 'switchserver')) {
+                            &check_privs($domain,$user,$then,$now,'ca');
+                            if ($server_status eq 'switchserver') {
+                                my $trolecode = 'ca./'.$domain.'/'.$user; 
+                                my $switchserver = '/adm/switchserver?'
+                                                  .'otherserver='.$home.'&role='.$trolecode;
+                                $r->internal_redirect($switchserver);
+                            }
+                        } else {
+                            delete($env{$envkey});
+                        }
+                    } else {
+                        delete($env{$envkey});
                     }
                     last;
                 }
@@ -149,8 +212,10 @@ sub handler {
 
 # store role if recent_role list being kept
                     if ($env{'environment.recentroles'}) {
+                        my %frozen_roles =
+                           &Apache::lonhtmlcommon::get_recent_frozen('roles',$env{'environment.recentrolesn'});
 			&Apache::lonhtmlcommon::store_recent('roles',
-							     $trolecode,' ');
+							     $trolecode,' ',$frozen_roles{$trolecode});
                     }
 
 
@@ -162,7 +227,7 @@ sub handler {
 			my $authnum=$cnum;
 			if ($env{'course.'.$cdom.'_'.$cnum.'.keyauth'}) {
 			    ($authnum,$authdom)=
-				split(/\W/,$env{'course.'.$cdom.'_'.$cnum.'.keyauth'});
+				split(/:/,$env{'course.'.$cdom.'_'.$cnum.'.keyauth'});
 			}
 # check with key authority
 			unless (&Apache::lonnet::validate_access_key(
@@ -187,8 +252,11 @@ sub handler {
 						     $cdom,$cnum,
                                                      $env{'user.domain'},
 						     $env{'user.name'},
-	      'Assigned from '.$ENV{'REMOTE_ADDR'}.' at '.localtime().' for '.
-                                                     $trolecode);
+                                                     &mt('Assigned from [_1] at [_2] for [_3]'
+                                                        ,$ENV{'REMOTE_ADDR'}
+                                                        ,&Apache::lonlocal::locallocaltime()
+                                                        ,$trolecode)
+                                                     );
 				 unless ($assignresult eq 'ok') {
 				     $assignresult=~s/^error\:\s*//;
 				     $message=&mt($assignresult).
@@ -198,7 +266,7 @@ sub handler {
 				 }
 				 $r->print(<<ENDENTEREDKEY);
 $start_page
-<script>
+<script type="text/javascript">
 $swinfo
 </script>
 <form method="post">
@@ -221,7 +289,7 @@ ENDENTEREDKEY
 				 my $end_page=&Apache::loncommon::end_page();
 				 $r->print(<<ENDENTERKEY);
 $start_page
-<script>
+<script type="text/javascript">
 $swinfo
 </script>
 <form method="post">
@@ -242,10 +310,10 @@ ENDENTERKEY
 					 "Role ".$trolecode);
 		    
 		    &Apache::lonnet::appenv(
-					   'request.role'        => $trolecode,
-					   'request.role.domain' => $cdom,
-					   'request.course.sec'  => $csec,
-                                           'request.course.groups' => $cgrps);
+					   {'request.role'        => $trolecode,
+					    'request.role.domain' => $cdom,
+					    'request.course.sec'  => $csec,
+                                            'request.course.groups' => $cgrps});
                     my $tadv=0;
 
 		    if (($cnum) && ($role ne 'ca') && ($role ne 'aa')) {
@@ -256,7 +324,7 @@ ENDENTERKEY
 			    ($env{'form.orgurl'}!~/^\/adm\/flip/)) {
 			    my $dest=$env{'form.orgurl'};
 			    if (&Apache::lonnet::allowed('adv') eq 'F') { $tadv=1; }
-			    &Apache::lonnet::appenv('request.role.adv'=>$tadv);
+			    &Apache::lonnet::appenv({'request.role.adv'=>$tadv});
                             if (($ferr) && ($tadv)) {
 				&error_page($r,$ferr,$dest);
 			    } else {
@@ -264,23 +332,18 @@ ENDENTERKEY
 			    }
 			    return OK;
 			} else {
-                            my $type = 'Course/Group';
-			    if ($env{'request.course.id'}) {
-                                if (defined($env{'course.'.
-                                            $env{'request.course.id'}.'.type'})) {
-                                    $type = $env{'course.'.
-                                                 $env{'request.course.id'}.'.type'};
-                                }
+			    if (!$env{'request.course.id'}) {
 				&Apache::lonnet::appenv(
-				      "request.course.id"  => $cdom.'_'.$cnum);
+				      {"request.course.id"  => $cdom.'_'.$cnum});
 				$furl='/adm/roles?tryagain=1';
 				$msg=
-				    '<h1><font color="red">'.
-			 &mt('Could not initialize [_1] at this time.',lc($type)).
-		    '</font></h1><h3>'.&mt('Please try again.').'</h3>'.$ferr;
+				    '<h1><span class="LC_error">'.
+				    &mt('Could not initialize [_1] at this time.',
+					$env{'course.'.$cdom.'_'.$cnum.'.description'}).
+				    '</span></h1><h3>'.&mt('Please try again.').'</h3>'.$ferr;
 			    }
 			    if (&Apache::lonnet::allowed('adv') eq 'F') { $tadv=1; }
-			    &Apache::lonnet::appenv('request.role.adv'=>$tadv);
+			    &Apache::lonnet::appenv({'request.role.adv'=>$tadv});
 
 			    if (($ferr) && ($tadv)) {
 				&error_page($r,$ferr,$furl);
@@ -297,6 +360,18 @@ ENDENTERKEY
 				    $furl = "/adm/helper/course.initialization.helper";
 				    # Send the user to the course they selected
 				} elsif ($env{'request.course.id'}) {
+                                    if ($env{'form.destinationurl'}) {
+                                        my $dest = $env{'form.destinationurl'};
+                                        if ($env{'form.destsymb'} ne '') {
+                                            my $esc_symb = &HTML::Entities::encode($env{'form.destsymb'},'"<>&');
+                                            $dest .= '?symb='.$esc_symb;
+                                        }
+                                        &redirect_user($r,&mt('Entering [_1]',
+                                                      $env{'course.'.$courseid.'.description'}),
+                                               $dest,$msg,
+                                               $env{'environment.remotenavmap'});
+                                        return OK;
+                                    }
 				    if (&Apache::lonnet::allowed('whn',
 								 $env{'request.course.id'})
 					|| &Apache::lonnet::allowed('whn',
@@ -305,7 +380,8 @@ ENDENTERKEY
 					) {
 					my $startpage = &courseloadpage($courseid);
 					unless ($startpage eq 'firstres') {         
-					    $msg = &mt('Entering [_1] ....',lc($type));
+					    $msg = &mt('Entering [_1] ...',
+						       $env{'course.'.$courseid.'.description'});
 					    &redirect_user($r,&mt('New in course'),
 							   '/adm/whatsnew?refpage=start',$msg,
 							   $env{'environment.remotenavmap'});
@@ -314,12 +390,14 @@ ENDENTERKEY
 				    }
 				}
 # Are we allowed to look at the first resource?
-				if (!&Apache::lonnet::allowed('bre',$furl)) {
+				if ($furl !~ m|^/adm/|) {
 # Guess not ...
 				    $furl=&Apache::lonpageflip::first_accessible_resource();
 				}
-                                $msg = &mt('Entering [_1] ...',lc($type));
-				&redirect_user($r,&mt('Entering [_1]',$type),
+                                $msg = &mt('Entering [_1] ...',
+					   $env{'course.'.$courseid.'.description'});
+				&redirect_user($r,&mt('Entering [_1]',
+						      $env{'course.'.$courseid.'.description'}),
 					       $furl,$msg,
 					       $env{'environment.remotenavmap'});
 			    }
@@ -364,11 +442,15 @@ ENDENTERKEY
     my $start_page=&Apache::loncommon::start_page('User Roles');
     my $standby=&mt('Role selected. Please stand by.');
     $standby=~s/\n/\\n/g;
-    my $helptag='<table><tr><td>'.&Apache::loncommon::help_open_menu('','General Intro','General_Intro','User Roles',1,undef,undef,undef,undef,,&mt("Click here for help")).'</td></td></tr></table>';
+    my $noscript='<span class="LC_error">'.&mt('Use of LON-CAPA requires Javascript to be enabled in your web browser.').'<br />'.&mt('As this is not the case, most functionality in the system will be unavailable.').'</span><br />';
+
     $r->print(<<ENDHEADER);
 $start_page
-$helptag<br />
-<script>
+<br />
+<noscript>
+$noscript
+</noscript>
+<script type="text/javascript">
 $swinfo
 window.focus();
 
@@ -401,15 +483,24 @@ ENDHEADER
     my $advanced=$env{'user.adv'};
     &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},['tryagain']);
     my $tryagain=$env{'form.tryagain'};
+    my $reinit=$env{'user.reinit'};
+    delete $env{'user.reinit'};
 
 # -------------------------------------------------------- Generate Page Output
 # --------------------------------------------------------------- Error Header?
     if ($error) {
-	$r->print("<h1>LON-CAPA Access Control</h1>");
-        $r->print("<!-- LONCAPAACCESSCONTROLERRORSCREEN --><hr /><pre>Access  : ".
-                  Apache::lonnet::plaintext($priv)."\n");
-        $r->print("Resource: ".&Apache::lonenc::check_encrypt($fn)."\n");
-        $r->print("Action  : $msg\n</pre><hr />");
+        $r->print("<h1>".&mt('LON-CAPA Access Control')."</h1>");
+	$r->print("<!-- LONCAPAACCESSCONTROLERRORSCREEN --><hr /><pre>");
+	if ($priv ne '') {
+            $r->print(&mt('Access  : ').&Apache::lonnet::plaintext($priv)."\n");
+	}
+	if ($fn ne '') {
+            $r->print(&mt('Resource: ').&Apache::lonenc::check_encrypt($fn)."\n");
+	}
+	if ($msg ne '') {
+            $r->print(&mt('Action  : ').$msg."\n");
+	}
+	$r->print("</pre><hr />");
 	my $url=$fn;
 	my $last;
 	if (tie(my %hash,'GDBM_File',$env{'request.course.fn'}.'_symb.db',
@@ -423,26 +514,24 @@ ENDHEADER
 					&Apache::lonenc::check_encrypt($fn));
     } else {
         if ($env{'user.error.msg'}) {
-	    $r->print(
- '<h3><font color="red">'.
- &mt('You need to choose another user role or enter a specific course for this function').'</font></h3>');
-	}
+            if ($reinit) {
+                $r->print(
+ '<h3><span class="LC_error">'.
+ &mt('As your session file for the course has expired, you will need to re-select the course.').'</span></h3>');
+            } else {
+	        $r->print(
+ '<h3><span class="LC_error">'.
+ &mt('You need to choose another user role or enter a specific course for this function').'</span></h3>');
+	    }
+        }
     }
 # -------------------------------------------------------- Choice or no choice?
     if ($nochoose) {
-	$r->print("<h2>".&mt('Sorry ...')."</h2>\n".
-		  &mt('This action is currently not authorized.').
+	$r->print("<h2>".&mt('Sorry ...')."</h2>\n<span class='LC_error'>".
+		  &mt('This action is currently not authorized.').'</span>'.
 		  &Apache::loncommon::end_page());
 	return OK;
     } else {
-        if ($advanced) {
-	    $r->print(&mt("Your home server is ").
-		      $Apache::lonnet::hostname{&Apache::lonnet::homeserver
-                      ($env{'user.name'},$env{'user.domain'})}.
-		      "<br />\n");
-	    $r->print(&mt(
-      "Author and Co-Author roles are not available on servers other than their respective home servers."));
-        }
         if (($ENV{'REDIRECT_QUERY_STRING'}) && ($fn)) {
     	    $fn.='?'.$ENV{'REDIRECT_QUERY_STRING'};
         }
@@ -451,17 +540,20 @@ ENDHEADER
         $r->print('<input type="hidden" name="selectrole" value="1" />');
         $r->print('<input type="hidden" name="newrole" value="" />');
     }
-    if ($env{'user.adv'}) {
-	$r->print(
-	      '<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);
     my $countactive=0;
+    my $countfuture=0;
+    my $countwill=0;
     my $inrole=0;
     my $possiblerole='';
+    my %futureroles;
+    my %roles_nextlogin;
+    my %timezones;
+    my $numcourses;
+    if ($env{'user.adv'}) {
+       my %courses = &Apache::lonnet::courseiddump($env{'user.domain'},'.','.','.','.','.',undef,undef,'Course');
+       $numcourses = keys(%courses);
+    }
     foreach $envkey (sort keys %env) {
         my $button = 1;
         my $switchserver='';
@@ -471,22 +563,26 @@ ENDHEADER
             my ($role,$where,$trolecode,$tstart,$tend,$tremark,$tstatus,$tpstart,$tpend,$tfont);
             &role_status($envkey,$then,$now,\$role,\$where,\$trolecode,\$tstatus,\$tstart,\$tend);
             next if (!defined($role) || $role eq '' || $role =~ /^gr/);
+            my $timezone = &role_timezone($where,\%timezones);
             $tremark='';
             $tpstart='&nbsp;';
             $tpend='&nbsp;';
             $tfont='#000000';
             if ($tstart) {
-                $tpstart=&Apache::lonlocal::locallocaltime($tstart);
+                $tpstart=&Apache::lonlocal::locallocaltime($tstart,$timezone);
             }
             if ($tend) {
-                $tpend=&Apache::lonlocal::locallocaltime($tend);
+                $tpend=&Apache::lonlocal::locallocaltime($tend,$timezone);
             }
             if ($env{'request.role'} eq $trolecode) {
 		$tstatus='selected';
             }
             my $tbg;
-            if (($tstatus eq 'is') || ($tstatus eq 'selected') ||
-                ($env{'form.showall'})) {
+            if (($tstatus eq 'is') 
+		|| ($tstatus eq 'selected') 
+		|| ($tstatus eq 'will') 
+		|| ($tstatus eq 'future') 
+                || ($env{'form.showall'})) {
                 if ($tstatus eq 'is') {
                     $tbg='#77FF77';
                     $tfont='#003300';
@@ -495,33 +591,34 @@ ENDHEADER
                 } elsif ($tstatus eq 'future') {
                     $tbg='#FFFF77';
                     $button=0;
+                    $futureroles{$trolecode} = $tstart.':'.$tend;
+                    $countfuture ++;
                 } elsif ($tstatus eq 'will') {
                     $tbg='#FFAA77';
-                    $tremark.=&mt('Active at next login. ');
+                    $tremark.=&mt('Active at next login.').' ';
+                    $roles_nextlogin{$trolecode} = $tstart.':'.$tend;
+                    $countwill ++;
                 } elsif ($tstatus eq 'expired') {
                     $tbg='#FF7777';
                     $tfont='#330000';
                     $button=0;
                 } elsif ($tstatus eq 'will_not') {
                     $tbg='#AAFF77';
-                    $tremark.=&mt('Expired after logout. ');
+                    $tremark.=&mt('Expired after logout.').' ';
                 } elsif ($tstatus eq 'selected') {
                     $tbg='#11CC55';
                     $tfont='#002200';
 		    $inrole=1;
 		    $countactive++;
-                    $tremark.=&mt('Currently selected. ');
+                    $tremark.=&mt('Currently selected.').' ';
                 }
                 my $trole;
                 if ($role =~ /^cr\//) {
                     my ($rdummy,$rdomain,$rauthor,$rrole)=split(/\//,$role);
 		    if ($tremark) { $tremark.='<br />'; }
-                    $tremark.=&mt('Defined by ').$rauthor.
-			&mt(' at ').$rdomain.'.';
-                    $trole=$rrole;
-                } else {
-                    $trole=Apache::lonnet::plaintext($role);
-                }
+                    $tremark.=&mt('Defined by [_1] at [_2].',$rauthor,$rdomain);
+		}
+		$trole=Apache::lonnet::plaintext($role);
                 my $ttype;
                 my $twhere;
                 my ($tdom,$trest,$tsection)=
@@ -537,7 +634,7 @@ ENDHEADER
                         $switchserver='otherserver='.$home.'&role='.$trolecode;
                     }
                     #next if ($home eq 'no_host');
-                    $home = $Apache::lonnet::hostname{$home};
+                    $home = &Apache::lonnet::hostname($home);
                     $ttype='Construction Space';
                     $twhere=&mt('User').': '.$trest.'<br />'.&mt('Domain').
 			': '.$tdom.'<br />'.
@@ -557,7 +654,7 @@ ENDHEADER
                         $switchserver='otherserver='.$home.'&role='.$trolecode;
                     }
                     #next if ($home eq 'no_host');
-                    $home = $Apache::lonnet::hostname{$home};
+                    $home = &Apache::lonnet::hostname($home);
                     $ttype='Construction Space';
                     $twhere=&mt('Domain').': '.$tdom.'<br />'.&mt('Server').
 			':&nbsp;'.$home;
@@ -595,7 +692,7 @@ ENDHEADER
                         }
                     }
                     if ($tsection) {
-                        $twhere.='<br />'.&mt('Section/Group').': '.$tsection;
+                        $twhere.='<br />'.&mt('Section').': '.$tsection;
 		    }
 		    if ($role ne 'st') { $twhere.="<br />".&mt('Domain').":".$tdom; }
                 } elsif ($tdom) {
@@ -607,7 +704,7 @@ ENDHEADER
                     $twhere=&mt('system wide');
 		    $sortkey=$role.$twhere;
                 }
-                $roletext.=&build_roletext($trolecode,$tdom,$trest,$tstatus,$tryagain,$advanced,$tremark,$tbg,$tfont,$trole,$twhere,$tpstart,$tpend,$nochoose,$button,$switchserver);
+                $roletext.=&build_roletext($trolecode,$tdom,$trest,$tstatus,$tryagain,$advanced,$tremark,$tbg,$tfont,$trole,$twhere,$tpstart,$tpend,$nochoose,$button,$switchserver,$reinit);
 		$roletext{$envkey}=$roletext;
 		if (!$sortkey) {$sortkey=$twhere."\0".$envkey;}
 		$sortrole{$sortkey}=$envkey;
@@ -615,6 +712,22 @@ ENDHEADER
 	    }
         }
     }
+    if ($env{'user.adv'}) {
+        $r->print(
+              '<br /><span class="LC_rolesinfo"><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').'" /></span>');
+    } else {
+        if ($countactive > 0) {
+            my $queuetotal = &queued_selfenrollment($r);
+            if (($numcourses-$queuetotal) > 1) {
+                my $domdesc = &Apache::lonnet::domain($env{'user.domain'},'description');
+                my $esc_dom = &HTML::Entities::encode($env{'user.domain'},'"<>&'); 
+                $r->print('<p>'.&mt('[_1]Visit the [_2]Course Catalog[_3] to view all [_4] GCI WebCenter courses.','<b>','<a href="/adm/coursecatalog?showdom='.$esc_dom.'">','</a></b>',$domdesc).'<br />'.&mt('If a course is [_1]not[_2] in your list of current courses below, you may be able to enroll if self-enrollment is permitted.','<b>','</b>').'</p>');
+            }
+        }
+    }
+
 # No active roles
     if ($countactive==0) {
 	if ($inrole) {
@@ -622,38 +735,58 @@ ENDHEADER
 	} else {
 	    $r->print('<h2>'.&mt('Currently no active roles or courses').'</h2>');
 	}
-	$r->print('</form>'.&Apache::loncommon::end_page());
-	return OK;
-# Is there only one choice?
-    } elsif (($countactive==1) && ($env{'request.role'} eq 'cm')) {
-	$r->print('<h3>'.&mt('Please stand by.').'</h3>'.
-	    '<input type="hidden" name="'.$possiblerole.'" value="1" />');
-	$r->print("</form>\n");
-	$r->rflush();
-	$r->print('<script>document.forms.rolechoice.submit();</script>');
-	$r->print(&Apache::loncommon::end_page());
+        &findcourse_advice($r,$numcourses);
+	$r->print('</form>');
+        if ($countfuture) {
+            $r->print(&mt('The following [quant,_1,role,roles] will become active in the future:',$countfuture));
+            my $doheaders = &roletable_headers($r,\%roleclass,\%sortrole,
+                                               $nochoose);
+            &print_rolerows($r,$doheaders,\%roleclass,\%sortrole,\%dcroles,
+                            \%roletext);
+            my $tremark='';
+            my $tfont='#003300';
+            if ($env{'request.role'} eq 'cm') {
+                $r->print('<tr bgcolor="#11CC55">');
+                $tremark=&mt('Currently selected.').' ';
+                $tfont='#002200';
+            } else {
+                $r->print('<tr bgcolor="#77FF77">');
+            }
+            $r->print('<td></td><td colspan="3"><font color="'.$tfont.'"><span class="LC_rolesinfo">'.&mt('No role specified').
+                      '</span></font></td><td><font color="'.$tfont.'">'.$tremark.
+                      '&nbsp;</font></td></tr>'."\n");
+
+            $r->print('</table>');
+        }
+        $r->print(&Apache::loncommon::end_page());
 	return OK;
+    } elsif ($countactive==1) { # Is there only one choice?
+        my $needs_switchserver;
+        if ($env{'user.author'}) {
+            $needs_switchserver = &check_needs_switchserver($possiblerole);
+        }
+        if ((!$needs_switchserver) && ($env{'request.role'} eq 'cm')) {
+	    $r->print('<h3>'.&mt('Please stand by.').'</h3>'.
+	        '<input type="hidden" name="'.$possiblerole.'" value="1" />'.
+            '<noscript><br /><input type="submit" name="submit" value="'.&mt('Continue').'" /></noscript>');
+	    $r->print("</form>\n");
+	    $r->rflush();
+	    $r->print('<script type="text/javascript">document.forms.rolechoice.submit();</script>');
+	    $r->print(&Apache::loncommon::end_page());
+	    return OK;
+        }
+        if ($needs_switchserver) {
+            $r->print("<h2>".&mt('Server Switch Required')."</h2>\n".
+                      &mt('Construction Space access is only available from '.
+                          'the home server of the corresponding Author.').'<br />'.
+                      &mt("Click the 'Switch Server' link to go there.").'<br />');   
+        }
     }
-# More than one possible role
 # ----------------------------------------------------------------------- Table
-    unless (($advanced) || ($nochoose)) {
-	$r->print("<h2>".&mt('Select a Course/Group to Enter')."</h2>\n");
+    unless ((!&Apache::lonmenu::show_course()) || ($nochoose) || ($countactive==1)) {
+	$r->print("<h2>".&mt('Select a Course to Enter')."</h2>\n");
     }
-    $r->print('<br /><table><tr>');
-    unless ($nochoose) { $r->print('<th>&nbsp;</th>'); }
-    $r->print('<th>'.&mt('User Role').'</th><th>'.&mt('Extent').
-         '</th><th>'.&mt('Start').'</th><th>'.&mt('End').'</th></tr>'."\n");
-    my $doheaders=-1;
-    foreach my $type ('Domain','Construction Space','Course','Group','Unavailable','System') {
-	my $haverole=0;
-	foreach my $which (sort {uc($a) cmp uc($b)} (keys(%sortrole))) {
-	    if ($roleclass{$sortrole{$which}} =~ /^\Q$type\E/) { 
-		$haverole=1;
-	    }
-	}
-	if ($haverole) { $doheaders++; }
-    }
-
+    my $doheaders = &roletable_headers($r,\%roleclass,\%sortrole,$nochoose);
     if ($env{'environment.recentroles'}) {
         my %recent_roles =
                &Apache::lonhtmlcommon::get_recent('roles',$env{'environment.recentrolesn'});
@@ -661,8 +794,9 @@ ENDHEADER
 	foreach (sort(keys(%recent_roles))) {
 	    if (defined($roletext{'user.role.'.$_})) {
 		$output.=$roletext{'user.role.'.$_};
-                if ($_ =~ m-dc\./(\w+)/- && $dcroles{$1}) {
-		    $output .= &allcourses_row($1,'recent');
+                if ($_ =~ m-dc\./($match_domain)/- 
+		    && $dcroles{$1}) {
+		    $output .= &adhoc_roles_row($1,'recent');
                 }
 	    } elsif ($numdc > 0) {
                 unless ($_ =~/^error\:/) {
@@ -672,58 +806,40 @@ ENDHEADER
 	}
 	if ($output) {
 	    $r->print("<tr><td align='center' colspan='5'><font face='arial'>".
-		      &mt('Recent Roles')."</font></td>");
+		      &mt('Recent Roles')."</font></td></tr>");
 	    $r->print($output);
-	    $r->print("</tr>");
             $doheaders ++;
 	}
     }
 
     if ($numdc > 0) {
         $r->print(&coursepick_jscript());
-        $r->print(&Apache::loncommon::coursebrowser_javascript());
+        $r->print(&Apache::loncommon::coursebrowser_javascript().
+                  &Apache::loncommon::authorbrowser_javascript());
     }
-    foreach my $type ('Construction Space','Domain','Course','Group','Unavailable','System') {
-	my $output;
-	foreach my $which (sort {uc($a) cmp uc($b)} (keys(%sortrole))) {
-	    if ($roleclass{$sortrole{$which}} =~ /^\Q$type\E/) { 
-		$output.=$roletext{$sortrole{$which}};
-                if ($sortrole{$which} =~ m-dc\./(\w+)/-) {
-                    if ($dcroles{$1}) {
-                        $output .= &allcourses_row($1,'');
-                    }
-                }
-	    }
-	}
-	if ($output) {
-	    if ($doheaders > 0) {
-		$r->print("<tr>".
-			  "<td align='center' colspan='5'><font face='arial'>".&mt($type)."</font></td></tr>");
+    &print_rolerows($r,$doheaders,\%roleclass,\%sortrole,\%dcroles,\%roletext);
+    if ($countactive > 1) {
+        my $tremark='';
+        my $tfont='#003300';
+        if ($env{'request.role'} eq 'cm') {
+	    $r->print('<tr bgcolor="#11CC55">');
+            $tremark=&mt('Currently selected.').' ';
+            $tfont='#002200';
+        } else {
+            $r->print('<tr bgcolor="#77FF77">');
+        }
+        unless ($nochoose) {
+	    if ($env{'request.role'} ne 'cm') {
+	        $r->print('<td><input type="submit" value="'.
+		          &mt('Select').'" name="cm" /></td>');
+	    } else {
+	        $r->print('<td>&nbsp;</td>');
 	    }
-	    $r->print($output);	
-	}
-    }
-    my $tremark='';
-    my $tfont='#003300';
-    if ($env{'request.role'} eq 'cm') {
-	$r->print('<tr bgcolor="#11CC55">');
-        $tremark=&mt('Currently selected. ');
-        $tfont='#002200';
-    } else {
-        $r->print('<tr bgcolor="#77FF77">');
-    }
-    unless ($nochoose) {
-	if ($env{'request.role'} ne 'cm') {
-	    $r->print('<td><input type="submit" value="'.
-		      &mt('Select').'" name="cm"></td>');
-	} else {
-	    $r->print('<td>&nbsp;</td>');
-	}
-    }
-    $r->print('<td colspan="3"><font color="'.$tfont.'">'.&mt('No role specified').
-      '</font></td><td><font color="'.$tfont.'">'.$tremark.
-      '&nbsp;</font></td></tr>'."\n");
-
+        }
+        $r->print('<td colspan="3"><font color="'.$tfont.'"><span class="LC_rolesinfo">'.&mt('No role specified').
+                  '</span></font></td><td><font color="'.$tfont.'">'.$tremark.
+                  '&nbsp;</font></td></tr>'."\n");
+    } 
     $r->print('</table>');
     unless ($nochoose) {
 	$r->print("</form>\n");
@@ -731,68 +847,260 @@ ENDHEADER
 # ------------------------------------------------------------ Privileges Info
     if (($advanced) && (($env{'user.error.msg'}) || ($error))) {
 	$r->print('<hr /><h2>Current Privileges</h2>');
+	$r->print(&privileges_info());
+    }
+    $r->print(&Apache::lonnet::getannounce());
+    if ($advanced) {
+        my $esc_dom = &HTML::Entities::encode($env{'user.domain'},'"<>&');
+	$r->print('<p><small><i>'
+                 .&mt('This is LON-CAPA [_1]',$r->dir_config('lonVersion'))
+		 .'</i><br />'
+		 .'<a href="/adm/logout">'.&mt('Logout').'</a>');
+        if ($numcourses>1) {
+            $r->print('&nbsp;&nbsp;'.
+                      '<a href="/adm/coursecatalog?showdom='.$esc_dom.'">'.
+                      &mt('Course Catalog').
+                      '</small>');
+        }
+        $r->print('</p>');
+    }
+    $r->print(&Apache::loncommon::end_page());
+    return OK;
+}
 
-	foreach $envkey (sort keys %env) {
-	    if ($envkey=~/^user\.priv\.$env{'request.role'}\./) {
-		my $where=$envkey;
-		$where=~s/^user\.priv\.$env{'request.role'}\.//;
-		my $ttype;
-		my $twhere;
-		my ($tdom,$trest,$tsec)=
-		    split(/\//,Apache::lonnet::declutter($where));
-		if ($trest) {
-		    if ($env{'course.'.$tdom.'_'.$trest.'.description'} eq 'ca') {
-			$ttype='Construction Space';
-			$twhere='User: '.$trest.', Domain: '.$tdom;
-		    } else {
-			$ttype='Course';
-                        if (defined($env{'course.'.$tdom.'_'.$trest.'.type'})) {
-                            $ttype = $env{'course.'.$tdom.'_'.$trest.'.type'};
+sub role_timezone {
+    my ($where,$timezones) = @_;
+    my $timezone;
+    if (ref($timezones) eq 'HASH') {
+        if ($where =~ m{^/($match_domain)/($match_courseid)}) {
+            my $cdom = $1;
+            my $cnum = $2;
+            if ($cdom && $cnum) {
+                if (!exists($timezones->{$cdom.'_'.$cnum})) {
+                    my %timehash =
+                        &Apache::lonnet::get('environment',['timezone'],$cdom,$cnum);
+                    if ($timehash{'timezone'} eq '') {
+                        if (!exists($timezones->{$cdom})) {
+                            my %domdefaults =
+                                &Apache::lonnet::get_domain_defaults($cdom);
+                            if ($domdefaults{'timezone_def'} eq '') {
+                                $timezones->{$cdom} = 'local';
+                            } else {
+                                $timezones->{$cdom} = $domdefaults{'timezone_def'};
+                            }
                         }
-			$twhere=$env{'course.'.$tdom.'_'.$trest.'.description'};
-			if ($tsec) {
-			    $twhere.=' (Section: '.$tsec.')';
-			}
-		    }
-		} elsif ($tdom) {
-		    $ttype='Domain';
-		    $twhere=$tdom;
-		} else {
-		    $ttype='System';
-		    $twhere='/';
-		}
-		$r->print("\n<h3>".$ttype.': '.$twhere.'</h3><ul>');
-		foreach (sort split(/:/,$env{$envkey})) {
-		    if ($_) {
-			my ($prv,$restr)=split(/\&/,$_);
-			my $trestr='';
-			if ($restr ne 'F') {
-			    my $i;
-			    $trestr.=' (';
-			    for ($i=0;$i<length($restr);$i++) {
-				$trestr.=
-			       Apache::lonnet::plaintext(substr($restr,$i,1));
-				if ($i<length($restr)-1) { $trestr.=', '; }
-			    }
-			    $trestr.=')';
-			}
-			$r->print('<li>'.
-				  Apache::lonnet::plaintext($prv).$trestr.
-				  '</li>');
+                        $timezones->{$cdom.'_'.$cnum} = $timezones->{$cdom};
+                    } else {
+                        $timezones->{$cdom.'_'.$cnum} =
+                            &Apache::lonlocal::gettimezone($timehash{'timezone'});
+                    }
+                }
+                $timezone = $timezones->{$cdom.'_'.$cnum};
+            }
+        } else {
+            my ($tdom) = ($where =~ m{^/($match_domain)});
+            if ($tdom) {
+                if (!exists($timezones->{$tdom})) {
+                    my %domdefaults = &Apache::lonnet::get_domain_defaults($tdom);
+                    if ($domdefaults{'timezone_def'} eq '') {
+                        $timezones->{$tdom} = 'local';
+                    } else {
+                        $timezones->{$tdom} = $domdefaults{'timezone_def'};
+                    }
+                }
+                $timezone = $timezones->{$tdom};
+            }
+        }
+        if ($timezone eq 'local') {
+            $timezone = undef;
+        }
+    }
+    return $timezone;
+}
+
+sub roletable_headers {
+    my ($r,$roleclass,$sortrole,$nochoose) = @_;
+    my $doheaders;
+    if ((ref($sortrole) eq 'HASH') && (ref($roleclass) eq 'HASH')) {
+        $r->print('<br /><table id="LC_rolesmenu"><tr>');
+        if (!$nochoose) { $r->print('<th>&nbsp;</th>'); }
+        $r->print('<th>'.&mt('User Role').'</th><th>'.&mt('Extent')
+                  .'</th><th>'.&mt('Start').'</th><th>'.&mt('End')
+                  .'</th></tr>'."\n");
+        $doheaders=-1;
+        my @roletypes = &roletypes();
+        foreach my $type (@roletypes) {
+            my $haverole=0;
+            foreach my $which (sort {uc($a) cmp uc($b)} (keys(%{$sortrole}))) {
+                if ($roleclass->{$sortrole->{$which}} =~ /^\Q$type\E/) {
+                    $haverole=1;
+                }
+            }
+            if ($haverole) { $doheaders++; }
+        }
+    }
+    return $doheaders;
+}
+
+sub roletypes {
+    my @types = ('Domain','Construction Space','Course','Unavailable','System');
+    return @types; 
+}
+
+sub print_rolerows {
+    my ($r,$doheaders,$roleclass,$sortrole,$dcroles,$roletext) = @_;
+    if ((ref($roleclass) eq 'HASH') && (ref($sortrole) eq 'HASH')) {
+        my @types = &roletypes();
+        foreach my $type (@types) {
+            my $output;
+            foreach my $which (sort {uc($a) cmp uc($b)} (keys(%{$sortrole}))) {
+                if ($roleclass->{$sortrole->{$which}} =~ /^\Q$type\E/) {
+                    if (ref($roletext) eq 'HASH') {
+                        $output.=$roletext->{$sortrole->{$which}};
+                        if ($sortrole->{$which} =~ m-dc\./($match_domain)/-) {
+                            if (ref($dcroles) eq 'HASH') {
+                                if ($dcroles->{$1}) {
+                                    $output .= &adhoc_roles_row($1,'');
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+            if ($output) {
+                if ($doheaders > 0) {
+                    $r->print("<tr>".
+                              "<td align='center' colspan='5'><font face='arial'>".
+                              &mt($type)."</font></td></tr>");
+                }
+                $r->print($output);
+            }
+        }
+    }
+}
+
+sub findcourse_advice {
+    my ($r,$numcourses) = @_;
+    my $domdesc = &Apache::lonnet::domain($env{'user.domain'},'description');
+    my $esc_dom = &HTML::Entities::encode($env{'user.domain'},'"<>&');
+    if (&Apache::lonnet::auto_run(undef,$env{'user.domain'})) {
+        $r->print(&mt('If you were expecting to see an active role listed for a particular course in the [_1] domain, it may be missing for one of the following reasons:',$domdesc).'
+<ul>
+ <li>'.&mt('The course has yet to be created.').'</li>
+ <li>'.&mt('Automatic enrollment of registered students has not been enabled for the course.').'</li>
+ <li>'.&mt('You are in a section of course for which automatic enrollment in the corresponding LON-CAPA course is not active.').'</li>
+ <li>'.&mt('The start date for automated enrollment has yet to be reached.').'</li>
+ <li>'.&mt('You registered for the course recently and there is a time lag between the time you register, and the time this information becomes available for the update of LON-CAPA course rosters.').'</li>
+ </ul>');
+    } else {
+        $r->print(&mt('If you were expecting to see an active role listed for a particular course, that course may not have been created yet.').'<br />');
+    }
+    my $queuetotal = &queued_selfenrollment($r);
+    if (($numcourses - $queuetotal) > 0) {
+        $r->print('<p>'.&mt('The [_1]Course Catalog[_2] provides information about all [_3] classes for which LON-CAPA courses have been created.','<a href="/adm/coursecatalog?showdom='.$esc_dom.'">','</a>',$domdesc).'<br />');
+        $r->print(&mt('You can search the course catalog for courses which permit self-enrollment, if you would like to enroll in a course.').'</p>');
+    }
+    return;
+}
+
+sub queued_selfenrollment {
+    my ($r) = @_;
+    my %selfenrollrequests = &Apache::lonnet::dump('selfenrollrequests');
+    my %reqs_by_date;
+    my $queuetotal = 0;
+    foreach my $item (keys(%selfenrollrequests)) {
+        if (ref($selfenrollrequests{$item}) eq 'HASH') {
+            if ($selfenrollrequests{$item}{'status'} eq 'request') {
+                if ($selfenrollrequests{$item}{'timestamp'}) {
+                    push(@{$reqs_by_date{$selfenrollrequests{$item}{'timestamp'}}},$item);
+                }
+            }
+        }
+    }
+    if (keys(%reqs_by_date)) {
+        my $rolename = &Apache::lonnet::plaintext('st');
+        $r->print('<b>'.&mt('Enrollment requests pending Course Coordinator approval').'</b><br />'.
+                  &Apache::loncommon::start_data_table().
+                  &Apache::loncommon::start_data_table_header_row().
+                  '<th>'.&mt('Date requested').'</th><th>'.&mt('Course title').'</th>'.
+                  '<th>'.&mt('User role').'</th><th>'.&mt('Section').'</th>'.
+                 &Apache::loncommon::end_data_table_header_row());
+        my @sorted = sort { $a <=> $b } (keys(%reqs_by_date));
+        foreach my $item (@sorted) {
+            if (ref($reqs_by_date{$item}) eq 'ARRAY') {
+                foreach my $crs (@{$reqs_by_date{$item}}) {
+                    my %courseinfo = &Apache::lonnet::coursedescription($crs);
+                    my $usec = $selfenrollrequests{$crs}{'section'};
+                    if ($usec eq '') {
+                        $usec = &mt('No section');
+                    }
+                    $r->print(&Apache::loncommon::start_data_table_row().
+                             '<td>'.&Apache::lonlocal::locallocaltime($item).'</td>'.
+                             '<td>'.$courseinfo{'description'}.'</td>'.
+                             '<td>'.$rolename.'</td><td>'.$usec.'</td>'.
+                             &Apache::loncommon::end_data_table_row());
+                    $queuetotal ++;
+                }
+            }
+        }
+        $r->print(&Apache::loncommon::end_data_table());
+    }
+    return $queuetotal;
+}
+
+sub privileges_info {
+    my ($which) = @_;
+    my $output;
+
+    $which ||= $env{'request.role'};
+
+    foreach my $envkey (sort(keys(%env))) {
+	next if ($envkey!~/^user\.priv\.\Q$which\E\.(.*)/);
+
+	my $where=$1;
+	my $ttype;
+	my $twhere;
+	my (undef,$tdom,$trest,$tsec)=split(m{/},$where);
+	if ($trest) {
+	    if ($env{'course.'.$tdom.'_'.$trest.'.description'} eq 'ca') {
+		$ttype='Construction Space';
+		$twhere='User: '.$trest.', Domain: '.$tdom;
+	    } else {
+		$ttype= &Apache::loncommon::course_type($tdom.'_'.$trest);
+		$twhere=$env{'course.'.$tdom.'_'.$trest.'.description'};
+		if ($tsec) {
+		    my $sec_type = 'Section';
+		    if (exists($env{"user.role.gr.$where"})) {
+			$sec_type = 'Group';
 		    }
+		    $twhere.=' ('.$sec_type.': '.$tsec.')';
 		}
-		$r->print('</ul>');
 	    }
+	} elsif ($tdom) {
+	    $ttype='Domain';
+	    $twhere=$tdom;
+	} else {
+	    $ttype='System';
+	    $twhere='/';
 	}
+	$output .= "\n<h3>".&mt($ttype).': '.$twhere.'</h3>'."\n<ul>";
+	foreach my $priv (sort(split(/:/,$env{$envkey}))) {
+	    next if (!$priv);
+
+	    my ($prv,$restr)=split(/\&/,$priv);
+	    my $trestr='';
+	    if ($restr ne 'F') {
+		$trestr.=' ('.
+		    join(', ',
+			 map { &Apache::lonnet::plaintext($_) } 
+			     (split('',$restr))).') ';
+	    }
+	    $output .= "\n\t".
+		'<li>'.&Apache::lonnet::plaintext($prv).$trestr.'</li>';
+	}
+	$output .= "\n".'</ul>';
     }
-    $r->print(&Apache::lonnet::getannounce());
-    if ($advanced) {
-	$r->print('<p><small><i>This is LON-CAPA '.
-		  $r->dir_config('lonVersion').'</i><br />'.
-		  '<a href="/adm/logout">'.&mt('Logout').'</a></small></p>');
-    }
-    $r->print(&Apache::loncommon::end_page());
-    return OK;
+    return $output;
 }
 
 sub role_status {
@@ -821,8 +1129,8 @@ sub role_status {
 }
 
 sub build_roletext {
-    my ($trolecode,$tdom,$trest,$tstatus,$tryagain,$advanced,$tremark,$tbg,$tfont,$trole,$twhere,$tpstart,$tpend,$nochoose,$button,$switchserver) = @_;
-    my $roletext='<tr bgcolor="'.$tbg.'">';
+    my ($trolecode,$tdom,$trest,$tstatus,$tryagain,$advanced,$tremark,$tbg,$tfont,$trole,$twhere,$tpstart,$tpend,$nochoose,$button,$switchserver,$reinit) = @_;
+    my $roletext='<tr bgcolor="'.$tbg.'" class="LC_rolesmenu_'.$tstatus.'">';
     my $is_dc=($trolecode =~ m/^dc\./);
     my $rowspan=($is_dc) ? ''
                          : ' rowspan="2" ';
@@ -832,55 +1140,99 @@ sub build_roletext {
         $buttonname=~s/\W//g;
         if (!$button) {
             if ($switchserver) {
-                $roletext.='<td'.$rowspan.'><a href="/adm/switchserver?'.
-                $switchserver.'">'.&mt('Switch Server').'</a></td>';
+                $roletext.='<td'.$rowspan.'><span class="LC_rolesinfo"><a href="/adm/switchserver?'.
+                $switchserver.'">'.&mt('Switch Server').'</a></span></td>';
             } else {
-                $roletext.=('<td>&nbsp;</td>');
+                $roletext.=('<td'.$rowspan.'>&nbsp;</td>');
             }
         } elsif ($tstatus eq 'is') {
             $roletext.='<td'.$rowspan.'><input name="'.$buttonname.'" type="button" value="'.
                         &mt('Select').'" onClick="javascript:enterrole(this.form,\''.
-                        $trolecode."','".$buttonname.'\');"></td>';
+                        $trolecode."','".$buttonname.'\');" /></td>';
         } elsif ($tryagain) {
             $roletext.=
                 '<td'.$rowspan.'><input name="'.$buttonname.'" type="button" value="'.
                 &mt('Try Selecting Again').'" onClick="javascript:enterrole(this.form,\''.
-                        $trolecode."','".$buttonname.'\');"></td>';
+                        $trolecode."','".$buttonname.'\');" /></td>';
         } elsif ($advanced) {
             $roletext.=
                 '<td'.$rowspan.'><input name="'.$buttonname.'" type="button" value="'.
-                &mt('Re-Initialize').'" onClick="javascript:enterrole(this.form,\''.
-                        $trolecode."','".$buttonname.'\');"></td>';
+                &mt('Re-Select').'" onClick="javascript:enterrole(this.form,\''.
+                        $trolecode."','".$buttonname.'\');" /></td>';
+        } elsif ($reinit) {
+            $roletext.= 
+                '<td'.$rowspan.'><input name="'.$buttonname.'" type="button" value="'.
+                &mt('Re-Select').'" onClick="javascript:enterrole(this.form,\''.
+                        $trolecode."','".$buttonname.'\');" /></td>';
         } else {
-            $roletext.='<td'.$rowspan.'>&nbsp;</td>';
+            $roletext.=
+                '<td'.$rowspan.'><input name="'.$buttonname.'" type="button" value="'.
+                &mt('Re-Select').'" onClick="javascript:enterrole(this.form,\''.
+                        $trolecode."','".$buttonname.'\');" /></td>';
         }
     }
-    $tremark.=&Apache::lonannounce::showday(time,1,
-                 &Apache::lonannounce::readcalendar($tdom.'_'.$trest));
-
+    if ($trolecode !~ m/^(dc|ca|au|aa)\./) {
+	$tremark.=&Apache::lonannounce::showday(time,1,
+			 &Apache::lonannounce::readcalendar($tdom.'_'.$trest));
+    }
     $roletext.='<td><font color="'.$tfont.'">'.$trole.
 	       '</font></td><td><font color="'.$tfont.'">'.$twhere.
                '</font></td><td><font color="'.$tfont.'">'.$tpstart.
                '</font></td><td><font color="'.$tfont.'">'.$tpend.
                '</font></td></tr>';
     if (!$is_dc) {
-	$roletext.='<tr bgcolor="'.$tbg.'"><td colspan="4"><font color="'.$tfont.'">'.$tremark.
-	    '&nbsp;</font></td></tr><tr><td colspan="5" height="3"></td></tr>'."\n";
+	$roletext.='<tr bgcolor="'.$tbg.'"><td colspan="4"><font color="'.$tfont.'"><span class="LC_rolesinfo">'.$tremark.
+	    '</span>&nbsp;</font></td></tr><tr><td colspan="5" height="3"></td></tr>'."\n";
     }
     return $roletext;
 }
 
+sub check_needs_switchserver {
+    my ($possiblerole) = @_;
+    my $needs_switchserver;
+    my ($role,$where) = split(/\./,$possiblerole,2);
+    my (undef,$tdom,$twho) = split(/\//,$where);
+    my ($server_status,$home);
+    if (($role eq 'ca') || ($role eq 'aa')) {
+        ($server_status,$home) = &check_author_homeserver($twho,$tdom);
+    } else {
+        ($server_status,$home) = &check_author_homeserver($env{'user.name'},
+                                                          $env{'user.domain'});
+    }
+    if ($server_status eq 'switchserver') {
+        $needs_switchserver = 1;
+    }
+    return $needs_switchserver;
+}
+
+sub check_author_homeserver {
+    my ($uname,$udom)=@_;
+    if (($uname eq '') || ($udom eq '')) {
+        return ('fail','');
+    }
+    my $home = &Apache::lonnet::homeserver($uname,$udom);
+    if (&Apache::lonnet::host_domain($home) ne $udom) {
+        return ('fail',$home);
+    }
+    my @ids=&Apache::lonnet::current_machine_ids();
+    if (grep(/^\Q$home\E$/,@ids)) {
+        return ('ok',$home);
+    } else {
+        return ('switchserver',$home);
+    }
+}
+
 sub check_privs {
-    my ($cdom,$cnum,$then,$now) = @_;
-    my $cckey = 'user.role.cc./'.$cdom.'/'.$cnum; 
+    my ($cdom,$cnum,$then,$now,$checkrole) = @_;
+    my $cckey = 'user.role.'.$checkrole.'./'.$cdom.'/'.$cnum; 
     if ($env{$cckey}) {
         my ($role,$where,$trolecode,$tstart,$tend,$tremark,$tstatus,$tpstart,$tpend,$tfont);
         &role_status($cckey,$then,$now,\$role,\$where,\$trolecode,\$tstatus,\$tstart,\$tend);
         unless (($tstatus eq 'is') || ($tstatus eq 'will_not')) {
-            &set_privileges($cdom,$cnum);
+            &set_privileges($cdom,$cnum,$checkrole);
         }
     } else {
-        &set_privileges($cdom,$cnum);
+        &set_privileges($cdom,$cnum,$checkrole);
     }
 }
 
@@ -889,7 +1241,7 @@ sub check_fordc {
     my $numdc = 0;
     if ($env{'user.adv'}) {
         foreach my $envkey (sort keys %env) {
-            if ($envkey=~/^user\.role\.dc\.\/(\w+)\/$/) {
+            if ($envkey=~/^user\.role\.dc\.\/($match_domain)\/$/) {
                 my $dcdom = $1;
                 my $livedc = 1;
                 my ($tstart,$tend)=split(/\./,$env{$envkey});
@@ -905,12 +1257,83 @@ sub check_fordc {
     return $numdc;
 }
 
+sub adhoc_course_role {
+    my ($then) = @_; 
+    my ($cdom,$cnum);
+    $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
+    $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
+    if (&check_forcc($cdom,$cnum,$then)) {
+        my $setprivs;
+        if (!defined($env{'user.role.'.$env{'form.switchrole'}})) {
+            $setprivs = 1;
+        } else {
+            my ($start,$end) = split(/\./,$env{'user.role.'.$env{'form.switchrole'}});
+            if (($start && ($start>$then || $start == -1)) ||
+                ($end && $end<$then)) {
+                $setprivs = 1;
+            }
+        } 
+        if ($setprivs) {
+            if ($env{'form.switchrole'} =~ m-^(in|ta|ep|ad|st|cr)([\w/]*)\./\Q$cdom\E/\Q$cnum\E/?(\w*)$-) {
+                my $role = $1;
+                my $custom_role = $2;
+                my $usec = $3;
+                if ($role eq 'cr') {
+                    if ($custom_role =~ m-^/$match_domain/$match_username/\w+$-) {
+                        $role .= $custom_role;
+                    } else {
+                        return;
+                    }
+                }
+                my (%userroles,%newrole,%newgroups,%group_privs);
+                my %cgroups =
+                    &Apache::lonnet::get_active_groups($env{'user.domain'},
+                                            $env{'user.name'},$cdom,$cnum);
+                foreach my $group (keys(%cgroups)) {
+                    $group_privs{$group} =
+                        $env{'user.priv.cc./'.$cdom.'/'.$cnum.'./'.$cdom.'/'.$cnum.'/'.$group};
+                }
+                $newgroups{'/'.$cdom.'/'.$cnum} = \%group_privs;
+                my $area = '/'.$cdom.'/'.$cnum;
+                my $spec = $role.'.'.$area;
+                if ($usec ne '') {
+                    $spec .= '/'.$usec;
+                    $area .= '/'.$usec;
+                }
+                &Apache::lonnet::standard_roleprivs(\%newrole,$role,$cdom,$spec,$cnum,$area);
+                &Apache::lonnet::set_userprivs(\%userroles,\%newrole,\%newgroups);
+                my $adhocstart = $then-1;
+                $userroles{'user.role.'.$spec} = $adhocstart.'.';
+                &Apache::lonnet::appenv(\%userroles,[$role,'cm']);
+            }
+        }
+    }
+    return;
+}
+
+sub check_forcc {
+    my ($cdom,$cnum,$then) = @_;
+    my $is_cc;
+    if ($cdom ne '' && $cnum ne '') {
+        if (&Apache::lonnet::is_course($cdom,$cnum)) {
+            my $envkey = 'user.role.cc./'.$cdom.'/'.$cnum;
+            if (defined($env{$envkey})) {
+                $is_cc = 1;
+                my ($tstart,$tend)=split(/\./,$env{$envkey});
+                if ($tstart && $tstart>$then) { $is_cc = 0; }
+                if ($tend   && $tend  <$then) { $is_cc = 0; }
+            }
+        }
+    }
+    return $is_cc;
+}
+
 sub courselink {
-    my ($dcdom,$rowtype,$selecttype) = @_;
+    my ($dcdom,$rowtype) = @_;
     my $courseform=&Apache::loncommon::selectcourse_link
                    ('rolechoice','dccourse'.$rowtype.'_'.$dcdom,
                     'dcdomain'.$rowtype.'_'.$dcdom,'coursedesc'.$rowtype.'_'.
-                    $dcdom,$dcdom,undef,$selecttype);
+                    $dcdom,$dcdom,undef);
     my $hiddenitems = '<input type="hidden" name="dcdomain'.$rowtype.'_'.$dcdom.'" value="'.$dcdom.'" />'.
                       '<input type="hidden" name="origdom'.$rowtype.'_'.$dcdom.'" value="'.$dcdom.'" />'.
                       '<input type="hidden" name="dccourse'.$rowtype.'_'.$dcdom.'" value="" />'.
@@ -919,8 +1342,12 @@ sub courselink {
 }
 
 sub coursepick_jscript {
+    my %lt = &Apache::lonlocal::texthash(
+                  plsu => "Please use the 'Select Course' link to open a separate pick course window where you may select the course you wish to enter.",
+                  youc => 'You can only use this screen to select courses in the current domain.',
+             );
     my $verify_script = <<"END";
-<script>
+<script type="text/javascript">
 function verifyCoursePick(caller) {
     var numbutton = getIndex(caller)
     var pickedCourse = document.rolechoice.elements[numbutton+4].value
@@ -934,11 +1361,11 @@ function verifyCoursePick(caller) {
             }
         }
         else {
-            alert("Please use the 'Select Course' link to open a separate pick course window where you may select the course you wish to enter.");
+            alert("$lt{'plsu'}");
         }
     }
     else {
-        alert("You can only use this screen to select courses in the current domain")
+        alert("$lt{'youc'}")
     }
 }
 function getIndex(caller) {
@@ -954,30 +1381,11 @@ END
     return $verify_script;
 }
 
-sub processpick {
-    my $process_pick = <<"END";
-<script>
-function process_pick(dom) {
-    var pickedCourse=opener.document.rolechoice.$env{'form.cnumelement'}.value;
-    var pickedDomain=opener.document.rolechoice.$env{'form.cdomelement'}.value;
-    var okDomain = 0;
-
-    if (pickedDomain == dom) {
-        if (pickedCourse != '') {
-            var courseTarget = "cc./"+pickedDomain+"/"+pickedCourse
-            opener.document.title='Role selected. Please stand by.';
-            opener.status='Role selected. Please stand by.';
-	    opener.document.rolechoice.newrole.value=courseTarget
-            opener.document.rolechoice.submit()
-        }
-    } else {
-        alert("You may only use this screen to select courses in the current domain: "+dom+"\\nPlease return to the roles page window and click the 'Select Course' link for domain: "+pickedDomain+",\\n if you are a Domain Coordinator in that domain, and wish to become a Course Coordinator in a course in the domain");
-    }
-}
- 
-</script>
-END
-    return $process_pick;
+sub coauthorlink {
+    my ($dcdom,$rowtype) = @_;
+    my $coauthorform=&Apache::loncommon::selectauthor_link('rolechoice',$dcdom);
+    my $hiddenitems = '<input type="hidden" name="adhoccauname'.$rowtype.'_'.$dcdom.'" value="" />';
+    return $coauthorform.$hiddenitems;
 }
 
 sub display_cc_role {
@@ -986,7 +1394,7 @@ sub display_cc_role {
     my $advanced = $env{'user.adv'};
     my $tryagain = $env{'form.tryagain'};
     unless ($rolekey =~/^error\:/) {
-        if ($rolekey =~ m-^user\.role.cc\./(\w+)/(\w+)$-) {
+        if ($rolekey =~ m-^user\.role.cc\./($match_domain)/($match_courseid)$-) {
             my $tcourseid = $1.'_'.$2;
             my $trolecode = 'cc./'.$1.'/'.$2;
             my $twhere;
@@ -1012,18 +1420,22 @@ sub display_cc_role {
     return ($roletext);
 }
 
-sub allcourses_row {
+sub adhoc_roles_row {
     my ($dcdom,$rowtype) = @_;
     my $output = '<tr bgcolor="#77FF77">'.
-                 ' <td colspan="5">';
-    foreach my $type ('Course','Group') {
-        my $selectlink = &courselink($dcdom,$rowtype,$type);
-        my $ccrole = &Apache::lonnet::plaintext('cc',$type);
-        $output.= '<font color="#002200">'.$ccrole.'</font>'.
-              ' <b>'.$selectlink.'</b>'.
-              ' from '.&mt('Domain').' '.$dcdom.'<br />';
-    }
-    $output .= '</tr><tr><td colspan="5" height="3"></td></tr>'."\n";
+                 ' <td colspan="5"><table><tr><td><span class="LC_rolesinfo">'
+                 .&mt('[_1]Ad hoc[_2] roles in domain [_3] --',
+                 '<span class="LC_cusr_emph">','</span>',$dcdom).'</span></td><td>';
+    my $selectcclink = &courselink($dcdom,$rowtype);
+    my $ccrole = &Apache::lonnet::plaintext('cc');
+    my $carole = &Apache::lonnet::plaintext('ca');
+    my $selectcalink = &coauthorlink($dcdom,$rowtype);
+    $output.= '<span class="LC_rolesinfo">'.
+            &mt('[_1]: [_2]',$ccrole,$selectcclink).
+            '</span><br /></td><td>&nbsp;&nbsp;</td><td><span class="LC_rolesinfo">'.
+            &mt('[_1]: [_2]',$carole,$selectcalink).
+            '</span><br /></td></tr></table></td></tr>'.
+            '<tr><td colspan="5" height="3"></td></tr>'."\n";
     return $output;
 }
 
@@ -1033,32 +1445,29 @@ sub recent_filename {
 }
 
 sub set_privileges {
-    my ($dcdom,$pickedcourse) = @_;
+# role can be cc or ca
+    my ($dcdom,$pickedcourse,$role) = @_;
     my $area = '/'.$dcdom.'/'.$pickedcourse;
-    my $role = 'cc';
     my $spec = $role.'.'.$area;
-    my $userroles = &Apache::lonnet::set_arearole($role,$area,'','',$dcdom,$env{'user.name'});
+    my %userroles = &Apache::lonnet::set_arearole($role,$area,'','',
+						  $env{'user.domain'},
+						  $env{'user.name'});
     my %ccrole = ();
     &Apache::lonnet::standard_roleprivs(\%ccrole,$role,$dcdom,$spec,$pickedcourse,$area);
-    my ($author,$adv)= &Apache::lonnet::set_userprivs(\$userroles,\%ccrole);
-    my @newprivs = split/\n/,$userroles;
-    my %newccroles = ();
-    foreach (@newprivs) {
-        my ($key,$val) = split/=/,$_;
-        $newccroles{$key} = $val;
-    }
-    &Apache::lonnet::appenv(%newccroles);
+    my ($author,$adv)= &Apache::lonnet::set_userprivs(\%userroles,\%ccrole);
+    &Apache::lonnet::appenv(\%userroles,[$role,'cm']);
+
     &Apache::lonnet::log($env{'user.domain'},
                          $env{'user.name'},
                          $env{'user.home'},
                         "Role ".$role);
     &Apache::lonnet::appenv(
-                          'request.role'        => $spec,
+                          {'request.role'        => $spec,
                           'request.role.domain' => $dcdom,
-                          'request.course.sec'  => '');
+                          'request.course.sec'  => ''});
     my $tadv=0;
     if (&Apache::lonnet::allowed('adv') eq 'F') { $tadv=1; }
-    &Apache::lonnet::appenv('request.role.adv'    => $tadv);
+    &Apache::lonnet::appenv({'request.role.adv'    => $tadv});
 }
 
 sub courseloadpage {