[LON-CAPA-cvs] cvs: loncom /auth lonroles.pm switchserver.pm

[raeburn]

raeburn		Sat Dec  8 15:16:03 2018 EDT

  Modified files:              
    /loncom/auth	lonroles.pm switchserver.pm 
  Log:
  - Trust settings
    - Fix logic for checking whether co-author role admissible 
    - Correct key for: "Co-author roles for this domain's users elsewhere".
  
  
Index: loncom/auth/lonroles.pm
diff -u loncom/auth/lonroles.pm:1.339 loncom/auth/lonroles.pm:1.340
--- loncom/auth/lonroles.pm:1.339	Sun Jul  1 00:03:42 2018
+++ loncom/auth/lonroles.pm	Sat Dec  8 15:16:03 2018
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # User Roles Screen
 #
-# $Id: lonroles.pm,v 1.339 2018/07/01 00:03:42 raeburn Exp $
+# $Id: lonroles.pm,v 1.340 2018/12/08 15:16:03 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -1366,8 +1366,8 @@
                     if (!$allowed) {
                         $button=0;
                         unless ($trustchecked{$tdom}) {
-                            if ((&Apache::lonnet::will_trust('othcoau',$tdom,$env{'user.domain'})) &&
-                                (&Apache::lonnet::will_trust('coremau',$env{'user.domain'},$tdom))) {
+                            if ((&Apache::lonnet::will_trust('othcoau',$env{'user.domain'},$tdom)) &&
+                                (&Apache::lonnet::will_trust('coremau',$tdom,$env{'user.domain'}))) {
                                 $willtrust{$tdom} = 1;
                                 $trustchecked{$tdom} = 1;
                             }
Index: loncom/auth/switchserver.pm
diff -u loncom/auth/switchserver.pm:1.45 loncom/auth/switchserver.pm:1.46
--- loncom/auth/switchserver.pm:1.45	Sun Dec  2 13:56:10 2018
+++ loncom/auth/switchserver.pm	Sat Dec  8 15:16:03 2018
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Switch Servers Handler
 #
-# $Id: switchserver.pm,v 1.45 2018/12/02 13:56:10 raeburn Exp $
+# $Id: switchserver.pm,v 1.46 2018/12/08 15:16:03 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -149,8 +149,8 @@
             } elsif ($env{'form.role'} =~ m{^[ac]a\./($match_domain)/($match_username)$}) {
                 my ($audom,$auname) = ($1,$2);
                 if (&Apache::lonnet::homeserver($auname,$audom) eq $env{'form.otherserver'}) {
-                    if ((&Apache::lonnet::will_trust('othcoau',$audom,$env{'user.domain'})) &&
-                        (&Apache::lonnet::will_trust('coremau',$env{'user.domain'},$audom))) {                             
+                    if ((&Apache::lonnet::will_trust('othcoau',$env{'user.domain'},$audom)) &&
+                        (&Apache::lonnet::will_trust('coaurem',$audom,$env{'user.domain'}))) {                             
                         $skip_canhost_check = 1;
                     }
                 }