--- loncom/auth/migrateuser.pm	2018/04/17 19:48:18	1.31
+++ loncom/auth/migrateuser.pm	2018/11/24 16:19:04	1.35
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Starts a user off based of an existing token.
 #
-# $Id: migrateuser.pm,v 1.31 2018/04/17 19:48:18 raeburn Exp $
+# $Id: migrateuser.pm,v 1.35 2018/11/24 16:19:04 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -69,6 +69,9 @@ sub sso_check {
             $extra_env{'request.sso.reloginserver'} = 
                 $data->{'sso.reloginserver'};
         }
+        if (($data->{'balancer'}) && ($data->{'server'}) && ($data->{'balcookie'})) {
+            $extra_env{'request.balancercookie'} = $data->{'server'}.':'.$data->{'balcookie'};
+        }
     }
     return \%extra_env;
 }
@@ -94,6 +97,9 @@ sub lti_check {
             if ($data->{'lti.target'}) {
                 $lti_env{'request.lti.target'} = $data->{'lti.target'};
             }
+            if ($data->{'lti.sourcecrs'}) {
+                $lti_env{'request.lti.sourcecrs'} = $data->{'lti.sourcecrs'};
+            }
         }
         if ($data->{'lti.passbackid'}) {
             $lti_env{'request.lti.passbackid'} = $data->{'lti.passbackid'};
@@ -214,6 +220,11 @@ sub ip_changed {
                     }
                 }
             }
+            unless ($hosthere) {
+                if (($dataref->{'balancer'}) && ($dataref->{'balcookie'})) {
+                    &Apache::lonnet::delbalcookie($dataref->{'balcookie'},$dataref->{'balancer'});
+                }
+            }
         }
         if ($dataref->{'sso.login'}) {
             $url .= '/adm/roles';
@@ -255,12 +266,12 @@ sub ip_changed {
 
 sub logout {
     my ($r,$handle,$data,$lti_env) = @_;
-    unlink($handle);
-    if ($env{'user.linkedenv'} ne '') {
-        my $lonidsdir=$r->dir_config('lonIDsDir');
-        if ((-l $env{'user.linkedenv'}) &&
-            (readlink($env{'user.linkedenv'}) eq "$lonidsdir/$handle.id")) {
-            unlink($env{'user.linkedenv'});
+    my $lonidsdir=$r->dir_config('lonIDsDir');
+    if (unlink("$lonidsdir/$handle.id")) {
+        if (($env{'user.linkedenv'} =~ /^[a-f0-9]+_linked$/) &&
+            (-l "$lonidsdir/$env{'user.linkedenv'}.id") &&
+            (readlink("$lonidsdir/$env{'user.linkedenv'}.id") eq "$lonidsdir/$handle.id")) {
+            unlink("$lonidsdir/$env{'user.linkedenv'}.id");
         }
     }
     my %temp=('logout' => time);
@@ -272,18 +283,15 @@ sub logout {
 
     &Apache::loncommon::content_type($r,'text/html');
 
-    #expire the cookie
-    my $c = new CGI::Cookie(-name    => 'lonID',
-                            -value   => '',
-                            -expires => '-10y',);
-    $r->headers_out->add('Set-cookie' => $c);
-    if ($env{'user.linkedenv'}) {
-        my $linked = new CGI::Cookie(-name    => 'lonLinkID',
-                                     -value   => '',
-                                     -expires => '-10y',);
-        $r->headers_out->add('Set-cookie' => $linked);
+    #expire the cookies
+    my %cookies=CGI::Cookie->parse($r->header_in('Cookie'));
+    foreach my $name (keys(%cookies)) {
+        next unless ($name =~ /^lon(|S|Link|Pub)ID$/);
+        my $c = new CGI::Cookie(-name    => $name,
+                                -value   => '',
+                                -expires => '-10y',);
+        $r->headers_out->add('Set-cookie' => $c);
     }
-    my $lonhost = $r->dir_config('lonHostID');
     my (%info,%user_info,%lti_info);
     if (ref($lti_env) eq 'HASH') {
         %lti_info = %{$lti_env};
@@ -420,7 +428,7 @@ sub handler {
                         delete($lti_env->{'selfenrollrole'});
                     }
                     if ($data{'lti.selfenrollrole'}) {
-                        if (&Apache::ltiauth::lti_enroll($data{'username'},data{'domain'},
+                        if (&Apache::ltiauth::lti_enroll($data{'username'},$data{'domain'},
                                                          $data{'lti.selfenrollrole'}) eq 'ok') {
                             my $url = '/adm/roles?selectrole=1&'.
                                       &escape($data{'lti.selfenrollrole'}).'=1';
@@ -480,13 +488,13 @@ sub handler {
 	return OK;
     }
 
-    my $next_url='/adm/roles?selectrole=1&'.&escape($data{'role'}).'=1';
+    my $next_url='/adm/roles?selectrole=1&'.&escape($data{'role'}).'=1';
     if ($data{'origurl'} ne '') {
-        $next_url .= '&orgurl='.&escape($data{'origurl'});
+        $next_url .= '&orgurl='.&escape($data{'origurl'});
         if ($data{'lti.login'}) {
             if (($data{'origurl'} =~ m{/default_\d+\.sequence$}) ||
                 ($data{'origurl'} =~ m{^/res/.+\.sequence$})) {
-                $next_url .= '&navmap=1';
+                $next_url .= '&navmap=1';
             }
         }
     }