--- loncom/auth/lonroles.pm	2014/05/22 14:17:53	1.306
+++ loncom/auth/lonroles.pm	2014/12/14 21:47:48	1.309
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # User Roles Screen
 #
-# $Id: lonroles.pm,v 1.306 2014/05/22 14:17:53 raeburn Exp $
+# $Id: lonroles.pm,v 1.309 2014/12/14 21:47:48 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -202,7 +202,7 @@ sub handler {
 
     my $r = shift;
 
-    # Check for critical messages and redirect if present.  
+    # 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');
@@ -1067,11 +1067,7 @@ ENDHEADER
         my $esc_dom = &HTML::Entities::encode($env{'user.domain'},'"<>&');
         $r->print('<p><small><i>'
                  .&mt('This LON-CAPA server is version [_1]',$r->dir_config('lonVersion'))
-                 .'</i><br />'
-                 .'<a href="/adm/logout">'.&mt('Logout').'</a>&nbsp;&nbsp;'
-                 .'<a href="/adm/coursecatalog?showdom='.$esc_dom.'">'
-                 .&mt('Course/Community Catalog')
-                 .'</a></small></p>');
+                 .'</i></small></p>');
     }
     $r->print(&Apache::loncommon::end_page());
     return OK;
@@ -1482,10 +1478,17 @@ sub requestcourse_advice {
             if (@reqdoms == 1 || @showtypes > 0) {
                 $requrl .= '&state=crstype&action=new';
             }
-            $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>');
+            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) {
@@ -1647,7 +1650,7 @@ sub check_fordc {
     my ($dcroles,$update,$then) = @_;
     my $numdc = 0;
     if ($env{'user.adv'}) {
-        foreach my $envkey (sort keys %env) {
+        foreach my $envkey (sort(keys(%env))) {
             if ($envkey=~/^user\.role\.dc\.\/($match_domain)\/$/) {
                 my $dcdom = $1;
                 my $livedc = 1;