--- loncom/auth/lonroles.pm	2017/05/19 19:20:42	1.330
+++ loncom/auth/lonroles.pm	2017/10/27 17:43:47	1.335
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # User Roles Screen
 #
-# $Id: lonroles.pm,v 1.330 2017/05/19 19:20:42 raeburn Exp $
+# $Id: lonroles.pm,v 1.335 2017/10/27 17:43:47 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);
@@ -578,12 +578,32 @@ ENDENTERKEY
 			my ($furl,$ferr)=
 			    &Apache::lonuserstate::readmap($cdom.'/'.$cnum);
                         unless ($ferr) {
+                            &Apache::lonnet::appenv({'request.course.timechecked'=>$now});
                             unless (($env{'form.switchrole'}) || 
                                     ($env{"environment.internal.$cdom.$cnum.$role.adhoc"})) {
                                 &Apache::lonnet::put('nohist_crslastlogin',
                                     {$env{'user.name'}.':'.$env{'user.domain'}.
                                      ':'.$csec.':'.$role => $now},$cdom,$cnum);
                             }
+                            if (($env{"environment.internal.$cdom.$cnum.$role.adhoc"}) &&
+                                (&Apache::lonnet::allowed('vxc',$cdom.'_'.$cnum))) {
+                                my $owner = $env{'course.'.$cdom.'_'.$cnum.'.internal.courseowner'};
+                                my @coowners = split(/,/,$env{'course.'.$env{'request.course.id'}.'.internal.co-owners'});
+                                my %auaccess;
+                                foreach my $user ($owner,@coowners) {
+                                    my ($cpname,$cpdom) = split(/:/,$user);
+                                    my %auroles = &Apache::lonnet::get_my_roles($cpname,$cpdom,'userroles',undef,['au','ca','aa'],[$cdom]);
+                                    foreach my $key (keys(%auroles)) {
+                                        my ($auname,$audom,$aurole) = split(/:/,$key);
+                                        if ($aurole eq 'au') {
+                                            $auaccess{$cpname} = 1;
+                                        } else {
+                                            $auaccess{$auname} = 1;
+                                        }
+                                    }
+                                }
+                                &Apache::lonnet::appenv({'request.course.adhocsrcaccess' => join(',',sort(keys(%auaccess))) });
+                            }
                             my ($feeds,$syllabus_time);
                             &Apache::lonrss::advertisefeeds($cnum,$cdom,undef,\$feeds);
                             &Apache::lonnet::appenv({'request.course.feeds' => $feeds});
@@ -1240,6 +1260,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}))) {
@@ -1308,10 +1329,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);
@@ -1320,7 +1354,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
@@ -2095,9 +2131,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;