--- loncom/auth/lonroles.pm	2013/05/10 20:26:22	1.269.2.8
+++ loncom/auth/lonroles.pm	2014/02/24 02:24:16	1.269.2.16
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # User Roles Screen
 #
-# $Id: lonroles.pm,v 1.269.2.8 2013/05/10 20:26:22 raeburn Exp $
+# $Id: lonroles.pm,v 1.269.2.16 2014/02/24 02:24:16 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -294,7 +294,7 @@ 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)$-)) {
@@ -364,7 +364,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,
@@ -538,6 +538,7 @@ ENDENTERKEY
                             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'})) {
@@ -550,13 +551,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'};
                             }
@@ -595,13 +597,8 @@ ENDENTERKEY
 			    } else {
 				# Check to see if the user is a CC entering a course 
 				# for the first time
-				my (undef, undef, $role, $courseid) = split(/\./, $envkey);
-				if (substr($courseid, 0, 1) eq '/') {
-				    $courseid = substr($courseid, 1);
-				}
-				$courseid =~ s/\//_/;
 				if ((($role eq 'cc') || ($role eq 'co')) 
-                                    && ($env{'course.' . $courseid .'.course.helper.not.run'})) { 
+                                    && ($env{'course.' .$cdom.'_'.$cnum.'.course.helper.not.run'})) { 
 				    $furl = "/adm/helper/course.initialization.helper";
 				    # Send the user to the course they selected
 				} elsif ($env{'request.course.id'}) {
@@ -653,7 +650,7 @@ ENDENTERKEY
                                             }
                                         }
                                         &redirect_user($r, &mt('Entering [_1]',
-                                                       $env{'course.'.$courseid.'.description'}),
+                                                       $env{'course.'.$env{'request.course.id'}.'.description'}),
                                                        $dest, $msg);
                                         return OK;
                                     }
@@ -663,10 +660,10 @@ ENDENTERKEY
 								    $env{'request.course.id'}.'/'
 								    .$env{'request.course.sec'})
 					) {
-					my $startpage = &courseloadpage($courseid);
+					my $startpage = &courseloadpage($env{'request.course.id'});
 					unless ($startpage eq 'firstres') {         
 					    $msg = &mt('Entering [_1] ...',
-						       $env{'course.'.$courseid.'.description'});
+						       $env{'course.'.$env{'request.course.id'}.'.description'});
 					    &redirect_user($r, &mt('New in course'),
                                        '/adm/whatsnew?refpage=start', $msg);
 					    return OK;
@@ -679,9 +676,9 @@ ENDENTERKEY
 				    $furl=&Apache::lonpageflip::first_accessible_resource();
 				}
                                 $msg = &mt('Entering [_1] ...',
-					   $env{'course.'.$courseid.'.description'});
+					   $env{'course.'.$cdom.'_'.$cnum.'.description'});
 				&redirect_user($r, &mt('Entering [_1]',
-                               $env{'course.'.$courseid.'.description'}),
+                               $env{'course.'.$cdom.'_'.$cnum.'.description'}),
                                $furl, $msg);
 			    }
 			    return OK;
@@ -697,7 +694,7 @@ ENDENTERKEY
                             $redirect_url .= $where;
                         }
                         $redirect_url .= '/';
-                        &redirect_user($r,&mt('Entering Construction Space'),
+                        &redirect_user($r,&mt('Entering Authoring Space'),
                                        $redirect_url);
                         return OK;
                     }
@@ -729,11 +726,13 @@ 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}];
 
@@ -743,7 +742,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 />';
 
@@ -892,11 +890,13 @@ ENDHEADER
             my $esc_dom = &HTML::Entities::encode($env{'user.domain'},'"<>&'); 
             $r->print(
                 '<p>'
-               .&mt('[_1]Visit the [_2]Course/Community Catalog[_3]'
-                   .' to view all [_4] LON-CAPA courses and communities.'
+               .&mt('[_1]Visit the [_2]Course/Community Catalog[_3][_4]'
+                   .' to view all [_5] LON-CAPA courses and communities.'
                    ,'<b>'
                    ,'<a href="/adm/coursecatalog?showdom='.$esc_dom.'">'
-                   ,'</a></b>',$domdesc)
+                   ,'</a>'
+                   ,'</b>'
+                   ,'"'. $domdesc.'"')
                .'<br />'
                .&mt('If a course or community is [_1]not[_2] in your list of current courses and communities below,'
                    .' you may be able to enroll if self-enrollment is permitted.'
@@ -1161,7 +1161,7 @@ sub gather_roles {
                     }
                     #next if ($home eq 'no_host');
                     $home = &Apache::lonnet::hostname($home);
-                    $ttype='Construction Space';
+                    $ttype='Authoring Space';
                     $twhere=&mt('User').': '.$trest.'<br />'.&mt('Domain').
                         ': '.$tdom.'<br />'.
                         ' '.&mt('Server').':&nbsp;'.$home;
@@ -1180,7 +1180,7 @@ sub gather_roles {
                     }
                     #next if ($home eq 'no_host');
                     $home = &Apache::lonnet::hostname($home);
-                    $ttype='Construction Space';
+                    $ttype='Authoring Space';
                     $twhere=&mt('Domain').': '.$tdom.'<br />'.&mt('Server').
                         ':&nbsp;'.$home;
                     $env{'course.'.$tdom.'_'.$trest.'.description'}='ca';
@@ -1353,7 +1353,7 @@ sub roletable_headers {
 }
 
 sub roletypes {
-    my @types = ('Domain','Construction Space','Course','Community','Unavailable','System');
+    my @types = ('Domain','Authoring Space','Course','Community','Unavailable','System');
     return @types; 
 }
 
@@ -1492,7 +1492,7 @@ sub privileges_info {
 	my (undef,$tdom,$trest,$tsec)=split(m{/},$where);
 	if ($trest) {
 	    if ($env{'course.'.$tdom.'_'.$trest.'.description'} eq 'ca') {
-		$ttype='Construction Space';
+		$ttype='Authoring Space';
 		$twhere='User: '.$trest.', Domain: '.$tdom;
 	    } else {
 		$ttype= &Apache::loncommon::course_type($tdom.'_'.$trest);
@@ -1605,24 +1605,6 @@ sub build_roletext {
     return ($roletext,$roletext_end);
 }
 
-sub check_needs_switchserver {
-    my ($possiblerole) = @_;
-    my $needs_switchserver;
-    my ($role,$where) = split(/\./,$possiblerole,2);
-    my (undef,$tdom,$twho) = split(/\//,$where);
-    my ($server_status,$home);
-    if (($role eq 'ca') || ($role eq 'aa')) {
-        ($server_status,$home) = &check_author_homeserver($twho,$tdom);
-    } else {
-        ($server_status,$home) = &check_author_homeserver($env{'user.name'},
-                                                          $env{'user.domain'});
-    }
-    if ($server_status eq 'switchserver') {
-        $needs_switchserver = 1;
-    }
-    return $needs_switchserver;
-}
-
 sub check_author_homeserver {
     my ($uname,$udom)=@_;
     if (($uname eq '') || ($udom eq '')) {
@@ -1688,7 +1670,7 @@ sub adhoc_course_role {
             }
         }
         if ($setprivs) {
-            if ($env{'form.switchrole'} =~ m-^(in|ta|ep|ad|st|cr)([\w/]*)\./\Q$cdom\E/\Q$cnum\E/?(\w*)$-) {
+            if ($env{'form.switchrole'} =~ m-^(in|ta|ep|ad|st|cr)(.*?)\./\Q$cdom\E/\Q$cnum\E/?(\w*)$-) {
                 my $role = $1;
                 my $custom_role = $2;
                 my $usec = $3;
@@ -2234,7 +2216,8 @@ sub update_session_roles {
         my $status_in_env =
             &curr_role_status($currstart,$currend,$refresh,$update);
         my ($rolekey) = ($envkey =~ /^user\.role\.(.+)$/);
-        my ($role,$rest)=split(/\./,$rolekey,2);
+        my ($role,$rest)=split(m{\./},$rolekey,2);
+        $rest = '/'.$rest; 
         if (&Apache::lonnet::delenv($envkey,undef,[$role])) {
             if ($status_in_env eq 'active') {
                 if ($role eq 'gr') {
@@ -2446,9 +2429,11 @@ sub update_session_roles {
                                 &unescape($groupinfo{'description'});
                         }
                         $groupdesc = $groupdescs{$cdom.'_'.$cnum}{$group};
-                        $groupmsg .= '<li>'.
-                                     &mt('[_1] with status: [_2].',
-                                     '<b>'.$groupdesc.'</b>',$newgroup{$item}).'</li>';
+                        if ($groupdesc) {
+                            $groupmsg .= '<li>'.
+                                         &mt('[_1] with status: [_2].',
+                                         '<b>'.$groupdesc.'</b>',$newgroup{$item}).'</li>';
+                        }
                     }
                 }
                 if ($groupmsg) {
@@ -2462,47 +2447,67 @@ sub update_session_roles {
             }
         }
         if (keys(%newrole) > 0) {
-            $changemsg .= '<li>'.&mt('New roles').
-                          '<ul>';
+            my $newmsg;
             foreach my $item (sort(keys(%newrole))) {
                 my $desc = &role_desc($item,$update,$refresh,$now);
-                $changemsg .= '<li>'.
-                              &mt('[_1] with status: [_2].',
-                              $desc,$newrole{$item}).'</li>';
+                if ($desc) {
+                    $newmsg .= '<li>'.
+                               &mt('[_1] with status: [_2].',
+                               $desc,$newrole{$item}).'</li>';
+                }
+            }
+            if ($newmsg) {
+                $changemsg .= '<li>'.&mt('New roles').
+                              '<ul>'.$newmsg.'</ul>'.
+                              '</li>';
             }
-            $changemsg .= '</ul></li>';
         }
         if (keys(%customprivchg) > 0) {
-            $changemsg .= '<li>'.
-                          &mt('Custom roles with privilege changes').
-                          '<ul>';
+            my $privmsg;
             foreach my $item (sort(keys(%customprivchg))) {
                 my $desc = &role_desc($item,$update,$refresh,$now);
-                $changemsg .= '<li>'.$desc.'</li>';
+                if ($desc) {
+                    $privmsg .= '<li>'.$desc.'</li>';
+                }
             }
-            $changemsg .= '</ul></li>';
+            if ($privmsg) {
+                $changemsg .= '<li>'.
+                              &mt('Custom roles with privilege changes').
+                              '<ul>'.$privmsg.'</ul>'.
+                              '</li>';
+             }
         }
         if (keys(%rolechange) > 0) {
-            $changemsg .= '<li>'.
-                          &mt('Existing roles with status changes').'</li>'.
-                          '<ul>';
+            my $rolemsg;
             foreach my $item (sort(keys(%rolechange))) {
-                my $desc = &role_desc($item,$update,$refresh,$now);
+                my $desc = &role_desc($item,$update,$refresh,$now);  
+                if ($desc) {
+                    $rolemsg .= '<li>'.
+                                &mt('[_1] status now: [_2].',$desc,
+                                $rolechange{$item}).'</li>';
+                }
+            }
+            if ($rolemsg) {
                 $changemsg .= '<li>'.
-                              &mt('[_1] status now: [_2].',$desc,
-                              $rolechange{$item}).'</li>';
+                              &mt('Existing roles with status changes').'</li>'.
+                              '<ul>'.$rolemsg.'</ul>'.
+                              '</li>';
             }
-            $changemsg .= '</ul></li>';
         }
         if (keys(%deletedroles) > 0) {
-            $changemsg .= '<li>'.
-                          &mt('Existing roles now expired').'</li>'.
-                          '<ul>';
+            my $delmsg;
             foreach my $item (sort(keys(%deletedroles))) {
                 my $desc = &role_desc($item,$update,$refresh,$now);
-                $changemsg .= '<li>'.$desc.'</li>';
+                if ($desc) {
+                    $delmsg .= '<li>'.$desc.'</li>';
+                }
+            }
+            if ($delmsg) {
+                $changemsg .= '<li>'.
+                              &mt('Existing roles now expired').'</li>'.
+                              '<ul>'.$delmsg.'</ul>'.
+                              '</li>';
             }
-            $changemsg .= '</ul></li>';
         }
     }
     if ((keys(%changed_groups) > 0) || (keys(%groupchange) > 0)) {
@@ -2562,6 +2567,12 @@ 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;
 }
@@ -2573,6 +2584,7 @@ sub role_desc {
     &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('Customrole defined by [_1].',$rauthor.':'.$rdomain);
@@ -2614,9 +2626,15 @@ sub role_desc {
     } elsif ($tdom) {
         $twhere = &mt('Domain').':&nbsp;'.$tdom;
     }
-    my $output = "$trole -- $twhere";
-    if ($tremark) {
-        $output .= '<br />'.$tremark;
+    my $output;
+    if ($trole) {
+        $output = $trole;
+        if ($twhere) {
+            $output .= " -- $twhere";
+        }
+        if ($tremark) {
+            $output .= '<br />'.$tremark;
+        }
     }
     return $output;
 }
@@ -2702,11 +2720,14 @@ sub get_roles_functions {
     }
     if ($env{'user.adv'}) {
         if ($env{'form.display'} eq 'showall') {
-            push(@links,["javascript:rolesView('noshowall');",'edit-redo-22x22',&mt('Exclude expired roles')]);
+            push(@links,["javascript:rolesView('noshowall');",'edit-redo-22x22',&mt('Exclude expired')]);
         } else {
-            push(@links,["javascript:rolesView('showall');",'edit-undo-22x22',&mt('Include expired roles')]);
+            push(@links,["javascript:rolesView('showall');",'edit-undo-22x22',&mt('Include expired')]);
         }
     }
+    if (&Apache::loncommon::designparm('login.coursecatalog',$env{'user.domain'})) {
+        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(
@@ -2725,7 +2746,7 @@ sub get_queued {
                                            $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);
+        (undef,my($cdom,$cnum)) = split(/:/,$key);
         my $requestkey = $cdom.'_'.$cnum;
         if ($requestkey =~ /^($match_domain)_($match_courseid)$/) {
             my %history = &Apache::lonnet::restore($requestkey,'courserequests',