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

[raeburn]

raeburn		Tue Oct 26 14:20:40 2021 EDT

  Modified files:              
    /loncom/auth	migrateuser.pm switchserver.pm 
  Log:
  - 0 is a valid linkkey.
  
  
Index: loncom/auth/migrateuser.pm
diff -u loncom/auth/migrateuser.pm:1.52 loncom/auth/migrateuser.pm:1.53
--- loncom/auth/migrateuser.pm:1.52	Mon Aug 16 15:25:44 2021
+++ loncom/auth/migrateuser.pm	Tue Oct 26 14:20:40 2021
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Starts a user off based of an existing token.
 #
-# $Id: migrateuser.pm,v 1.52 2021/08/16 15:25:44 raeburn Exp $
+# $Id: migrateuser.pm,v 1.53 2021/10/26 14:20:40 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -732,11 +732,11 @@
                 } else {
                     &Apache::lonnet::appenv({'user.linkproturi' => $deeplink});
                 }
-            } elsif ($data{'linkkey'}) {
+            } elsif ($data{'linkkey'} ne '') {
                 &Apache::lonnet::appenv({'request.linkkey' => $data{'linkkey'}});
                 my $deeplink = $data{'deeplink.login'};
                 my $linkkey = $data{'linkkey'};
-                if ($env{'user.deeplinkkey'}) {
+                if ($env{'user.deeplinkkey'} ne '') {
                     my @linkkeys = split(/,/,$env{'user.deeplinkkey'});
                     unless (grep(/^\Q$linkkey\E$/, at linkkeys)) {
                         push(@linkkeys,$linkkey);
@@ -876,7 +876,7 @@
                                           'request.linkprot' => $data{'linkprot'}};
                         }
                     }
-                } elsif ($data{'linkkey'}) {
+                } elsif ($data{'linkkey'} ne '') {
                     if (ref($extra_env) eq 'HASH') {
                         $extra_env->{'user.deeplinkkey'} = $data{'linkkey'};
                         $extra_env->{'user.keyedlinkuri'} = $data{'deeplink.login'};
Index: loncom/auth/switchserver.pm
diff -u loncom/auth/switchserver.pm:1.58 loncom/auth/switchserver.pm:1.59
--- loncom/auth/switchserver.pm:1.58	Wed Aug 11 17:03:03 2021
+++ loncom/auth/switchserver.pm	Tue Oct 26 14:20:40 2021
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Switch Servers Handler
 #
-# $Id: switchserver.pm,v 1.58 2021/08/11 17:03:03 raeburn Exp $
+# $Id: switchserver.pm,v 1.59 2021/10/26 14:20:40 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -312,7 +312,7 @@
     }
     if ($env{'request.linkprot'}) {
         $info{'linkprot'} = $env{'request.linkprot'};
-    } elsif ($env{'request.linkkey'}) {
+    } elsif ($env{'request.linkkey'} ne '') {
         $info{'linkkey'} = $env{'request.linkkey'};
     }
     if ($env{'request.deeplink.login'}) {