--- loncom/auth/lonroles.pm	2013/08/16 13:25:41	1.269.2.13
+++ loncom/auth/lonroles.pm	2014/01/05 11:02:49	1.292
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # User Roles Screen
 #
-# $Id: lonroles.pm,v 1.269.2.13 2013/08/16 13:25:41 raeburn Exp $
+# $Id: lonroles.pm,v 1.292 2014/01/05 11:02:49 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -143,7 +143,7 @@ use Apache::lonrss;
 use GDBM_File;
 use LONCAPA qw(:DEFAULT :match);
 use HTML::Entities;
- 
+
 
 sub redirect_user {
     my ($r,$title,$url,$msg) = @_;
@@ -151,7 +151,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 +165,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
@@ -221,7 +215,7 @@ sub handler {
 
     &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'});
 
-# -------------------------------------------------- Check if setting hot list
+# -------------------------------------------------- Check if setting hot list 
     my $hotlist;
     if ($env{'form.action'} eq 'verify_and_change_rolespref') {
         $hotlist = &Apache::lonpreferences::verify_and_change_rolespref($r);
@@ -526,10 +520,10 @@ 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'}) ||
+                            unless (($env{'form.switchrole'}) || 
                                     ($env{"environment.internal.$cdom.$cnum.$role.adhoc"})) {
                                 &Apache::lonnet::put('nohist_crslastlogin',
                                     {$env{'user.name'}.':'.$env{'user.domain'}.
@@ -551,13 +545,14 @@ ENDENTERKEY
                             }
                         }
 			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'};
                             }
@@ -622,7 +617,7 @@ ENDENTERKEY
                                                 if ($env{'request.role.adv'}) {
                                                     $dest = &Apache::lonenc::unencrypted($dest);
                                                     if ($destsymb eq '') {
-                                                        ($destsymb) = ($dest =~ /(?:\?|\&)symb=([^\&]*)/); 
+                                                        ($destsymb) = ($dest =~ /(?:\?|\&)symb=([^\&]*)/);
                                                         $destsymb = &unescape($destsymb);
                                                     }
                                                 }
@@ -647,7 +642,7 @@ ENDENTERKEY
                                                 }
                                             }
                                         }
-                                        unless (($dest =~ m{^/enc/}) || ($dest =~ /(\?|\&)symb=.+___\d+___.+/)) { 
+                                        unless (($dest =~ m{^/enc/}) || ($dest =~ /(\?|\&)symb=.+___\d+___.+/)) {
                                             if (($destsymb ne '') && ($destsymb !~ m{^/enc/})) {
                                                 my $esc_symb = &escape($destsymb);
                                                 $dest .= '?symb='.$esc_symb;
@@ -736,7 +731,7 @@ ENDENTERKEY
         $crumbtext = 'Courses';
         $pagetitle = 'My Courses';
         $recent = &mt('Recent Courses');
-        $standby = &mt('Course selected. Please stand by.');
+        $standby = &mt('Course selected. Please stand by.'); 
     }
     my $brcrum =[{href=>"/adm/roles",text=>$crumbtext}];
 
@@ -746,7 +741,6 @@ ENDENTERKEY
     my $swinfo=&Apache::lonmenu::rawconfig();
     my $start_page=&Apache::loncommon::start_page($pagetitle,undef,{bread_crumbs=>$brcrum});
     my $funcs = &get_roles_functions($showcount);
-    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 />';
 
@@ -780,7 +774,7 @@ function rolesView (caller) {
         document.rolechoice.display.value = caller;
     } else {
         if ((caller == 'doupdate') || (caller == 'requestauthor') ||
-            (caller == 'queued')) {
+            (caller == 'queued')) { 
             document.rolechoice.state.value = caller;
         }
     }
@@ -864,7 +858,7 @@ ENDHEADER
             }
             if ($hotlist) {
                 $showresult .= $hotlist;
-            }
+            } 
             $showresult .= '</div>';
             $r->print($showresult);
         } elsif ($env{'form.state'} eq 'queued') {
@@ -889,7 +883,7 @@ ENDHEADER
                       \%sortrole,\%roleclass,\%futureroles,\%timezones,$loncaparev);
     $refresh = $now;
     &Apache::lonnet::appenv({'user.refresh.time'  => $refresh});
-    unless ($env{'user.adv'}) {
+    unless ($env{'user.adv'}) { 
         if ($countactive > 0) {
             my $domdesc = &Apache::lonnet::domain($env{'user.domain'},'description');
             my $esc_dom = &HTML::Entities::encode($env{'user.domain'},'"<>&'); 
@@ -2437,15 +2431,15 @@ sub update_session_roles {
                         }
                         my $groupdesc;
                         unless (ref($curr_groups{$cdom.'_'.$cnum}) eq 'HASH') {
-                            %{$curr_groups{$cdom.'_'.$cnum}} =
+                            %{$curr_groups{$cdom.'_'.$cnum}} = 
                                 &Apache::longroup::coursegroups($cdom,$cnum);
                         }
                         unless ((ref($groupdescs{$cdom.'_'.$cnum}) eq 'HASH') &&
                             ($groupdescs{$cdom.'_'.$cnum}{$group})) {
 
-                            my %groupinfo =
+                            my %groupinfo = 
                                 &Apache::longroup::get_group_settings($curr_groups{$cdom.'_'.$cnum}{$group});
-                            $groupdescs{$cdom.'_'.$cnum}{$group} =
+                            $groupdescs{$cdom.'_'.$cnum}{$group} = 
                                 &unescape($groupinfo{'description'});
                         }
                         $groupdesc = $groupdescs{$cdom.'_'.$cnum}{$group};
@@ -2564,7 +2558,7 @@ sub update_session_roles {
                 my $cdom = $env{'course.'.$cid.'.domain'};
                 my $cnum = $env{'course.'.$cid.'.num'};
                 my %curr_groups = &Apache::longroup::coursegroups($cdom,$cnum);
-                my %groupdesc;
+                my %groupdesc; 
                 if (ref($groupchange{$crs}) eq 'HASH') {
                     $groupchgmsg .= '<li>'.&mt('Course/Community: [_1]','<b>'.$crsdesc.'</b><ul>');
                     foreach my $group (sort(keys(%{$groupchange{$crs}}))) {
@@ -2782,7 +2776,7 @@ sub get_queued {
             if (ref($history{'details'}) eq 'HASH') {
                 $description = $history{details}{'cdescr'};
             }
-            @{$reqcrs{$reqtime}} = ($description,$showtype);
+            @{$reqcrs{$reqtime}} = ($description,$showtype); 
         }
     }
     my @sortedtimes = sort {$a <=> $b} (keys(%reqcrs));