--- loncom/auth/lonroles.pm	2012/05/16 21:19:44	1.266
+++ loncom/auth/lonroles.pm	2016/10/27 22:53:48	1.269.2.28
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # User Roles Screen
 #
-# $Id: lonroles.pm,v 1.266 2012/05/16 21:19:44 droeschl Exp $
+# $Id: lonroles.pm,v 1.269.2.28 2016/10/27 22:53:48 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -128,7 +128,7 @@ 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;
@@ -138,6 +138,8 @@ 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;
@@ -149,6 +151,7 @@ sub redirect_user {
     &Apache::loncommon::content_type($r,'text/html');
     &Apache::loncommon::no_cache($r);
     $r->send_http_header;
+    my $swinfo=&Apache::lonmenu::rawconfig();
 
     # Breadcrumbs
     my $brcrum = [{'href' => $url,
@@ -163,6 +166,11 @@ sub redirect_user {
     $url=~s/ /\%20/g;
     $r->print(<<ENDREDIR);
 $start_page
+<script type="text/javascript">
+// <![CDATA[
+$swinfo
+// ]]>
+</script>
 <p>$msg</p>
 $end_page
 ENDREDIR
@@ -200,6 +208,14 @@ 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'};
@@ -211,9 +227,17 @@ sub handler {
         $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.doupdate'}) {
+    if ($env{'form.state'} eq 'doupdate') {
         my $show_course=&Apache::loncommon::show_course();
         my $checkingtxt;
         if ($show_course) {
@@ -221,17 +245,24 @@ sub handler {
         } else {
             $checkingtxt = &mt('Checking for new roles ...');
         }
-        $updateresult = '<span class="LC_info">'.$checkingtxt.'</span>';
+        $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,$update,$then);
-    &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'});
-    my $loncaparev = $Apache::lonnet::perlvar{'lonVersion'};
+    my %dhroles = ();
+    my ($numdc,$numdh,$numadhoc) = &check_for_adhoc(\%dcroles,\%dhroles,$update,$then);
+    my $loncaparev = $r->dir_config('lonVersion');
 
 # ================================================================== Roles Init
     if ($env{'form.selectrole'}) {
@@ -239,8 +270,15 @@ sub handler {
         my $locknum=&Apache::lonnet::get_locks();
         if ($locknum) { return 409; }
 
+        my $custom_adhoc;
         if ($env{'form.newrole'}) {
             $env{'form.'.$env{'form.newrole'}}=1;
+# Check if this is a Domain Helpdesk role trying to enter a course
+            if ($env{'form.newrole'} =~ m{^cr/($match_domain)/\1\-domainconfig/\w+\./\1/$match_courseid$}) {
+                if ($dhroles{$1}) {
+                    $custom_adhoc = 1;
+                }
+            }
 	}
 	if ($env{'request.course.id'}) {
             # Check if user is CC trying to select a course role
@@ -262,81 +300,142 @@ sub handler {
 	    &Apache::lonnet::put('email_status',\%temp);
 	    &Apache::lonnet::delenv('user.state.'.$env{'request.course.id'});
 	}
-	&Apache::lonnet::appenv({"request.course.id"   => '',
-			 	 "request.course.fn"   => '',
-				 "request.course.uri"  => '',
-				 "request.course.sec"  => '',
-				 "request.role"        => 'cm',
-                                 "request.role.adv"    => $env{'user.adv'},
-				 "request.role.domain" => $env{'user.domain'}});
-# Check if user is a DC trying to enter a course or author space and needs privs to be created
-        if ($numdc > 0) {
-            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}) {
-                        &Apache::lonnet::check_adhoc_privs($domain,$coursenum,
-                                                           $update,$refresh,$now,$ccrole);
+	&Apache::lonnet::appenv({"request.course.id"           => '',
+			 	 "request.course.fn"           => '',
+				 "request.course.uri"          => '',
+				 "request.course.sec"          => '',
+                                 "request.course.tied"         => '',
+                                 "request.course.timechecked"  => '',
+				 "request.role"                => 'cm',
+                                 "request.role.adv"            => $env{'user.adv'},
+				 "request.role.domain"         => $env{'user.domain'}});
+# Check if Domain Helpdesk role trying to enter a course needs privs to be created
+        if ($env{'form.newrole'} =~ m{^cr/($match_domain)/\1\-domainconfig/(\w+)\./\1/($match_courseid)$}) {
+            my $cdom = $1;
+            my $rolename = $2;
+            my $cnum = $3;
+            if ($custom_adhoc) {
+                my %adhocroles = &Apache::lonnet::userenvironment($env{'user.domain'},$env{'user.name'},
+                                                                  'adhocroles.'.$cdom);
+                if (keys(%adhocroles)) {
+                    my @adhoc = split(',',$adhocroles{'adhocroles.'.$cdom});
+                    if (grep(/^\Q$rolename\E$/,@adhoc)) {
+                        if (&Apache::lonnet::check_adhoc_privs($cdom,$cnum,$update,$refresh,$now,
+                                                               "cr/$cdom/$cdom".'-domainconfig/'.$rolename)) {
+                            &Apache::lonnet::appenv({"environment.internal.$cdom.$cnum.cr/$cdom/$cdom".'-domainconfig/'."$rolename.adhoc" => time});
+                        }
                     }
-                    last;
                 }
-# Is this an ad-hoc CA-role?
-                if (my ($domain,$user) =
-		    ($envkey =~ m-^form\.ca\./($match_domain)/($match_username)$-)) {
-                    if (($domain eq $env{'user.domain'}) && ($user eq $env{'user.name'})) {
-                        delete($env{$envkey});
-                        $env{'form.au./'.$domain.'/'} = 1;
-                        my ($server_status,$home) = &check_author_homeserver($user,$domain);
-                        if ($server_status eq 'switchserver') {
-                            my $trolecode = 'au./'.$domain.'/';
-                            my $switchserver = '/adm/switchserver?otherserver='.$home.'&amp;role='.$trolecode;
-                            $r->internal_redirect($switchserver);
+            }
+        } elsif (($numdc > 0) || ($numdh > 0)) {
+# Check if user is a DC trying to enter a course or author space and needs privs to be created
+# Check if user is a DH trying to enter a course and needs privs to be created
+            foreach my $envkey (keys(%env)) {
+                if ($numdc) {
+# Is this an ad-hoc Coordinator role?
+                    if (my ($ccrole,$domain,$coursenum) =
+		        ($envkey =~ m-^form\.(cc|co)\./($match_domain)/($match_courseid)$-)) {
+                        if ($dcroles{$domain}) {
+                            if (&Apache::lonnet::check_adhoc_privs($domain,$coursenum,
+                                                                   $update,$refresh,$now,$ccrole)) {
+                                &Apache::lonnet::appenv({"environment.internal.$domain.$coursenum.$ccrole.adhoc" => time});
+                            }
                         }
                         last;
                     }
-                    if (my ($castart,$caend) = ($env{'user.role.ca./'.$domain.'/'.$user} =~ /^(\d*)\.(\d*)$/)) {
-                        if (((($castart) && ($castart < $now)) || !$castart) && 
-                            ((!$caend) || (($caend) && ($caend > $now)))) {
+# Is this an ad-hoc CA-role?
+                    if (my ($domain,$user) =
+		        ($envkey =~ m-^form\.ca\./($match_domain)/($match_username)$-)) {
+                        if (($domain eq $env{'user.domain'}) && ($user eq $env{'user.name'})) {
+                            delete($env{$envkey});
+                            $env{'form.au./'.$domain.'/'} = 1;
                             my ($server_status,$home) = &check_author_homeserver($user,$domain);
                             if ($server_status eq 'switchserver') {
-                                my $trolecode = 'ca./'.$domain.'/'.$user;
+                                my $trolecode = 'au./'.$domain.'/';
                                 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';
+                        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;
+                        }
+                        if ($dcroles{$domain}) {
+                            my ($server_status,$home) = &check_author_homeserver($user,$domain);
+                            if (($server_status eq 'ok') || ($server_status eq 'switchserver')) {
+                                &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.'&amp;role='.$trolecode;
+                                    $r->internal_redirect($switchserver);
+                                    return OK;
+                                }
+                            } else {
+                                delete($env{$envkey});
+                            }
+                        } else {
+                            delete($env{$envkey});
+                        }
                         last;
                     }
-                    if ($dcroles{$domain}) {
-                        my ($server_status,$home) = &check_author_homeserver($user,$domain);
-                        if (($server_status eq 'ok') || ($server_status eq 'switchserver')) {
-                            &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.'&amp;role='.$trolecode;
-                                $r->internal_redirect($switchserver);
+                }
+                if ($numdh) {
+# Is this an ad hoc custom role in a course/community?
+                    if (my ($domain,$rolename,$coursenum) = ($envkey =~ m{^form\.cr/($match_domain)/\1\-domainconfig/(\w+)\./\1/($match_courseid)$})) {
+                        if ($dhroles{$domain}) {
+                            my @adhoc;
+                            if ($env{'environment.adhocroles.'.$domain}) {
+                                @adhoc = split(',',$env{'environment.adhocroles.'.$domain});
+                            } else {
+                                my %adhocroles = &Apache::lonnet::userenvironment($env{'user.domain'},$env{'user.name'},
+                                                                                  'adhocroles.'.$domain);
+                                if (keys(%adhocroles)) {
+                                    @adhoc = split(',',$adhocroles{'adhocroles.'.$domain});
+                                }
+                            }
+                            if ((@adhoc > 0) && ($rolename ne '')) {
+                                if (grep(/^\Q$rolename\E$/,@adhoc)) {
+                                    if (&Apache::lonnet::check_adhoc_privs($domain,$coursenum,$update,$refresh,$now,
+                                                                           "cr/$domain/$domain".'-domainconfig/'.$rolename)) {
+                                        &Apache::lonnet::appenv({"environment.internal.$domain.$coursenum.cr/$domain/$domain".
+                                                                 '-domainconfig/'."$rolename.adhoc" => time});
+                                    }
+                                } else {
+                                    delete($env{$envkey});
+                                }
+                            } else {
+                                delete($env{$envkey});
                             }
                         } else {
                             delete($env{$envkey});
                         }
-                    } else {
-                        delete($env{$envkey});
+                        last;
                     }
-                    last;
-                }
+                } 
             }
         }
 
-        foreach $envkey (keys %env) {
+        foreach $envkey (keys(%env)) {
             next if ($envkey!~/^user\.role\./);
             my ($where,$trolecode,$role,$tstatus,$tend,$tstart);
             &Apache::lonnet::role_status($envkey,$update,$refresh,$now,\$role,\$where,
@@ -352,30 +451,13 @@ sub handler {
                             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'});
+                                    &Apache::loncommon::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());
+                                    $r->print(&Apache::loncommon::check_release_result($switchwarning,$switchserver));
                                     return OK;
                                 }
                             }
@@ -498,16 +580,39 @@ ENDENTERKEY
 
 		    if (($cnum) && ($role ne 'ca') && ($role ne 'aa')) {
                         my $msg;
-			my ($furl,$ferr)=
-			    &Apache::lonuserstate::readmap($cdom.'/'.$cnum);
+                        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 .= '?';
                                 }
                                 $dest .= 'symb='.$env{'form.symb'};
                             }
@@ -519,7 +624,8 @@ ENDENTERKEY
                                 if ($dest =~ m{^/adm/coursedocs\?folderpath}) {
                                     if ($env{'request.course.id'} eq $cdom.'_'.$cnum) { 
                                         my $chome = &Apache::lonnet::homeserver($cnum,$cdom);
-                                        &update_content_constraints($cdom,$cnum,$chome,$cdom.'_'.$cnum);
+                                        &Apache::loncommon::update_content_constraints($cdom,$cnum,$chome,
+                                                                                       $cdom.'_'.$cnum);
                                     }
                                 }
 				$r->internal_redirect($dest);
@@ -545,24 +651,60 @@ 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') || ($role eq 'co')) 
-                                    && ($env{'course.' . $courseid .'.course.helper.not.run'})) { 
+                                    && ($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'};
-                                        if ($env{'form.destsymb'} ne '') {
-                                            my $esc_symb = &HTML::Entities::encode($env{'form.destsymb'},'"<>&');
-                                            $dest .= '?symb='.$esc_symb;
+                                    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.'.$courseid.'.description'}),
+                                                       $env{'course.'.$cdom.'_'.$cnum.'.description'}),
                                                        $dest, $msg);
                                         return OK;
                                     }
@@ -572,25 +714,39 @@ 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'});
+						       $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?
+                                my $access;
+                                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
+                                    $access = &Apache::lonnet::allowed('bre',$exturl,$symb);
+                                # For other resources just check for permission
+                                } else {
+                                    $access = &Apache::lonnet::allowed('bre',$furl);
+                                }
+                                if (!$access) {
+                                    $furl = &Apache::lonpageflip::first_accessible_resource();
+                                } elsif ($access eq 'B') {
+                                    $furl = '/adm/navmaps?showOnlyHomework=1';
+                                }
                                 $msg = &mt('Entering [_1] ...',
-					   $env{'course.'.$courseid.'.description'});
+					   $env{'course.'.$cdom.'_'.$cnum.'.description'});
 				&redirect_user($r, &mt('Entering [_1]',
-                               $env{'course.'.$courseid.'.description'}),
+                               $env{'course.'.$cdom.'_'.$cnum.'.description'}),
                                $furl, $msg);
 			    }
 			    return OK;
@@ -606,7 +762,7 @@ ENDENTERKEY
                             $redirect_url .= $where;
                         }
                         $redirect_url .= '/';
-                        &redirect_user($r,&mt('Entering Construction Space'),
+                        &redirect_user($r,&mt('Entering Authoring Space'),
                                        $redirect_url);
                         return OK;
                     }
@@ -616,6 +772,12 @@ ENDENTERKEY
                                        $redirect_url);
                         return OK;
                     }
+                    if ($role eq 'dh') {
+                        my $redirect_url = '/adm/menu/';
+                        &redirect_user($r,&mt('Loading Domain Helpdesk Menu'),
+                                       $redirect_url);
+                        return OK;
+                    }
                     if ($role eq 'sc') {
                         my $redirect_url = '/adm/grades?command=scantronupload';
                         &redirect_user($r,&mt('Loading Data Upload Page'),
@@ -638,22 +800,39 @@ ENDENTERKEY
     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($pagetitle,undef,{bread_crumbs=>$brcrum});
-    my $standby=&mt('Role selected. Please stand by.');
-    $standby=~s/\n/\\n/g;
-    my $noscript='<span class="LC_error">'.&mt('Use of LON-CAPA requires Javascript to be enabled in your web browser.').'<br />'.&mt('As this is not the case, most functionality in the system will be unavailable.').'</span><br />';
+    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);
+    my $crumbsright;
+    if ($env{'browser.mobile'}) {
+        $crumbsright = $funcs;
+        undef($funcs);
+    }
+    my $start_page=&Apache::loncommon::start_page($pagetitle,undef,{bread_crumbs=>$brcrum,
+                                                                    bread_crumbs_component=>$crumbsright});
+    &js_escape(\$standby);
+    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>
@@ -676,10 +855,17 @@ function enterrole (thisform,rolecode,bu
     }
 }
 
-function setToUpdate(thisform) {
-    thisform.doupdate.value='1';
-    thisform.selectrole.value='';
-    thisform.submit();
+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();
 }
 
 // ]]>
@@ -748,64 +934,54 @@ ENDHEADER
 		  &Apache::loncommon::end_page());
 	return OK;
     } else {
-        $r->print($updateresult); 
+        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="" />');
     }
     $r->rflush();
 
     my (%roletext,%sortrole,%roleclass,%futureroles,%timezones);
     my ($countactive,$countfuture,$inrole,$possiblerole) = 
-        &gather_roles($update,$refresh,$now,$reinit,$nochoose,\%roletext,\%sortrole,\%roleclass,
-                      \%futureroles,\%timezones,$loncaparev);
+        &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});
-    my $updatebutton = &mt('Check for role changes');
-    my $show_course=&Apache::loncommon::show_course();
-    if ($show_course) {
-        $updatebutton = &mt('Check for new courses');
-    }
-    my $do_update;
-    unless (($env{'form.source'} eq 'login') || ($env{'form.doupdate'})) {
-        $do_update = '<input type="hidden" name="doupdate" value="" />'.
-                     '<input type="button" name="update" value="'.
-                     $updatebutton.'" onclick="javascript:setToUpdate(this.form)" />';
-    }
-    if ($env{'user.adv'}) {
-        my $showall = '<label><input type="checkbox" name="showall"';
-        if ($env{'form.showall'}) { 
-            $showall .= ' checked="checked" ';
-        }
-        $showall .= ' />'.&mt('Show all roles').'</label>&nbsp;'.
-                    '<input type="submit" value="'.&mt('Update display').'" />';
-        if ($do_update) {
-            $r->print('<div class="LC_left_float"><fieldset>'.
-                      '<legend>'. &mt('Display').'</legend>'.
-                      $showall.'</fieldset></div>'.
-                      '<div class="LC_left_float"><fieldset><legend>'.
-                      &mt('Changes?').'</legend>'.
-                      $do_update.'</fieldset></div><br clear="all" />');
-        } else {
-            $r->print($showall);
-        }
-    } else {
-        $r->print('<p>'.$do_update.'</p>');
+    if ((($cattype eq 'std') || ($cattype eq 'domonly')) && (!$env{'user.adv'})) {
         if ($countactive > 0) {
-            $r->print(&Apache::loncoursequeueadmin::queued_selfenrollment());
             my $domdesc = &Apache::lonnet::domain($env{'user.domain'},'description');
             my $esc_dom = &HTML::Entities::encode($env{'user.domain'},'"<>&'); 
             $r->print(
                 '<p>'
-               .&mt('[_1]Visit the [_2]Course/Community Catalog[_3]'
-                   .' to view all [_4] LON-CAPA courses and communities.'
+               .&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)
+                   ,'</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.'
@@ -817,13 +993,7 @@ ENDHEADER
 
 # No active roles
     if ($countactive==0) {
-	if ($inrole) {
-	    $r->print('<h2>'.&mt('Currently no additional roles, courses or communities').'</h2>');
-	} else {
-	    $r->print('<h2>'.&mt('Currently no active roles, courses or communities').'</h2>');
-	}
-        &findcourse_advice($r);
-        &requestcourse_advice($r); 
+        &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));
@@ -855,7 +1025,7 @@ ENDHEADER
     }
 # ----------------------------------------------------------------------- Table
 
-    if ($numdc > 0) {
+    if (($numdc > 0) || (($numdh > 0) && ($numadhoc > 0))) {
         $r->print(&coursepick_jscript());
         $r->print(&Apache::loncommon::coursebrowser_javascript().
                   &Apache::loncommon::authorbrowser_javascript());
@@ -888,9 +1058,12 @@ ENDHEADER
                                $roletext{'user.role.'.$role}->[1].
                                &Apache::loncommon::end_data_table_row();
                 }
-                if ($role =~ m{dc\./($match_domain)/} 
+                if ($role =~ m{^dc\./($match_domain)/$} 
 		    && $dcroles{$1}) {
 		    $output .= &adhoc_roles_row($1,'recent');
+                } elsif ($role =~ m{^dh\./($match_domain)/$}
+                         && ($env{'environment.adhocroles.'.$1} ne '')) {
+                    $output .= &adhoc_customroles_row($1,'recent');
                 }
 	    } elsif ($numdc > 0) {
                 unless ($role =~/^error\:/) {
@@ -954,34 +1127,54 @@ ENDHEADER
 	$r->print('<hr /><h2>'.&mt('Current Privileges').'</h2>');
 	$r->print(&privileges_info());
     }
-    $r->print(&Apache::lonnet::getannounce());
+    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><br />'
-                 .'<a href="/adm/logout">'.&mt('Logout').'</a>&nbsp;&nbsp;'
-                 .'<a href="/adm/coursecatalog?showdom='.$esc_dom.'">'
-                 .&mt('Course/Community Catalog')
-                 .'</a></small></p>');
+                 .'</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,$roletext,$sortrole,$roleclass,$futureroles,$timezones,$loncaparev) = @_;
+    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();
-    foreach my $envkey (sort(keys(%env))) {
-        my $button = 1;
-        my $switchserver='';
-        my $switchwarning;
-        my ($role_text,$role_text_end,$sortkey);
-        if ($envkey=~/^user\.role\./) {
-            my ($role,$where,$trolecode,$tstart,$tend,$tremark,$tstatus,$tpstart,$tpend);
+    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/);
@@ -995,7 +1188,7 @@ sub gather_roles {
             if (($tstatus eq 'is')
                 || ($tstatus eq 'selected')
                 || ($tstatus eq 'future')
-                || ($env{'form.showall'})) {
+                || ($env{'form.display'} eq 'showall')) {
                 my $timezone = &role_timezone($where,$timezones);
                 if ($tstart) {
                     $tpstart=&Apache::lonlocal::locallocaltime($tstart,$timezone);
@@ -1028,7 +1221,7 @@ sub gather_roles {
                 if ($role =~ /^cr\//) {
                     my ($rdummy,$rdomain,$rauthor,$rrole)=split(/\//,$role);
                     if ($tremark) { $tremark.='<br />'; }
-                    $tremark.=&mt('Customrole defined by [_1].',$rauthor.':'.$rdomain);
+                    $tremark.=&mt('Custom role defined by [_1].',$rauthor.':'.$rdomain);
                 }
                 $trole=Apache::lonnet::plaintext($role);
                 my $ttype;
@@ -1046,7 +1239,7 @@ sub gather_roles {
                     }
                     #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 />'.
                         ' '.&mt('Server').':&nbsp;'.$home;
@@ -1065,7 +1258,7 @@ sub gather_roles {
                     }
                     #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;
                     $env{'course.'.$tdom.'_'.$trest.'.description'}='ca';
@@ -1088,7 +1281,7 @@ sub gather_roles {
                                 my $required = $env{'course.'.$tcourseid.'.internal.releaserequired'};
                                 if ($required ne '') {
                                     ($switchserver,$switchwarning) = 
-                                        &check_release_required($loncaparev,$tcourseid,$trolecode,$required);
+                                        &Apache::loncommon::check_release_required($loncaparev,$tcourseid,$trolecode,$required);
                                     if ($switchserver || $switchwarning) {
                                         $button = 0;
                                     }
@@ -1111,7 +1304,7 @@ sub gather_roles {
                                 my $required = $newhash{'internal.releaserequired'};
                                 if ($required ne '') {
                                     ($switchserver,$switchwarning) =
-                                        &check_release_required($loncaparev,$tcourseid,$trolecode,$required);
+                                        &Apache::loncommon::check_release_required($loncaparev,$tcourseid,$trolecode,$required);
                                     if ($switchserver || $switchwarning) {
                                         $button = 0;
                                     }
@@ -1212,7 +1405,7 @@ sub roletable_headers {
     my $doheaders;
     if ((ref($sortrole) eq 'HASH') && (ref($roleclass) eq 'HASH')) {
         $r->print('<br />'
-                 .&Apache::loncommon::start_data_table()
+                 .&Apache::loncommon::start_data_table('LC_textsize_mobile')
                  .&Apache::loncommon::start_data_table_header_row()
         );
         if (!$nochoose) { $r->print('<th>&nbsp;</th>'); }
@@ -1238,7 +1431,7 @@ sub roletable_headers {
 }
 
 sub roletypes {
-    my @types = ('Domain','Construction Space','Course','Community','Unavailable','System');
+    my @types = ('Domain','Authoring Space','Course','Community','Unavailable','System');
     return @types; 
 }
 
@@ -1261,12 +1454,15 @@ sub print_rolerows {
                                            &Apache::loncommon::end_data_table_row();
                             }
                         }
-                        if ($sortrole->{$which} =~ m-dc\./($match_domain)/-) {
+                        if ($sortrole->{$which} =~ m{^user\.role\.dc\./($match_domain)/}) {
                             if (ref($dcroles) eq 'HASH') {
                                 if ($dcroles->{$1}) {
                                     $output .= &adhoc_roles_row($1,'');
                                 }
                             }
+                        } elsif (($sortrole->{$which} =~ m{^user\.role\.dh\./($match_domain)/}) &&
+                                 ($env{'environment.adhocroles.'.$1} ne '')) {
+                            $output .= &adhoc_customroles_row($1,'');
                         }
                     }
                 }
@@ -1287,7 +1483,7 @@ sub print_rolerows {
 }
 
 sub findcourse_advice {
-    my ($r) = @_;
+    my ($r,$cattype) = @_;
     my $domdesc = &Apache::lonnet::domain($env{'user.domain'},'description');
     my $esc_dom = &HTML::Entities::encode($env{'user.domain'},'"<>&');
     if (&Apache::lonnet::auto_run(undef,$env{'user.domain'})) {
@@ -1302,37 +1498,36 @@ 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('<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());
+    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) = @_;
+    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);
+    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')) { 
-            $r->print('<h3>'.&mt('Request creation of a course or community').'</h3>'.
-                      '<p>'.&mt('You have rights to request the creation of courses and/or communities in the following domain(s):').'<ul>');
             my (@reqdoms,@reqtypes);
             foreach my $type (sort(keys(%request_doms))) {
                 push(@reqtypes,$type); 
                 if (ref($request_doms{$type}) eq 'ARRAY') {
                     my $domstr = join(', ',map { &Apache::lonnet::domain($_) } sort(@{$request_doms{$type}}));
-                    $r->print(
+                    $output .=
                         '<li>'
                        .&mt('[_1]'.$typename->{$type}.'[_2] in domain: [_3]',
                             '<i>',
                             '</i>',
                             '<b>'.$domstr.'</b>')
-                       .'</li>'
-                    );
+                       .'</li>';
                     foreach my $dom (@{$request_doms{$type}}) {
                         unless (grep(/^\Q$dom\E/,@reqdoms)) {
                             push(@reqdoms,$dom);
@@ -1355,9 +1550,26 @@ sub requestcourse_advice {
             }
             if (@reqdoms == 1 || @showtypes > 0) {
                 $requrl .= '&state=crstype&action=new';
-            } 
-            $r->print('</ul>'.&mt('Use the [_1]request form[_2] to submit a request for creation of a new course or community.','<a href="'.$requrl.'">','</a>').'</p>');
+            }
+            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;
 }
@@ -1377,7 +1589,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);
@@ -1490,24 +1702,6 @@ sub build_roletext {
     return ($roletext,$roletext_end);
 }
 
-sub check_needs_switchserver {
-    my ($possiblerole) = @_;
-    my $needs_switchserver;
-    my ($role,$where) = split(/\./,$possiblerole,2);
-    my (undef,$tdom,$twho) = split(/\//,$where);
-    my ($server_status,$home);
-    if (($role eq 'ca') || ($role eq 'aa')) {
-        ($server_status,$home) = &check_author_homeserver($twho,$tdom);
-    } else {
-        ($server_status,$home) = &check_author_homeserver($env{'user.name'},
-                                                          $env{'user.domain'});
-    }
-    if ($server_status eq 'switchserver') {
-        $needs_switchserver = 1;
-    }
-    return $needs_switchserver;
-}
-
 sub check_author_homeserver {
     my ($uname,$udom)=@_;
     if (($uname eq '') || ($udom eq '')) {
@@ -1525,29 +1719,42 @@ sub check_author_homeserver {
     }
 }
 
-sub check_fordc {
-    my ($dcroles,$update,$then) = @_;
+sub check_for_adhoc {
+    my ($dcroles,$dhroles,$update,$then) = @_;
     my $numdc = 0;
+    my $numdh = 0;
+    my $numadhoc = 0;
+    my $num_custom_adhoc = 0;
     if ($env{'user.adv'}) {
-        foreach my $envkey (sort keys %env) {
-            if ($envkey=~/^user\.role\.dc\.\/($match_domain)\/$/) {
-                my $dcdom = $1;
-                my $livedc = 1;
+        foreach my $envkey (sort(keys(%env))) {
+            if ($envkey=~/^user\.role\.(dc|dh)\.\/($match_domain)\/$/) {
+                my $role = $1;
+                my $roledom = $2;
+                my $liverole = 1;
                 my ($tstart,$tend)=split(/\./,$env{$envkey});
                 my $limit = $update;
-                if ($env{'request.role'} eq 'dc./'.$dcdom.'/') {
+                if ((($role eq 'dc') && ($env{'request.role'} eq 'dc./'.$roledom.'/')) ||
+                    (($role eq 'dh') && ($env{'request.role'} eq 'dh./'.$roledom.'/'))) {
                     $limit = $then;
                 }
-                if ($tstart && $tstart>$limit) { $livedc = 0; }
-                if ($tend   && $tend  <$limit) { $livedc = 0; }
-                if ($livedc) {
-                    $$dcroles{$dcdom} = $envkey;
-                    $numdc++;
+                if ($tstart && $tstart>$limit) { $liverole = 0; }
+                if ($tend   && $tend  <$limit) { $liverole = 0; }
+                if ($liverole) {
+                    if ($role eq 'dc') {
+                        $dcroles->{$roledom} = $envkey;
+                        $numdc++;
+                    } else {
+                        $dhroles->{$roledom} = $envkey;
+                        if ($env{'environment.adhocroles.'.$roledom} ne '') {
+                            $numadhoc ++;
+                        }
+                        $numdh++;
+                    }
                 }
             }
         }
     }
-    return $numdc;
+    return ($numdc,$numdh,$numadhoc);
 }
 
 sub adhoc_course_role {
@@ -1567,8 +1774,13 @@ sub adhoc_course_role {
                 $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;
@@ -1594,7 +1806,11 @@ sub adhoc_course_role {
                     $spec .= '/'.$usec;
                     $area .= '/'.$usec;
                 }
-                &Apache::lonnet::standard_roleprivs(\%newrole,$role,$cdom,$spec,$cnum,$area);
+                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.'.';
@@ -1629,113 +1845,26 @@ sub check_forcc {
     return $is_cc;
 }
 
-sub check_release_required {
-    my ($loncaparev,$tcourseid,$trolecode,$required) = @_;
-    my ($switchserver,$warning);
-    if ($required ne '') {
-        my ($reqdmajor,$reqdminor) = ($required =~ /^(\d+)\.(\d+)$/);
-        my ($major,$minor) = ($loncaparev =~ /^\'?(\d+)\.(\d+)\.[\w.\-]+\'?$/);
-        if ($reqdmajor ne '' && $reqdminor ne '') {
-            my $otherserver;
-            if (($major eq '' && $minor eq '') || 
-                (($reqdmajor > $major) || (($reqdmajor == $major) && ($reqdminor > $minor)))) {
-                my ($userdomserver) = &Apache::lonnet::choose_server($env{'user.domain'});
-                my $switchlcrev = 
-                    &Apache::lonnet::get_server_loncaparev($env{'user.domain'},
-                                                           $userdomserver);
-                my ($swmajor,$swminor) = ($switchlcrev =~ /^\'?(\d+)\.(\d+)\.[\w.\-]+\'?$/);
-                if (($swmajor eq '' && $swminor eq '') || ($reqdmajor > $swmajor) || 
-                    (($reqdmajor == $swmajor) && ($reqdminor > $swminor))) {
-                    my $cdom = $env{'course.'.$tcourseid.'.domain'};
-                    if ($cdom ne $env{'user.domain'}) {
-                        my ($coursedomserver,$coursehostname) = &Apache::lonnet::choose_server($cdom); 
-                        my $serverhomeID = &Apache::lonnet::get_server_homeID($coursehostname);
-                        my $serverhomedom = &Apache::lonnet::host_domain($serverhomeID);
-                        my %defdomdefaults = &Apache::lonnet::get_domain_defaults($serverhomedom);
-                        my %udomdefaults = &Apache::lonnet::get_domain_defaults($env{'user.domain'});
-                        my $remoterev = &Apache::lonnet::get_server_loncaparev($serverhomedom,$coursedomserver);
-                        my $canhost =
-                            &Apache::lonnet::can_host_session($env{'user.domain'},
-                                                              $coursedomserver,
-                                                              $remoterev,
-                                                              $udomdefaults{'remotesessions'},
-                                                              $defdomdefaults{'hostedsessions'});
-
-                        if ($canhost) {
-                            $otherserver = $coursedomserver;
-                        } else {
-                            $warning = &mt('Requires LON-CAPA version [_1].',$env{'course.'.$tcourseid.'.internal.releaserequired'}).'<br />'. &mt("No suitable server could be found amongst servers in either your own domain or in the course's domain.");
-                        }
-                    } else {
-                        $warning = &mt('Requires LON-CAPA version [_1].',$env{'course.'.$tcourseid.'.internal.releaserequired'}).'<br />'.&mt("No suitable server could be found amongst servers in your own domain (which is also the course's domain).");
-                    }
-                } else {
-                    $otherserver = $userdomserver;
-                }
-            }
-            if ($otherserver ne '') {
-                $switchserver = 'otherserver='.$otherserver.'&amp;role='.$trolecode;
-            }
-        }
-    }
-    return ($switchserver,$warning);
-}
-
-sub update_content_constraints {
-    my ($cdom,$cnum,$chome,$cid) = @_;
-    my %curr_reqd_hash = &Apache::lonnet::userenvironment($cdom,$cnum,'internal.releaserequired');
-    my ($reqdmajor,$reqdminor) = split(/\./,$curr_reqd_hash{'internal.releaserequired'}); 
-    my %checkresponsetypes;
-    foreach my $key (keys(%Apache::lonnet::needsrelease)) {
-        my ($item,$name,$value) = split(/:/,$key);
-        if ($item eq 'resourcetag') {
-            if ($name eq 'responsetype') {
-                $checkresponsetypes{$value} = $Apache::lonnet::needsrelease{$key}
-            }
-        }
-    }
-    my $navmap = Apache::lonnavmaps::navmap->new();
-    if (defined($navmap)) {
-        my %allresponses;
-        foreach my $res ($navmap->retrieveResources(undef,sub { $_[0]->is_problem() },1,0)) {
-            my %responses = $res->responseTypes();
-            foreach my $key (keys(%responses)) {
-                next unless(exists($checkresponsetypes{$key}));
-                $allresponses{$key} += $responses{$key};
-            }
-        }
-        foreach my $key (keys(%allresponses)) {
-            my ($major,$minor) = split(/\./,$checkresponsetypes{$key});
-            if (($major > $reqdmajor) || ($major == $reqdmajor && $minor > $reqdminor)) { 
-                ($reqdmajor,$reqdminor) = ($major,$minor);
-            } 
-        }
-        undef($navmap);
-    }
-    unless (($reqdmajor eq '') && ($reqdminor eq '')) {
-        &Apache::lonnet::update_released_required($reqdmajor.'.'.$reqdminor,$cdom,$cnum,$chome,$cid);
-    }
-    return;
-}
-
 sub courselink {
-    my ($dcdom,$rowtype) = @_;
+    my ($roledom,$rowtype,$role) = @_;
     my $courseform=&Apache::loncommon::selectcourse_link
-                   ('rolechoice','dccourse'.$rowtype.'_'.$dcdom,
-                    'dcdomain'.$rowtype.'_'.$dcdom,'coursedesc'.$rowtype.'_'.
-                    $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="" />'.
-                      '<input type="hidden" name="coursedesc'.$rowtype.'_'.$dcdom.'" value="" />';
+                   ('rolechoice','course'.$rowtype.'_'.$roledom.'_'.$role,
+                    'domain'.$rowtype.'_'.$roledom.'_'.$role,
+                    'coursedesc'.$rowtype.'_'.$roledom.'_'.$role,
+                    $roledom.':'.$role,undef,'Course/Community');
+    my $hiddenitems = '<input type="hidden" name="domain'.$rowtype.'_'.$roledom.'_'.$role.'" value="'.$roledom.'" />'.
+                      '<input type="hidden" name="origdom'.$rowtype.'_'.$roledom.'_'.$role.'" value="'.$roledom.'" />'.
+                      '<input type="hidden" name="course'.$rowtype.'_'.$roledom.'_'.$role.'" value="" />'.
+                      '<input type="hidden" name="coursedesc'.$rowtype.'_'.$roledom.'_'.$role.'" value="" />';
     return $courseform.$hiddenitems;
 }
 
 sub coursepick_jscript {
-    my %lt = &Apache::lonlocal::texthash(
+    my %js_lt = &Apache::lonlocal::texthash(
                   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.',
              );
+    &js_escape(\%js_lt);
     my $verify_script = <<"END";
 <script type="text/javascript">
 // <![CDATA[
@@ -1752,11 +1881,11 @@ function verifyCoursePick(caller) {
             }
         }
         else {
-            alert("$lt{'plsu'}");
+            alert("$js_lt{'plsu'}");
         }
     }
     else {
-        alert("$lt{'youc'}")
+        alert("$js_lt{'youc'}")
     }
 }
 function getIndex(caller) {
@@ -1817,11 +1946,12 @@ sub display_cc_role {
 sub adhoc_roles_row {
     my ($dcdom,$rowtype) = @_;
     my $output = &Apache::loncommon::continue_data_table_row()
-                 .' <td colspan="5">'
+                 .' <td colspan="5" class="LC_textsize_mobile">'
                  .&mt('[_1]Ad hoc[_2] roles in domain [_3] --'
                      ,'<span class="LC_cusr_emph">','</span>',$dcdom)
                  .' ';
-    my $selectcclink = &courselink($dcdom,$rowtype);
+    my $role = 'cc';
+    my $selectcclink = &courselink($dcdom,$rowtype,$role);
     my $ccrole = &Apache::lonnet::plaintext('co',undef,undef,1);
     my $carole = &Apache::lonnet::plaintext('ca');
     my $selectcalink = &coauthorlink($dcdom,$rowtype);
@@ -1831,6 +1961,25 @@ sub adhoc_roles_row {
     return $output;
 }
 
+sub adhoc_customroles_row {
+    my ($dhdom,$rowtype) = @_;
+    my $output = &Apache::loncommon::continue_data_table_row()
+                 .' <td colspan="5" class="LC_textsize_mobile">'
+                 .&mt('[_1]Ad hoc[_2] course/community roles in domain [_3] --',
+                      '<span class="LC_cusr_emph">','</span>',$dhdom);
+    my @customroles = split(/,/,$env{'environment.adhocroles.'.$dhdom});
+    my $count = 0;
+    foreach my $role (@customroles) {
+        next if (($role eq '') || ($role =~ /\W/));
+        $output .= ' '.$role.': '.&courselink($dhdom,$rowtype,$role).' |';
+        $count ++;
+    }
+    if ($count) {
+        return $output;
+    }
+    return;
+}
+
 sub recent_filename {
     my $area=shift;
     return 'nohist_recent_'.&escape($area);
@@ -1919,7 +2068,7 @@ sub update_session_roles {
         }
         if ($env{$envkey} eq '') {
             my $status_in_db =
-                &curr_role_status($tstart,$tend,$refresh,$now);
+                &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') {
@@ -1963,7 +2112,7 @@ sub update_session_roles {
                 my $status_in_env =
                     &curr_role_status($currstart,$currend,$refresh,$update);
                 my $status_in_db =
-                    &curr_role_status($tstart,$tend,$refresh,$now);
+                    &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') {
@@ -2090,7 +2239,6 @@ sub update_session_roles {
                     my $status_in_db =
                         &curr_role_status($tstart,$tend,$refresh,$now);
                     my ($rdummy,$rest) = split(/\//,$role,2);
-                    my ($rdummy,$rdomain,$rauthor,$rrole)=split(/\//,$role);
                     my %currpriv;
                     unless (exists($crprivs{$rest})) {
                         my ($rdomain,$rauthor,$rrole)=split(/\//,$rest);
@@ -2115,21 +2263,23 @@ sub update_session_roles {
                             }
                         }
                     }
-                    $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})
+                    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);
-                            }
-                            my $status_in_env =
-                                &curr_role_status($currstart,$currend,$refresh,$update);
-                            if ($status_in_env eq 'active') {
+                                ($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;
                             }
                         }
@@ -2146,7 +2296,8 @@ sub update_session_roles {
         my $status_in_env =
             &curr_role_status($currstart,$currend,$refresh,$update);
         my ($rolekey) = ($envkey =~ /^user\.role\.(.+)$/);
-        my ($role,$rest)=split(/\./,$rolekey,2);
+        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') {
@@ -2165,7 +2316,7 @@ sub update_session_roles {
     }
     if (($oldsec) && (@newsec > 0)) {
         if (@newsec > 1) {
-            $msg = '<div class="LC_warning">'.&mt('The section has changed for your current role. Log-out and log-in again to select a role for the new section.').'</div>';
+            $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') {
@@ -2203,13 +2354,100 @@ sub update_session_roles {
             $msg .= '</form></p>';
         }
     } elsif ($currrole_expired) {
-        $msg .= '<div class="LC_warning">';
+        $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.').'</div>';
+        $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);
@@ -2234,7 +2472,7 @@ sub update_session_roles {
                 }
                 $msg .= '</ul>';
             } else {
-                $msg = '&nbsp;<span class="LC_cusr_emph">'.$rolesmsg.'</span><br /><br />';
+                $msg = '&nbsp;<span class="LC_cusr_emph">'.$rolesmsg.'</span><br />';
             }
             return $msg;
         }
@@ -2243,11 +2481,43 @@ sub update_session_roles {
     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)) {
-                    $groupmsg .= '<li>'.
-                                 &mt('[_1] with status: [_2].',
-                                 $item,$newgroup{$item}).'</li>';
+                    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) {
@@ -2257,43 +2527,67 @@ sub update_session_roles {
             }
         }
         if (keys(%newrole) > 0) {
-            $changemsg .= '<li>'.&mt('New roles').
-                          '<ul>';
+            my $newmsg;
             foreach my $item (sort(keys(%newrole))) {
-                $changemsg .= '<li>'.
-                              &mt('[_1] with status: [_2].',
-                              $item,$newrole{$item}).'</li>';
+                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>';
             }
-            $changemsg .= '</ul></li>';
         }
         if (keys(%customprivchg) > 0) {
-            $changemsg .= '<li>'.
-                          &mt('Custom roles with privilege changes').
-                          '<ul>';
+            my $privmsg;
             foreach my $item (sort(keys(%customprivchg))) {
-                $changemsg .= '<li>'.$item.'</li>';
+                my $desc = &role_desc($item,$update,$refresh,$now);
+                if ($desc) {
+                    $privmsg .= '<li>'.$desc.'</li>';
+                }
             }
-            $changemsg .= '</ul></li>';
+            if ($privmsg) {
+                $changemsg .= '<li>'.
+                              &mt('Custom roles with privilege changes').
+                              '<ul>'.$privmsg.'</ul>'.
+                              '</li>';
+             }
         }
         if (keys(%rolechange) > 0) {
-            $changemsg .= '<li>'.
-                          &mt('Existing roles with status changes').'</li>'.
-                          '<ul>';
+            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('[_1] status now: [_2].',$item,
-                              $rolechange{$item}).'</li>';
+                              &mt('Existing roles with status changes').'</li>'.
+                              '<ul>'.$rolemsg.'</ul>'.
+                              '</li>';
             }
-            $changemsg .= '</ul></li>';
         }
         if (keys(%deletedroles) > 0) {
-            $changemsg .= '<li>'.
-                          &mt('Existing roles deleted').'</li>'.
-                          '<ul>';
+            my $delmsg;
             foreach my $item (sort(keys(%deletedroles))) {
-                $changemsg .= '<li>'.$item.'</li>';
+                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>';
             }
-            $changemsg .= '</ul></li>';
         }
     }
     if ((keys(%changed_groups) > 0) || (keys(%groupchange) > 0)) {
@@ -2323,10 +2617,22 @@ sub update_session_roles {
                           &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>'.$crs.'</b><ul>');
+                    $groupchgmsg .= '<li>'.&mt('Course/Community: [_1]','<b>'.$crsdesc.'</b><ul>');
                     foreach my $group (sort(keys(%{$groupchange{$crs}}))) {
-                        $groupchgmsg .= '<li>'.&mt('Group: [_1] status now: [_2].','<b>'.$group.'</b>',$groupchange{$crs}{$group}).'</li>';
+                        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>';
                 }
@@ -2341,95 +2647,76 @@ sub update_session_roles {
     }
     if ($changemsg) {
         $msg .= '<ul>'.$changemsg.'</ul>';
+    } else {
+        if (&Apache::loncommon::show_course()) {
+            $msg = &mt('No new courses or communities');
+        } else {
+            $msg = &mt('No role changes');
+        }
     }
-    &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);
+    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');
             }
         }
-        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;
+        if ($tsection) {
+            $twhere.= '&nbsp; '.&mt('Section').':&nbsp;'.$tsection;
         }
-    } 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;
+        if ($role ne 'st') {
+            $twhere.= '&nbsp; '.&mt('Domain').':&nbsp;'.$tdom;
         }
-    } elsif ($curr_author && !$curr_role_author) {
-        &Apache::lonnet::delenv('user.author');
+    } elsif ($tdom) {
+        $twhere = &mt('Domain').':&nbsp;'.$tdom;
     }
-    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;
-                    }
-                }
-            }
+    my $output;
+    if ($trole) {
+        $output = $trole;
+        if ($twhere) {
+            $output .= " -- $twhere";
         }
-        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 ($tremark) {
+            $output .= '<br />'.$tremark;
         }
     }
-    if (keys(%newenv)) {
-        &Apache::lonnet::appenv(\%newenv);
-    }
-    return $msg;
+    return $output;
 }
 
 sub curr_role_status {
@@ -2491,6 +2778,148 @@ sub is_active_course {
     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;
+    if ($env{'browser.mobile'}) {
+        my @functions;
+        foreach my $link (@links) {
+            push(@functions,[$link->[0],$link->[2]]);
+        }
+        my $title = 'Display options';
+        if ($env{'user.adv'}) {
+            $title = 'Roles options';
+        }
+        $funcs = &Apache::lonmenu::create_submenu('','',$title,\@functions,1,'LC_breadcrumbs_hoverable');
+        $funcs = '<ol class="LC_primary_menu LC_floatright">'.$funcs.'</ol>';
+    } else {
+        $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();
+        $funcs = &Apache::loncommon::head_subbox($funcs);
+    }
+    return $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__