--- loncom/auth/lonroles.pm	2014/05/22 18:51:01	1.269.2.20
+++ loncom/auth/lonroles.pm	2012/08/15 14:37:23	1.272
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # User Roles Screen
 #
-# $Id: lonroles.pm,v 1.269.2.20 2014/05/22 18:51:01 raeburn Exp $
+# $Id: lonroles.pm,v 1.272 2012/08/15 14:37:23 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 REDIRECT);
+use Apache::Constants qw(:common);
 use Apache::File();
 use Apache::lonmenu;
 use Apache::loncommon;
@@ -138,8 +138,6 @@ 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;
@@ -151,7 +149,6 @@ 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,
@@ -166,11 +163,6 @@ 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
@@ -208,14 +200,6 @@ 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'};
@@ -227,17 +211,9 @@ 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.state'} eq 'doupdate') {
+    if ($env{'form.doupdate'}) {
         my $show_course=&Apache::loncommon::show_course();
         my $checkingtxt;
         if ($show_course) {
@@ -245,7 +221,7 @@ sub handler {
         } else {
             $checkingtxt = &mt('Checking for new roles ...');
         }
-        $updateresult = $checkingtxt;
+        $updateresult = '<span class="LC_info">'.$checkingtxt.'</span>';
         $updateresult .= &update_session_roles();
         &Apache::lonnet::appenv({'user.update.time'  => $now});
         $update = $now;
@@ -254,14 +230,15 @@ sub handler {
 
 # -------------------------------------------------- Check for author requests
     my $reqauthor;
-    if ($env{'form.state'} eq 'requestauthor') {
+    if ($env{'form.requestauthor'}) {
        $reqauthor = &Apache::loncoursequeueadmin::process_reqauthor(\$update);
     }
 
     my $envkey;
     my %dcroles = ();
     my $numdc = &check_fordc(\%dcroles,$update,$then);
-    my $loncaparev = $r->dir_config('lonVersion');
+    &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'});
+    my $loncaparev = $Apache::lonnet::perlvar{'lonVersion'};
 
 # ================================================================== Roles Init
     if ($env{'form.selectrole'}) {
@@ -302,15 +279,13 @@ sub handler {
 				 "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)) {
+            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}) {
-                        if (&Apache::lonnet::check_adhoc_privs($domain,$coursenum,
-                                                           $update,$refresh,$now,$ccrole)) {
-                            &Apache::lonnet::appenv({"environment.internal.$domain.$coursenum.$ccrole.adhoc" => time});
-                        }
+                        &Apache::lonnet::check_adhoc_privs($domain,$coursenum,
+                                                           $update,$refresh,$now,$ccrole);
                     }
                     last;
                 }
@@ -325,7 +300,6 @@ sub handler {
                             my $trolecode = 'au./'.$domain.'/';
                             my $switchserver = '/adm/switchserver?otherserver='.$home.'&amp;role='.$trolecode;
                             $r->internal_redirect($switchserver);
-                            return OK;
                         }
                         last;
                     }
@@ -337,7 +311,6 @@ sub handler {
                                 my $trolecode = 'ca./'.$domain.'/'.$user;
                                 my $switchserver = '/adm/switchserver?otherserver='.$home.'&amp;role='.$trolecode;
                                 $r->internal_redirect($switchserver);
-                                return OK;
                             }
                             last;
                         }
@@ -359,7 +332,6 @@ sub handler {
                                 my $switchserver = '/adm/switchserver?'
                                                   .'otherserver='.$home.'&amp;role='.$trolecode;
                                 $r->internal_redirect($switchserver);
-                                return OK;
                             }
                         } else {
                             delete($env{$envkey});
@@ -372,7 +344,7 @@ sub handler {
             }
         }
 
-        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,
@@ -534,39 +506,16 @@ ENDENTERKEY
 
 		    if (($cnum) && ($role ne 'ca') && ($role ne 'aa')) {
                         my $msg;
-                        my ($furl,$ferr)=
-                            &Apache::lonuserstate::readmap($cdom.'/'.$cnum);
-                        unless ($ferr) {
-                            unless (($env{'form.switchrole'}) ||
-                                    ($env{"environment.internal.$cdom.$cnum.$role.adhoc"})) {
-                                &Apache::lonnet::put('nohist_crslastlogin',
-                                    {$env{'user.name'}.':'.$env{'user.domain'}.
-                                     ':'.$csec.':'.$role => $now},$cdom,$cnum);
-                            }
-                            my ($feeds,$syllabus_time);
-                            &Apache::lonrss::advertisefeeds($cnum,$cdom,undef,\$feeds);
-                            &Apache::lonnet::appenv({'request.course.feeds' => $feeds});
-                            &Apache::lonnet::get_numsuppfiles($cnum,$cdom,1);
-                            unless ($env{'course.'.$cdom.'_'.$cnum.'.updatedsyllabus'}) {
-                                unless (($env{'course.'.$cdom.'_'.$cnum.'.externalsyllabus'}) ||
-                                        ($env{'course.'.$cdom.'_'.$cnum.'.uploadedsyllabus'})) {
-                                    my %syllabus=&Apache::lonnet::dump('syllabus',$cdom,$cnum);
-                                    $syllabus_time = $syllabus{'uploaded.lastmodified'};
-                                    if ($syllabus_time) {
-                                        &Apache::lonnet::appenv({'request.course.syllabustime' => $syllabus_time});
-                                    }
-                                }
-                            }
-                        }
+			my ($furl,$ferr)=
+			    &Apache::lonuserstate::readmap($cdom.'/'.$cnum);
 			if (($env{'form.orgurl'}) && 
-			    ($env{'form.orgurl'}!~/^\/adm\/flip/) &&
-                            ($env{'form.orgurl'} ne '/adm/roles')) {
+			    ($env{'form.orgurl'}!~/^\/adm\/flip/)) {
 			    my $dest=$env{'form.orgurl'};
                             if ($env{'form.symb'}) {
                                 if ($dest =~ /\?/) {
                                     $dest .= '&';
                                 } else {
-                                    $dest .= '?';
+                                    $dest .= '?'
                                 }
                                 $dest .= 'symb='.$env{'form.symb'};
                             }
@@ -605,60 +554,24 @@ 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.'.$cdom.'_'.$cnum.'.course.helper.not.run'})) { 
+                                    && ($env{'course.' . $courseid .'.course.helper.not.run'})) { 
 				    $furl = "/adm/helper/course.initialization.helper";
 				    # Send the user to the course they selected
 				} elsif ($env{'request.course.id'}) {
-                                    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;
-                                            }
+                                    if ($env{'form.destinationurl'}) {
+                                        my $dest = $env{'form.destinationurl'};
+                                        if ($env{'form.destsymb'} ne '') {
+                                            my $esc_symb = &HTML::Entities::encode($env{'form.destsymb'},'"<>&');
+                                            $dest .= '?symb='.$esc_symb;
                                         }
                                         &redirect_user($r, &mt('Entering [_1]',
-                                                       $env{'course.'.$cdom.'_'.$cnum.'.description'}),
+                                                       $env{'course.'.$courseid.'.description'}),
                                                        $dest, $msg);
                                         return OK;
                                     }
@@ -668,36 +581,25 @@ ENDENTERKEY
 								    $env{'request.course.id'}.'/'
 								    .$env{'request.course.sec'})
 					) {
-					my $startpage = &courseloadpage($env{'request.course.id'});
+					my $startpage = &courseloadpage($courseid);
 					unless ($startpage eq 'firstres') {         
 					    $msg = &mt('Entering [_1] ...',
-						       $env{'course.'.$env{'request.course.id'}.'.description'});
+						       $env{'course.'.$courseid.'.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/wrapper|)/ext/}) {
-                                    # If it's an external resource,
-                                    # strip off the symb argument and possible query
-                                    my ($exturl,$symb) = ($furl =~ m{^(.+)(?:\?|\&)symb=(.+)$});
-                                    # Unencode $symb
-                                    $symb = &unescape($symb);
-                                    # Then check for permission
-                                    if (!&Apache::lonnet::allowed('bre',$exturl,$symb)) {
-                                        $furl = &Apache::lonpageflip::first_accessible_resource();
-                                    }
-                                # For other resources just check for permission
-                                } elsif (!&Apache::lonnet::allowed('bre',$furl)) {
-                                    $furl = &Apache::lonpageflip::first_accessible_resource();
-                                }
-
+# Are we allowed to look at the first resource?
+				if ($furl !~ m|^/adm/|) {
+# Guess not ...
+				    $furl=&Apache::lonpageflip::first_accessible_resource();
+				}
                                 $msg = &mt('Entering [_1] ...',
-					   $env{'course.'.$cdom.'_'.$cnum.'.description'});
+					   $env{'course.'.$courseid.'.description'});
 				&redirect_user($r, &mt('Entering [_1]',
-                               $env{'course.'.$cdom.'_'.$cnum.'.description'}),
+                               $env{'course.'.$courseid.'.description'}),
                                $furl, $msg);
 			    }
 			    return OK;
@@ -713,7 +615,7 @@ ENDENTERKEY
                             $redirect_url .= $where;
                         }
                         $redirect_url .= '/';
-                        &redirect_user($r,&mt('Entering Authoring Space'),
+                        &redirect_user($r,&mt('Entering Construction Space'),
                                        $redirect_url);
                         return OK;
                     }
@@ -745,33 +647,22 @@ 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 %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 $standby=&mt('Role selected. Please stand by.');
     $standby=~s/\n/\\n/g;
-    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 />';
+    my $noscript='<span class="LC_error">'.&mt('Use of LON-CAPA requires Javascript to be enabled in your web browser.').'<br />'.&mt('As this is not the case, most functionality in the system will be unavailable.').'</span><br />';
 
     $r->print(<<ENDHEADER);
 $start_page
-$funcs
+<br />
 <noscript>
 $noscript
 </noscript>
@@ -794,17 +685,16 @@ function enterrole (thisform,rolecode,bu
     }
 }
 
-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();
+function setToUpdate(thisform) {
+    thisform.doupdate.value='1';
+    thisform.selectrole.value='';
+    thisform.submit();
+}
+
+function setToRequestAuthor(thisform) {
+    thisform.requestauthor.value='1';
+    thisform.selectrole.value='';
+    thisform.submit(); 
 }
 
 // ]]>
@@ -873,54 +763,124 @@ ENDHEADER
 		  &Apache::loncommon::end_page());
 	return OK;
     } else {
-        if ($updateresult || $reqauthor || $hotlist) {
-            my $showresult = '<div>';
-            if ($updateresult) {
-                $showresult .= &Apache::lonhtmlcommon::confirm_success($updateresult);
-            }
-            if ($reqauthor) {
-                $showresult .= &Apache::lonhtmlcommon::confirm_success($reqauthor);
-            }
-            if ($hotlist) {
-                $showresult .= $hotlist;
-            }
-            $showresult .= '</div>';
-            $r->print($showresult);
-        } elsif ($env{'form.state'} eq 'queued') {
-            $r->print(&get_queued());
+        if ($updateresult || $reqauthor) {
+            $r->print('<div>'.
+                      $updateresult.
+                      $reqauthor.
+                      '</div>');
         }
         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,\%roles_in_env,\%roletext,
-                      \%sortrole,\%roleclass,\%futureroles,\%timezones,$loncaparev);
+        &gather_roles($update,$refresh,$now,$reinit,$nochoose,\%roletext,\%sortrole,\%roleclass,
+                      \%futureroles,\%timezones,$loncaparev);
     $refresh = $now;
     &Apache::lonnet::appenv({'user.refresh.time'  => $refresh});
-    if ((($cattype eq 'std') || ($cattype eq 'domonly')) && (!$env{'user.adv'})) {
+    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)" />';
+    }
+    my ($requestauthor,$requestcrs);
+    unless ($reqauthor) {
+        if ($env{'environment.canrequest.author'}) {
+            unless (&is_active_author()) {
+                my ($status,$timestamp) = split(/:/,$env{'environment.requestauthorqueued'});
+                if ($status eq 'approval') {
+                    $requestauthor = &mt('A request for authoring space submitted on [_1] is awaiting approval',&Apache::lonlocal::locallocaltime($timestamp)); 
+                } elsif (($status eq 'approved') && ($do_update)) {
+                    my %roleshash = &Apache::lonnet::get_my_roles($env{'user.name'},$env{'user.domain'},'userroles',
+                                                                  ['active'],['au'],[$env{'user.domain'}]);
+                    if (keys(%roleshash)) {
+                        $requestauthor = &mt('Your request for an author role has been approved.').'<br />';
+                        if ($show_course) {
+                            $requestauthor .= &mt('Use the "Check for new courses" button to update your list of roles.');
+                        } else {
+                            $requestauthor .= &mt('Use the "Check for new roles" button to update your list of roles.'); 
+                        }
+                        $requestauthor = '<span class="LC_info">'.$requestauthor.'</span>';
+                    }
+                }
+                unless ($requestauthor) {
+                    $requestauthor = 
+                        '<input type="hidden" name="requestauthor" value="" />'.
+                        '<input type="button" name="reqauthor" value="'.
+                        &mt('Request author space').'" '. 
+                        'onclick="javascript:setToRequestAuthor(this.form)" />';
+                }
+            }
+        }
+    }
+    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 || $requestauthor) {
+            $r->print('<div class="LC_left_float"><fieldset>'.
+                      '<legend>'. &mt('Display').'</legend>'.
+                      $showall.'</fieldset></div>');
+            if ($do_update) {
+                $r->print('<div class="LC_left_float">'.
+                          '<fieldset><legend>'.&mt('Changes?').'</legend>'.
+                          $do_update.'</fieldset></div>');
+            }
+            if ($requestauthor) {
+                $r->print('<div class="LC_left_float">'.
+                          '<fieldset><legend>'.&mt('Add author role').'</legend>'.
+                          $requestauthor.'</fieldset>');
+            }
+            $r->print('</div><br clear="all" />');
+        } else {
+            $r->print($showall);
+        }
+    } else {
+        if ($do_update && $requestauthor) {
+            $r->print('<div class="LC_left_float">'.
+                      '<fieldset><legend>'.&mt('Changes?').'</legend>'.
+                      $do_update.'</fieldset></div>'.
+                      '<div class="LC_left_float">'.
+                      '<fieldset><legend>'.&mt('Add author role').'</legend>'.
+                      $requestauthor.'</fieldset></div><br clear="all" />');
+        } elsif ($do_update) {
+            $r->print('<p>'.$do_update.'</p>');
+        } elsif ($requestauthor) {
+            $r->print('<p>'.$requestauthor.'</p>');
+        }
         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][_4]'
-                   .' to view all [_5] LON-CAPA courses and communities.'
+               .&mt('[_1]Visit the [_2]Course/Community Catalog[_3]'
+                   .' to view all [_4] LON-CAPA courses and communities.'
                    ,'<b>'
                    ,'<a href="/adm/coursecatalog?showdom='.$esc_dom.'">'
-                   ,'</a>'
-                   ,'</b>'
-                   ,'"'.$domdesc.'"')
+                   ,'</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.'
@@ -932,7 +892,13 @@ ENDHEADER
 
 # No active roles
     if ($countactive==0) {
-        &requestcourse_advice($r,$cattype,$inrole); 
+	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); 
 	$r->print('</form>');
         if ($countfuture) {
             $r->print(&mt('The following [quant,_1,role,roles] will become active in the future:',$countfuture));
@@ -1083,38 +1049,46 @@ ENDHEADER
     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 ++;
-                }
-            }
+sub is_active_author {
+    if ($env{'user.role.au./'.$env{'user.domain'}.'/'} =~ /^(\d*)\.(\d*)$/) {
+        if ((!$1 || $1 < time) &&
+            (!$2 || $2 > time)) {
+            return 1;
+        }
+    }
+    return;
+}
+
+sub reqauthor_check {
+    my $queued = $env{'environment.requestauthorqueued'};
+    my %reqauthor = &Apache::lonnet::get('requestauthor',['author_status','author'],
+                                         $env{'user.domain'},$env{'user.name'});
+    my $reqstatus = $reqauthor{'author_status'};
+    if (($reqstatus eq '' && $queued ne '') || 
+        ($env{'environment.requestauthorqueued'} !~ /^\Q$reqstatus\E/)) {
+        if (ref($reqauthor{'author'}) eq 'HASH') {
+            $queued = $reqstatus.':'.$reqauthor{'author'}{'timestamp'};
+        } else {
+            undef($queued);
         }
+        &Apache::lonnet::appenv({'environment.requestauthorqueued' => $queued});
     }
-    return $count;
+    return $queued;
 }
 
 sub gather_roles {
-    my ($update,$refresh,$now,$reinit,$nochoose,$roles_in_env,$roletext,$sortrole,$roleclass,$futureroles,
-        $timezones,$loncaparev) = @_;
+    my ($update,$refresh,$now,$reinit,$nochoose,$roletext,$sortrole,$roleclass,$futureroles,$timezones,$loncaparev) = @_;
     my ($countactive,$countfuture,$inrole,$possiblerole) = (0,0,0,'');
     my $advanced = $env{'user.adv'};
     my $tryagain = $env{'form.tryagain'};
     my @ids = &Apache::lonnet::current_machine_ids();
-    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);
+    foreach my $envkey (sort(keys(%env))) {
+        my $button = 1;
+        my $switchserver='';
+        my $switchwarning;
+        my ($role_text,$role_text_end,$sortkey);
+        if ($envkey=~/^user\.role\./) {
+            my ($role,$where,$trolecode,$tstart,$tend,$tremark,$tstatus,$tpstart,$tpend);
             &Apache::lonnet::role_status($envkey,$update,$refresh,$now,\$role,\$where,
                                          \$trolecode,\$tstatus,\$tstart,\$tend);
             next if (!defined($role) || $role eq '' || $role =~ /^gr/);
@@ -1128,7 +1102,7 @@ sub gather_roles {
             if (($tstatus eq 'is')
                 || ($tstatus eq 'selected')
                 || ($tstatus eq 'future')
-                || ($env{'form.display'} eq 'showall')) {
+                || ($env{'form.showall'})) {
                 my $timezone = &role_timezone($where,$timezones);
                 if ($tstart) {
                     $tpstart=&Apache::lonlocal::locallocaltime($tstart,$timezone);
@@ -1161,7 +1135,7 @@ sub gather_roles {
                 if ($role =~ /^cr\//) {
                     my ($rdummy,$rdomain,$rauthor,$rrole)=split(/\//,$role);
                     if ($tremark) { $tremark.='<br />'; }
-                    $tremark.=&mt('Custom role defined by [_1].',$rauthor.':'.$rdomain);
+                    $tremark.=&mt('Customrole defined by [_1].',$rauthor.':'.$rdomain);
                 }
                 $trole=Apache::lonnet::plaintext($role);
                 my $ttype;
@@ -1179,7 +1153,7 @@ sub gather_roles {
                     }
                     #next if ($home eq 'no_host');
                     $home = &Apache::lonnet::hostname($home);
-                    $ttype='Authoring Space';
+                    $ttype='Construction Space';
                     $twhere=&mt('User').': '.$trest.'<br />'.&mt('Domain').
                         ': '.$tdom.'<br />'.
                         ' '.&mt('Server').':&nbsp;'.$home;
@@ -1198,7 +1172,7 @@ sub gather_roles {
                     }
                     #next if ($home eq 'no_host');
                     $home = &Apache::lonnet::hostname($home);
-                    $ttype='Authoring Space';
+                    $ttype='Construction Space';
                     $twhere=&mt('Domain').': '.$tdom.'<br />'.&mt('Server').
                         ':&nbsp;'.$home;
                     $env{'course.'.$tdom.'_'.$trest.'.description'}='ca';
@@ -1371,7 +1345,7 @@ sub roletable_headers {
 }
 
 sub roletypes {
-    my @types = ('Domain','Authoring Space','Course','Community','Unavailable','System');
+    my @types = ('Domain','Construction Space','Course','Community','Unavailable','System');
     return @types; 
 }
 
@@ -1420,7 +1394,7 @@ sub print_rolerows {
 }
 
 sub findcourse_advice {
-    my ($r,$cattype) = @_;
+    my ($r) = @_;
     my $domdesc = &Apache::lonnet::domain($env{'user.domain'},'description');
     my $esc_dom = &HTML::Entities::encode($env{'user.domain'},'"<>&');
     if (&Apache::lonnet::auto_run(undef,$env{'user.domain'})) {
@@ -1435,36 +1409,37 @@ 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 />');
     }
-    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());
-    }
+    $r->print('<h3>'.&mt('Self-Enrollment').'</h3>'.
+              '<p>'.&mt('The [_1]Course/Community Catalog[_2] provides information about all [_3] classes for which LON-CAPA courses have been created, as well as any communities in the domain.','<a href="/adm/coursecatalog?showdom='.$esc_dom.'">','</a>',$domdesc).'<br />');
+    $r->print(&mt('You can search for courses and communities which permit self-enrollment, if you would like to enroll in one.').'</p>'.
+              &Apache::loncoursequeueadmin::queued_selfenrollment());
     return;
 }
 
 sub requestcourse_advice {
-    my ($r,$cattype,$inrole) = @_;
+    my ($r) = @_;
     my $domdesc = &Apache::lonnet::domain($env{'user.domain'},'description');
     my $esc_dom = &HTML::Entities::encode($env{'user.domain'},'"<>&');
-    my (%can_request,%request_doms,$output);
+    my (%can_request,%request_doms);
     &Apache::lonnet::check_can_request($env{'user.domain'},\%can_request,\%request_doms);
     if (keys(%request_doms) > 0) {
         my ($types,$typename) = &Apache::loncommon::course_types();
         if ((ref($types) eq 'ARRAY') && (ref($typename) eq 'HASH')) { 
+            $r->print('<h3>'.&mt('Request creation of a course or community').'</h3>'.
+                      '<p>'.&mt('You have rights to request the creation of courses and/or communities in the following domain(s):').'<ul>');
             my (@reqdoms,@reqtypes);
             foreach my $type (sort(keys(%request_doms))) {
                 push(@reqtypes,$type); 
                 if (ref($request_doms{$type}) eq 'ARRAY') {
                     my $domstr = join(', ',map { &Apache::lonnet::domain($_) } sort(@{$request_doms{$type}}));
-                    $output .=
+                    $r->print(
                         '<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);
@@ -1487,26 +1462,9 @@ sub requestcourse_advice {
             }
             if (@reqdoms == 1 || @showtypes > 0) {
                 $requrl .= '&state=crstype&action=new';
-            }
-            if ($output) {
-                $r->print('<h3>'.&mt('Request creation of a course or community').'</h3>'.
-                          '<p>'.
-                          &mt('You have rights to request the creation of courses and/or communities in the following domain(s):').
-                          '<ul>'.
-                          $output.
-                          '</ul>'.
-                          &mt('Use the [_1]request form[_2] to submit a request for creation of a new course or community.',
-                              '<a href="'.$requrl.'">','</a>').
-                          '</p>');
-            }
-        }
-    } elsif (!$env{'user.adv'}) {
-       if ($inrole) {
-            $r->print('<h3>'.&mt('Currently no additional roles, courses or communities').'</h3>');
-        } else {
-            $r->print('<h3>'.&mt('Currently no active roles, courses or communities').'</h3>');
+            } 
+            $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>');
         }
-        &findcourse_advice($r,$cattype);
     }
     return;
 }
@@ -1526,7 +1484,7 @@ sub privileges_info {
 	my (undef,$tdom,$trest,$tsec)=split(m{/},$where);
 	if ($trest) {
 	    if ($env{'course.'.$tdom.'_'.$trest.'.description'} eq 'ca') {
-		$ttype='Authoring Space';
+		$ttype='Construction Space';
 		$twhere='User: '.$trest.', Domain: '.$tdom;
 	    } else {
 		$ttype= &Apache::loncommon::course_type($tdom.'_'.$trest);
@@ -1639,6 +1597,24 @@ 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 '')) {
@@ -1698,13 +1674,8 @@ 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)(.*?)\./\Q$cdom\E/\Q$cnum\E/?(\w*)$-) {
+            if ($env{'form.switchrole'} =~ m-^(in|ta|ep|ad|st|cr)([\w/]*)\./\Q$cdom\E/\Q$cnum\E/?(\w*)$-) {
                 my $role = $1;
                 my $custom_role = $2;
                 my $usec = $3;
@@ -1730,11 +1701,7 @@ sub adhoc_course_role {
                     $spec .= '/'.$usec;
                     $area .= '/'.$usec;
                 }
-                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::standard_roleprivs(\%newrole,$role,$cdom,$spec,$cnum,$area);
                 &Apache::lonnet::set_userprivs(\%userroles,\%newrole,\%newgroups);
                 my $adhocstart = $refresh-1;
                 $userroles{'user.role.'.$spec} = $adhocstart.'.';
@@ -1779,7 +1746,7 @@ sub check_release_required {
             my $otherserver;
             if (($major eq '' && $minor eq '') || 
                 (($reqdmajor > $major) || (($reqdmajor == $major) && ($reqdminor > $minor)))) {
-                my ($userdomserver) = &Apache::lonnet::choose_server($env{'user.domain'},undef,$required,1);
+                my ($userdomserver) = &Apache::lonnet::choose_server($env{'user.domain'});
                 my $switchlcrev = 
                     &Apache::lonnet::get_server_loncaparev($env{'user.domain'},
                                                            $userdomserver);
@@ -1788,7 +1755,7 @@ sub check_release_required {
                     (($reqdmajor == $swmajor) && ($reqdminor > $swminor))) {
                     my $cdom = $env{'course.'.$tcourseid.'.domain'};
                     if ($cdom ne $env{'user.domain'}) {
-                        my ($coursedomserver,$coursehostname) = &Apache::lonnet::choose_server($cdom,undef,$required,1);
+                        my ($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);
@@ -2193,6 +2160,7 @@ 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);
@@ -2217,23 +2185,21 @@ sub update_session_roles {
                             }
                         }
                     }
-                    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})
+                    $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);
-                                }
+                            ($crprivs{$rest}{crs} ne $currpriv{crs})) {
+                            &gather_roleprivs(\%allroles,\%allgroups,\%userroles,$where,$role,$tstart,$tend,$status_in_db);
+                            unless (grep(/^\Q$role\E$/,@changed_roles)) {
+                                push(@changed_roles,$role);
+                            }
+                            my $status_in_env =
+                                &curr_role_status($currstart,$currend,$refresh,$update);
+                            if ($status_in_env eq 'active') {
                                 $customprivchg{$rolekey} = $status_in_env;
                             }
                         }
@@ -2250,8 +2216,7 @@ sub update_session_roles {
         my $status_in_env =
             &curr_role_status($currstart,$currend,$refresh,$update);
         my ($rolekey) = ($envkey =~ /^user\.role\.(.+)$/);
-        my ($role,$rest)=split(m{\./},$rolekey,2);
-        $rest = '/'.$rest; 
+        my ($role,$rest)=split(/\./,$rolekey,2);
         if (&Apache::lonnet::delenv($envkey,undef,[$role])) {
             if ($status_in_env eq 'active') {
                 if ($role eq 'gr') {
@@ -2270,7 +2235,7 @@ sub update_session_roles {
     }
     if (($oldsec) && (@newsec > 0)) {
         if (@newsec > 1) {
-            $msg = '<p class="LC_warning">'.&mt('The section has changed for your current role. Log-out and log-in again to select a role for the new section.').'</p>';
+            $msg = '<div class="LC_warning">'.&mt('The section has changed for your current role. Log-out and log-in again to select a role for the new section.').'</div>';
         } else {
             my $newrole = $env{'request.role'};
             if ($newsec[0] eq 'none') {
@@ -2308,100 +2273,13 @@ sub update_session_roles {
             $msg .= '</form></p>';
         }
     } elsif ($currrole_expired) {
-        $msg .= '<p class="LC_warning">';
+        $msg .= '<div class="LC_warning">';
         if (&Apache::loncommon::show_course()) {
             $msg .= &mt('Your role in the current course has expired.');
         } else {
             $msg .= &mt('Your current role has expired.');
         }
-        $msg .= '<br />'.&mt('However you can continue to use this role until you logout, click the "Re-Select" button, or your session has been idle for more than 24 hours.').'</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);
+        $msg .= '<br />'.&mt('However you can continue to use this role until you logout, click the "Re-Select" button, or your session has been idle for more than 24 hours.').'</div>';
     }
     if (!@changed_roles || !(keys(%changed_groups))) {
         my ($rolesmsg,$groupsmsg);
@@ -2435,43 +2313,11 @@ 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)) {
-                    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>';
+                    $groupmsg .= '<li>'.
+                                 &mt('[_1] with status: [_2].',
+                                 $item,$newgroup{$item}).'</li>';
                 }
             }
             if ($groupmsg) {
@@ -2481,67 +2327,43 @@ sub update_session_roles {
             }
         }
         if (keys(%newrole) > 0) {
-            my $newmsg;
+            $changemsg .= '<li>'.&mt('New roles').
+                          '<ul>';
             foreach my $item (sort(keys(%newrole))) {
-                my $desc = &role_desc($item,$update,$refresh,$now);
-                if ($desc) {
-                    $newmsg .= '<li>'.
-                               &mt('[_1] with status: [_2].',
-                               $desc,&mt($newrole{$item})).'</li>';
-                }
-            }
-            if ($newmsg) {
-                $changemsg .= '<li>'.&mt('New roles').
-                              '<ul>'.$newmsg.'</ul>'.
-                              '</li>';
+                $changemsg .= '<li>'.
+                              &mt('[_1] with status: [_2].',
+                              $item,$newrole{$item}).'</li>';
             }
+            $changemsg .= '</ul></li>';
         }
         if (keys(%customprivchg) > 0) {
-            my $privmsg;
+            $changemsg .= '<li>'.
+                          &mt('Custom roles with privilege changes').
+                          '<ul>';
             foreach my $item (sort(keys(%customprivchg))) {
-                my $desc = &role_desc($item,$update,$refresh,$now);
-                if ($desc) {
-                    $privmsg .= '<li>'.$desc.'</li>';
-                }
+                $changemsg .= '<li>'.$item.'</li>';
             }
-            if ($privmsg) {
-                $changemsg .= '<li>'.
-                              &mt('Custom roles with privilege changes').
-                              '<ul>'.$privmsg.'</ul>'.
-                              '</li>';
-             }
+            $changemsg .= '</ul></li>';
         }
         if (keys(%rolechange) > 0) {
-            my $rolemsg;
+            $changemsg .= '<li>'.
+                          &mt('Existing roles with status changes').'</li>'.
+                          '<ul>';
             foreach my $item (sort(keys(%rolechange))) {
-                my $desc = &role_desc($item,$update,$refresh,$now);  
-                if ($desc) {
-                    $rolemsg .= '<li>'.
-                                &mt('[_1] status now: [_2].',$desc,
-                                $rolechange{$item}).'</li>';
-                }
-            }
-            if ($rolemsg) {
                 $changemsg .= '<li>'.
-                              &mt('Existing roles with status changes').'</li>'.
-                              '<ul>'.$rolemsg.'</ul>'.
-                              '</li>';
+                              &mt('[_1] status now: [_2].',$item,
+                              $rolechange{$item}).'</li>';
             }
+            $changemsg .= '</ul></li>';
         }
         if (keys(%deletedroles) > 0) {
-            my $delmsg;
+            $changemsg .= '<li>'.
+                          &mt('Existing roles now expired').'</li>'.
+                          '<ul>';
             foreach my $item (sort(keys(%deletedroles))) {
-                my $desc = &role_desc($item,$update,$refresh,$now);
-                if ($desc) {
-                    $delmsg .= '<li>'.$desc.'</li>';
-                }
-            }
-            if ($delmsg) {
-                $changemsg .= '<li>'.
-                              &mt('Existing roles now expired').'</li>'.
-                              '<ul>'.$delmsg.'</ul>'.
-                              '</li>';
+                $changemsg .= '<li>'.$item.'</li>';
             }
+            $changemsg .= '</ul></li>';
         }
     }
     if ((keys(%changed_groups) > 0) || (keys(%groupchange) > 0)) {
@@ -2571,22 +2393,10 @@ 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>'.$crsdesc.'</b><ul>');
+                    $groupchgmsg .= '<li>'.&mt('Course/Community: [_1]','<b>'.$crs.'</b><ul>');
                     foreach my $group (sort(keys(%{$groupchange{$crs}}))) {
-                        unless ($groupdesc{$group}) {
-                            my %groupinfo = &Apache::longroup::get_group_settings($curr_groups{$group});
-                            $groupdesc{$group} =  &unescape($groupinfo{'description'});
-                        }
-                        $groupchgmsg .= '<li>'.&mt('Group: [_1] status now: [_2].','<b>'.$groupdesc{$group}.'</b>',$groupchange{$crs}{$group}).'</li>';
+                        $groupchgmsg .= '<li>'.&mt('Group: [_1] status now: [_2].','<b>'.$group.'</b>',$groupchange{$crs}{$group}).'</li>';
                     }
                     $groupchgmsg .= '</ul></li>';
                 }
@@ -2601,76 +2411,95 @@ 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');
-        }
     }
-    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');
+    &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);
             }
         }
-        if ($tsection) {
-            $twhere.= '&nbsp; '.&mt('Section').':&nbsp;'.$tsection;
+        unless(grep(/^\Qcm\E$/,@rolecodes)) {
+            push(@rolecodes,'cm');
         }
-        if ($role ne 'st') {
-            $twhere.= '&nbsp; '.&mt('Domain').':&nbsp;'.$tdom;
+        &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 ($tdom) {
-        $twhere = &mt('Domain').':&nbsp;'.$tdom;
+    } elsif ($curr_is_adv && !$curr_role_adv) {
+        &Apache::lonnet::delenv('user.adv');
     }
-    my $output;
-    if ($trole) {
-        $output = $trole;
-        if ($twhere) {
-            $output .= " -- $twhere";
+    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;
+                    }
+                }
+            }
         }
-        if ($tremark) {
-            $output .= '<br />'.$tremark;
+        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);
         }
     }
-    return $output;
+    if (keys(%newenv)) {
+        &Apache::lonnet::appenv(\%newenv);
+    }
+    return $msg;
 }
 
 sub curr_role_status {
@@ -2732,133 +2561,6 @@ 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 = &Apache::lonhtmlcommon::start_funclist();
-    foreach my $link (@links) {
-        $funcs .= &Apache::lonhtmlcommon::add_item_funclist(
-                      '<a href="'.$link->[0].'" class="LC_menubuttons_link">'.
-                      '<img src="/res/adm/pages/'.$link->[1].'.png" class="LC_icon" alt="'.$link->[2].'" />'.
-                      $link->[2].'</a>');
-    }
-    $funcs .= &Apache::lonhtmlcommon::end_funclist();
-    return &Apache::loncommon::head_subbox($funcs);
-}
-
-sub get_queued {
-    my ($output,%reqcrs);
-    my ($types,$typenames) = &Apache::loncommon::course_types();
-    my %statusinfo = &Apache::lonnet::dump('courserequests',$env{'user.domain'},
-                                           $env{'user.name'},'^status:');
-    foreach my $key (keys(%statusinfo)) {
-        next unless (($statusinfo{$key} eq 'approval') || ($statusinfo{$key} eq 'pending'));
-        (undef,my($cdom,$cnum)) = split(/:/,$key);
-        my $requestkey = $cdom.'_'.$cnum;
-        if ($requestkey =~ /^($match_domain)_($match_courseid)$/) {
-            my %history = &Apache::lonnet::restore($requestkey,'courserequests',
-                                                   $env{'user.domain'},$env{'user.name'});
-            next if ((exists($history{'status'})) && ($history{'status'} eq 'created'));
-            my $reqtime = $history{'reqtime'};
-            my $lastupdate = $history{'timestamp'};
-            my $showtype = $history{'crstype'};
-            if (defined($typenames->{$history{'crstype'}})) {
-                $showtype = $typenames->{$history{'crstype'}};
-            }
-            my $description;
-            if (ref($history{'details'}) eq 'HASH') {
-                $description = $history{details}{'cdescr'};
-            }
-            @{$reqcrs{$reqtime}} = ($description,$showtype);
-        }
-    }
-    my @sortedtimes = sort {$a <=> $b} (keys(%reqcrs));
-    if (@sortedtimes > 0) {
-        $output .= '<p><b>'.&mt('Course/Community requests').'</b><br />'.
-                   &Apache::loncommon::start_data_table().
-                   &Apache::loncommon::start_data_table_header_row().
-                   '<th>'.&mt('Date requested').'</th>'.
-                   '<th>'.&mt('Course title').'</th>'.
-                   '<th>'.&mt('Course type').'</th>';
-                   &Apache::loncommon::end_data_table_header_row();
-        foreach my $reqtime (@sortedtimes) {
-            next unless (ref($reqcrs{$reqtime}) eq 'ARRAY');
-            $output .= &Apache::loncommon::start_data_table_row().
-                       '<td>'.&Apache::lonlocal::locallocaltime($reqtime).'</td>'.
-                       '<td>'.join('</td><td>',@{$reqcrs{$reqtime}}).'</td>'.
-                       &Apache::loncommon::end_data_table_row();
-        }
-        $output .= &Apache::loncommon::end_data_table().
-                   '<br /></p>';
-    }
-    my $queuedselfenroll = &Apache::loncoursequeueadmin::queued_selfenrollment(1);
-    if ($queuedselfenroll) {
-        $output .= '<p><b>'.&mt('Enrollment requests').'</b><br />'.
-                   $queuedselfenroll.'<br /></p>';
-    }
-    if ($env{'environment.canrequest.author'}) {
-        unless (&Apache::loncoursequeueadmin::is_active_author()) {
-            my $requestauthor;
-            my ($status,$timestamp) = split(/:/,$env{'environment.requestauthorqueued'});
-            if (($status eq 'approval') || ($status eq 'approved')) {
-                $output .= '<p><b>'.&mt('Author role request').'</b><br />';
-                if ($status eq 'approval') {
-                    $output .= &mt('A request for Authoring Space submitted on [_1] is awaiting approval',
-                                  &Apache::lonlocal::locallocaltime($timestamp));
-                } elsif ($status eq 'approved') {
-                    my %roleshash =
-                        &Apache::lonnet::get_my_roles($env{'user.name'},$env{'user.domain'},'userroles',
-                                                      ['active'],['au'],[$env{'user.domain'}]);
-                    if (keys(%roleshash)) {
-                        $output .= '<span class="LC_info">'.
-                                   &mt('Your request for an author role has been approved.').'<br />'.
-                                   &mt('Use the "Check for changes" link to update your list of roles.').
-                                   '</span>';
-                    }
-                }
-                $output .= '</p>';
-            }
-        }
-    }
-    unless ($output) {
-        if ($env{'environment.canrequest.author'} || $env{'environment.canrequest.official'} ||
-            $env{'environment.canrequest.unofficial'} || $env{'environment.canrequest.community'}) {
-            $output = &mt('No requests for courses, communities or authoring currently queued');
-        } else {
-            $output = &mt('No enrollment requests currently queued awaiting approval');
-        }
-    }
-    return '<div class="LC_left_float"><fieldset><legend>'.&mt('Queued requests').'</legend>'.
-           $output.'</fieldset></div><br clear="all" />';
-}
-
 1;
 __END__