--- loncom/auth/lonroles.pm	2014/05/22 18:51:01	1.269.2.20
+++ loncom/auth/lonroles.pm	2014/05/05 03:24:37	1.303
@@ -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.303 2014/05/05 03:24:37 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;
@@ -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
@@ -208,14 +202,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'};
@@ -229,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);
@@ -261,7 +247,7 @@ sub handler {
     my $envkey;
     my %dcroles = ();
     my $numdc = &check_fordc(\%dcroles,$update,$then);
-    my $loncaparev = $r->dir_config('lonVersion');
+    my $loncaparev = $Apache::lonnet::perlvar{'lonVersion'};
 
 # ================================================================== Roles Init
     if ($env{'form.selectrole'}) {
@@ -534,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'}.
@@ -560,7 +546,7 @@ ENDENTERKEY
                         }
 			if (($env{'form.orgurl'}) && 
 			    ($env{'form.orgurl'}!~/^\/adm\/flip/) &&
-                            ($env{'form.orgurl'} ne '/adm/roles')) {
+			    ($env{'form.orgurl'} ne '/adm/roles')) {
 			    my $dest=$env{'form.orgurl'};
                             if ($env{'form.symb'}) {
                                 if ($dest =~ /\?/) {
@@ -626,7 +612,7 @@ ENDENTERKEY
                                                 if ($env{'request.role.adv'}) {
                                                     $dest = &Apache::lonenc::unencrypted($dest);
                                                     if ($destsymb eq '') {
-                                                        ($destsymb) = ($dest =~ /(?:\?|\&)symb=([^\&]*)/); 
+                                                        ($destsymb) = ($dest =~ /(?:\?|\&)symb=([^\&]*)/);
                                                         $destsymb = &unescape($destsymb);
                                                     }
                                                 }
@@ -651,7 +637,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;
@@ -693,7 +679,7 @@ ENDENTERKEY
                                 } elsif (!&Apache::lonnet::allowed('bre',$furl)) {
                                     $furl = &Apache::lonpageflip::first_accessible_resource();
                                 }
-
+ 
                                 $msg = &mt('Entering [_1] ...',
 					   $env{'course.'.$cdom.'_'.$cnum.'.description'});
 				&redirect_user($r, &mt('Entering [_1]',
@@ -751,7 +737,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}];
 
@@ -799,7 +785,7 @@ function rolesView (caller) {
         document.rolechoice.display.value = caller;
     } else {
         if ((caller == 'doupdate') || (caller == 'requestauthor') ||
-            (caller == 'queued')) {
+            (caller == 'queued')) { 
             document.rolechoice.state.value = caller;
         }
     }
@@ -883,7 +869,7 @@ ENDHEADER
             }
             if ($hotlist) {
                 $showresult .= $hotlist;
-            }
+            } 
             $showresult .= '</div>';
             $r->print($showresult);
         } elsif ($env{'form.state'} eq 'queued') {
@@ -932,7 +918,12 @@ 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>');
+	}
+        &requestcourse_advice($r,$cattype); 
 	$r->print('</form>');
         if ($countfuture) {
             $r->print(&mt('The following [quant,_1,role,roles] will become active in the future:',$countfuture));
@@ -1445,26 +1436,29 @@ sub findcourse_advice {
 }
 
 sub requestcourse_advice {
-    my ($r,$cattype,$inrole) = @_;
+    my ($r,$cattype) = @_;
     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,25 +1481,10 @@ 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>');
-            }
+            } 
+            $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>');
         }
     } 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;
@@ -1788,7 +1767,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,undef,$required,1); 
                         my $serverhomeID = &Apache::lonnet::get_server_homeID($coursehostname);
                         my $serverhomedom = &Apache::lonnet::host_domain($serverhomeID);
                         my %defdomdefaults = &Apache::lonnet::get_domain_defaults($serverhomedom);
@@ -2251,7 +2230,7 @@ sub update_session_roles {
             &curr_role_status($currstart,$currend,$refresh,$update);
         my ($rolekey) = ($envkey =~ /^user\.role\.(.+)$/);
         my ($role,$rest)=split(m{\./},$rolekey,2);
-        $rest = '/'.$rest; 
+        $rest = '/'.$rest;
         if (&Apache::lonnet::delenv($envkey,undef,[$role])) {
             if ($status_in_env eq 'active') {
                 if ($role eq 'gr') {
@@ -2451,15 +2430,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};
@@ -2578,7 +2557,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}}))) {
@@ -2796,7 +2775,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));