--- loncom/auth/lonroles.pm	2017/03/13 18:14:13	1.328
+++ loncom/auth/lonroles.pm	2017/08/08 20:10:55	1.333
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # User Roles Screen
 #
-# $Id: lonroles.pm,v 1.328 2017/03/13 18:14:13 raeburn Exp $
+# $Id: lonroles.pm,v 1.333 2017/08/08 20:10:55 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -204,7 +204,7 @@ sub handler {
     my $r = shift;
 
     # Check for critical messages and redirect if present.
-    my ($redirect,$url) = &Apache::loncommon::critical_redirect(300);
+    my ($redirect,$url) = &Apache::loncommon::critical_redirect(300,'roles');
     if ($redirect) {
         &Apache::loncommon::content_type($r,'text/html');
         $r->header_out(Location => $url);
@@ -1097,9 +1097,11 @@ ENDHEADER
 # ----------------------------------------------------------------------- Table
 
     if (($numdc > 0) || (($numhelpdesk > 0) && ($numadhoc > 0))) {
-        $r->print(&coursepick_jscript());
-        $r->print(&Apache::loncommon::coursebrowser_javascript().
-                  &Apache::loncommon::authorbrowser_javascript());
+        $r->print(&coursepick_jscript().
+                  &Apache::loncommon::coursebrowser_javascript());
+    }
+    if ($numdc > 0) {
+        $r->print(&Apache::loncommon::authorbrowser_javascript());
     }
 
     unless ((!&Apache::loncommon::show_course()) || ($nochoose) || ($countactive==1)) {
@@ -1238,6 +1240,7 @@ sub gather_roles {
     my $advanced = $env{'user.adv'};
     my $tryagain = $env{'form.tryagain'};
     my @ids = &Apache::lonnet::current_machine_ids();
+    my (%willtrust,%trustchecked);
     if (ref($roles_in_env) eq 'HASH') {
         my %adhocdesc;
         foreach my $envkey (sort(keys(%{$roles_in_env}))) {
@@ -1306,10 +1309,23 @@ sub gather_roles {
                 if (($role eq 'ca') || ($role eq 'aa')) {
                     my $home = &Apache::lonnet::homeserver($trest,$tdom);
                     my $allowed=0;
+                    my $prohibited;
                     foreach my $id (@ids) { if ($id eq $home) { $allowed=1; } }
                     if (!$allowed) {
                         $button=0;
-                        $switchserver='otherserver='.$home.'&role='.$trolecode;
+                        unless ($trustchecked{$tdom}) {
+                            if ((&Apache::lonnet::will_trust('othcoau',$tdom,$env{'user.domain'})) &&
+                                (&Apache::lonnet::will_trust('coremau',$env{'user.domain'},$tdom))) {
+                                $willtrust{$tdom} = 1;
+                                $trustchecked{$tdom} = 1;
+                            }
+                        } 
+                        if ($willtrust{$tdom}) {
+                            $switchserver='otherserver='.$home.'&role='.$trolecode;
+                        } else {
+                            $prohibited = 1;
+                            $tremark .= &mt('Session switch required but prohibited.');
+                        }
                     }
                     #next if ($home eq 'no_host');
                     $home = &Apache::lonnet::hostname($home);
@@ -1318,7 +1334,9 @@ sub gather_roles {
                         ': '.$tdom.'<br />'.
                         ' '.&mt('Server').':&nbsp;'.$home;
                     $env{'course.'.$tdom.'_'.$trest.'.description'}='ca';
-                    $tremark.=&Apache::lonhtmlcommon::authorbombs('/res/'.$tdom.'/'.$trest.'/');
+                    unless ($prohibited) {
+                        $tremark.=&Apache::lonhtmlcommon::authorbombs('/res/'.$tdom.'/'.$trest.'/');
+                    }
                     $sortkey=$role."$trest:$tdom";
                 } elsif ($role eq 'au') {
                     # Authors
@@ -2063,9 +2081,9 @@ sub adhoc_roles_row {
     my ($dcdom,$rowtype) = @_;
     my $output = &Apache::loncommon::continue_data_table_row()
                  .' <td colspan="5" class="LC_textsize_mobile">'
-                 .&mt('[_1]Ad hoc[_2] roles in domain [_3] --'
+                 .&mt('[_1]Ad hoc[_2] roles in domain [_3]'
                      ,'<span class="LC_cusr_emph">','</span>',$dcdom)
-                 .' ';
+                 .' -- ';
     my $role = 'cc';
     my $selectcclink = &courselink($dcdom,$rowtype,$role);
     my $ccrole = &Apache::lonnet::plaintext('co',undef,undef,1);
@@ -2093,9 +2111,9 @@ sub adhoc_customroles_row {
         if (scalar(keys(%{$domdefaults{'adhocroles'}})) > 0) {
             return &Apache::loncommon::continue_data_table_row()
                   .' <td colspan="5" class="LC_textsize_mobile">'
-                  .&mt('[_1]Ad hoc[_2] course/community roles in domain [_3] --',
+                  .&mt('[_1]Ad hoc[_2] course/community roles in domain [_3]',
                        '<span class="LC_cusr_emph">','</span>',$dhdom)
-                  .' '.&courselink($dhdom,$rowtype,$role);
+                  .' -- '.&courselink($dhdom,$rowtype,$role);
         }
     }
     return;