--- loncom/auth/lonroles.pm	2009/09/23 19:42:20	1.209.4.2
+++ loncom/auth/lonroles.pm	2012/02/09 01:11:52	1.256.2.6.2.3
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # User Roles Screen
 #
-# $Id: lonroles.pm,v 1.209.4.2 2009/09/23 19:42:20 raeburn Exp $
+# $Id: lonroles.pm,v 1.256.2.6.2.3 2012/02/09 01:11:52 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -27,6 +27,102 @@
 #
 ###
 
+=pod
+
+=head1 NAME
+
+Apache::lonroles - User Roles Screen
+
+=head1 SYNOPSIS
+
+Invoked by /etc/httpd/conf/srm.conf:
+
+ <Location /adm/roles>
+ PerlAccessHandler       Apache::lonacc
+ SetHandler perl-script
+ PerlHandler Apache::lonroles
+ ErrorDocument     403 /adm/login
+ ErrorDocument	  500 /adm/errorhandler
+ </Location>
+
+=head1 OVERVIEW
+
+=head2 Choosing Roles
+
+C<lonroles> is a handler that allows a user to switch roles in
+mid-session. LON-CAPA attempts to work with "No Role Specified", the
+default role that a user has before selecting a role, as widely as
+possible, but certain handlers for example need specification which
+course they should act on, etc. Both in this scenario, and when the
+handler determines via C<lonnet>'s C<&allowed> function that a certain
+action is not allowed, C<lonroles> is used as error handler. This
+allows the user to select another role which may have permission to do
+what they were trying to do.
+
+=begin latex
+
+\begin{figure}
+\begin{center}
+\includegraphics[width=0.45\paperwidth,keepaspectratio]{Sample_Roles_Screen}
+  \caption{\label{Sample_Roles_Screen}Sample Roles Screen} 
+\end{center}
+\end{figure}
+
+=end latex
+
+=head2 Role Initialization
+
+The privileges for a user are established at login time and stored in the session environment. As a consequence, a new role does not become active till the next login. Handlers are able to query for privileges using C<lonnet>'s C<&allowed> function. When a user first logs in, their role is the "common" role, which means that they have the sum of all of their privileges. During a session it might become necessary to choose a particular role, which as a consequence also limits the user to only the privileges in that particular role.
+
+=head1 INTRODUCTION
+
+This module enables a user to select what role he wishes to
+operate under (instructor, student, teaching assistant, course
+coordinator, etc).  These roles are pre-established by the actions
+of upper-level users.
+
+This is part of the LearningOnline Network with CAPA project
+described at http://www.lon-capa.org.
+
+=head1 HANDLER SUBROUTINE
+
+This routine is called by Apache and mod_perl.
+
+=over 4
+
+=item *
+
+Roles Initialization (yes/no)
+
+=item *
+
+Get Error Message from Environment
+
+=item *
+
+Who is this?
+
+=item *
+
+Generate Page Output
+
+=item *
+
+Choice or no choice
+
+=item *
+
+Table
+
+=item *
+
+Privileges
+
+=back
+
+=cut
+
+
 package Apache::lonroles;
 
 use strict;
@@ -41,10 +137,11 @@ use Apache::lonannounce;
 use Apache::lonlocal;
 use Apache::lonpageflip();
 use Apache::lonnavdisplay();
+use Apache::loncoursequeueadmin;
 use GDBM_File;
 use LONCAPA qw(:DEFAULT :match);
 use HTML::Entities;
- 
+
 
 sub redirect_user {
     my ($r,$title,$url,$msg,$launch_nav) = @_;
@@ -55,13 +152,18 @@ sub redirect_user {
     my $swinfo=&Apache::lonmenu::rawconfig();
     my $navwindow;
     if ($launch_nav eq 'on') {
-	$navwindow.=&Apache::lonnavdisplay::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();
+        $navwindow.=&Apache::lonnavmaps::close();
     }
+
+    # Breadcrumbs
+    my $brcrum = [{'href' => $url,
+                   'text' => 'Switching Role'},];
     my $start_page = &Apache::loncommon::start_page('Switching Role',undef,
-						    {'redirect' => [1,$url],});
+                                                    {'redirect' => [1,$url],
+                                                     'bread_crumbs' => $brcrum,});
     my $end_page   = &Apache::loncommon::end_page();
 
 # Note to style police: 
@@ -70,10 +172,12 @@ sub redirect_user {
     $r->print(<<ENDREDIR);
 $start_page
 <script type="text/javascript">
+// <![CDATA[
 $swinfo
+// ]]>
 </script>
 $navwindow
-<h1>$msg</h1>
+<p>$msg</p>
 $end_page
 ENDREDIR
     return;
@@ -85,13 +189,25 @@ sub error_page {
     &Apache::loncommon::no_cache($r);
     $r->send_http_header;
     return OK if $r->header_only;
-    $r->print(&Apache::loncommon::start_page('Problems during Course Initialization').
-	      '<script type="text/javascript">'.
-	      &Apache::lonmenu::rawconfig().'</script>'.
-	      '<p>'.&mt('The following problems occurred:').
+    # Breadcrumbs
+    my $brcrum = [{'href' => $dest,
+                   'text' => 'Problems during Course Initialization'},];
+    $r->print(&Apache::loncommon::start_page('Problems during Course Initialization',
+                                             undef,
+                                             {'bread_crumbs' => $brcrum,})
+    );
+    $r->print(
+        '<script type="text/javascript">'.
+        '// <![CDATA['.
+        &Apache::lonmenu::rawconfig().
+        '// ]]>'.
+        '</script>'.
+	      '<p class="LC_error">'.&mt('The following problems occurred:').
+          '<br />'.
 	      $error.
-	      '</p><br /><a href="'.$dest.'">'.&mt('Continue').'</a>'.
-	      &Apache::loncommon::end_page());
+	      '</p><br /><a href="'.$dest.'">'.&mt('Continue').'</a>'
+    );
+    $r->print(&Apache::loncommon::end_page());
 }
 
 sub handler {
@@ -100,10 +216,36 @@ sub handler {
 
     my $now=time;
     my $then=$env{'user.login.time'};
+    my $refresh=$env{'user.refresh.time'};
+    my $update=$env{'user.update.time'};
+    if (!$refresh) {
+        $refresh = $then;
+    }
+    if (!$update) {
+        $update = $then;
+    }
+
+# -------------------------------------------------------- Check for new roles
+    my $updateresult;
+    if ($env{'form.doupdate'}) {
+        my $show_course=&Apache::loncommon::show_course();
+        my $checkingtxt;
+        if ($show_course) {
+            $checkingtxt = &mt('Checking for new courses ...');
+        } else {
+            $checkingtxt = &mt('Checking for new roles ...');
+        }
+        $updateresult = '<span class="LC_info">'.$checkingtxt.'</span>';
+        $updateresult .= &update_session_roles();
+        &Apache::lonnet::appenv({'user.update.time'  => $now});
+        $update = $now;
+    }
+
     my $envkey;
     my %dcroles = ();
-    my $numdc = &check_fordc(\%dcroles,$then);
+    my $numdc = &check_fordc(\%dcroles,$update,$then);
     &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'});
+    my $loncaparev = $Apache::lonnet::perlvar{'lonVersion'};
 
 # ================================================================== Roles Init
     if ($env{'form.selectrole'}) {
@@ -117,8 +259,17 @@ sub handler {
 	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 $switch_is_active;
+                if (defined($env{'user.role.'.$env{'form.switchrole'}})) {
+                    my ($start,$end) = split(/\./,$env{'user.role.'.$env{'form.switchrole'}});
+                    if (!$end || $end > $now) {
+                        if (!$start || $start < $update) {
+                            $switch_is_active = 1;
+                        }
+                    }
+                }
+                unless ($switch_is_active) {
+                    &adhoc_course_role($refresh,$update,$then);
                 }
             }
 	    my %temp=('logout_'.$env{'request.course.id'} => time);
@@ -135,11 +286,12 @@ sub handler {
 # 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\./($match_domain)/($match_courseid)$-)) {
+# Is this an ad-hoc Coordinator role?
+                if (my ($ccrole,$domain,$coursenum) =
+		    ($envkey =~ m-^form\.(cc|co)\./($match_domain)/($match_courseid)$-)) {
                     if ($dcroles{$domain}) {
-                        &check_privs($domain,$coursenum,$then,$now,'cc');
+                        &Apache::lonnet::check_adhoc_privs($domain,$coursenum,
+                                                           $update,$refresh,$now,$ccrole);
                     }
                     last;
                 }
@@ -152,7 +304,7 @@ sub handler {
                         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;
+                            my $switchserver = '/adm/switchserver?otherserver='.$home.'&amp;role='.$trolecode;
                             $r->internal_redirect($switchserver);
                         }
                         last;
@@ -163,7 +315,7 @@ sub handler {
                             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;
+                                my $switchserver = '/adm/switchserver?otherserver='.$home.'&amp;role='.$trolecode;
                                 $r->internal_redirect($switchserver);
                             }
                             last;
@@ -179,11 +331,12 @@ sub handler {
                     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');
+                            &Apache::lonnet::check_adhoc_privs($domain,$user,$update,
+                                                               $refresh,$now,'ca');
                             if ($server_status eq 'switchserver') {
                                 my $trolecode = 'ca./'.$domain.'/'.$user; 
                                 my $switchserver = '/adm/switchserver?'
-                                                  .'otherserver='.$home.'&role='.$trolecode;
+                                                  .'otherserver='.$home.'&amp;role='.$trolecode;
                                 $r->internal_redirect($switchserver);
                             }
                         } else {
@@ -200,11 +353,48 @@ sub handler {
         foreach $envkey (keys %env) {
             next if ($envkey!~/^user\.role\./);
             my ($where,$trolecode,$role,$tstatus,$tend,$tstart);
-            &role_status($envkey,$then,$now,\$role,\$where,\$trolecode,\$tstatus,\$tstart,\$tend);
+            &Apache::lonnet::role_status($envkey,$update,$refresh,$now,\$role,\$where,
+                                         \$trolecode,\$tstatus,\$tstart,\$tend);
             if ($env{'form.'.$trolecode}) {
 		if ($tstatus eq 'is') {
 		    $where=~s/^\///;
 		    my ($cdom,$cnum,$csec)=split(/\//,$where);
+                    if (($cnum) && ($role ne 'ca') && ($role ne 'aa')) {
+                        my $home = $env{'course.'.$cdom.'_'.$cnum.'.home'};
+                        my @ids = &Apache::lonnet::current_machine_ids();
+                        unless ($loncaparev eq '' && $home && grep(/^\Q$home\E$/,@ids)) {
+                            my %curr_reqd_hash = &Apache::lonnet::userenvironment($cdom,$cnum,'internal.releaserequired');
+                            if ($curr_reqd_hash{'internal.releaserequired'} ne '') {
+                                my ($switchserver,$switchwarning) =
+                                    &check_release_required($loncaparev,$cdom.'_'.$cnum,$trolecode,$curr_reqd_hash{'internal.releaserequired'});
+                                if ($switchwarning ne '' || $switchserver ne '') {
+                                    &Apache::loncommon::content_type($r,'text/html');
+                                    &Apache::loncommon::no_cache($r);
+                                    $r->send_http_header;
+                                    my $end_page=&Apache::loncommon::end_page();
+                                    $r->print(&Apache::loncommon::start_page('Selected course unavailable on this server').
+                                              '<p class="LC_warning">');
+                                    if ($switchwarning) {
+                                        $r->print($switchwarning.'<br /><a href="/adm/roles">');
+                                        if (&Apache::loncommon::show_course()) {
+                                            $r->print(&mt('Display courses'));
+                                        } else {
+                                            $r->print(&mt('Display roles'));
+                                        }
+                                        $r->print('</a>');
+                                    } elsif ($switchserver) {
+				        $r->print(&mt('This course requires a newer version of LON-CAPA than is installed on this server.').
+                                                  '<br />'.
+                                                  '<a href="/adm/switchserver?'.$switchserver.'">'.
+                                                  &mt('Switch Server').
+                                                  '</a>');
+                                    }
+                                    $r->print('</p>'.&Apache::loncommon::end_page());
+                                    return OK;
+                                }
+                            }
+                        }
+                    }
 # check for course groups
                     my %coursegroups = &Apache::lonnet::get_active_groups(
                           $env{'user.domain'},$env{'user.name'},$cdom, $cnum);
@@ -267,12 +457,14 @@ sub handler {
 				 $r->print(<<ENDENTEREDKEY);
 $start_page
 <script type="text/javascript">
+// <![CDATA[
 $swinfo
+// ]]>
 </script>
-<form method="post">
+<form action="" method="post">
 <input type="hidden" name="selectrole" value="1" />
 <input type="hidden" name="$trolecode" value="1" />
-<font size="+2">$message</font><br />
+<span class="LC_fontsize_large">$message</span><br />
 <input type="submit" value="$buttontext" />
 </form>
 $end_page
@@ -290,9 +482,11 @@ ENDENTEREDKEY
 				 $r->print(<<ENDENTERKEY);
 $start_page
 <script type="text/javascript">
+// <![CDATA[
 $swinfo
+// ]]>
 </script>
-<form method="post">
+<form action="" method="post">
 <input type="hidden" name="selectrole" value="1" />
 <input type="hidden" name="$trolecode" value="1" />
 <input type="text" size="20" name="newkey" value="$env{'form.newkey'}" />
@@ -320,14 +514,33 @@ ENDENTERKEY
                         my $msg;
 			my ($furl,$ferr)=
 			    &Apache::lonuserstate::readmap($cdom.'/'.$cnum);
+                        unless (($ferr) || ($env{'form.switchrole'})) {
+                            &Apache::lonnet::put('nohist_crslastlogin',
+                                {$env{'user.name'}.':'.$env{'user.domain'}.
+                                ':'.$csec.':'.$role => $now},$cdom,$cnum);
+                        }
 			if (($env{'form.orgurl'}) && 
 			    ($env{'form.orgurl'}!~/^\/adm\/flip/)) {
 			    my $dest=$env{'form.orgurl'};
+                            if ($env{'form.symb'}) {
+                                if ($dest =~ /\?/) {
+                                    $dest .= '&';
+                                } else {
+                                    $dest .= '?'
+                                }
+                                $dest .= 'symb='.$env{'form.symb'};
+                            }
 			    if (&Apache::lonnet::allowed('adv') eq 'F') { $tadv=1; }
 			    &Apache::lonnet::appenv({'request.role.adv'=>$tadv});
                             if (($ferr) && ($tadv)) {
 				&error_page($r,$ferr,$dest);
 			    } else {
+                                if ($dest =~ m{^/adm/coursedocs\?folderpath}) {
+                                    if ($env{'request.course.id'} eq $cdom.'_'.$cnum) { 
+                                        my $chome = &Apache::lonnet::homeserver($cnum,$cdom);
+                                        &update_content_constraints($cdom,$cnum,$chome,$cdom.'_'.$cnum);
+                                    }
+                                }
 				$r->internal_redirect($dest);
 			    }
 			    return OK;
@@ -336,11 +549,12 @@ ENDENTERKEY
 				&Apache::lonnet::appenv(
 				      {"request.course.id"  => $cdom.'_'.$cnum});
 				$furl='/adm/roles?tryagain=1';
-				$msg=
-				    '<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;
+                $msg='<p><span class="LC_error">'
+                    .&mt('Could not initialize [_1] at this time.',
+                         $env{'course.'.$cdom.'_'.$cnum.'.description'})
+                    .'</span></p>'
+                    .'<p>'.&mt('Please try again.').'</p>'
+                    .'<p>'.$ferr.'</p>';
 			    }
 			    if (&Apache::lonnet::allowed('adv') eq 'F') { $tadv=1; }
 			    &Apache::lonnet::appenv({'request.role.adv'=>$tadv});
@@ -355,8 +569,8 @@ ENDENTERKEY
 				    $courseid = substr($courseid, 1);
 				}
 				$courseid =~ s/\//_/;
-				if ($role eq 'cc' && $env{'course.' . $courseid . 
-							      '.course.helper.not.run'}) {
+				if ((($role eq 'cc') || ($role eq 'co')) 
+                                    && ($env{'course.' . $courseid .'.course.helper.not.run'})) { 
 				    $furl = "/adm/helper/course.initialization.helper";
 				    # Send the user to the course they selected
 				} elsif ($env{'request.course.id'}) {
@@ -366,10 +580,10 @@ ENDENTERKEY
                                             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'});
+                                        &redirect_user($r, &mt('Entering [_1]',
+                                                       $env{'course.'.$courseid.'.description'}),
+                                                       $dest, $msg,
+                                                       $env{'environment.remotenavmap'});
                                         return OK;
                                     }
 				    if (&Apache::lonnet::allowed('whn',
@@ -382,24 +596,26 @@ ENDENTERKEY
 					unless ($startpage eq 'firstres') {         
 					    $msg = &mt('Entering [_1] ...',
 						       $env{'course.'.$courseid.'.description'});
-					    &redirect_user($r,&mt('New in course'),
-							   '/adm/whatsnew?refpage=start',$msg,
-							   $env{'environment.remotenavmap'});
+                                            &redirect_user($r,&mt('New in course'),
+                                                           '/adm/whatsnew?refpage=start',$msg,
+                                                           $env{'environment.remotenavmap'});
 					    return OK;
 					}
 				    }
 				}
 # Are we allowed to look at the first resource?
-				if ($furl !~ m|^/adm/|) {
+				if (($furl !~ m|^/adm/|) || 
+                                    (($env{'environment.remotenavmap'} eq 'on') && 
+                                     ($furl =~ m{^/adm/navmaps}))) {
 # Guess not ...
 				    $furl=&Apache::lonpageflip::first_accessible_resource();
 				}
                                 $msg = &mt('Entering [_1] ...',
 					   $env{'course.'.$courseid.'.description'});
-				&redirect_user($r,&mt('Entering [_1]',
-						      $env{'course.'.$courseid.'.description'}),
-					       $furl,$msg,
-					       $env{'environment.remotenavmap'});
+                                &redirect_user($r,&mt('Entering [_1]',
+                                                      $env{'course.'.$courseid.'.description'}),
+                                               $furl,$msg,
+                                               $env{'environment.remotenavmap'});
 			    }
 			    return OK;
 			}
@@ -425,6 +641,12 @@ ENDENTERKEY
                                        $redirect_url);
                         return OK;
                     }
+                    if ($role eq 'sc') {
+                        my $redirect_url = '/adm/grades?command=scantronupload';
+                        &redirect_user($r,&mt('Loading Data Upload Page'),
+                                       $redirect_url);
+                        return OK;
+                    }
 		}
             }
         }
@@ -438,8 +660,18 @@ ENDENTERKEY
     $r->send_http_header;
     return OK if $r->header_only;
 
+    my $crumbtext = 'User Roles';
+    my $pagetitle = 'My Roles';
+    my $recent = &mt('Recent Roles');
+    my $show_course=&Apache::loncommon::show_course();
+    if ($show_course) {
+        $crumbtext = 'Courses';
+        $pagetitle = 'My Courses';
+        $recent = &mt('Recent Courses');
+    }
+    my $brcrum =[{href=>"/adm/roles",text=>$crumbtext}];
     my $swinfo=&Apache::lonmenu::rawconfig();
-    my $start_page=&Apache::loncommon::start_page('User Roles');
+    my $start_page=&Apache::loncommon::start_page($pagetitle,undef,{bread_crumbs=>$brcrum});
     my $standby=&mt('Role selected. Please stand by.');
     $standby=~s/\n/\\n/g;
     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 />';
@@ -451,6 +683,7 @@ $start_page
 $noscript
 </noscript>
 <script type="text/javascript">
+// <![CDATA[
 $swinfo
 window.focus();
 
@@ -467,6 +700,14 @@ function enterrole (thisform,rolecode,bu
        alert('$standby');
     }   
 }
+
+function setToUpdate(thisform) {
+    thisform.doupdate.value='1';
+    thisform.selectrole.value='';
+    thisform.submit();
+}
+
+// ]]>
 </script>
 ENDHEADER
 
@@ -517,225 +758,98 @@ ENDHEADER
             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>');
+ &mt('As your session file for the course or community has expired, you will need to re-select it.').'</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>');
+ &mt('You need to choose another user role or enter a specific course or community for this function.').
+ '</span></h3>');
 	    }
         }
     }
 # -------------------------------------------------------- Choice or no choice?
     if ($nochoose) {
-	$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;
+        $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 {
+        $r->print($updateresult);
         if (($ENV{'REDIRECT_QUERY_STRING'}) && ($fn)) {
-    	    $fn.='?'.$ENV{'REDIRECT_QUERY_STRING'};
+            $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="newrole" value="" />');
     }
-    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='';
-	my $roletext;
-	my $sortkey;
-        if ($envkey=~/^user\.role\./) {
-            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,$timezone);
-            }
-            if ($tend) {
-                $tpend=&Apache::lonlocal::locallocaltime($tend,$timezone);
-            }
-            if ($env{'request.role'} eq $trolecode) {
-		$tstatus='selected';
-            }
-            my $tbg;
-            if (($tstatus eq 'is') 
-		|| ($tstatus eq 'selected') 
-		|| ($tstatus eq 'will') 
-		|| ($tstatus eq 'future') 
-                || ($env{'form.showall'})) {
-                if ($tstatus eq 'is') {
-                    $tbg='#77FF77';
-                    $tfont='#003300';
-		    $possiblerole=$trolecode;
-		    $countactive++;
-                } 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.').' ';
-                    $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.').' ';
-                } elsif ($tstatus eq 'selected') {
-                    $tbg='#11CC55';
-                    $tfont='#002200';
-		    $inrole=1;
-		    $countactive++;
-                    $tremark.=&mt('Currently selected.').' ';
-                }
-                my $trole;
-                if ($role =~ /^cr\//) {
-                    my ($rdummy,$rdomain,$rauthor,$rrole)=split(/\//,$role);
-		    if ($tremark) { $tremark.='<br />'; }
-                    $tremark.=&mt('Defined by [_1] at [_2].',$rauthor,$rdomain);
-		}
-		$trole=Apache::lonnet::plaintext($role);
-                my $ttype;
-                my $twhere;
-                my ($tdom,$trest,$tsection)=
-                    split(/\//,Apache::lonnet::declutter($where));
-                # First, Co-Authorship roles
-                if (($role eq 'ca') || ($role eq 'aa')) {
-                    my $home = &Apache::lonnet::homeserver($trest,$tdom);
-		    my $allowed=0;
-		    my @ids=&Apache::lonnet::current_machine_ids();
-		    foreach my $id (@ids) { if ($id eq $home) { $allowed=1; } }
-                    if (!$allowed) {
-			$button=0;
-                        $switchserver='otherserver='.$home.'&role='.$trolecode;
-                    }
-                    #next if ($home eq 'no_host');
-                    $home = &Apache::lonnet::hostname($home);
-                    $ttype='Construction Space';
-                    $twhere=&mt('User').': '.$trest.'<br />'.&mt('Domain').
-			': '.$tdom.'<br />'.
-                        ' '.&mt('Server').':&nbsp;'.$home;
-                    $env{'course.'.$tdom.'_'.$trest.'.description'}='ca';
-		    $tremark.=&Apache::lonhtmlcommon::authorbombs('/res/'.$tdom.'/'.$trest.'/');
-		    $sortkey=$role."$trest:$tdom";
-                } elsif ($role eq 'au') {
-                    # Authors
-                    my $home = &Apache::lonnet::homeserver
-                        ($env{'user.name'},$env{'user.domain'});
-		    my $allowed=0;
-		    my @ids=&Apache::lonnet::current_machine_ids();
-		    foreach my $id (@ids) { if ($id eq $home) { $allowed=1; } }
-                    if (!$allowed) {
-			$button=0;
-                        $switchserver='otherserver='.$home.'&role='.$trolecode;
-                    }
-                    #next if ($home eq 'no_host');
-                    $home = &Apache::lonnet::hostname($home);
-                    $ttype='Construction Space';
-                    $twhere=&mt('Domain').': '.$tdom.'<br />'.&mt('Server').
-			':&nbsp;'.$home;
-                    $env{'course.'.$tdom.'_'.$trest.'.description'}='ca';
-		    $tremark.=&Apache::lonhtmlcommon::authorbombs('/res/'.$tdom.'/'.$env{'user.name'}.'/');
-		    $sortkey=$role;
-                } elsif ($trest) {
-                    my $tcourseid=$tdom.'_'.$trest;
-                    $ttype = &Apache::loncommon::course_type($tcourseid);
-                    $trole = &Apache::lonnet::plaintext($role,$ttype);
-                    if ($env{'course.'.$tcourseid.'.description'}) {
-                        $twhere=$env{'course.'.$tcourseid.'.description'};
-			$sortkey=$role."\0".$tdom."\0".$twhere."\0".$envkey;
-                        unless ($twhere eq &mt('Currently not available')) {
-			    $twhere.=' <font size="-2">'.
-        &Apache::loncommon::syllabuswrapper(&mt('Syllabus'),$trest,$tdom,$tfont).
-                                    '</font>';
-			}
-                    } else {
-                        my %newhash=&Apache::lonnet::coursedescription($tcourseid);
-                        if (%newhash) {
-			    $sortkey=$role."\0".$tdom."\0".$newhash{'description'}.
-				"\0".$envkey;
-                            $twhere=$newhash{'description'}.
-                              ' <font size="-2">'.
-        &Apache::loncommon::syllabuswrapper(&mt('Syllabus'),$trest,$tdom,$tfont).
-                              '</font>';
-                            $ttype = $newhash{'type'};
-                            $trole = &Apache::lonnet::plaintext($role,$ttype);
-                        } else {
-                            $twhere=&mt('Currently not available');
-                            $env{'course.'.$tcourseid.'.description'}=$twhere;
-			    $sortkey=$role."\0".$tdom."\0".$twhere."\0".$envkey;
-                            $ttype = 'Unavailable';
-                        }
-                    }
-                    if ($tsection) {
-                        $twhere.='<br />'.&mt('Section').': '.$tsection;
-		    }
-		    if ($role ne 'st') { $twhere.="<br />".&mt('Domain').":".$tdom; }
-                } elsif ($tdom) {
-                    $ttype='Domain';
-                    $twhere=$tdom;
-		    $sortkey=$role.$twhere;
-                } else {
-                    $ttype='System';
-                    $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,$reinit);
-		$roletext{$envkey}=$roletext;
-		if (!$sortkey) {$sortkey=$twhere."\0".$envkey;}
-		$sortrole{$sortkey}=$envkey;
-		$roleclass{$envkey}=$ttype;
-	    }
-        }
+    $r->rflush();
+
+    my (%roletext,%sortrole,%roleclass,%futureroles,%timezones);
+    my ($countactive,$countfuture,$inrole,$possiblerole) =
+        &gather_roles($update,$refresh,$now,$reinit,$nochoose,\%roletext,\%sortrole,\%roleclass,
+                      \%futureroles,\%timezones,$loncaparev);
+    $refresh = $now;
+    &Apache::lonnet::appenv({'user.refresh.time'  => $refresh});
+    my $updatebutton = &mt('Check for role changes');
+    my $show_course=&Apache::loncommon::show_course();
+    if ($show_course) {
+        $updatebutton = &mt('Check for new courses');
+    }
+    my $do_update;
+    unless (($env{'form.source'} eq 'login') || ($env{'form.doupdate'})) {
+        $do_update = '<input type="hidden" name="doupdate" value="" />'.
+                     '<input type="button" name="update" value="'.
+                     $updatebutton.'" onclick="javascript:setToUpdate(this.form)" />';
     }
     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>');
+        my $showall = '<label><input type="checkbox" name="showall"';
+        if ($env{'form.showall'}) {
+            $showall .= ' checked="checked" ';
+        }
+        $showall .= ' />'.&mt('Show all roles').'</label>&nbsp;'.
+                    '<input type="submit" value="'.&mt('Update display').'" />';
+        if ($do_update) {
+            $r->print('<div class="LC_left_float"><fieldset>'.
+                      '<legend>'. &mt('Display').'</legend>'.
+                      $showall.'</fieldset></div>'.
+                      '<div class="LC_left_float"><fieldset><legend>'.
+                      &mt('Changes?').'</legend>'.
+                      $do_update.'</fieldset></div><br clear="all" />');
+        } else {
+            $r->print($showall);
+        }
     } else {
+        $r->print('<p>'.$do_update.'</p>');
         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>');
-            }
+            $r->print(&Apache::loncoursequeueadmin::queued_selfenrollment());
+            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/Community Catalog[_3]'
+                   .' to view all [_4] LON-CAPA courses and communities.'
+                   ,'<b>'
+                   ,'<a href="/adm/coursecatalog?showdom='.$esc_dom.'">'
+                   ,'</a></b>',$domdesc)
+               .'<br />'
+               .&mt('If a course or community is [_1]not[_2] in your list of current courses and communities below,'
+                   .' you may be able to enroll if self-enrollment is permitted.'
+                   ,'<b>','</b>')
+               .'</p>'
+            );
         }
     }
 
 # No active roles
     if ($countactive==0) {
 	if ($inrole) {
-	    $r->print('<h2>'.&mt('Currently no additional roles or courses').'</h2>');
+	    $r->print('<h2>'.&mt('Currently no additional roles, courses or communities').'</h2>');
 	} else {
-	    $r->print('<h2>'.&mt('Currently no active roles or courses').'</h2>');
+	    $r->print('<h2>'.&mt('Currently no active roles, courses or communities').'</h2>');
 	}
-        &findcourse_advice($r,$numcourses);
+        &findcourse_advice($r);
+        &requestcourse_advice($r); 
 	$r->print('</form>');
         if ($countfuture) {
             $r->print(&mt('The following [quant,_1,role,roles] will become active in the future:',$countfuture));
@@ -744,144 +858,366 @@ ENDHEADER
             &print_rolerows($r,$doheaders,\%roleclass,\%sortrole,\%dcroles,
                             \%roletext);
             my $tremark='';
-            my $tfont='#003300';
+            my $tbg;
             if ($env{'request.role'} eq 'cm') {
-                $r->print('<tr bgcolor="#11CC55">');
+                $tbg="LC_roles_selected";
                 $tremark=&mt('Currently selected.').' ';
-                $tfont='#002200';
             } else {
-                $r->print('<tr bgcolor="#77FF77">');
+                $tbg="LC_roles_is";
             }
-            $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(&Apache::loncommon::start_data_table_row()
+                     .'<td class="'.$tbg.'">&nbsp;</td>'
+                     .'<td colspan="3">'
+                     .&mt('No role specified')
+                     .'</td>'
+                     .'<td>'.$tremark.'&nbsp;</td>'
+                     .&Apache::loncommon::end_data_table_row()
+            );
 
-            $r->print('</table>');
+            $r->print(&Apache::loncommon::end_data_table());
         }
         $r->print(&Apache::loncommon::end_page());
 	return OK;
-    } elsif ($countactive==1) { # Is there only one choice?
+    } elsif ($countactive==1 && $countfuture==0) { # 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" />'.
+            $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;
+            $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 />');   
+                      &mt("Click the 'Switch Server' link to go there.").'<br />');
         }
     }
 # ----------------------------------------------------------------------- Table
-    unless ((!&Apache::lonmenu::show_course()) || ($nochoose) || ($countactive==1)) {
+
+    if ($numdc > 0) {
+        $r->print(&coursepick_jscript());
+        $r->print(&Apache::loncommon::coursebrowser_javascript().
+                  &Apache::loncommon::authorbrowser_javascript());
+    }
+
+    unless ((!&Apache::loncommon::show_course()) || ($nochoose) || ($countactive==1)) {
 	$r->print("<h2>".&mt('Select a Course to Enter')."</h2>\n");
     }
+    if ($env{'form.destinationurl'}) {
+        $r->print('<input type="hidden" name="destinationurl" value="'.
+                  $env{'form.destinationurl'}.'" />');
+        if ($env{'form.destsymb'} ne '') {
+            $r->print('<input type="hidden" name="destsymb" value="'.
+                      $env{'form.destsymb'}.'" />');
+        }
+    }
+
     my $doheaders = &roletable_headers($r,\%roleclass,\%sortrole,$nochoose);
     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.'.$_};
-                if ($_ =~ m-dc\./($match_domain)/- 
+	foreach my $role (sort(keys(%recent_roles))) {
+	    if (ref($roletext{'user.role.'.$role}) eq 'ARRAY') {
+		$output.= &Apache::loncommon::start_data_table_row().
+                          $roletext{'user.role.'.$role}->[0].
+                          &Apache::loncommon::end_data_table_row();
+                if ($roletext{'user.role.'.$role}->[1] ne '') {
+                    $output .= &Apache::loncommon::continue_data_table_row().
+                               $roletext{'user.role.'.$role}->[1].
+                               &Apache::loncommon::end_data_table_row();
+                }
+                if ($role =~ m{dc\./($match_domain)/} 
 		    && $dcroles{$1}) {
 		    $output .= &adhoc_roles_row($1,'recent');
                 }
 	    } elsif ($numdc > 0) {
-                unless ($_ =~/^error\:/) {
-                    $output.=&display_cc_role('user.role.'.$_);
+                unless ($role =~/^error\:/) {
+                    my ($roletext,$role_text_end) = &display_cc_role('user.role.'.$role);
+                    if ($roletext) {
+                        $output.= &Apache::loncommon::start_data_table_row().
+                                  $roletext.
+                                  &Apache::loncommon::end_data_table_row();
+                        if ($role_text_end) {
+                            $output .= &Apache::loncommon::continue_data_table_row().
+                                       $role_text_end.
+                                       &Apache::loncommon::end_data_table_row();
+                        }
+                    }
                 }
-            } 
+            }
 	}
 	if ($output) {
-	    $r->print("<tr><td align='center' colspan='5'><font face='arial'>".
-		      &mt('Recent Roles')."</font></td></tr>");
+	    $r->print(&Apache::loncommon::start_data_table_empty_row()
+                     .'<td align="center" colspan="5">'
+                     .$recent
+                     .'</td>'
+                     .&Apache::loncommon::end_data_table_empty_row()
+            );
 	    $r->print($output);
             $doheaders ++;
 	}
     }
-
-    if ($numdc > 0) {
-        $r->print(&coursepick_jscript());
-        $r->print(&Apache::loncommon::coursebrowser_javascript().
-                  &Apache::loncommon::authorbrowser_javascript());
-    }
     &print_rolerows($r,$doheaders,\%roleclass,\%sortrole,\%dcroles,\%roletext);
     if ($countactive > 1) {
         my $tremark='';
-        my $tfont='#003300';
+        my $tbg;
         if ($env{'request.role'} eq 'cm') {
-	    $r->print('<tr bgcolor="#11CC55">');
+            $tbg="LC_roles_selected";
             $tremark=&mt('Currently selected.').' ';
-            $tfont='#002200';
         } else {
-            $r->print('<tr bgcolor="#77FF77">');
+                $tbg="LC_roles_is";
         }
+        $r->print(&Apache::loncommon::start_data_table_row());
         unless ($nochoose) {
 	    if ($env{'request.role'} ne 'cm') {
-	        $r->print('<td><input type="submit" value="'.
+	        $r->print('<td class="'.$tbg.'"><input type="submit" value="'.
 		          &mt('Select').'" name="cm" /></td>');
 	    } else {
-	        $r->print('<td>&nbsp;</td>');
+	        $r->print('<td class="'.$tbg.'">&nbsp;</td>');
 	    }
         }
-        $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('<td colspan="3">'
+                 .&mt('No role specified')
+                 .'</td>'
+                 .'<td>'.$tremark.'&nbsp;</td>'
+                 .&Apache::loncommon::end_data_table_row()
+        );
     } 
-    $r->print('</table>');
+    $r->print(&Apache::loncommon::end_data_table());
     unless ($nochoose) {
 	$r->print("</form>\n");
     }
 # ------------------------------------------------------------ Privileges Info
     if (($advanced) && (($env{'user.error.msg'}) || ($error))) {
-	$r->print('<hr /><h2>Current Privileges</h2>');
+	$r->print('<hr /><h2>'.&mt('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('<p><small><i>'
+                 .&mt('This LON-CAPA server is version [_1]',$r->dir_config('lonVersion'))
+                 .'</i><br />'
+                 .'<a href="/adm/logout">'.&mt('Logout').'</a>&nbsp;&nbsp;'
+                 .'<a href="/adm/coursecatalog?showdom='.$esc_dom.'">'
+                 .&mt('Course/Community Catalog')
+                 .'</a></small></p>');
     }
     $r->print(&Apache::loncommon::end_page());
     return OK;
 }
 
+sub gather_roles {
+    my ($update,$refresh,$now,$reinit,$nochoose,$roletext,$sortrole,$roleclass,$futureroles,$timezones,$loncaparev) = @_;
+    my ($countactive,$countfuture,$inrole,$possiblerole) = (0,0,0,'');
+    my $advanced = $env{'user.adv'};
+    my $tryagain = $env{'form.tryagain'};
+    my @ids = &Apache::lonnet::current_machine_ids();
+    foreach my $envkey (sort(keys(%env))) {
+        my $button = 1;
+        my $switchserver='';
+        my $switchwarning;
+        my ($role_text,$role_text_end,$sortkey);
+        if ($envkey=~/^user\.role\./) {
+            my ($role,$where,$trolecode,$tstart,$tend,$tremark,$tstatus,$tpstart,$tpend);
+            &Apache::lonnet::role_status($envkey,$update,$refresh,$now,\$role,\$where,
+                                         \$trolecode,\$tstatus,\$tstart,\$tend);
+            next if (!defined($role) || $role eq '' || $role =~ /^gr/);
+            $tremark='';
+            $tpstart='&nbsp;';
+            $tpend='&nbsp;';
+            if ($env{'request.role'} eq $trolecode) {
+                $tstatus='selected';
+            }
+            my $tbg;
+            if (($tstatus eq 'is')
+                || ($tstatus eq 'selected')
+                || ($tstatus eq 'future')
+                || ($env{'form.showall'})) {
+                my $timezone = &role_timezone($where,$timezones);
+                if ($tstart) {
+                    $tpstart=&Apache::lonlocal::locallocaltime($tstart,$timezone);
+                }
+                if ($tend) {
+                    $tpend=&Apache::lonlocal::locallocaltime($tend,$timezone);
+                }
+                if ($tstatus eq 'is') {
+                    $tbg='LC_roles_is';
+                    $possiblerole=$trolecode;
+                    $countactive++;
+                } elsif ($tstatus eq 'future') {
+                    $tbg='LC_roles_future';
+                    $button=0;
+                    $futureroles->{$trolecode} = $tstart.':'.$tend;
+                    $countfuture ++;
+                } elsif ($tstatus eq 'expired') {
+                    $tbg='LC_roles_expired';
+                    $button=0;
+                } elsif ($tstatus eq 'will_not') {
+                    $tbg='LC_roles_will_not';
+                    $tremark.=&mt('Expired after logout.').' ';
+                } elsif ($tstatus eq 'selected') {
+                    $tbg='LC_roles_selected';
+                    $inrole=1;
+                    $countactive++;
+                    $tremark.=&mt('Currently selected.').' ';
+                }
+                my $trole;
+                if ($role =~ /^cr\//) {
+                    my ($rdummy,$rdomain,$rauthor,$rrole)=split(/\//,$role);
+                    if ($tremark) { $tremark.='<br />'; }
+                    $tremark.=&mt('Customrole defined by [_1].',$rauthor.':'.$rdomain);
+                }
+                $trole=Apache::lonnet::plaintext($role);
+                my $ttype;
+                my $twhere;
+                my ($tdom,$trest,$tsection)=
+                    split(/\//,Apache::lonnet::declutter($where));
+                # First, Co-Authorship roles
+                if (($role eq 'ca') || ($role eq 'aa')) {
+                    my $home = &Apache::lonnet::homeserver($trest,$tdom);
+                    my $allowed=0;
+                    foreach my $id (@ids) { if ($id eq $home) { $allowed=1; } }
+                    if (!$allowed) {
+                        $button=0;
+                        $switchserver='otherserver='.$home.'&amp;role='.$trolecode;
+                    }
+                    #next if ($home eq 'no_host');
+                    $home = &Apache::lonnet::hostname($home);
+                    $ttype='Construction Space';
+                    $twhere=&mt('User').': '.$trest.'<br />'.&mt('Domain').
+                        ': '.$tdom.'<br />'.
+                        ' '.&mt('Server').':&nbsp;'.$home;
+                    $env{'course.'.$tdom.'_'.$trest.'.description'}='ca';
+                    $tremark.=&Apache::lonhtmlcommon::authorbombs('/res/'.$tdom.'/'.$trest.'/');
+                    $sortkey=$role."$trest:$tdom";
+                } elsif ($role eq 'au') {
+                    # Authors
+                    my $home = &Apache::lonnet::homeserver
+                        ($env{'user.name'},$env{'user.domain'});
+                    my $allowed=0;
+                    foreach my $id (@ids) { if ($id eq $home) { $allowed=1; } }
+                    if (!$allowed) {
+                        $button=0;
+                        $switchserver='otherserver='.$home.'&amp;role='.$trolecode;
+                    }
+                    #next if ($home eq 'no_host');
+                    $home = &Apache::lonnet::hostname($home);
+                    $ttype='Construction Space';
+                    $twhere=&mt('Domain').': '.$tdom.'<br />'.&mt('Server').
+                        ':&nbsp;'.$home;
+                    $env{'course.'.$tdom.'_'.$trest.'.description'}='ca';
+                    $tremark.=&Apache::lonhtmlcommon::authorbombs('/res/'.$tdom.'/'.$env{'user.name'}.'/');
+                    $sortkey=$role;
+                } elsif ($trest) {
+                    my $tcourseid=$tdom.'_'.$trest;
+                    $ttype = &Apache::loncommon::course_type($tcourseid);
+                    $trole = &Apache::lonnet::plaintext($role,$ttype,$tcourseid);
+                    if ($env{'course.'.$tcourseid.'.description'}) {
+                        my $home=$env{'course.'.$tcourseid.'.home'};
+                        $twhere=$env{'course.'.$tcourseid.'.description'};
+                        $sortkey=$role."\0".$tdom."\0".$twhere."\0".$envkey;
+                        $twhere = &HTML::Entities::encode($twhere,'"<>&');
+                        unless ($twhere eq &mt('Currently not available')) {
+                            $twhere.=' <span class="LC_fontsize_small">'.
+        &Apache::loncommon::syllabuswrapper(&mt('Syllabus'),$trest,$tdom).
+                                    '</span>';
+                            unless ($home && grep(/^\Q$home\E$/,@ids) && $loncaparev eq '') {
+                                my $required = $env{'course.'.$tcourseid.'.internal.releaserequired'};
+                                if ($required ne '') {
+                                    ($switchserver,$switchwarning) = 
+                                        &check_release_required($loncaparev,$tcourseid,$trolecode,$required);
+                                    if ($switchserver || $switchwarning) {
+                                        $button = 0;
+                                    }
+                                }
+                            }
+                        }
+                    } else {
+                        my %newhash=&Apache::lonnet::coursedescription($tcourseid);
+                        if (%newhash) {
+                            $sortkey=$role."\0".$tdom."\0".$newhash{'description'}.
+                                "\0".$envkey;
+                            $twhere=&HTML::Entities::encode($newhash{'description'},'"<>&').
+                                    ' <span class="LC_fontsize_small">'.
+                                     &Apache::loncommon::syllabuswrapper(&mt('Syllabus'),$trest,$tdom).
+                                    '</span>';
+                            $ttype = $newhash{'type'};
+                            $trole = &Apache::lonnet::plaintext($role,$ttype,$tcourseid);
+                            my $home = $newhash{'home'};
+                            unless ($home && grep(/^\Q$home\E$/,@ids) && $loncaparev eq '') {
+                                my $required = $newhash{'internal.releaserequired'};
+                                if ($required ne '') {
+                                    ($switchserver,$switchwarning) =
+                                        &check_release_required($loncaparev,$tcourseid,$trolecode,$required);
+                                    if ($switchserver || $switchwarning) {
+                                        $button = 0;
+                                    }
+                                }
+                            }
+                        } else {
+                            $twhere=&mt('Currently not available');
+                            $env{'course.'.$tcourseid.'.description'}=$twhere;
+                            $sortkey=$role."\0".$tdom."\0".$twhere."\0".$envkey;
+                            $ttype = 'Unavailable';
+                        }
+                    }
+                    if ($tsection) {
+                        $twhere.='<br />'.&mt('Section').': '.$tsection;
+                    }
+                    if ($role ne 'st') { $twhere.="<br />".&mt('Domain').":".$tdom; }
+                } elsif ($tdom) {
+                    $ttype='Domain';
+                    $twhere=$tdom;
+                    $sortkey=$role.$twhere;
+                } else {
+                    $ttype='System';
+                    $twhere=&mt('system wide');
+                    $sortkey=$role.$twhere;
+                }
+                ($role_text,$role_text_end) =
+                    &build_roletext($trolecode,$tdom,$trest,$tstatus,$tryagain,
+                                    $advanced,$tremark,$tbg,$trole,$twhere,$tpstart,
+                                    $tpend,$nochoose,$button,$switchserver,$reinit,$switchwarning);
+                $roletext->{$envkey}=[$role_text,$role_text_end];
+                if (!$sortkey) {$sortkey=$twhere."\0".$envkey;}
+                $sortrole->{$sortkey}=$envkey;
+                $roleclass->{$envkey}=$ttype;
+            }
+        }
+    }
+    return ($countactive,$countfuture,$inrole,$possiblerole);
+}
+
 sub role_timezone {
     my ($where,$timezones) = @_;
     my $timezone;
-    if (ref($timezones) eq 'HASH') {
+    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 '') {
+                    my $tz;
+                    if ($env{'course.'.$cdom.'_'.$cnum.'.description'}) {
+                        $tz = $env{'course.'.$cdom.'_'.$cnum.'.timezone'};
+                    } else {
+                        my %timehash =
+                            &Apache::lonnet::get('environment',['timezone'],$cdom,$cnum);
+                        $tz = $timehash{'timezone'};
+                    }
+                    if ($tz eq '') {
                         if (!exists($timezones->{$cdom})) {
-                            my %domdefaults =
+                            my %domdefaults = 
                                 &Apache::lonnet::get_domain_defaults($cdom);
                             if ($domdefaults{'timezone_def'} eq '') {
                                 $timezones->{$cdom} = 'local';
@@ -891,8 +1227,8 @@ sub role_timezone {
                         }
                         $timezones->{$cdom.'_'.$cnum} = $timezones->{$cdom};
                     } else {
-                        $timezones->{$cdom.'_'.$cnum} =
-                            &Apache::lonlocal::gettimezone($timehash{'timezone'});
+                        $timezones->{$cdom.'_'.$cnum} = 
+                            &Apache::lonlocal::gettimezone($tz);
                     }
                 }
                 $timezone = $timezones->{$cdom.'_'.$cnum};
@@ -922,11 +1258,17 @@ 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>');
+        $r->print('<br />'
+                 .&Apache::loncommon::start_data_table()
+                 .&Apache::loncommon::start_data_table_header_row()
+        );
         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");
+        $r->print('<th>'.&mt('User Role').'</th>'
+                 .'<th>'.&mt('Extent').'</th>'
+                 .'<th>'.&mt('Start').'</th>'
+                 .'<th>'.&mt('End').'</th>'
+                 .&Apache::loncommon::end_data_table_header_row()
+        );
         $doheaders=-1;
         my @roletypes = &roletypes();
         foreach my $type (@roletypes) {
@@ -943,7 +1285,7 @@ sub roletable_headers {
 }
 
 sub roletypes {
-    my @types = ('Domain','Construction Space','Course','Unavailable','System');
+    my @types = ('Domain','Construction Space','Course','Community','Unavailable','System');
     return @types; 
 }
 
@@ -956,7 +1298,16 @@ sub print_rolerows {
             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 (ref($roletext->{$sortrole->{$which}}) eq 'ARRAY') {
+                            $output.= &Apache::loncommon::start_data_table_row().
+                                      $roletext->{$sortrole->{$which}}->[0].
+                                      &Apache::loncommon::end_data_table_row();
+                            if ($roletext->{$sortrole->{$which}}->[1] ne '') {
+                                $output .= &Apache::loncommon::continue_data_table_row().
+                                           $roletext->{$sortrole->{$which}}->[1].
+                                           &Apache::loncommon::end_data_table_row();
+                            }
+                        }
                         if ($sortrole->{$which} =~ m-dc\./($match_domain)/-) {
                             if (ref($dcroles) eq 'HASH') {
                                 if ($dcroles->{$1}) {
@@ -969,9 +1320,12 @@ sub print_rolerows {
             }
             if ($output) {
                 if ($doheaders > 0) {
-                    $r->print("<tr>".
-                              "<td align='center' colspan='5'><font face='arial'>".
-                              &mt($type)."</font></td></tr>");
+                    $r->print(&Apache::loncommon::start_data_table_empty_row()
+                             .'<td align="center" colspan="5">'
+                             .&mt($type)
+                             .'</td>'
+                             .&Apache::loncommon::end_data_table_empty_row()
+                    );
                 }
                 $r->print($output);
             }
@@ -980,7 +1334,7 @@ sub print_rolerows {
 }
 
 sub findcourse_advice {
-    my ($r,$numcourses) = @_;
+    my ($r) = @_;
     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'})) {
@@ -995,57 +1349,64 @@ sub findcourse_advice {
     } 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>');
-    }
+    $r->print('<h3>'.&mt('Self-Enrollment').'</h3>'.
+              '<p>'.&mt('The [_1]Course/Community Catalog[_2] provides information about all [_3] classes for which LON-CAPA courses have been created, as well as any communities in the domain.','<a href="/adm/coursecatalog?showdom='.$esc_dom.'">','</a>',$domdesc).'<br />');
+    $r->print(&mt('You can search for courses and communities which permit self-enrollment, if you would like to enroll in one.').'</p>'.
+              &Apache::loncoursequeueadmin::queued_selfenrollment());
     return;
 }
 
-sub queued_selfenrollment {
+sub requestcourse_advice {
     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);
+    my $domdesc = &Apache::lonnet::domain($env{'user.domain'},'description');
+    my $esc_dom = &HTML::Entities::encode($env{'user.domain'},'"<>&');
+    my (%can_request,%request_doms);
+    &Apache::lonnet::check_can_request($env{'user.domain'},\%can_request,\%request_doms);
+    if (keys(%request_doms) > 0) {
+        my ($types,$typename) = &Apache::loncommon::course_types();
+        if ((ref($types) eq 'ARRAY') && (ref($typename) eq 'HASH')) { 
+            $r->print('<h3>'.&mt('Request creation of a course or community').'</h3>'.
+                      '<p>'.&mt('You have rights to request the creation of courses and/or communities in the following domain(s):').'<ul>');
+            my (@reqdoms,@reqtypes);
+            foreach my $type (sort(keys(%request_doms))) {
+                push(@reqtypes,$type); 
+                if (ref($request_doms{$type}) eq 'ARRAY') {
+                    my $domstr = join(', ',map { &Apache::lonnet::domain($_) } sort(@{$request_doms{$type}}));
+                    $r->print(
+                        '<li>'
+                       .&mt('[_1]'.$typename->{$type}.'[_2] in domain: [_3]',
+                            '<i>',
+                            '</i>',
+                            '<b>'.$domstr.'</b>')
+                       .'</li>'
+                    );
+                    foreach my $dom (@{$request_doms{$type}}) {
+                        unless (grep(/^\Q$dom\E/,@reqdoms)) {
+                            push(@reqdoms,$dom);
+                        }
+                    }
                 }
             }
-        }
-    }
-    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 ++;
+            my @showtypes;
+            foreach my $type (@{$types}) {
+                if (grep(/^\Q$type\E$/,@reqtypes)) {
+                    push(@showtypes,$type);
                 }
             }
+            my $requrl = '/adm/requestcourse';
+            if (@reqdoms == 1) {
+                $requrl .= '?showdom='.$reqdoms[0];
+            }
+            if (@showtypes > 0) {
+                $requrl.=(($requrl=~/\?/)?'&':'?').'crstype='.$showtypes[0];
+            }
+            if (@reqdoms == 1 || @showtypes > 0) {
+                $requrl .= '&state=crstype&action=new';
+            } 
+            $r->print('</ul>'.&mt('Use the [_1]request form[_2] to submit a request for creation of a new course or community.','<a href="'.$requrl.'">','</a>').'</p>');
         }
-        $r->print(&Apache::loncommon::end_data_table());
     }
-    return $queuetotal;
+    return;
 }
 
 sub privileges_info {
@@ -1103,34 +1464,9 @@ sub privileges_info {
     return $output;
 }
 
-sub role_status {
-    my ($rolekey,$then,$now,$role,$where,$trolecode,$tstatus,$tstart,$tend) = @_;
-    my @pwhere = ();
-    if (exists($env{$rolekey}) && $env{$rolekey} ne '') {
-        (undef,undef,$$role,@pwhere)=split(/\./,$rolekey);
-        unless (!defined($$role) || $$role eq '') {
-            $$where=join('.',@pwhere);
-            $$trolecode=$$role.'.'.$$where;
-            ($$tstart,$$tend)=split(/\./,$env{$rolekey});
-            $$tstatus='is';
-            if ($$tstart && $$tstart>$then) {
-		$$tstatus='future';
-		if ($$tstart<$now) { $$tstatus='will'; }
-            }
-            if ($$tend) {
-                if ($$tend<$then) {
-                    $$tstatus='expired';
-                } elsif ($$tend<$now) {
-                    $$tstatus='will_not';
-                }
-            }
-        }
-    }
-}
-
 sub build_roletext {
-    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 ($trolecode,$tdom,$trest,$tstatus,$tryagain,$advanced,$tremark,$tbg,$trole,$twhere,$tpstart,$tpend,$nochoose,$button,$switchserver,$reinit,$switchwarning) = @_;
+    my ($roletext,$roletext_end);
     my $is_dc=($trolecode =~ m/^dc\./);
     my $rowspan=($is_dc) ? ''
                          : ' rowspan="2" ';
@@ -1140,34 +1476,48 @@ sub build_roletext {
         $buttonname=~s/\W//g;
         if (!$button) {
             if ($switchserver) {
-                $roletext.='<td'.$rowspan.'><span class="LC_rolesinfo"><a href="/adm/switchserver?'.
-                $switchserver.'">'.&mt('Switch Server').'</a></span></td>';
+                $roletext.='<td'.$rowspan.' class="'.$tbg.'">'
+                          .'<a href="/adm/switchserver?'.$switchserver.'">'
+                          .&mt('Switch Server')
+                          .'</a></td>';
             } else {
-                $roletext.=('<td'.$rowspan.'>&nbsp;</td>');
+                $roletext.=('<td'.$rowspan.' class="'.$tbg.'">&nbsp;</td>');
+            }
+            if ($switchwarning) {
+                if ($tremark eq '') {
+                    $tremark = $switchwarning;
+                } else {
+                    $tremark .= '<br />'.$switchwarning;
+                }
             }
         } elsif ($tstatus eq 'is') {
-            $roletext.='<td'.$rowspan.'><input name="'.$buttonname.'" type="button" value="'.
-                        &mt('Select').'" onClick="javascript:enterrole(this.form,\''.
+            $roletext.='<td'.$rowspan.' class="'.$tbg.'">'.
+                        '<input name="'.$buttonname.'" type="button" value="'.
+                        &mt('Select').'" onclick="javascript:enterrole(this.form,\''.
                         $trolecode."','".$buttonname.'\');" /></td>';
         } elsif ($tryagain) {
             $roletext.=
-                '<td'.$rowspan.'><input name="'.$buttonname.'" type="button" value="'.
-                &mt('Try Selecting Again').'" onClick="javascript:enterrole(this.form,\''.
+                '<td'.$rowspan.' class="'.$tbg.'">'.
+                '<input name="'.$buttonname.'" type="button" value="'.
+                &mt('Try Selecting Again').'" onclick="javascript:enterrole(this.form,\''.
                         $trolecode."','".$buttonname.'\');" /></td>';
         } elsif ($advanced) {
             $roletext.=
-                '<td'.$rowspan.'><input name="'.$buttonname.'" type="button" value="'.
-                &mt('Re-Select').'" onClick="javascript:enterrole(this.form,\''.
+                '<td'.$rowspan.' class="'.$tbg.'">'.
+                '<input name="'.$buttonname.'" type="button" value="'.
+                &mt('Re-Initialize').'" 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,\''.
+                '<td'.$rowspan.' class="'.$tbg.'">'.
+                '<input name="'.$buttonname.'" type="button" value="'.
+                &mt('Re-Select').'" onclick="javascript:enterrole(this.form,\''.
                         $trolecode."','".$buttonname.'\');" /></td>';
         } else {
             $roletext.=
-                '<td'.$rowspan.'><input name="'.$buttonname.'" type="button" value="'.
-                &mt('Re-Select').'" onClick="javascript:enterrole(this.form,\''.
+                '<td'.$rowspan.' class="'.$tbg.'">'.
+                '<input name="'.$buttonname.'" type="button" value="'.
+                &mt('Re-Select').'" onclick="javascript:enterrole(this.form,\''.
                         $trolecode."','".$buttonname.'\');" /></td>';
         }
     }
@@ -1175,16 +1525,16 @@ sub build_roletext {
 	$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>';
+    $roletext.='<td>'.$trole.'</td>'
+              .'<td>'.$twhere.'</td>'
+              .'<td>'.$tpstart.'</td>'
+              .'<td>'.$tpend.'</td>';
     if (!$is_dc) {
-	$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";
+        $roletext_end = '<td colspan="4">'.
+                        $tremark.'&nbsp;'.
+                        '</td>';
     }
-    return $roletext;
+    return ($roletext,$roletext_end);
 }
 
 sub check_needs_switchserver {
@@ -1222,22 +1572,8 @@ sub check_author_homeserver {
     }
 }
 
-sub check_privs {
-    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,$checkrole);
-        }
-    } else {
-        &set_privileges($cdom,$cnum,$checkrole);
-    }
-}
-
 sub check_fordc {
-    my ($dcroles,$then) = @_;
+    my ($dcroles,$update,$then) = @_;
     my $numdc = 0;
     if ($env{'user.adv'}) {
         foreach my $envkey (sort keys %env) {
@@ -1245,8 +1581,12 @@ sub check_fordc {
                 my $dcdom = $1;
                 my $livedc = 1;
                 my ($tstart,$tend)=split(/\./,$env{$envkey});
-                if ($tstart && $tstart>$then) { $livedc = 0; }
-                if ($tend   && $tend  <$then) { $livedc = 0; }
+                my $limit = $update;
+                if ($env{'request.role'} eq 'dc./'.$dcdom.'/') {
+                    $limit = $then;
+                }
+                if ($tstart && $tstart>$limit) { $livedc = 0; }
+                if ($tend   && $tend  <$limit) { $livedc = 0; }
                 if ($livedc) {
                     $$dcroles{$dcdom} = $envkey;
                     $numdc++;
@@ -1258,21 +1598,22 @@ sub check_fordc {
 }
 
 sub adhoc_course_role {
-    my ($then) = @_; 
-    my ($cdom,$cnum);
+    my ($refresh,$update,$then) = @_;
+    my ($cdom,$cnum,$crstype);
     $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
     $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
-    if (&check_forcc($cdom,$cnum,$then)) {
+    $crstype = &Apache::loncommon::course_type();
+    if (&check_forcc($cdom,$cnum,$refresh,$update,$then,$crstype)) {
         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)) {
+            if (($start && ($start>$refresh || $start == -1)) ||
+                ($end && $end<$update)) {
                 $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;
@@ -1302,7 +1643,7 @@ sub adhoc_course_role {
                 }
                 &Apache::lonnet::standard_roleprivs(\%newrole,$role,$cdom,$spec,$cnum,$area);
                 &Apache::lonnet::set_userprivs(\%userroles,\%newrole,\%newgroups);
-                my $adhocstart = $then-1;
+                my $adhocstart = $refresh-1;
                 $userroles{'user.role.'.$spec} = $adhocstart.'.';
                 &Apache::lonnet::appenv(\%userroles,[$role,'cm']);
             }
@@ -1312,28 +1653,126 @@ sub adhoc_course_role {
 }
 
 sub check_forcc {
-    my ($cdom,$cnum,$then) = @_;
-    my $is_cc;
+    my ($cdom,$cnum,$refresh,$update,$then,$crstype) = @_;
+    my ($is_cc,$ccrole);
+    if ($crstype eq 'Community') {
+        $ccrole = 'co';
+    } else {
+        $ccrole = 'cc';
+    }
     if ($cdom ne '' && $cnum ne '') {
         if (&Apache::lonnet::is_course($cdom,$cnum)) {
-            my $envkey = 'user.role.cc./'.$cdom.'/'.$cnum;
+            my $envkey = 'user.role.'.$ccrole.'./'.$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; }
+                my $limit = $update;
+                if ($env{'request.role'} eq $ccrole.'./'.$cdom.'/'.$cnum) {
+                    $limit = $then;
+                }
+                if ($tstart && $tstart>$refresh) { $is_cc = 0; }
+                if ($tend   && $tend  <$limit) { $is_cc = 0; }
             }
         }
     }
     return $is_cc;
 }
 
+sub check_release_required {
+    my ($loncaparev,$tcourseid,$trolecode,$required) = @_;
+    my ($switchserver,$warning);
+    if ($required ne '') {
+        my ($reqdmajor,$reqdminor) = ($required =~ /^(\d+)\.(\d+)$/);
+        my ($major,$minor) = ($loncaparev =~ /^\'?(\d+)\.(\d+)\.[\w.\-]+\'?$/);
+        if ($reqdmajor ne '' && $reqdminor ne '') {
+            my $otherserver;
+            if (($major eq '' && $minor eq '') || 
+                (($reqdmajor > $major) || (($reqdmajor == $major) && ($reqdminor > $minor)))) {
+                my ($userdomserver) = &Apache::lonnet::choose_server($env{'user.domain'});
+                my $switchlcrev = 
+                    &Apache::lonnet::get_server_loncaparev($env{'user.domain'},
+                                                           $userdomserver);
+                my ($swmajor,$swminor) = ($switchlcrev =~ /^\'?(\d+)\.(\d+)\.[\w.\-]+\'?$/);
+                if (($swmajor eq '' && $swminor eq '') || ($reqdmajor > $swmajor) || 
+                    (($reqdmajor == $swmajor) && ($reqdminor > $swminor))) {
+                    my $cdom = $env{'course.'.$tcourseid.'.domain'};
+                    if ($cdom ne $env{'user.domain'}) {
+                        my ($coursedomserver,$coursehostname) = &Apache::lonnet::choose_server($cdom); 
+                        my $serverhomeID = &Apache::lonnet::get_server_homeID($coursehostname);
+                        my $serverhomedom = &Apache::lonnet::host_domain($serverhomeID);
+                        my %defdomdefaults = &Apache::lonnet::get_domain_defaults($serverhomedom);
+                        my %udomdefaults = &Apache::lonnet::get_domain_defaults($env{'user.domain'});
+                        my $remoterev = &Apache::lonnet::get_server_loncaparev($serverhomedom,$coursedomserver);
+                        my $canhost =
+                            &Apache::lonnet::can_host_session($env{'user.domain'},
+                                                              $coursedomserver,
+                                                              $remoterev,
+                                                              $udomdefaults{'remotesessions'},
+                                                              $defdomdefaults{'hostedsessions'});
+
+                        if ($canhost) {
+                            $otherserver = $coursedomserver;
+                        } else {
+                            $warning = &mt('Requires LON-CAPA version [_1].',$env{'course.'.$tcourseid.'.internal.releaserequired'}).'<br />'. &mt("No suitable server could be found amongst servers in either your own domain or in the course's domain.");
+                        }
+                    } else {
+                        $warning = &mt('Requires LON-CAPA version [_1].',$env{'course.'.$tcourseid.'.internal.releaserequired'}).'<br />'.&mt("No suitable server could be found amongst servers in your own domain (which is also the course's domain).");
+                    }
+                } else {
+                    $otherserver = $userdomserver;
+                }
+            }
+            if ($otherserver ne '') {
+                $switchserver = 'otherserver='.$otherserver.'&amp;role='.$trolecode;
+            }
+        }
+    }
+    return ($switchserver,$warning);
+}
+
+sub update_content_constraints {
+    my ($cdom,$cnum,$chome,$cid) = @_;
+    my %curr_reqd_hash = &Apache::lonnet::userenvironment($cdom,$cnum,'internal.releaserequired');
+    my ($reqdmajor,$reqdminor) = split(/\./,$curr_reqd_hash{'internal.releaserequired'}); 
+    my %checkresponsetypes;
+    foreach my $key (keys(%Apache::lonnet::needsrelease)) {
+        my ($item,$name,$value) = split(/:/,$key);
+        if ($item eq 'resourcetag') {
+            if ($name eq 'responsetype') {
+                $checkresponsetypes{$value} = $Apache::lonnet::needsrelease{$key}
+            }
+        }
+    }
+    my $navmap = Apache::lonnavmaps::navmap->new();
+    if (defined($navmap)) {
+        my %allresponses;
+        foreach my $res ($navmap->retrieveResources(undef,sub { $_[0]->is_problem() },1,0)) {
+            my %responses = $res->responseTypes();
+            foreach my $key (keys(%responses)) {
+                next unless(exists($checkresponsetypes{$key}));
+                $allresponses{$key} += $responses{$key};
+            }
+        }
+        foreach my $key (keys(%allresponses)) {
+            my ($major,$minor) = split(/\./,$checkresponsetypes{$key});
+            if (($major > $reqdmajor) || ($major == $reqdmajor && $minor > $reqdminor)) { 
+                ($reqdmajor,$reqdminor) = ($major,$minor);
+            } 
+        }
+        undef($navmap);
+    }
+    unless (($reqdmajor eq '') && ($reqdminor eq '')) {
+        &Apache::lonnet::update_released_required($reqdmajor.'.'.$reqdminor,$cdom,$cnum,$chome,$cid);
+    }
+    return;
+}
+
 sub courselink {
     my ($dcdom,$rowtype) = @_;
     my $courseform=&Apache::loncommon::selectcourse_link
                    ('rolechoice','dccourse'.$rowtype.'_'.$dcdom,
                     'dcdomain'.$rowtype.'_'.$dcdom,'coursedesc'.$rowtype.'_'.
-                    $dcdom,$dcdom,undef);
+                    $dcdom,$dcdom,undef,'Course/Community');
     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="" />'.
@@ -1343,11 +1782,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.',
+                  plsu => "Please use the 'Select Course/Community' link to open a separate pick course window where you may select the course or community you wish to enter.",
+                  youc => 'You can only use this screen to select courses and communities in the current domain.',
              );
     my $verify_script = <<"END";
 <script type="text/javascript">
+// <![CDATA[
 function verifyCoursePick(caller) {
     var numbutton = getIndex(caller)
     var pickedCourse = document.rolechoice.elements[numbutton+4].value
@@ -1376,6 +1816,7 @@ function getIndex(caller) {
     }
     return -1;
 }
+// ]]>
 </script>
 END
     return $verify_script;
@@ -1390,52 +1831,52 @@ sub coauthorlink {
 
 sub display_cc_role {
     my $rolekey = shift;
-    my $roletext;
+    my ($roletext,$roletext_end);
     my $advanced = $env{'user.adv'};
     my $tryagain = $env{'form.tryagain'};
     unless ($rolekey =~/^error\:/) {
-        if ($rolekey =~ m-^user\.role.cc\./($match_domain)/($match_courseid)$-) {
-            my $tcourseid = $1.'_'.$2;
-            my $trolecode = 'cc./'.$1.'/'.$2;
+        if ($rolekey =~ m{^user\.role\.(cc|co)\./($match_domain)/($match_courseid)$}) {
+            my $ccrole = $1;
+            my $tdom = $2;
+            my $trest = $3;
+            my $tcourseid = $tdom.'_'.$trest;
+            my $trolecode = $ccrole.'./'.$tdom.'/'.$trest;
             my $twhere;
             my $ttype;
-            my $tbg='#77FF77';
-            my $tfont='#003300';
+            my $tbg='LC_roles_is';
             my %newhash=&Apache::lonnet::coursedescription($tcourseid);
             if (%newhash) {
                 $twhere=$newhash{'description'}.
-                        ' <font size="-2">'.
-                        &Apache::loncommon::syllabuswrapper(&mt('Syllabus'),$2,$1,$tfont).
-                        '</font>';
+                        ' <span class="LC_fontsize_small">'.
+                        &Apache::loncommon::syllabuswrapper(&mt('Syllabus'),$trest,$tdom).
+                        '</span>';
                 $ttype = $newhash{'type'};
             } else {
                 $twhere=&mt('Currently not available');
                 $env{'course.'.$tcourseid.'.description'}=$twhere;
             }
-            my $trole = &Apache::lonnet::plaintext('cc',$ttype);
-            $twhere.="<br />".&mt('Domain').":".$1;
-            $roletext = &build_roletext($trolecode,$1,$2,'is',$tryagain,$advanced,'',$tbg,$tfont,$trole,$twhere,'','','',1,'');
+            my $trole = &Apache::lonnet::plaintext($ccrole,$ttype,$tcourseid);
+            $twhere.="<br />".&mt('Domain').":".$tdom;
+            ($roletext,$roletext_end) = &build_roletext($trolecode,$tdom,$trest,'is',$tryagain,$advanced,'',$tbg,$trole,$twhere,'','','',1,'');
         }
     }
-    return ($roletext);
+    return ($roletext,$roletext_end);
 }
 
 sub adhoc_roles_row {
     my ($dcdom,$rowtype) = @_;
-    my $output = '<tr bgcolor="#77FF77">'.
-                 ' <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 $output = &Apache::loncommon::continue_data_table_row()
+                 .' <td colspan="5">'
+                 .&mt('[_1]Ad hoc[_2] roles in domain [_3] --'
+                     ,'<span class="LC_cusr_emph">','</span>',$dcdom)
+                 .' ';
     my $selectcclink = &courselink($dcdom,$rowtype);
-    my $ccrole = &Apache::lonnet::plaintext('cc');
+    my $ccrole = &Apache::lonnet::plaintext('co',undef,undef,1);
     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";
+    $output.=$ccrole.': '.$selectcclink
+            .' | '.$carole.': '.$selectcalink.'</td>'
+            .&Apache::loncommon::end_data_table_row();
     return $output;
 }
 
@@ -1444,32 +1885,6 @@ sub recent_filename {
     return 'nohist_recent_'.&escape($area);
 }
 
-sub set_privileges {
-# role can be cc or ca
-    my ($dcdom,$pickedcourse,$role) = @_;
-    my $area = '/'.$dcdom.'/'.$pickedcourse;
-    my $spec = $role.'.'.$area;
-    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);
-    &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.domain' => $dcdom,
-                          'request.course.sec'  => ''});
-    my $tadv=0;
-    if (&Apache::lonnet::allowed('adv') eq 'F') { $tadv=1; }
-    &Apache::lonnet::appenv({'request.role.adv'    => $tadv});
-}
-
 sub courseloadpage {
     my ($courseid) = @_;
     my $startpage;
@@ -1487,6 +1902,644 @@ sub courseloadpage {
     return $startpage;
 }
 
+sub update_session_roles {
+    my $then=$env{'user.login.time'};
+    my $refresh=$env{'user.refresh.time'};
+    if (!$refresh) {
+        $refresh = $then;
+    }
+    my $update = $env{'user.update.time'};
+    if (!$update) {
+        $update = $then;
+    }
+    my $now = time;
+    my %roleshash =
+        &Apache::lonnet::get_my_roles('','','userroles',
+                                      ['active','future','previous'],
+                                      undef,undef,1);
+    my ($msg,@newsec,$oldsec,$currrole_expired,@changed_roles,
+        %changed_groups,%dbroles,%deletedroles,%allroles,%allgroups,
+        %userroles,%checkedgroup,%crprivs,$hasgroups,%rolechange,
+        %groupchange,%newrole,%newgroup,%customprivchg,%groups_roles,
+        @rolecodes);
+    my @possroles = ('cr','st','ta','ad','ep','in','co','cc');
+    my %courseroles;
+    foreach my $item (keys(%roleshash)) {
+        my ($uname,$udom,$role,$remainder) = split(/:/,$item,4);
+        my ($tstart,$tend) = split(/:/,$roleshash{$item});
+        my ($section,$group,@group_privs);
+        if ($role =~ m{^gr/(\w*)$}) {
+            $role = 'gr';
+            my $priv = $1;
+            next if ($tstart eq '-1');
+            if (&curr_role_status($tstart,$tend,$refresh,$now) eq 'active') {
+                if ($priv ne '') {
+                    push(@group_privs,$priv);
+                }
+            }
+            if ($remainder =~ /:/) {
+                (my $additional_privs,$group) =
+                    ($remainder =~ /^([\w:]+):([^:]+)$/);
+                if ($additional_privs ne '') {
+                    if (&curr_role_status($tstart,$tend,$refresh,$now) eq 'active') {
+                        push(@group_privs,split(/:/,$additional_privs));
+                        @group_privs = sort(@group_privs);
+                    }
+                }
+            } else {
+                $group = $remainder;
+            }
+        } else {
+            $section = $remainder;
+        }
+        my $where = "/$udom/$uname";
+        if ($section ne '') {
+            $where .= "/$section";
+        } elsif ($group ne '') {
+            $where .= "/$group";
+        }
+        my $rolekey = "$role.$where";
+        my $envkey = "user.role.$rolekey";
+        $dbroles{$envkey} = 1;
+        if (($env{'request.role'} eq $rolekey) && ($role ne 'st')) {
+            if (&curr_role_status($tstart,$tend,$refresh,$now) ne 'active') {
+                $currrole_expired = 1;
+            }
+        }
+        if ($env{$envkey} eq '') {
+            my $status_in_db =
+                &curr_role_status($tstart,$tend,$refresh,$now);
+                &gather_roleprivs(\%allroles,\%allgroups,\%userroles,$where,$role,$tstart,$tend,$status_in_db);
+            if (($role eq 'st') && ($env{'request.role'} =~ m{^\Q$role\E\.\Q/$udom/$uname\E})) {
+                if ($status_in_db eq 'active') {
+                    if ($section eq '') {
+                        push(@newsec,'none');
+                    } else {
+                        push(@newsec,$section);
+                    }
+                }
+            } else {
+                unless (grep(/^\Q$role\E$/,@changed_roles)) {
+                    push(@changed_roles,$role);
+                }
+                if ($status_in_db ne 'previous') {
+                    if ($role eq 'gr') {
+                        $newgroup{$rolekey} = $status_in_db;
+                        if ($status_in_db eq 'active') {
+                            unless (ref($courseroles{$udom}) eq 'HASH') {
+                                %{$courseroles{$udom}} =
+                                    &Apache::lonnet::get_my_roles('','','userroles',
+                                                                  ['active'],\@possroles,
+                                                                  [$udom],1);
+                            }
+                            &Apache::lonnet::get_groups_roles($udom,$uname,
+                                                              $courseroles{$udom},
+                                                              \@rolecodes,\%groups_roles);
+                        }
+                    } else {
+                        $newrole{$rolekey} = $status_in_db;
+                    }
+                }
+            }
+        } else {
+            my ($currstart,$currend) = split(/\./,$env{$envkey});
+            if ($role eq 'gr') {
+                if (&curr_role_status($currstart,$currend,$refresh,$update) ne 'previous') {
+                    $hasgroups = 1;
+                }
+            }
+            if (($currstart ne $tstart) || ($currend ne $tend)) {
+                my $status_in_env =
+                    &curr_role_status($currstart,$currend,$refresh,$update);
+                my $status_in_db =
+                    &curr_role_status($tstart,$tend,$refresh,$now);
+                if ($status_in_env ne $status_in_db) {
+                    if ($status_in_env eq 'active') {
+                        if ($role eq 'st') {
+                            if ($env{'request.role'} eq $rolekey) {
+                                my $switchsection;
+                                unless (ref($courseroles{$udom}) eq 'HASH') {
+                                    %{$courseroles{$udom}} =
+                                        &Apache::lonnet::get_my_roles('','','userroles',
+                                                                      ['active'],
+                                                                      \@possroles,[$udom],1);
+                                }
+                                foreach my $crsrole (keys(%{$courseroles{$udom}})) {
+                                    if ($crsrole =~ /^\Q$uname\E:\Q$udom\E:st/) {
+                                        $switchsection = 1;
+                                        last;
+                                    }
+                                }
+                                if ($switchsection) {
+                                    if ($section eq '') {
+                                        $oldsec = 'none';
+                                    } else {
+                                        $oldsec = $section;
+                                    }
+                                    &gather_roleprivs(\%allroles,\%allgroups,\%userroles,$where,$role,$tstart,$tend,$status_in_db);
+                                } else {
+                                    $currrole_expired = 1;
+                                    next;
+                                }
+                            }
+                        }
+                        unless ($rolekey eq $env{'request.role'}) {
+                            if ($role eq 'gr') {
+                                &Apache::lonnet::delete_env_groupprivs($where,\%courseroles,\@possroles);
+                            } else {
+                                &Apache::lonnet::delenv("user.priv.$rolekey",undef,[$role]);
+                                &Apache::lonnet::delenv("user.priv.cm.$where",undef,['cm']);
+                            }
+                            &gather_roleprivs(\%allroles,\%allgroups,\%userroles,$where,$role,$tstart,$tend,$status_in_db);
+                        }
+                    } elsif ($status_in_db eq 'active') {
+                        if (($role eq 'st') &&
+                            ($env{'request.role'} =~ m{^\Q$role\E\.\Q/$udom/$uname\E})) {
+                            if ($section eq '') {
+                                push(@newsec,'none');
+                            } else {
+                                push(@newsec,$section);
+                            }
+                        } elsif ($role eq 'gr') {
+                            unless (ref($courseroles{$udom}) eq 'HASH') {
+                                %{$courseroles{$udom}} =
+                                    &Apache::lonnet::get_my_roles('','','userroles',
+                                                                  ['active'],
+                                                                  \@possroles,[$udom],1);
+                            }
+                            &Apache::lonnet::get_groups_roles($udom,$uname,
+                                                              $courseroles{$udom},
+                                                              \@rolecodes,\%groups_roles);
+                        }
+                        &gather_roleprivs(\%allroles,\%allgroups,\%userroles,$where,$role,$tstart,$tend,$status_in_db);
+                    }
+                    unless (grep(/^\Q$role\E$/,@changed_roles)) {
+                        push(@changed_roles,$role);
+                    }
+                    if ($role eq 'gr') {
+                        $groupchange{"/$udom/$uname"}{$group} = $status_in_db;
+                    } else {
+                        $rolechange{$rolekey} = $status_in_db;
+                    }
+                }
+            } else {
+                if ($role eq 'gr') {
+                    unless ($checkedgroup{$where}) {
+                        my $status_in_db =
+                            &curr_role_status($tstart,$tend,$refresh,$now);
+                        if ($tstart eq '-1') {
+                            $status_in_db = 'deleted';
+                        }
+                        unless (ref($courseroles{$udom}) eq 'HASH') {
+                            %{$courseroles{$udom}} =
+                                &Apache::lonnet::get_my_roles('','','userroles',
+                                                              ['active'],
+                                                              \@possroles,[$udom],1);
+                        }
+                        if (ref($courseroles{$udom}) eq 'HASH') {
+                            foreach my $item (keys(%{$courseroles{$udom}})) {
+                                next unless ($item =~ /^\Q$uname\E/);
+                                my ($cnum,$cdom,$crsrole,$crssec) = split(/:/,$item);
+                                my $area = '/'.$cdom.'/'.$cnum;
+                                if ($crssec ne '') {
+                                    $area .= '/'.$crssec;
+                                }
+                                my $crsrolekey = $crsrole.'.'.$area;
+                                my $currprivs = $env{'user.priv.'.$crsrole.'.'.$area.'.'.$where};
+                                $currprivs =~ s/^://;
+                                $currprivs =~ s/\&F$//;
+                                my @curr_grp_privs = split(/\&F:/,$currprivs);
+                                @curr_grp_privs = sort(@curr_grp_privs);
+                                my @diffs;
+                                if (@group_privs > 0 || @curr_grp_privs > 0) {
+                                    @diffs = &Apache::loncommon::compare_arrays(\@group_privs,\@curr_grp_privs);
+                                }
+                                if (@diffs == 0) {
+                                    last;
+                                } else {
+                                    unless(grep(/^\Qgr\E$/,@rolecodes)) {
+                                        push(@rolecodes,'gr');
+                                    }
+                                    &gather_roleprivs(\%allroles,\%allgroups,
+                                                      \%userroles,$where,$role,
+                                                      $tstart,$tend,$status_in_db);
+                                    if ($status_in_db eq 'active') {
+                                        &Apache::lonnet::get_groups_roles($udom,$uname,
+                                                                          $courseroles{$udom},
+                                                                          \@rolecodes,\%groups_roles);
+                                    }
+                                    $changed_groups{$udom.'_'.$uname}{$group} = $status_in_db;
+                                    last;
+                                }
+                            }
+                        }
+                        $checkedgroup{$where} = 1;
+                    }
+                } elsif ($role =~ /^cr/) {
+                    my $status_in_db =
+                        &curr_role_status($tstart,$tend,$refresh,$now);
+                    my ($rdummy,$rest) = split(/\//,$role,2);
+                    my ($rdummy,$rdomain,$rauthor,$rrole)=split(/\//,$role);
+                    my %currpriv;
+                    unless (exists($crprivs{$rest})) {
+                        my ($rdomain,$rauthor,$rrole)=split(/\//,$rest);
+                        my $homsvr=&Apache::lonnet::homeserver($rauthor,$rdomain);
+                        if (&Apache::lonnet::hostname($homsvr) ne '') {
+                            my ($rdummy,$roledef)=
+                            &Apache::lonnet::get('roles',["rolesdef_$rrole"],
+                                                 $rdomain,$rauthor);
+                            if (($rdummy ne 'con_lost') && ($roledef ne '')) {
+                                my $i = 0;
+                                my @scopes = ('sys','dom','crs');
+                                my @privs = split(/\_/,$roledef);
+                                foreach my $priv (@privs) {
+                                    my ($blank,@prv) = split(/:/,$priv);
+                                    @prv = map { $_ .= (/\&\w+$/ ? '':'&F') } @prv;
+                                    if (@prv) {
+                                        $priv = ':'.join(':',sort(@prv));
+                                    }
+                                    $crprivs{$rest}{$scopes[$i]} = $priv;
+                                    $i++;
+                                }
+                            }
+                        }
+                    }
+                    $currpriv{sys} = $env{"user.priv.$rolekey./"};
+                    $currpriv{dom} = $env{"user.priv.$rolekey./$udom/"};
+                    $currpriv{crs} = $env{"user.priv.$rolekey.$where"};
+                    if (keys(%crprivs)) {
+                        if (($crprivs{$rest}{sys} ne $currpriv{sys}) ||
+                            ($crprivs{$rest}{dom} ne $currpriv{dom})
+ ||
+                            ($crprivs{$rest}{crs} ne $currpriv{crs})) {
+                            &gather_roleprivs(\%allroles,\%allgroups,\%userroles,$where,$role,$tstart,$tend,$status_in_db);
+                            unless (grep(/^\Q$role\E$/,@changed_roles)) {
+                                push(@changed_roles,$role);
+                            }
+                            my $status_in_env =
+                                &curr_role_status($currstart,$currend,$refresh,$update);
+                            if ($status_in_env eq 'active') {
+                                $customprivchg{$rolekey} = $status_in_env;
+                            }
+                        }
+                    }
+                }
+            }
+        }
+    }
+    foreach my $envkey (keys(%env)) {
+        next unless ($envkey =~ /^user\.role\./);
+        next if ($dbroles{$envkey});
+        next if ($envkey eq 'user.role.'.$env{'request.role'});
+        my ($currstart,$currend) = split(/\./,$env{$envkey});
+        my $status_in_env =
+            &curr_role_status($currstart,$currend,$refresh,$update);
+        my ($rolekey) = ($envkey =~ /^user\.role\.(.+)$/);
+        my ($role,$rest)=split(/\./,$rolekey,2);
+        if (&Apache::lonnet::delenv($envkey,undef,[$role])) {
+            if ($status_in_env eq 'active') {
+                if ($role eq 'gr') {
+                    &Apache::lonnet::delete_env_groupprivs($rest,\%courseroles,
+                                                           \@possroles);
+                } else {
+                    &Apache::lonnet::delenv("user.priv.$rolekey",undef,[$role]);
+                    &Apache::lonnet::delenv("user.priv.cm.$rest",undef,['cm']);
+                }
+                unless (grep(/^\Q$role\E$/,@changed_roles)) {
+                    push(@changed_roles,$role);
+                }
+                $deletedroles{$rolekey} = 1;
+            }
+        }
+    }
+    if (($oldsec) && (@newsec > 0)) {
+        if (@newsec > 1) {
+            $msg = '<div class="LC_warning">'.&mt('The section has changed for your current role. Log-out and log-in again to select a role for the new section.').'</div>';
+        } else {
+            my $newrole = $env{'request.role'};
+            if ($newsec[0] eq 'none') {
+                $newrole =~ s{(/[^/])$}{};
+            } elsif ($oldsec eq 'none') {
+                $newrole .= '/'.$newsec[0];
+            } else {
+                $newrole =~ s{([^/]+)$}{$newsec[0]};
+            }
+            my $coursedesc = $env{'course.'.$env{'request.course.id'}.'.description'};
+            my ($curr_role) = ($env{'request.role'} =~ m{^(\w+)\./$match_domain/$match_courseid});
+            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'}});
+            my $rolename = &Apache::loncommon::plainname($curr_role);
+            $msg = '<p><form name="reselectrole" action="/adm/roles" method="post" />'.
+                   '<input type="hidden" name="newrole" value="" />'.
+                   '<input type="hidden" name="selectrole" value="1" />'.
+                   '<span class="LC_info">'.
+                   &mt('Your section has changed for your current [_1] role in [_2].',$rolename,$coursedesc).'</span><br />';
+            my $button = '<input type="button" name="sectionchanged" value="'.
+                         &mt('Re-Select').'" onclick="javascript:enterrole(this.form,'."'$newrole','sectionchanged'".')" />';
+            if ($newsec[0] eq 'none') {
+                $msg .= &mt('[_1] to continue with your new section-less role.',$button);
+            } else {
+                $msg .= &mt('[_1] to continue with your new role in section ([_2]).',$button,$newsec[0]);
+            }
+            $msg .= '</form></p>';
+        }
+    } elsif ($currrole_expired) {
+        $msg .= '<div class="LC_warning">';
+        if (&Apache::loncommon::show_course()) {
+            $msg .= &mt('Your role in the current course has expired.');
+        } else {
+            $msg .= &mt('Your current role has expired.');
+        }
+        $msg .= '<br />'.&mt('However you can continue to use this role until you logout, click the "Re-Select" button, or your session has been idle for more than 24 hours.').'</div>';
+    }
+    if (!@changed_roles || !(keys(%changed_groups))) {
+        my ($rolesmsg,$groupsmsg);
+        if (!@changed_roles) {
+            if (&Apache::loncommon::show_course()) {
+                $rolesmsg = &mt('No new courses or communities');
+            } else {
+                $rolesmsg = &mt('No role changes');
+            }
+        }
+        if ($hasgroups && !(keys(%changed_groups)) && !(grep(/gr/,@changed_roles))) {
+            $groupsmsg = &mt('No changes in course/community groups');
+        }
+        if (!@changed_roles && !(keys(%changed_groups))) {
+            if (($msg ne '') || ($groupsmsg ne '')) {
+                $msg .= '<ul>';
+                if ($rolesmsg) {
+                    $msg .= '<li>'.$rolesmsg.'</li>';
+                }
+                if ($groupsmsg) {
+                    $msg .= '<li>'.$groupsmsg.'</li>';
+                }
+                $msg .= '</ul>';
+            } else {
+                $msg = '&nbsp;<span class="LC_cusr_emph">'.$rolesmsg.'</span><br />';
+            }
+            return $msg;
+        }
+    }
+    my $changemsg;
+    if (@changed_roles > 0) {
+        if (keys(%newgroup) > 0) {
+            my $groupmsg;
+            foreach my $item (sort(keys(%newgroup))) {
+                if (&is_active_course($item,$refresh,$update,\%roleshash)) {
+                    $groupmsg .= '<li>'.
+                                 &mt('[_1] with status: [_2].',
+                                 $item,$newgroup{$item}).'</li>';
+                }
+            }
+            if ($groupmsg) {
+                $changemsg .= '<li>'.
+                              &mt('Courses with new groups').'</li>'.
+                              '<ul>'.$groupmsg.'</ul></li>';
+            }
+        }
+        if (keys(%newrole) > 0) {
+            $changemsg .= '<li>'.&mt('New roles').
+                          '<ul>';
+            foreach my $item (sort(keys(%newrole))) {
+                $changemsg .= '<li>'.
+                              &mt('[_1] with status: [_2].',
+                              $item,$newrole{$item}).'</li>';
+            }
+            $changemsg .= '</ul></li>';
+        }
+        if (keys(%customprivchg) > 0) {
+            $changemsg .= '<li>'.
+                          &mt('Custom roles with privilege changes').
+                          '<ul>';
+            foreach my $item (sort(keys(%customprivchg))) {
+                $changemsg .= '<li>'.$item.'</li>';
+            }
+            $changemsg .= '</ul></li>';
+        }
+        if (keys(%rolechange) > 0) {
+            $changemsg .= '<li>'.
+                          &mt('Existing roles with status changes').'</li>'.
+                          '<ul>';
+            foreach my $item (sort(keys(%rolechange))) {
+                $changemsg .= '<li>'.
+                              &mt('[_1] status now: [_2].',$item,
+                              $rolechange{$item}).'</li>';
+            }
+            $changemsg .= '</ul></li>';
+        }
+        if (keys(%deletedroles) > 0) {
+            $changemsg .= '<li>'.
+                          &mt('Existing roles deleted').'</li>'.
+                          '<ul>';
+            foreach my $item (sort(keys(%deletedroles))) {
+                $changemsg .= '<li>'.$item.'</li>';
+            }
+            $changemsg .= '</ul></li>';
+        }
+    }
+    if ((keys(%changed_groups) > 0) || (keys(%groupchange) > 0)) {
+        my $groupchgmsg;
+        foreach my $key (sort(keys(%changed_groups))) {
+            my $crs = 'gr/'.$key;
+            $crs =~ s/_/\//;
+            if (&is_active_course($crs,$refresh,$update,\%roleshash)) {
+                if (ref($changed_groups{$key}) eq 'HASH') {
+                    my @showgroups;
+                    foreach my $group (sort(keys(%{$changed_groups{$key}}))) {
+                        if ($changed_groups{$key}{$group} eq 'active') {
+                            push(@showgroups,$group);
+                        }
+                    }
+                    if (@showgroups > 0) {
+                        $groupchgmsg .= '<li>'.
+                                        &mt('Course: [_1], groups: [_2].',$key,
+                                        join(', ',@showgroups)).
+                                        '</li>';
+                    }
+                }
+            }
+        }
+        if (keys(%groupchange) > 0) {
+            $groupchgmsg .= '<li>'.
+                          &mt('Existing course/community groups with status changes').'</li>'.
+                          '<ul>';
+            foreach my $crs (sort(keys(%groupchange))) {
+                if (ref($groupchange{$crs}) eq 'HASH') {
+                    $groupchgmsg .= '<li>'.&mt('Course/Community: [_1]','<b>'.$crs.'</b><ul>');
+                    foreach my $group (sort(keys(%{$groupchange{$crs}}))) {
+                        $groupchgmsg .= '<li>'.&mt('Group: [_1] status now: [_2].','<b>'.$group.'</b>',$groupchange{$crs}{$group}).'</li>';
+                    }
+                    $groupchgmsg .= '</ul></li>';
+                }
+            }
+            $groupchgmsg .= '</ul></li>';
+        }
+        if ($groupchgmsg) {
+            $changemsg .= '<li>'.
+                          &mt('Courses with changes in groups').'</li>'.
+                          '<ul>'.$groupchgmsg.'</ul></li>';
+        }
+    }
+    if ($changemsg) {
+        $msg .= '<ul>'.$changemsg.'</ul>';
+    }
+    &Apache::lonnet::set_userprivs(\%userroles,\%allroles,\%allgroups,\%groups_roles);
+    my ($curr_is_adv,$curr_role_adv,$curr_author,$curr_role_author);
+    $curr_author = $env{'user.author'};
+    if (($env{'request.role'} =~/^au/) || ($env{'request.role'} =~/^ca/) ||
+        ($env{'request.role'} =~/^aa/)) {
+        $curr_role_author=1;
+    }
+    $curr_is_adv = $env{'user.adv'};
+    $curr_role_adv = $env{'request.role.adv'};
+    if (keys(%userroles) > 0) {
+        foreach my $role (@changed_roles) {
+            unless(grep(/^\Q$role\E$/,@rolecodes)) {
+                push(@rolecodes,$role);
+            }
+        }
+        unless(grep(/^\Qcm\E$/,@rolecodes)) {
+            push(@rolecodes,'cm');
+        }
+        &Apache::lonnet::appenv(\%userroles,\@rolecodes);
+    }
+    my %newenv;
+    if (&Apache::lonnet::is_advanced_user($env{'user.domain'},$env{'user.name'})) {
+        unless ($curr_is_adv) {
+            $newenv{'user.adv'} = 1;
+        }
+    } elsif ($curr_is_adv && !$curr_role_adv) {
+        &Apache::lonnet::delenv('user.adv');
+    }
+    my %authorroleshash =
+        &Apache::lonnet::get_my_roles('','','userroles',['active'],['au','ca','aa']);
+    if (keys(%authorroleshash)) {
+        unless ($curr_author) {
+            $newenv{'user.author'} = 1;
+        }
+    } elsif ($curr_author && !$curr_role_author) {
+        &Apache::lonnet::delenv('user.author');
+    }
+    if ($env{'request.course.id'}) {
+        my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
+        my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
+        my (@activecrsgroups,$crsgroupschanged);
+        if ($env{'request.course.groups'}) {
+            @activecrsgroups = split(/:/,$env{'request.course.groups'});
+            foreach my $item (keys(%deletedroles)) {
+                if ($item =~ m{^gr\./\Q$cdom\E/\Q$cnum\E/(\w+)$}) {
+                    if (grep(/^\Q$1\E$/,@activecrsgroups)) {
+                        $crsgroupschanged = 1;
+                        last;
+                    }
+                }
+            }
+        }
+        unless ($crsgroupschanged) {
+            foreach my $item (keys(%newgroup)) {
+                if ($item =~ m{^gr\./\Q$cdom\E/\Q$cnum\E/(\w+)$}) {
+                    if ($newgroup{$item} eq 'active') {
+                        $crsgroupschanged = 1;
+                        last;
+                    }
+                }
+            }
+        }
+        if ((ref($changed_groups{$env{'request.course.id'}}) eq 'HASH') ||
+            (ref($groupchange{"/$cdom/$cnum"}) eq 'HASH') ||
+            ($crsgroupschanged)) {
+            my %grouproles =  &Apache::lonnet::get_my_roles('','','userroles',
+                                                            ['active'],['gr'],[$cdom],1);
+            my @activegroups;
+            foreach my $item (keys(%grouproles)) {
+                next unless($item =~ /^\Q$cnum\E:\Q$cdom\E/);
+                my $group;
+                my ($crsn,$crsd,$role,$remainder) = split(/:/,$item,4);
+                if ($remainder =~ /:/) {
+                    (my $other,$group) = ($remainder =~ /^([\w:]+):([^:]+)$/);
+                } else {
+                    $group = $remainder;
+                }
+                if ($group ne '') {
+                    push(@activegroups,$group);
+                }
+            }
+            $newenv{'request.course.groups'} = join(':',@activegroups);
+        }
+    }
+    if (keys(%newenv)) {
+        &Apache::lonnet::appenv(\%newenv);
+    }
+    return $msg;
+}
+
+sub curr_role_status {
+    my ($start,$end,$refresh,$update) = @_;
+    if (($start) && ($start<0)) { return 'deleted' };
+    my $status = 'active';
+    if (($end) && ($end<=$update)) {
+        $status = 'previous';
+    }
+    if (($start) && ($refresh<$start)) {
+        $status = 'future';
+    }
+    return $status;
+}
+
+sub gather_roleprivs {
+    my ($allroles,$allgroups,$userroles,$area,$role,$tstart,$tend,$status) = @_;
+    return unless ((ref($allroles) eq 'HASH') && (ref($allgroups) eq 'HASH') && (ref($userroles) eq 'HASH'));
+    if (($area ne '') && ($role ne '')) {
+        &Apache::lonnet::userrolelog($role,$env{'user.name'},$env{'user.domain'},
+                                     $area,$tstart,$tend);
+        my $spec=$role.'.'.$area;
+        $userroles->{'user.role.'.$spec} = $tstart.'.'.$tend;
+        my ($tdummy,$tdomain,$trest)=split(/\//,$area);
+        if ($status eq 'active') {
+            if ($role =~ /^cr\//) {
+                &Apache::lonnet::custom_roleprivs($allroles,$role,$tdomain,$trest,$spec,$area);
+            } elsif ($role eq 'gr') {
+                my %rolehash = &Apache::lonnet::get('roles',[$area.'_'.$role],
+                                                    $env{'user.domain'},
+                                                    $env{'user.name'});
+                my ($trole) = split(/_/,$rolehash{$area.'_'.$role},2);
+                (undef,my $group_privs) = split(/\//,$trole);
+                $group_privs = &unescape($group_privs);
+                &Apache::lonnet::group_roleprivs($allgroups,$area,$group_privs,$tend,$tstart);
+            } else {
+                &Apache::lonnet::standard_roleprivs($allroles,$role,$tdomain,$spec,$trest,$area);
+            }
+        }
+    }
+    return;
+}
+
+sub is_active_course {
+    my ($rolekey,$refresh,$update,$roleshashref) = @_;
+    return unless(ref($roleshashref) eq 'HASH');
+    my ($role,$cdom,$cnum) = split(/\//,$rolekey);
+    my $is_active;
+    foreach my $key (keys(%{$roleshashref})) {
+        if ($key =~ /^\Q$cnum\E:\Q$cdom\E:/) {
+            my ($tstart,$tend) = split(/:/,$roleshashref->{$key});
+            my $status = &curr_role_status($tstart,$tend,$refresh,$update);
+            if ($status eq 'active') {
+                $is_active = 1;
+                last;
+            }
+        }
+    }
+    return $is_active;
+}
+
 1;
 __END__
 
@@ -1518,8 +2571,7 @@ course they should act on, etc. Both in
 handler determines via C<lonnet>'s C<&allowed> function that a certain
 action is not allowed, C<lonroles> is used as error handler. This
 allows the user to select another role which may have permission to do
-what they were trying to do. C<lonroles> can also be accessed via the
-B<CRS> button in the Remote Control. 
+what they were trying to do.
 
 =begin latex