--- loncom/auth/lonroles.pm	2013/05/09 05:24:42	1.284
+++ loncom/auth/lonroles.pm	2013/06/04 22:20:31	1.288
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # User Roles Screen
 #
-# $Id: lonroles.pm,v 1.284 2013/05/09 05:24:42 raeburn Exp $
+# $Id: lonroles.pm,v 1.288 2013/06/04 22:20:31 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -311,6 +311,7 @@ sub handler {
                             my $trolecode = 'au./'.$domain.'/';
                             my $switchserver = '/adm/switchserver?otherserver='.$home.'&role='.$trolecode;
                             $r->internal_redirect($switchserver);
+                            return OK;
                         }
                         last;
                     }
@@ -322,6 +323,7 @@ sub handler {
                                 my $trolecode = 'ca./'.$domain.'/'.$user;
                                 my $switchserver = '/adm/switchserver?otherserver='.$home.'&role='.$trolecode;
                                 $r->internal_redirect($switchserver);
+                                return OK;
                             }
                             last;
                         }
@@ -343,6 +345,7 @@ sub handler {
                                 my $switchserver = '/adm/switchserver?'
                                                   .'otherserver='.$home.'&role='.$trolecode;
                                 $r->internal_redirect($switchserver);
+                                return OK;
                             }
                         } else {
                             delete($env{$envkey});
@@ -688,7 +691,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;
                     }
@@ -720,11 +723,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}];
 
@@ -734,7 +739,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 />';
 
@@ -1152,7 +1156,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;
@@ -1171,7 +1175,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';
@@ -1344,7 +1348,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; 
 }
 
@@ -1483,7 +1487,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);
@@ -2437,9 +2441,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) {
@@ -2453,47 +2459,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);  
+                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)) {
@@ -2553,6 +2579,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;
 }
@@ -2564,6 +2596,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);
@@ -2605,9 +2638,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;
 }