--- loncom/auth/migrateuser.pm	2022/07/02 19:55:15	1.64
+++ loncom/auth/migrateuser.pm	2022/09/17 23:38:50	1.66
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Starts a user off based of an existing token.
 #
-# $Id: migrateuser.pm,v 1.64 2022/07/02 19:55:15 raeburn Exp $
+# $Id: migrateuser.pm,v 1.66 2022/09/17 23:38:50 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -42,6 +42,10 @@ use CGI::Cookie;
 
 sub goto_login {
     my ($r,$domain,$data) = @_;
+    my $write_to_opener;
+    if (ref($data) eq 'HASH') {
+        $write_to_opener = $data->{'lcssowin'};
+    }
     if ((ref($data) eq 'HASH') && ($data->{'lti.login'})) {
         &Apache::ltiauth::invalid_request($r,'22');
     } else {
@@ -52,7 +56,7 @@ sub goto_login {
             $url .= '?domain='.$domain;
         }
         $r->print(&Apache::loncommon::start_page('Going to login',undef,
-					         {'redirect' => [0,$url],}).
+					         {'redirect' => [0,$url,'',$write_to_opener],}).
 	          '<h1>'.&mt('One moment please...').'</h1>'.
 	          '<p>'.&mt('Transferring to login page.').'</p>'.
 	          &Apache::loncommon::end_page());
@@ -291,13 +295,21 @@ sub ip_changed {
                 $info{$name} = $dataref->{$name};
             }
         }
+        if ($info{'origurl'} eq '/adm/email') {
+            if (($dataref->{'display'}) && ($dataref->{'mailrecip'})) {
+                if (&unescape($dataref->{'mailrecip'}) eq $dataref->{'username'}.':'.$dataref->{'domain'}) {
+                    $info{'display'} = $dataref->{'display'};
+                    $info{'mailrecip'} = $dataref->{'mailrecip'};
+                }
+            }
+        }
         my $iptoken = &Apache::lonnet::tmpput(\%info,$switchto,'link');
         unless ($iptoken eq 'conlost') {
             $url .= (($url =~ /\?/) ? '&' : '?') . 'iptoken='.$iptoken;
         }
         $r->print(&Apache::loncommon::start_page($title,undef,
                                                  {'redirect' =>
-                                                  [2,$url],}).
+                                                  [2,$url,'',$dataref->{'lcssowin'}],}).
                   '<h1>'.&mt('One moment please...').'</h1>'.
                   '<p class="LC_warning">'.$message.'</p>'.
                   &Apache::loncommon::end_page());
@@ -336,7 +348,7 @@ sub logout {
         $r->headers_out->add('Set-cookie' => $c);
     }
     my $lonhost = $r->dir_config('lonHostID');
-    my ($url,$token,$delay,%info,%user_info);
+    my ($url,$token,$delay,$write_to_opener,%info,%user_info);
     if (ref($data) eq 'HASH') {
         %user_info=('ip'       => $ip,
                     'domain'   => $data->{'domain'},
@@ -346,6 +358,7 @@ sub logout {
                     'origurl'  => $data->{'origurl'},
                     'symb'     => $data->{'symb'},
                     'server'   => $lonhost);
+        $write_to_opener = $data->{'lcssowin'};
     }
     $delay = 0.1;
     if (ref($linkprot_info) eq 'HASH') {
@@ -379,7 +392,7 @@ sub logout {
     $r->send_http_header;
     $r->print(
         &Apache::loncommon::start_page('Updating Session ...',undef,
-                                       {'redirect'       => [$delay,$url],
+                                       {'redirect'       => [$delay,$url,'',$write_to_opener],
                                         'only_body'      => 1,}).
         &Apache::loncommon::end_page());
     if ($env{'request.balancercookie'}) {
@@ -991,6 +1004,13 @@ sub handler {
                         $extra_env = {'request.deeplink.login' => $data{'deeplink.login'}};
                     }
                 }
+                if ($desturl eq '/adm/email') {
+                    if (($data{'display'}) && ($data{'mailrecip'})) {
+                        if (&unescape($data{'mailrecip'}) eq "$data{'username'}:$data{'domain'}") {
+                            $form{'display'} = &unescape($data{'display'});
+                        }
+                    }
+                }
             }
             my $skipcritical;
             if ($data{'lti.login'}) {
@@ -1002,7 +1022,7 @@ sub handler {
             }
 	    &Apache::lonauth::success($r,$data{'username'},$data{'domain'},
 				      $home,$desturl,$extra_env,\%form,$skipcritical,'',
-                                      $expirepub);
+                                      $expirepub,$data{'lcssowin'});
 	}
 	return OK;
     }
@@ -1083,7 +1103,7 @@ sub handler {
             }
         }
         &Apache::lonauth::success($r,$data{'username'},$data{'domain'},$home,
-                                  $next_url,$extra_env,\%form,'',$cid);
+                                  $next_url,$extra_env,\%form,'',$cid,'',$data{'lcssowin'});
     }
     return OK;
 }