--- loncom/auth/lonroles.pm	2008/05/20 18:19:28	1.194
+++ loncom/auth/lonroles.pm	2014/05/31 12:49:12	1.308
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # User Roles Screen
 #
-# $Id: lonroles.pm,v 1.194 2008/05/20 18:19:28 www Exp $
+# $Id: lonroles.pm,v 1.308 2014/05/31 12:49:12 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -27,12 +27,108 @@
 #
 ###
 
+=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;
 use Apache::lonnet;
 use Apache::lonuserstate();
-use Apache::Constants qw(:common);
+use Apache::Constants qw(:common REDIRECT);
 use Apache::File();
 use Apache::lonmenu;
 use Apache::loncommon;
@@ -41,26 +137,27 @@ use Apache::lonannounce;
 use Apache::lonlocal;
 use Apache::lonpageflip();
 use Apache::lonnavdisplay();
+use Apache::loncoursequeueadmin;
+use Apache::longroup;
+use Apache::lonrss;
 use GDBM_File;
 use LONCAPA qw(:DEFAULT :match);
- 
+use HTML::Entities;
+
 
 sub redirect_user {
-    my ($r,$title,$url,$msg,$launch_nav) = @_;
+    my ($r,$title,$url,$msg) = @_;
     $msg = $title if (! defined($msg));
     &Apache::loncommon::content_type($r,'text/html');
     &Apache::loncommon::no_cache($r);
     $r->send_http_header;
-    my $swinfo=&Apache::lonmenu::rawconfig();
-    my $navwindow;
-    if ($launch_nav eq 'on') {
-	$navwindow.=&Apache::lonnavdisplay::launch_win('now',undef,undef,
-						       ($url =~ m-^/adm/whatsnew-));
-    } else {
-	$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: 
@@ -68,11 +165,7 @@ sub redirect_user {
     $url=~s/ /\%20/g;
     $r->print(<<ENDREDIR);
 $start_page
-<script type="text/javascript">
-$swinfo
-</script>
-$navwindow
-<h1>$msg</h1>
+<p>$msg</p>
 $end_page
 ENDREDIR
     return;
@@ -84,25 +177,85 @@ 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 {
 
     my $r = shift;
 
+    # Check for critical messages and redirect if present.
+    my ($redirect,$url) = &Apache::loncommon::critical_redirect(300);
+    if ($redirect) {
+        &Apache::loncommon::content_type($r,'text/html');
+        $r->header_out(Location => $url);
+        return REDIRECT;
+    }
+
     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;
+    }
+
+    &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'});
+
+# -------------------------------------------------- Check if setting hot list 
+    my $hotlist;
+    if ($env{'form.action'} eq 'verify_and_change_rolespref') {
+        $hotlist = &Apache::lonpreferences::verify_and_change_rolespref($r);
+    }
+
+# -------------------------------------------------------- Check for new roles
+    my $updateresult;
+    if ($env{'form.state'} eq '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 = $checkingtxt;
+        $updateresult .= &update_session_roles();
+        &Apache::lonnet::appenv({'user.update.time'  => $now});
+        $update = $now;
+        &Apache::loncoursequeueadmin::reqauthor_check();
+    }
+
+# -------------------------------------------------- Check for author requests
+    my $reqauthor;
+    if ($env{'form.state'} eq 'requestauthor') {
+       $reqauthor = &Apache::loncoursequeueadmin::process_reqauthor(\$update);
+    }
+
     my $envkey;
     my %dcroles = ();
-    my $numdc = &check_fordc(\%dcroles,$then);
-    &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'});
+    my $numdc = &check_fordc(\%dcroles,$update,$then);
+    my $loncaparev = $r->dir_config('lonVersion');
 
 # ================================================================== Roles Init
     if ($env{'form.selectrole'}) {
@@ -116,8 +269,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);
@@ -128,39 +290,70 @@ sub handler {
 			 	 "request.course.fn"   => '',
 				 "request.course.uri"  => '',
 				 "request.course.sec"  => '',
+                                 "request.course.tied" => '',
 				 "request.role"        => 'cm',
                                  "request.role.adv"    => $env{'user.adv'},
 				 "request.role.domain" => $env{'user.domain'}});
 # Check if user is a DC trying to enter a course or author space and needs privs to be created
         if ($numdc > 0) {
-            foreach my $envkey (keys %env) {
-# Is this an ad-hoc CC-role?
-                if (my ($domain,$coursenum) =
-		    ($envkey =~ m-^form\.cc\./($match_domain)/($match_courseid)$-)) {
+            foreach my $envkey (keys(%env)) {
+# 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');
+                        if (&Apache::lonnet::check_adhoc_privs($domain,$coursenum,
+                                                           $update,$refresh,$now,$ccrole)) {
+                            &Apache::lonnet::appenv({"environment.internal.$domain.$coursenum.$ccrole.adhoc" => time});
+                        }
                     }
                     last;
                 }
 # Is this an ad-hoc CA-role?
                 if (my ($domain,$user) =
 		    ($envkey =~ m-^form\.ca\./($match_domain)/($match_username)$-)) {
-                   # Check if author blocked ca-access
+                    if (($domain eq $env{'user.domain'}) && ($user eq $env{'user.name'})) {
+                        delete($env{$envkey});
+                        $env{'form.au./'.$domain.'/'} = 1;
+                        my ($server_status,$home) = &check_author_homeserver($user,$domain);
+                        if ($server_status eq 'switchserver') {
+                            my $trolecode = 'au./'.$domain.'/';
+                            my $switchserver = '/adm/switchserver?otherserver='.$home.'&amp;role='.$trolecode;
+                            $r->internal_redirect($switchserver);
+                            return OK;
+                        }
+                        last;
+                    }
+                    if (my ($castart,$caend) = ($env{'user.role.ca./'.$domain.'/'.$user} =~ /^(\d*)\.(\d*)$/)) {
+                        if (((($castart) && ($castart < $now)) || !$castart) && 
+                            ((!$caend) || (($caend) && ($caend > $now)))) {
+                            my ($server_status,$home) = &check_author_homeserver($user,$domain);
+                            if ($server_status eq 'switchserver') {
+                                my $trolecode = 'ca./'.$domain.'/'.$user;
+                                my $switchserver = '/adm/switchserver?otherserver='.$home.'&amp;role='.$trolecode;
+                                $r->internal_redirect($switchserver);
+                                return OK;
+                            }
+                            last;
+                        }
+                    }
+                    # Check if author blocked ca-access
                     my %blocked=&Apache::lonnet::get('environment',['domcoord.author'],$domain,$user);
                     if ($blocked{'domcoord.author'} eq 'blocked') {
-                       delete($env{$envkey});
-                       $env{'user.error.msg'}=':::1:User '.$user.' in domain '.$domain.' blocked domain coordinator access';
-                       last;
+                        delete($env{$envkey});
+                        $env{'user.error.msg'}=':::1:User '.$user.' in domain '.$domain.' blocked domain coordinator access';
+                        last;
                     }
                     if ($dcroles{$domain}) {
                         my ($server_status,$home) = &check_author_homeserver($user,$domain);
                         if (($server_status eq 'ok') || ($server_status eq 'switchserver')) {
-                            &check_privs($domain,$user,$then,$now,'ca');
+                            &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);
+                                return OK;
                             }
                         } else {
                             delete($env{$envkey});
@@ -173,14 +366,51 @@ sub handler {
             }
         }
 
-        foreach $envkey (keys %env) {
+        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);
@@ -228,8 +458,11 @@ sub handler {
 						     $cdom,$cnum,
                                                      $env{'user.domain'},
 						     $env{'user.name'},
-	      'Assigned from '.$ENV{'REMOTE_ADDR'}.' at '.localtime().' for '.
-                                                     $trolecode);
+                                                     &mt('Assigned from [_1] at [_2] for [_3]'
+                                                        ,$ENV{'REMOTE_ADDR'}
+                                                        ,&Apache::lonlocal::locallocaltime()
+                                                        ,$trolecode)
+                                                     );
 				 unless ($assignresult eq 'ok') {
 				     $assignresult=~s/^error\:\s*//;
 				     $message=&mt($assignresult).
@@ -240,12 +473,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
@@ -263,9 +498,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'}" />
@@ -293,14 +530,52 @@ ENDENTERKEY
                         my $msg;
 			my ($furl,$ferr)=
 			    &Apache::lonuserstate::readmap($cdom.'/'.$cnum);
+                        unless ($ferr) {
+                            unless (($env{'form.switchrole'}) || 
+                                    ($env{"environment.internal.$cdom.$cnum.$role.adhoc"})) {
+                                &Apache::lonnet::put('nohist_crslastlogin',
+                                    {$env{'user.name'}.':'.$env{'user.domain'}.
+                                     ':'.$csec.':'.$role => $now},$cdom,$cnum);
+                            }
+                            my ($feeds,$syllabus_time);
+                            &Apache::lonrss::advertisefeeds($cnum,$cdom,undef,\$feeds);
+                            &Apache::lonnet::appenv({'request.course.feeds' => $feeds});
+                            &Apache::lonnet::get_numsuppfiles($cnum,$cdom,1);
+                            unless ($env{'course.'.$cdom.'_'.$cnum.'.updatedsyllabus'}) {
+                                unless (($env{'course.'.$cdom.'_'.$cnum.'.externalsyllabus'}) ||
+                                        ($env{'course.'.$cdom.'_'.$cnum.'.uploadedsyllabus'})) {
+                                    my %syllabus=&Apache::lonnet::dump('syllabus',$cdom,$cnum);
+                                    $syllabus_time = $syllabus{'uploaded.lastmodified'};
+                                    if ($syllabus_time) {
+                                        &Apache::lonnet::appenv({'request.course.syllabustime' => $syllabus_time});
+                                    }
+                                }
+                            }
+                        }
 			if (($env{'form.orgurl'}) && 
-			    ($env{'form.orgurl'}!~/^\/adm\/flip/)) {
+			    ($env{'form.orgurl'}!~/^\/adm\/flip/) &&
+			    ($env{'form.orgurl'} ne '/adm/roles')) {
 			    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);
+                                        &Apache::loncommon::update_content_constraints($cdom,$cnum,$chome,
+                                                                                       $cdom.'_'.$cnum);
+                                    }
+                                }
 				$r->internal_redirect($dest);
 			    }
 			    return OK;
@@ -309,11 +584,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});
@@ -323,22 +599,61 @@ ENDENTERKEY
 			    } else {
 				# Check to see if the user is a CC entering a course 
 				# for the first time
-				my (undef, undef, $role, $courseid) = split(/\./, $envkey);
-				if (substr($courseid, 0, 1) eq '/') {
-				    $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.'.$cdom.'_'.$cnum.'.course.helper.not.run'})) { 
 				    $furl = "/adm/helper/course.initialization.helper";
 				    # Send the user to the course they selected
 				} elsif ($env{'request.course.id'}) {
-                                    if ($env{'form.destinationurl'}) {
-                                        my $dest = $env{'form.destinationurl'};
-                                        &redirect_user($r,&mt('Entering [_1]',
-                                                      $env{'course.'.$courseid.'.description'}),
-                                               $dest,$msg,
-                                               $env{'environment.remotenavmap'});
+                                    my ($dest,$destsymb,$checkenc);
+                                    $dest = $env{'form.destinationurl'};
+                                    $destsymb = $env{'form.destsymb'};
+                                    if ($dest ne '') {
+                                        if ($env{'form.switchrole'}) {
+                                            if ($destsymb ne '') {
+                                                if ($destsymb !~ m{^/enc/}) {
+                                                    unless ($env{'request.role.adv'}) {
+                                                        $checkenc = 1;
+                                                    }
+                                                }
+                                            }
+                                            if ($dest =~ m{^/enc/}) {
+                                                if ($env{'request.role.adv'}) {
+                                                    $dest = &Apache::lonenc::unencrypted($dest);
+                                                    if ($destsymb eq '') {
+                                                        ($destsymb) = ($dest =~ /(?:\?|\&)symb=([^\&]*)/);
+                                                        $destsymb = &unescape($destsymb);
+                                                    }
+                                                }
+                                            } else {
+                                                if ($destsymb eq '') {
+                                                    ($destsymb) = ($dest =~ /(?:\?|\&)symb=([^\&]+)/);
+                                                    $destsymb = &unescape($destsymb);
+                                                }
+                                                unless ($env{'request.role.adv'}) {
+                                                    $checkenc = 1;
+                                                }
+                                            }
+                                            if (($checkenc) && ($destsymb ne '')) {
+                                                my ($encstate,$unencsymb,$res);
+                                                $unencsymb = &Apache::lonnet::symbclean($destsymb);
+                                                (undef,undef,$res) = &Apache::lonnet::decode_symb($unencsymb);
+                                                &Apache::lonnet::symbverify($unencsymb,$res,\$encstate);
+                                                if ($encstate) {
+                                                    if (($dest ne '') && ($dest !~ m{^/enc/})) {
+                                                        $dest=&Apache::lonenc::encrypted($dest);
+                                                    }
+                                                }
+                                            }
+                                        }
+                                        unless (($dest =~ m{^/enc/}) || ($dest =~ /(\?|\&)symb=.+___\d+___.+/)) {
+                                            if (($destsymb ne '') && ($destsymb !~ m{^/enc/})) {
+                                                my $esc_symb = &escape($destsymb);
+                                                $dest .= '?symb='.$esc_symb;
+                                            }
+                                        }
+                                        &redirect_user($r, &mt('Entering [_1]',
+                                                       $env{'course.'.$cdom.'_'.$cnum.'.description'}),
+                                                       $dest, $msg);
                                         return OK;
                                     }
 				    if (&Apache::lonnet::allowed('whn',
@@ -347,28 +662,37 @@ ENDENTERKEY
 								    $env{'request.course.id'}.'/'
 								    .$env{'request.course.sec'})
 					) {
-					my $startpage = &courseloadpage($courseid);
+					my $startpage = &courseloadpage($env{'request.course.id'});
 					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'});
+					    $msg = &mt('Entering [_1] ...',
+						       $env{'course.'.$env{'request.course.id'}.'.description'});
+					    &redirect_user($r, &mt('New in course'),
+                                       '/adm/whatsnew?refpage=start', $msg);
 					    return OK;
 					}
 				    }
 				}
-# Are we allowed to look at the first resource?
-				if ($furl !~ m|^/adm/|) {
-# Guess not ...
-				    $furl=&Apache::lonpageflip::first_accessible_resource();
-				}
+                                # Are we allowed to look at the first resource?
+                                if ($furl =~ m{^(/adm/wrapper|)/ext/}) {
+                                    # If it's an external resource,
+                                    # strip off the symb argument and possible query
+                                    my ($exturl,$symb) = ($furl =~ m{^(.+)(?:\?|\&)symb=(.+)$});
+                                    # Unencode $symb
+                                    $symb = &unescape($symb);
+                                    # Then check for permission
+                                    if (!&Apache::lonnet::allowed('bre',$exturl,$symb)) {
+                                        $furl = &Apache::lonpageflip::first_accessible_resource();
+                                    }
+                                # For other resources just check for permission
+                                } elsif (!&Apache::lonnet::allowed('bre',$furl)) {
+                                    $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'});
+					   $env{'course.'.$cdom.'_'.$cnum.'.description'});
+				&redirect_user($r, &mt('Entering [_1]',
+                               $env{'course.'.$cdom.'_'.$cnum.'.description'}),
+                               $furl, $msg);
 			    }
 			    return OK;
 			}
@@ -378,13 +702,12 @@ ENDENTERKEY
                     if ($role =~ /^(au|ca|aa)$/) {
                         my $redirect_url = '/priv/';
                         if ($role eq 'au') {
-                            $redirect_url.=$env{'user.name'};
+                            $redirect_url.=$env{'user.domain'}.'/'.$env{'user.name'};
                         } else {
-                            $where =~ /\/(.*)$/;
-                            $redirect_url .= $1;
+                            $redirect_url .= $where;
                         }
                         $redirect_url .= '/';
-                        &redirect_user($r,&mt('Entering Construction Space'),
+                        &redirect_user($r,&mt('Entering Authoring Space'),
                                        $redirect_url);
                         return OK;
                     }
@@ -394,6 +717,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;
+                    }
 		}
             }
         }
@@ -407,19 +736,41 @@ 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 $standby = &mt('Role selected. Please stand by.');
+    my $show_course=&Apache::loncommon::show_course();
+    if ($show_course) {
+        $crumbtext = 'Courses';
+        $pagetitle = 'My Courses';
+        $recent = &mt('Recent Courses');
+        $standby = &mt('Course selected. Please stand by.'); 
+    }
+    my $brcrum =[{href=>"/adm/roles",text=>$crumbtext}];
+
+    my %roles_in_env;
+    my $showcount = &roles_from_env(\%roles_in_env,$update); 
+
     my $swinfo=&Apache::lonmenu::rawconfig();
-    my $start_page=&Apache::loncommon::start_page('User Roles');
-    my $standby=&mt('Role selected. Please stand by.');
+    my $start_page=&Apache::loncommon::start_page($pagetitle,undef,{bread_crumbs=>$brcrum});
+    my %domdefs=&Apache::lonnet::get_domain_defaults($env{'user.domain'}); 
+    my $cattype = 'std';
+    if ($domdefs{'catauth'}) {
+        $cattype = $domdefs{'catauth'};
+    }
+    my $funcs = &get_roles_functions($showcount,$cattype);
     $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 />';
+    my $noscript='<br /><span class="LC_error">'.&mt('Use of LON-CAPA requires Javascript to be enabled in your web browser.').'<br />'.&mt('As this is not the case, most functionality in the system will be unavailable.').'</span><br />';
 
     $r->print(<<ENDHEADER);
 $start_page
-<br />
+$funcs
 <noscript>
 $noscript
 </noscript>
 <script type="text/javascript">
+// <![CDATA[
 $swinfo
 window.focus();
 
@@ -434,8 +785,23 @@ function enterrole (thisform,rolecode,bu
 	thisform.submit();
     } else {
        alert('$standby');
-    }   
+    }
 }
+
+function rolesView (caller) {
+    if ((caller == 'showall') || (caller == 'noshowall')) {
+        document.rolechoice.display.value = caller;
+    } else {
+        if ((caller == 'doupdate') || (caller == 'requestauthor') ||
+            (caller == 'queued')) { 
+            document.rolechoice.state.value = caller;
+        }
+    }
+    document.rolechoice.selectrole.value='';
+    document.rolechoice.submit();
+}
+
+// ]]>
 </script>
 ENDHEADER
 
@@ -452,6 +818,8 @@ ENDHEADER
     my $advanced=$env{'user.adv'};
     &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},['tryagain']);
     my $tryagain=$env{'form.tryagain'};
+    my $reinit=$env{'user.reinit'};
+    delete $env{'user.reinit'};
 
 # -------------------------------------------------------- Generate Page Output
 # --------------------------------------------------------------- Error Header?
@@ -481,106 +849,311 @@ ENDHEADER
 					&Apache::lonenc::check_encrypt($fn));
     } else {
         if ($env{'user.error.msg'}) {
-	    $r->print(
+            if ($reinit) {
+                $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('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 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;
     } else {
+        if ($updateresult || $reqauthor || $hotlist) {
+            my $showresult = '<div>';
+            if ($updateresult) {
+                $showresult .= &Apache::lonhtmlcommon::confirm_success($updateresult);
+            }
+            if ($reqauthor) {
+                $showresult .= &Apache::lonhtmlcommon::confirm_success($reqauthor);
+            }
+            if ($hotlist) {
+                $showresult .= $hotlist;
+            } 
+            $showresult .= '</div>';
+            $r->print($showresult);
+        } elsif ($env{'form.state'} eq 'queued') {
+            $r->print(&get_queued());
+        }
         if (($ENV{'REDIRECT_QUERY_STRING'}) && ($fn)) {
     	    $fn.='?'.$ENV{'REDIRECT_QUERY_STRING'};
         }
+        my $display = ($env{'form.display'} =~ /^(showall)$/);
         $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="" />');
+        $r->print('<input type="hidden" name="display" value="'.$display.'" />');
+        $r->print('<input type="hidden" name="state" value="" />');
     }
-    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 (%roletext,%sortrole,%roleclass);
-    my $countactive=0;
-    my $countfuture=0;
-    my $countwill=0;
-    my $inrole=0;
-    my $possiblerole='';
-    my %futureroles;
-    my %roles_nextlogin;
-    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);
+    $r->rflush();
+
+    my (%roletext,%sortrole,%roleclass,%futureroles,%timezones);
+    my ($countactive,$countfuture,$inrole,$possiblerole) = 
+        &gather_roles($update,$refresh,$now,$reinit,$nochoose,\%roles_in_env,\%roletext,
+                      \%sortrole,\%roleclass,\%futureroles,\%timezones,$loncaparev);
+    $refresh = $now;
+    &Apache::lonnet::appenv({'user.refresh.time'  => $refresh});
+    if ((($cattype eq 'std') || ($cattype eq 'domonly')) && (!$env{'user.adv'})) {
+        if ($countactive > 0) {
+            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][_4]'
+                   .' to view all [_5] 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) {
+        &requestcourse_advice($r,$cattype,$inrole); 
+	$r->print('</form>');
+        if ($countfuture) {
+            $r->print(&mt('The following [quant,_1,role,roles] will become active in the future:',$countfuture));
+            my $doheaders = &roletable_headers($r,\%roleclass,\%sortrole,
+                                               $nochoose);
+            &print_rolerows($r,$doheaders,\%roleclass,\%sortrole,\%dcroles,
+                            \%roletext);
+            my $tremark='';
+            my $tbg;
+            if ($env{'request.role'} eq 'cm') {
+                $tbg="LC_roles_selected";
+                $tremark=&mt('Currently selected.').' ';
+            } else {
+                $tbg="LC_roles_is";
+            }
+            $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(&Apache::loncommon::end_data_table());
+        }
+        $r->print(&Apache::loncommon::end_page());
+	return OK;
+    }
+# ----------------------------------------------------------------------- Table
+
+    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 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 ($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(&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 ++;
+	}
+    }
+    &print_rolerows($r,$doheaders,\%roleclass,\%sortrole,\%dcroles,\%roletext);
+    if ($countactive > 1) {
+        my $tremark='';
+        my $tbg;
+        if ($env{'request.role'} eq 'cm') {
+            $tbg="LC_roles_selected";
+            $tremark=&mt('Currently selected.').' ';
+        } else {
+                $tbg="LC_roles_is";
+        }
+        $r->print(&Apache::loncommon::start_data_table_row());
+        unless ($nochoose) {
+	    if ($env{'request.role'} ne 'cm') {
+	        $r->print('<td class="'.$tbg.'"><input type="submit" value="'.
+		          &mt('Select').'" name="cm" /></td>');
+	    } else {
+	        $r->print('<td class="'.$tbg.'">&nbsp;</td>');
+	    }
+        }
+        $r->print('<td colspan="3">'
+                 .&mt('No role specified')
+                 .'</td>'
+                 .'<td>'.$tremark.'&nbsp;</td>'
+                 .&Apache::loncommon::end_data_table_row()
+        );
+    } 
+    $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>'.&mt('Current Privileges').'</h2>');
+	$r->print(&privileges_info());
+    }
+    my $announcements = &Apache::lonnet::getannounce();
+    $r->print(
+        '<br />'.
+        '<h2>'.&mt('Announcements').'</h2>'.
+        $announcements
+    ) unless (!$announcements);
+    if ($advanced) {
+        my $esc_dom = &HTML::Entities::encode($env{'user.domain'},'"<>&');
+        $r->print('<p><small><i>'
+                 .&mt('This LON-CAPA server is version [_1]',$r->dir_config('lonVersion'))
+                 .'</i></small></p>');
+    }
+    $r->print(&Apache::loncommon::end_page());
+    return OK;
+}
+
+sub roles_from_env {
+    my ($roleshash,$update) = @_;
+    my $count = 0;
+    if (ref($roleshash) eq 'HASH') {
+        foreach my $envkey (keys(%env)) {
+            if ($envkey =~ m{^user\.role\.(\w+)[./]}) {
+                next if ($1 eq 'gr');
+                $roleshash->{$envkey} = $env{$envkey};
+                my ($start,$end) = split(/\./,$env{$envkey});
+                unless ($end && $end<$update) {
+                    $count ++;
+                }
+            }
+        }
+    }
+    return $count;
+}
+
+sub gather_roles {
+    my ($update,$refresh,$now,$reinit,$nochoose,$roles_in_env,$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();
+    if (ref($roles_in_env) eq 'HASH') {
+        foreach my $envkey (sort(keys(%{$roles_in_env}))) {
+            my $button = 1;
+            my $switchserver='';
+            my $switchwarning;
+            my ($role_text,$role_text_end,$sortkey,$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;';
-            $tfont='#000000';
-            if ($tstart) {
-                $tpstart=&Apache::lonlocal::locallocaltime($tstart);
-            }
-            if ($tend) {
-                $tpend=&Apache::lonlocal::locallocaltime($tend);
-            }
             if ($env{'request.role'} eq $trolecode) {
-		$tstatus='selected';
+                $tstatus='selected';
             }
             my $tbg;
-            if (($tstatus eq 'is') 
-		|| ($tstatus eq 'selected') 
-		|| ($tstatus eq 'will') 
-		|| ($tstatus eq 'future') 
-                || ($env{'form.showall'})) {
+            if (($tstatus eq 'is')
+                || ($tstatus eq 'selected')
+                || ($tstatus eq 'future')
+                || ($env{'form.display'} eq '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='#77FF77';
-                    $tfont='#003300';
-		    $possiblerole=$trolecode;
-		    $countactive++;
+                    $tbg='LC_roles_is';
+                    $possiblerole=$trolecode;
+                    $countactive++;
                 } elsif ($tstatus eq 'future') {
-                    $tbg='#FFFF77';
+                    $tbg='LC_roles_future';
                     $button=0;
-                    $futureroles{$trolecode} = $tstart.':'.$tend;
+                    $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';
+                    $tbg='LC_roles_expired';
                     $button=0;
                 } elsif ($tstatus eq 'will_not') {
-                    $tbg='#AAFF77';
-                    $tremark.=&mt('Expired after logout. ');
+                    $tbg='LC_roles_will_not';
+                    $tremark.=&mt('Expired after logout.').' ';
                 } elsif ($tstatus eq 'selected') {
-                    $tbg='#11CC55';
-                    $tfont='#002200';
-		    $inrole=1;
-		    $countactive++;
-                    $tremark.=&mt('Currently 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('Defined by ').$rauthor.
-			&mt(' at ').$rdomain.'.';
-		}
-		$trole=Apache::lonnet::plaintext($role);
+                    if ($tremark) { $tremark.='<br />'; }
+                    $tremark.=&mt('Custom role defined by [_1].',$rauthor.':'.$rdomain);
+                }
+                $trole=Apache::lonnet::plaintext($role);
                 my $ttype;
                 my $twhere;
                 my ($tdom,$trest,$tsection)=
@@ -588,221 +1161,190 @@ ENDHEADER
                 # 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; } }
+                    my $allowed=0;
+                    foreach my $id (@ids) { if ($id eq $home) { $allowed=1; } }
                     if (!$allowed) {
-			$button=0;
-                        $switchserver='otherserver='.$home.'&role='.$trolecode;
+                        $button=0;
+                        $switchserver='otherserver='.$home.'&amp;role='.$trolecode;
                     }
                     #next if ($home eq 'no_host');
                     $home = &Apache::lonnet::hostname($home);
-                    $ttype='Construction Space';
+                    $ttype='Authoring Space';
                     $twhere=&mt('User').': '.$trest.'<br />'.&mt('Domain').
-			': '.$tdom.'<br />'.
+                        ': '.$tdom.'<br />'.
                         ' '.&mt('Server').':&nbsp;'.$home;
                     $env{'course.'.$tdom.'_'.$trest.'.description'}='ca';
-		    $tremark.=&Apache::lonhtmlcommon::authorbombs('/res/'.$tdom.'/'.$trest.'/');
-		    $sortkey=$role."$trest:$tdom";
+                    $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; } }
+                    my $allowed=0;
+                    foreach my $id (@ids) { if ($id eq $home) { $allowed=1; } }
                     if (!$allowed) {
-			$button=0;
-                        $switchserver='otherserver='.$home.'&role='.$trolecode;
+                        $button=0;
+                        $switchserver='otherserver='.$home.'&amp;role='.$trolecode;
                     }
                     #next if ($home eq 'no_host');
                     $home = &Apache::lonnet::hostname($home);
-                    $ttype='Construction Space';
+                    $ttype='Authoring Space';
                     $twhere=&mt('Domain').': '.$tdom.'<br />'.&mt('Server').
-			':&nbsp;'.$home;
+                        ':&nbsp;'.$home;
                     $env{'course.'.$tdom.'_'.$trest.'.description'}='ca';
-		    $tremark.=&Apache::lonhtmlcommon::authorbombs('/res/'.$tdom.'/'.$env{'user.name'}.'/');
-		    $sortkey=$role;
+                    $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);
+                    $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;
+                        $sortkey=$role."\0".$tdom."\0".$twhere."\0".$envkey;
+                        $twhere = &HTML::Entities::encode($twhere,'"<>&');
                         unless ($twhere eq &mt('Currently not available')) {
-			    $twhere.=' <font size="-2">'.
-        &Apache::loncommon::syllabuswrapper(&mt('Syllabus'),$trest,$tdom,$tfont).
-                                    '</font>';
-			}
+                            $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=$newhash{'description'}.
-                              ' <font size="-2">'.
-        &Apache::loncommon::syllabuswrapper(&mt('Syllabus'),$trest,$tdom,$tfont).
-                              '</font>';
+                            $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);
+                            $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;
+                            $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; }
+                    }
+                    if ($role ne 'st') { $twhere.="<br />".&mt('Domain').":".$tdom; }
                 } elsif ($tdom) {
                     $ttype='Domain';
                     $twhere=$tdom;
-		    $sortkey=$role.$twhere;
+                    $sortkey=$role.$twhere;
                 } else {
                     $ttype='System';
                     $twhere=&mt('system wide');
-		    $sortkey=$role.$twhere;
+                    $sortkey=$role.$twhere;
                 }
-                $roletext.=&build_roletext($trolecode,$tdom,$trest,$tstatus,$tryagain,$advanced,$tremark,$tbg,$tfont,$trole,$twhere,$tpstart,$tpend,$nochoose,$button,$switchserver);
-		$roletext{$envkey}=$roletext;
-		if (!$sortkey) {$sortkey=$twhere."\0".$envkey;}
-		$sortrole{$sortkey}=$envkey;
-		$roleclass{$envkey}=$ttype;
-	    }
-        }
-    }
-# No active roles
-    if ($countactive==0) {
-	if ($inrole) {
-	    $r->print('<h2>'.&mt('Currently no additional roles or courses').'</h2>');
-	} else {
-	    $r->print('<h2>'.&mt('Currently no active roles or courses').'</h2>');
-	}
-        &findcourse_advice($r);
-	$r->print('</form>');
-        if ($countfuture) {
-            $r->print(&mt('The following [quant,_1,role,roles] will become active in the future:',$countfuture));
-            my $doheaders = &roletable_headers($r,\%roleclass,\%sortrole,
-                                               $nochoose);
-            &print_rolerows($r,$doheaders,\%roleclass,\%sortrole,\%dcroles,
-                            \%roletext);
-            my $tremark='';
-            my $tfont='#003300';
-            if ($env{'request.role'} eq 'cm') {
-                $r->print('<tr bgcolor="#11CC55">');
-                $tremark=&mt('Currently selected. ');
-                $tfont='#002200';
-            } else {
-                $r->print('<tr bgcolor="#77FF77">');
+                ($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;
             }
-            $r->print('<td></td><td colspan="3"><font color="'.$tfont.'"><span class="LC_rolesinfo">'.&mt('No role specified').
-                      '</span></font></td><td><font color="'.$tfont.'">'.$tremark.
-                      '&nbsp;</font></td></tr>'."\n");
-
-            $r->print('</table>');
         }
-        $r->print(&Apache::loncommon::end_page());
-	return OK;
-# Is there only one choice?
-    } elsif (($countactive==1) && ($env{'request.role'} eq 'cm')) {
-	$r->print('<h3>'.&mt('Please stand by.').'</h3>'.
-	    '<input type="hidden" name="'.$possiblerole.'" value="1" />'.
-            '<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;
     }
-# More than one possible role
-# ----------------------------------------------------------------------- Table
-    unless ((!&Apache::lonmenu::show_course()) || ($nochoose)) {
-	$r->print("<h2>".&mt('Select a Course to Enter')."</h2>\n");
-    }
-    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)/- 
-		    && $dcroles{$1}) {
-		    $output .= &adhoc_roles_row($1,'recent');
+    return ($countactive,$countfuture,$inrole,$possiblerole);
+}
+
+sub role_timezone {
+    my ($where,$timezones) = @_;
+    my $timezone;
+    if (ref($timezones) eq 'HASH') { 
+        if ($where =~ m{^/($match_domain)/($match_courseid)}) {
+            my $cdom = $1;
+            my $cnum = $2;
+            if ($cdom && $cnum) {
+                if (!exists($timezones->{$cdom.'_'.$cnum})) {
+                    my $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 = 
+                                &Apache::lonnet::get_domain_defaults($cdom);
+                            if ($domdefaults{'timezone_def'} eq '') {
+                                $timezones->{$cdom} = 'local';
+                            } else {
+                                $timezones->{$cdom} = $domdefaults{'timezone_def'};
+                            }
+                        }
+                        $timezones->{$cdom.'_'.$cnum} = $timezones->{$cdom};
+                    } else {
+                        $timezones->{$cdom.'_'.$cnum} = 
+                            &Apache::lonlocal::gettimezone($tz);
+                    }
                 }
-	    } elsif ($numdc > 0) {
-                unless ($_ =~/^error\:/) {
-                    $output.=&display_cc_role('user.role.'.$_);
+                $timezone = $timezones->{$cdom.'_'.$cnum};
+            }
+        } else {
+            my ($tdom) = ($where =~ m{^/($match_domain)});
+            if ($tdom) {
+                if (!exists($timezones->{$tdom})) {
+                    my %domdefaults = &Apache::lonnet::get_domain_defaults($tdom);
+                    if ($domdefaults{'timezone_def'} eq '') {
+                        $timezones->{$tdom} = 'local';
+                    } else {
+                        $timezones->{$tdom} = $domdefaults{'timezone_def'};
+                    }
                 }
-            } 
-	}
-	if ($output) {
-	    $r->print("<tr><td align='center' colspan='5'><font face='arial'>".
-		      &mt('Recent Roles')."</font></td></tr>");
-	    $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);
-    my $tremark='';
-    my $tfont='#003300';
-    if ($env{'request.role'} eq 'cm') {
-	$r->print('<tr bgcolor="#11CC55">');
-        $tremark=&mt('Currently selected. ');
-        $tfont='#002200';
-    } else {
-        $r->print('<tr bgcolor="#77FF77">');
-    }
-    unless ($nochoose) {
-	if ($env{'request.role'} ne 'cm') {
-	    $r->print('<td><input type="submit" value="'.
-		      &mt('Select').'" name="cm" /></td>');
-	} else {
-	    $r->print('<td>&nbsp;</td>');
-	}
-    }
-    $r->print('<td colspan="3"><font color="'.$tfont.'"><span class="LC_rolesinfo">'.&mt('No role specified').
-      '</span></font></td><td><font color="'.$tfont.'">'.$tremark.
-      '&nbsp;</font></td></tr>'."\n");
-
-    $r->print('</table>');
-    unless ($nochoose) {
-	$r->print("</form>\n");
-    }
-# ------------------------------------------------------------ Privileges Info
-    if (($advanced) && (($env{'user.error.msg'}) || ($error))) {
-	$r->print('<hr /><h2>Current Privileges</h2>');
-	$r->print(&privileges_info());
-    }
-    $r->print(&Apache::lonnet::getannounce());
-    if ($advanced) {
-	$r->print('<p><small><i>This is LON-CAPA '.
-		  $r->dir_config('lonVersion').'</i><br />'.
-		  '<a href="/adm/logout">'.&mt('Logout').'</a></small></p>');
+                $timezone = $timezones->{$tdom};
+            }
+        }
+        if ($timezone eq 'local') {
+            $timezone = undef;
+        }
     }
-    $r->print(&Apache::loncommon::end_page());
-    return OK;
+    return $timezone;
 }
 
 sub roletable_headers {
     my ($r,$roleclass,$sortrole,$nochoose) = @_;
     my $doheaders;
     if ((ref($sortrole) eq 'HASH') && (ref($roleclass) eq 'HASH')) {
-        $r->print('<br /><table id="LC_rolesmenu"><tr>');
+        $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) {
@@ -819,7 +1361,7 @@ sub roletable_headers {
 }
 
 sub roletypes {
-    my @types = ('Domain','Construction Space','Course','Unavailable','System');
+    my @types = ('Domain','Authoring Space','Course','Community','Unavailable','System');
     return @types; 
 }
 
@@ -832,7 +1374,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}) {
@@ -845,9 +1396,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);
             }
@@ -856,9 +1410,10 @@ sub print_rolerows {
 }
 
 sub findcourse_advice {
-    my ($r) = @_;
+    my ($r,$cattype) = @_;
     my $domdesc = &Apache::lonnet::domain($env{'user.domain'},'description');
-    if (&check_autoenroll($env{'user.domain'})) {
+    my $esc_dom = &HTML::Entities::encode($env{'user.domain'},'"<>&');
+    if (&Apache::lonnet::auto_run(undef,$env{'user.domain'})) {
         $r->print(&mt('If you were expecting to see an active role listed for a particular course in the [_1] domain, it may be missing for one of the following reasons:',$domdesc).'
 <ul>
  <li>'.&mt('The course has yet to be created.').'</li>
@@ -870,8 +1425,79 @@ 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 />');
     }
-    $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">','</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>');
+    if (($cattype eq 'std') || ($cattype eq 'domonly')) {
+        $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 requestcourse_advice {
+    my ($r,$cattype,$inrole) = @_;
+    my $domdesc = &Apache::lonnet::domain($env{'user.domain'},'description');
+    my $esc_dom = &HTML::Entities::encode($env{'user.domain'},'"<>&');
+    my (%can_request,%request_doms,$output);
+    &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')) { 
+            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}}));
+                    $output .=
+                        '<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);
+                        }
+                    }
+                }
+            }
+            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';
+            }
+            if ($output) {
+                $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>'.
+                          $output.
+                          '</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>');
+            }
+        }
+    } elsif (!$env{'user.adv'}) {
+       if ($inrole) {
+            $r->print('<h3>'.&mt('Currently no additional roles, courses or communities').'</h3>');
+        } else {
+            $r->print('<h3>'.&mt('Currently no active roles, courses or communities').'</h3>');
+        }
+        &findcourse_advice($r,$cattype);
+    }
     return;
 }
 
@@ -890,7 +1516,7 @@ sub privileges_info {
 	my (undef,$tdom,$trest,$tsec)=split(m{/},$where);
 	if ($trest) {
 	    if ($env{'course.'.$tdom.'_'.$trest.'.description'} eq 'ca') {
-		$ttype='Construction Space';
+		$ttype='Authoring Space';
 		$twhere='User: '.$trest.', Domain: '.$tdom;
 	    } else {
 		$ttype= &Apache::loncommon::course_type($tdom.'_'.$trest);
@@ -910,7 +1536,7 @@ sub privileges_info {
 	    $ttype='System';
 	    $twhere='/';
 	}
-	$output .= "\n<h3>".$ttype.': '.$twhere.'</h3>'."\n<ul>";
+	$output .= "\n<h3>".&mt($ttype).': '.$twhere.'</h3>'."\n<ul>";
 	foreach my $priv (sort(split(/:/,$env{$envkey}))) {
 	    next if (!$priv);
 
@@ -930,34 +1556,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) = @_;
-    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" ';
@@ -967,43 +1568,65 @@ 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-Initialize').'" 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.' class="'.$tbg.'">'.
+                '<input name="'.$buttonname.'" type="button" value="'.
+                &mt('Re-Select').'" onclick="javascript:enterrole(this.form,\''.
                         $trolecode."','".$buttonname.'\');" /></td>';
         } else {
-            $roletext.='<td'.$rowspan.'>&nbsp;</td>';
+            $roletext.=
+                '<td'.$rowspan.' class="'.$tbg.'">'.
+                '<input name="'.$buttonname.'" type="button" value="'.
+                &mt('Re-Select').'" onclick="javascript:enterrole(this.form,\''.
+                        $trolecode."','".$buttonname.'\');" /></td>';
         }
     }
     if ($trolecode !~ m/^(dc|ca|au|aa)\./) {
 	$tremark.=&Apache::lonannounce::showday(time,1,
 			 &Apache::lonannounce::readcalendar($tdom.'_'.$trest));
     }
-    $roletext.='<td><font color="'.$tfont.'">'.$trole.
-	       '</font></td><td><font color="'.$tfont.'">'.$twhere.
-               '</font></td><td><font color="'.$tfont.'">'.$tpstart.
-               '</font></td><td><font color="'.$tfont.'">'.$tpend.
-               '</font></td></tr>';
+    $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_author_homeserver {
@@ -1023,22 +1646,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) {
@@ -1046,8 +1655,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++;
@@ -1059,43 +1672,61 @@ sub check_fordc {
 }
 
 sub adhoc_course_role {
-    my ($then) = @_; 
-    my ($cdom,$cnum);
-    my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
-    my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
-    if (&check_forcc($cdom,$cnum,$then)) {
+    my ($refresh,$update,$then) = @_;
+    my ($cdom,$cnum,$crstype);
+    $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
+    $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
+    $crstype = &Apache::loncommon::course_type();
+    if (&check_forcc($cdom,$cnum,$refresh,$update,$then,$crstype)) {
         my $setprivs;
-        if (!defined($env{'user.role.'.$env{'form.selectrole'}})) {
+        if (!defined($env{'user.role.'.$env{'form.switchrole'}})) {
             $setprivs = 1;
         } else {
-            my ($start,$end) = split(/\./,$env{'user.role.'.$env{'form.selectrole'}});
-            if (($start && ($start>$then || $start == -1)) ||
-                ($end && $end<$then)) {
+            my ($start,$end) = split(/\./,$env{'user.role.'.$env{'form.switchrole'}});
+            if (($start && ($start>$refresh || $start == -1)) ||
+                ($end && $end<$update)) {
                 $setprivs = 1;
             }
-        } 
+        }
+        unless ($setprivs) {
+            if (!exists($env{'user.priv.'.$env{'form.switchrole'}.'./'})) {
+                $setprivs = 1;
+            }
+        }
         if ($setprivs) {
-            if ($env{'form.switchrole'} =~ m-^(in|ta|ep|ad|st|cr)([\w/]*)\./\Q$cdom\E/\Q$cnum\E(/?\w*)$-) {
+            if ($env{'form.switchrole'} =~ m-^(in|ta|ep|ad|st|cr)(.*?)\./\Q$cdom\E/\Q$cnum\E/?(\w*)$-) {
                 my $role = $1;
                 my $custom_role = $2;
                 my $usec = $3;
                 if ($role eq 'cr') {
-                    if ($custom_role =~ m-^$match_domain/$match_courseid/\w+$-) {
+                    if ($custom_role =~ m-^/$match_domain/$match_username/\w+$-) {
                         $role .= $custom_role;
                     } else {
                         return;
                     }
                 }
-                my (%userroles,%newrole,%newgroups);
+                my (%userroles,%newrole,%newgroups,%group_privs);
+                my %cgroups =
+                    &Apache::lonnet::get_active_groups($env{'user.domain'},
+                                            $env{'user.name'},$cdom,$cnum);
+                foreach my $group (keys(%cgroups)) {
+                    $group_privs{$group} =
+                        $env{'user.priv.cc./'.$cdom.'/'.$cnum.'./'.$cdom.'/'.$cnum.'/'.$group};
+                }
+                $newgroups{'/'.$cdom.'/'.$cnum} = \%group_privs;
                 my $area = '/'.$cdom.'/'.$cnum;
                 my $spec = $role.'.'.$area;
                 if ($usec ne '') {
                     $spec .= '/'.$usec;
                     $area .= '/'.$usec;
                 }
-                &Apache::lonnet::standard_roleprivs(\%newrole,$role,$cdom,$spec,$cnum,$area);
-                &Apache::lonnet::set_userprivs(\%userroles,\%newrole,%newgroups);
-                my $adhocstart = $then-1;
+                if ($role =~ /^cr/) {
+                    &Apache::lonnet::custom_roleprivs(\%newrole,$role,$cdom,$cnum,$spec,$area);
+                } else {
+                    &Apache::lonnet::standard_roleprivs(\%newrole,$role,$cdom,$spec,$cnum,$area);
+                }
+                &Apache::lonnet::set_userprivs(\%userroles,\%newrole,\%newgroups);
+                my $adhocstart = $refresh-1;
                 $userroles{'user.role.'.$spec} = $adhocstart.'.';
                 &Apache::lonnet::appenv(\%userroles,[$role,'cm']);
             }
@@ -1105,28 +1736,87 @@ sub adhoc_course_role {
 }
 
 sub check_forcc {
-    my ($cdom,$cnum,$then) = @_;
-    my $is_cc;
-    if ($cdom ne '' && $cnum ne '') {
-        if (&Apache::lonnet::is_course($cdom,$cnum)) {
-            my $envkey = 'user.role.cc./'.$cdom.'/'.$cnum;
-            if (defined($env{$envkey})) {
-                $is_cc = 1;
-                my ($tstart,$tend)=split(/\./,$env{$envkey});
-                if ($tstart && $tstart>$then) { $is_cc = 0; }
-                if ($tend   && $tend  <$then) { $is_cc = 0; }
+    my ($cdom,$cnum,$refresh,$update,$then,$crstype) = @_;
+    my ($is_cc,$ccrole);
+    if ($crstype eq 'Community') {
+        $ccrole = 'co';
+    } else {
+        $ccrole = 'cc';
+    }
+    if (&Apache::lonnet::is_course($cdom,$cnum)) {
+        my $envkey = 'user.role.'.$ccrole.'./'.$cdom.'/'.$cnum;
+        if (defined($env{$envkey})) {
+            $is_cc = 1;
+            my ($tstart,$tend)=split(/\./,$env{$envkey});
+            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'},undef,$required,1);
+                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,undef,$required,1); 
+                        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 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="" />'.
@@ -1136,11 +1826,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
@@ -1169,6 +1860,7 @@ function getIndex(caller) {
     }
     return -1;
 }
+// ]]>
 </script>
 END
     return $verify_script;
@@ -1183,52 +1875,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;
 }
 
@@ -1237,32 +1929,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;
@@ -1280,23 +1946,908 @@ sub courseloadpage {
     return $startpage;
 }
 
-sub check_autoenroll {
-    my ($dom) = @_;
-    my $run_enroll = 0;
-    my $settings;
-    my %domconfig =
-        &Apache::lonnet::get_dom('configuration',['autoenroll'],$dom);
-    if (ref($domconfig{'autoenroll'}) eq 'HASH') {
-        $settings = $domconfig{'autoenroll'};
-        if ($settings->{'run'} eq '1') {
-            $run_enroll = 1;
+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,$now,$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,$now,$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 %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++;
+                                }
+                            }
+                        }
+                    }
+                    my $status_in_env =
+                        &curr_role_status($currstart,$currend,$refresh,$update);
+                    if ($status_in_env eq 'active') {
+                        $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);
+                                }
+                                $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(m{\./},$rolekey,2);
+        $rest = '/'.$rest;
+        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 = '<p 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.').'</p>';
+        } 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 .= '<p 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.').'</p>';
+    }
+    &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);
+    }
+    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;
+            my (%curr_groups,%groupdescs,$currcrs);
+            foreach my $item (sort(keys(%newgroup))) {
+                if (&is_active_course($item,$refresh,$update,\%roleshash)) {
+                    if ($item =~ m{^gr\./($match_domain/$match_courseid)/(\w+)$}) {
+                        my ($cdom,$cnum) = split(/\//,$1);
+                        my $group = $2;
+                        if ($currcrs ne $cdom.'_'.$cnum) {
+                            if ($currcrs) {
+                                $groupmsg .= '</ul><li>';
+                            }
+                            $groupmsg .= '<li><b>'.
+                                         $env{'course.'.$cdom.'_'.$cnum.'.description'}.'</b><ul>';
+                            $currcrs = $cdom.'_'.$cnum;
+                        }
+                        my $groupdesc;
+                        unless (ref($curr_groups{$cdom.'_'.$cnum}) eq 'HASH') {
+                            %{$curr_groups{$cdom.'_'.$cnum}} = 
+                                &Apache::longroup::coursegroups($cdom,$cnum);
+                        }
+                        unless ((ref($groupdescs{$cdom.'_'.$cnum}) eq 'HASH') &&
+                            ($groupdescs{$cdom.'_'.$cnum}{$group})) {
+
+                            my %groupinfo = 
+                                &Apache::longroup::get_group_settings($curr_groups{$cdom.'_'.$cnum}{$group});
+                            $groupdescs{$cdom.'_'.$cnum}{$group} = 
+                                &unescape($groupinfo{'description'});
+                        }
+                        $groupdesc = $groupdescs{$cdom.'_'.$cnum}{$group};
+                        if ($groupdesc) {
+                            $groupmsg .= '<li>'.
+                                         &mt('[_1] with status: [_2].',
+                                         '<b>'.$groupdesc.'</b>',$newgroup{$item}).'</li>';
+                        }
+                    }
+                }
+                if ($groupmsg) {
+                    $groupmsg .= '</ul></li>';
+                }
+            }
+            if ($groupmsg) {
+                $changemsg .= '<li>'.
+                              &mt('Courses with new groups').'</li>'.
+                              '<ul>'.$groupmsg.'</ul></li>';
+            }
+        }
+        if (keys(%newrole) > 0) {
+            my $newmsg;
+            foreach my $item (sort(keys(%newrole))) {
+                my $desc = &role_desc($item,$update,$refresh,$now);
+                if ($desc) {
+                    $newmsg .= '<li>'.
+                               &mt('[_1] with status: [_2].',
+                               $desc,&mt($newrole{$item})).'</li>';
+                }
+            }
+            if ($newmsg) {
+                $changemsg .= '<li>'.&mt('New roles').
+                              '<ul>'.$newmsg.'</ul>'.
+                              '</li>';
+            }
         }
+        if (keys(%customprivchg) > 0) {
+            my $privmsg;
+            foreach my $item (sort(keys(%customprivchg))) {
+                my $desc = &role_desc($item,$update,$refresh,$now);
+                if ($desc) {
+                    $privmsg .= '<li>'.$desc.'</li>';
+                }
+            }
+            if ($privmsg) {
+                $changemsg .= '<li>'.
+                              &mt('Custom roles with privilege changes').
+                              '<ul>'.$privmsg.'</ul>'.
+                              '</li>';
+             }
+        }
+        if (keys(%rolechange) > 0) {
+            my $rolemsg;
+            foreach my $item (sort(keys(%rolechange))) {
+                my $desc = &role_desc($item,$update,$refresh,$now);  
+                if ($desc) {
+                    $rolemsg .= '<li>'.
+                                &mt('[_1] status now: [_2].',$desc,
+                                $rolechange{$item}).'</li>';
+                }
+            }
+            if ($rolemsg) {
+                $changemsg .= '<li>'.
+                              &mt('Existing roles with status changes').'</li>'.
+                              '<ul>'.$rolemsg.'</ul>'.
+                              '</li>';
+            }
+        }
+        if (keys(%deletedroles) > 0) {
+            my $delmsg;
+            foreach my $item (sort(keys(%deletedroles))) {
+                my $desc = &role_desc($item,$update,$refresh,$now);
+                if ($desc) {
+                    $delmsg .= '<li>'.$desc.'</li>';
+                }
+            }
+            if ($delmsg) {
+                $changemsg .= '<li>'.
+                              &mt('Existing roles now expired').'</li>'.
+                              '<ul>'.$delmsg.'</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))) {
+                my $cid = $crs;
+                $cid=~s{^/}{};
+                $cid=~s{/}{_};
+                my $crsdesc = $env{'course.'.$cid.'.description'};
+                my $cdom = $env{'course.'.$cid.'.domain'};
+                my $cnum = $env{'course.'.$cid.'.num'};
+                my %curr_groups = &Apache::longroup::coursegroups($cdom,$cnum);
+                my %groupdesc; 
+                if (ref($groupchange{$crs}) eq 'HASH') {
+                    $groupchgmsg .= '<li>'.&mt('Course/Community: [_1]','<b>'.$crsdesc.'</b><ul>');
+                    foreach my $group (sort(keys(%{$groupchange{$crs}}))) {
+                        unless ($groupdesc{$group}) {
+                            my %groupinfo = &Apache::longroup::get_group_settings($curr_groups{$group});
+                            $groupdesc{$group} =  &unescape($groupinfo{'description'});
+                        }
+                        $groupchgmsg .= '<li>'.&mt('Group: [_1] status now: [_2].','<b>'.$groupdesc{$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>';
     } else {
-        $run_enroll = &localenroll::run($dom);
+        if (&Apache::loncommon::show_course()) {
+            $msg = &mt('No new courses or communities');
+        } else {
+            $msg = &mt('No role changes');
+        }
+    }
+    return $msg;
+}
+
+sub role_desc {
+    my ($item,$update,$refresh,$now) = @_;
+    my ($where,$trolecode,$role,$tstatus,$tend,$tstart,$twhere,
+        $trole,$tremark);
+    &Apache::lonnet::role_status('user.role.'.$item,$update,$refresh,
+                                 $now,\$role,\$where,\$trolecode,
+                                 \$tstatus,\$tstart,\$tend);
+    return unless ($role);
+    if ($role =~ /^cr\//) {
+        my ($rdummy,$rdomain,$rauthor,$rrole)=split(/\//,$role);
+        $tremark = &mt('Custom role defined by [_1].',$rauthor.':'.$rdomain);
+    }
+    $trole=Apache::lonnet::plaintext($role);
+    my ($tdom,$trest,$tsection)=
+        split(/\//,Apache::lonnet::declutter($where));
+    if (($role eq 'ca') || ($role eq 'aa')) {
+        my $home = &Apache::lonnet::homeserver($trest,$tdom);
+        $home = &Apache::lonnet::hostname($home);
+        $twhere=&mt('User').':&nbsp;'.$trest.'&nbsp; '.&mt('Domain').
+                ':&nbsp;'.$tdom.'&nbsp; '.&mt('Server').':&nbsp;'.$home;
+    } elsif ($role eq 'au') {
+        my $home = &Apache::lonnet::homeserver
+                       ($env{'user.name'},$env{'user.domain'});
+        $home = &Apache::lonnet::hostname($home);
+        $twhere=&mt('Domain').':&nbsp;'.$tdom.'&nbsp; '.&mt('Server').
+                        ':&nbsp;'.$home;
+    } elsif ($trest) {
+        my $tcourseid=$tdom.'_'.$trest;
+        my $crstype = &Apache::loncommon::course_type($tcourseid);
+        $trole = &Apache::lonnet::plaintext($role,$crstype,$tcourseid);
+        if ($env{'course.'.$tcourseid.'.description'}) {
+            $twhere=$env{'course.'.$tcourseid.'.description'};
+        } else {
+            my %newhash=&Apache::lonnet::coursedescription($tcourseid);
+            if (%newhash) {
+                $twhere=$newhash{'description'};
+            } else {
+                $twhere=&mt('Currently not available');
+            }
+        }
+        if ($tsection) {
+            $twhere.= '&nbsp; '.&mt('Section').':&nbsp;'.$tsection;
+        }
+        if ($role ne 'st') {
+            $twhere.= '&nbsp; '.&mt('Domain').':&nbsp;'.$tdom;
+        }
+    } elsif ($tdom) {
+        $twhere = &mt('Domain').':&nbsp;'.$tdom;
+    }
+    my $output;
+    if ($trole) {
+        $output = $trole;
+        if ($twhere) {
+            $output .= " -- $twhere";
+        }
+        if ($tremark) {
+            $output .= '<br />'.$tremark;
+        }
+    }
+    return $output;
+}
+
+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 $run_enroll;
+    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;
+}
+
+sub get_roles_functions {
+    my ($rolescount,$cattype) = @_;
+    my @links;
+    push(@links,["javascript:rolesView('doupdate');",'start-here-22x22',&mt('Check for changes')]);
+    if ($env{'environment.canrequest.author'}) {
+        unless (&Apache::loncoursequeueadmin::is_active_author()) {
+            push(@links,["javascript:rolesView('requestauthor');",'list-add-22x22',&mt('Request author role')]);
+        }
+    }
+    if (($rolescount > 3) || ($env{'environment.recentroles'})) {
+        push(@links,['/adm/preferences?action=changerolespref&amp;returnurl=/adm/roles','role_hotlist-22x22',&mt('Hotlist')]);
+    }
+    if (&Apache::lonmenu::check_for_rcrs()) {
+        push(@links,['/adm/requestcourse','rcrs-22x22',&mt('Request course')]);
+    }
+    if ($env{'form.state'} eq 'queued') {
+        push(@links,["javascript:rolesView('noqueued');",'selfenrl-queue-22x22',&mt('Hide queued')]);
+    } else {
+        push(@links,["javascript:rolesView('queued');",'selfenrl-queue-22x22',&mt('Show queued')]);
+    }
+    if ($env{'user.adv'}) {
+        if ($env{'form.display'} eq 'showall') {
+            push(@links,["javascript:rolesView('noshowall');",'edit-redo-22x22',&mt('Exclude expired')]);
+        } else {
+            push(@links,["javascript:rolesView('showall');",'edit-undo-22x22',&mt('Include expired')]);
+        }
+    }
+    unless ($cattype eq 'none') {
+        push(@links,['/adm/coursecatalog','ccat-22x22',&mt('Course catalog')]);
+    }
+    my $funcs = &Apache::lonhtmlcommon::start_funclist();
+    foreach my $link (@links) {
+        $funcs .= &Apache::lonhtmlcommon::add_item_funclist(
+                      '<a href="'.$link->[0].'" class="LC_menubuttons_link">'.
+                      '<img src="/res/adm/pages/'.$link->[1].'.png" class="LC_icon" alt="'.$link->[2].'" />'.
+                      $link->[2].'</a>');
+    }
+    $funcs .= &Apache::lonhtmlcommon::end_funclist();
+    return &Apache::loncommon::head_subbox($funcs);
+}
+
+sub get_queued {
+    my ($output,%reqcrs);
+    my ($types,$typenames) = &Apache::loncommon::course_types();
+    my %statusinfo = &Apache::lonnet::dump('courserequests',$env{'user.domain'},
+                                           $env{'user.name'},'^status:');
+    foreach my $key (keys(%statusinfo)) {
+        next unless (($statusinfo{$key} eq 'approval') || ($statusinfo{$key} eq 'pending'));
+        (undef,my($cdom,$cnum)) = split(/:/,$key);
+        my $requestkey = $cdom.'_'.$cnum;
+        if ($requestkey =~ /^($match_domain)_($match_courseid)$/) {
+            my %history = &Apache::lonnet::restore($requestkey,'courserequests',
+                                                   $env{'user.domain'},$env{'user.name'});
+            next if ((exists($history{'status'})) && ($history{'status'} eq 'created'));
+            my $reqtime = $history{'reqtime'};
+            my $lastupdate = $history{'timestamp'};
+            my $showtype = $history{'crstype'};
+            if (defined($typenames->{$history{'crstype'}})) {
+                $showtype = $typenames->{$history{'crstype'}};
+            }
+            my $description;
+            if (ref($history{'details'}) eq 'HASH') {
+                $description = $history{details}{'cdescr'};
+            }
+            @{$reqcrs{$reqtime}} = ($description,$showtype); 
+        }
+    }
+    my @sortedtimes = sort {$a <=> $b} (keys(%reqcrs));
+    if (@sortedtimes > 0) {
+        $output .= '<p><b>'.&mt('Course/Community requests').'</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('Course type').'</th>';
+                   &Apache::loncommon::end_data_table_header_row();
+        foreach my $reqtime (@sortedtimes) {
+            next unless (ref($reqcrs{$reqtime}) eq 'ARRAY');
+            $output .= &Apache::loncommon::start_data_table_row().
+                       '<td>'.&Apache::lonlocal::locallocaltime($reqtime).'</td>'.
+                       '<td>'.join('</td><td>',@{$reqcrs{$reqtime}}).'</td>'.
+                       &Apache::loncommon::end_data_table_row();
+        }
+        $output .= &Apache::loncommon::end_data_table().
+                   '<br /></p>';
+    }
+    my $queuedselfenroll = &Apache::loncoursequeueadmin::queued_selfenrollment(1);
+    if ($queuedselfenroll) {
+        $output .= '<p><b>'.&mt('Enrollment requests').'</b><br />'.
+                   $queuedselfenroll.'<br /></p>';
+    }
+    if ($env{'environment.canrequest.author'}) {
+        unless (&Apache::loncoursequeueadmin::is_active_author()) {
+            my $requestauthor;
+            my ($status,$timestamp) = split(/:/,$env{'environment.requestauthorqueued'});
+            if (($status eq 'approval') || ($status eq 'approved')) {
+                $output .= '<p><b>'.&mt('Author role request').'</b><br />';
+                if ($status eq 'approval') {
+                    $output .= &mt('A request for Authoring Space submitted on [_1] is awaiting approval',
+                                  &Apache::lonlocal::locallocaltime($timestamp));
+                } elsif ($status eq 'approved') {
+                    my %roleshash =
+                        &Apache::lonnet::get_my_roles($env{'user.name'},$env{'user.domain'},'userroles',
+                                                      ['active'],['au'],[$env{'user.domain'}]);
+                    if (keys(%roleshash)) {
+                        $output .= '<span class="LC_info">'.
+                                   &mt('Your request for an author role has been approved.').'<br />'.
+                                   &mt('Use the "Check for changes" link to update your list of roles.').
+                                   '</span>';
+                    }
+                }
+                $output .= '</p>';
+            }
+        }
+    }
+    unless ($output) {
+        if ($env{'environment.canrequest.author'} || $env{'environment.canrequest.official'} ||
+            $env{'environment.canrequest.unofficial'} || $env{'environment.canrequest.community'}) {
+            $output = &mt('No requests for courses, communities or authoring currently queued');
+        } else {
+            $output = &mt('No enrollment requests currently queued awaiting approval');
+        }
+    }
+    return '<div class="LC_left_float"><fieldset><legend>'.&mt('Queued requests').'</legend>'.
+           $output.'</fieldset></div><br clear="all" />';
+}
 
 1;
 __END__
@@ -1329,8 +2880,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