--- loncom/auth/lonacc.pm	2022/06/30 21:04:13	1.205
+++ loncom/auth/lonacc.pm	2022/09/17 23:38:50	1.207
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Cookie Based Access Handler
 #
-# $Id: lonacc.pm,v 1.205 2022/06/30 21:04:13 raeburn Exp $
+# $Id: lonacc.pm,v 1.207 2022/09/17 23:38:50 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -315,7 +315,7 @@ sub sso_login {
     my %form;
     if ($query) {
         my @items = ('role','symb','iptoken','origurl','ttoken',
-                     'ltoken','linkkey','logtoken','sso');
+                     'ltoken','linkkey','logtoken','sso','lcssowin');
         &Apache::loncommon::get_unprocessed_cgi($query,\@items);
         foreach my $item (@items) {
             if (defined($env{'form.'.$item})) {
@@ -394,6 +394,8 @@ sub sso_login {
             if ($firsturl =~ m{^/tiny/$match_domain/\w+$}) {
                 $form{'origurl'} = $firsturl;
                 $deeplinkurl = $firsturl;
+            } elsif ($firsturl eq '/adm/email') {
+                $form{'origurl'} = $firsturl;
             }
             if ($form{'linkprot'}) {
                 $linkprot = $form{'linkprot'};
@@ -465,6 +467,9 @@ sub sso_login {
                            linkprotuser => $linkprotuser,
                            linkprotexit => $linkprotexit,
                        );
+            if ($env{'form.lcssowin'}) {
+                $data{'lcssowin'} = $env{'form.lcssowin'};
+            }
             my $token = &Apache::lonnet::tmpput(\%data,$r->dir_config('lonHostID'),'link');
             unless (($token eq 'con_lost') || ($token eq 'refused') || ($token =~ /^error:/) ||
                     ($token eq 'unknown_cmd') || ($token eq 'no_such_host')) {
@@ -537,6 +542,12 @@ sub sso_login {
                     $env{'request.linkkey'} = $linkkey;
                 }
             }
+            if (($r->uri eq '/adm/sso') && ($form{'origurl'} eq '/adm/email')) {
+                if ($form{'display'} && ($env{'form.mailrecip'} eq $user.':'.$domain)) {
+                    $env{'request.display'} = $form{'display'};
+                    $env{'request.mailrecip'} = $env{'form.mailrecip'};
+                }
+            }
             $env{'request.sso.login'} = 1;
             if (defined($r->dir_config("lonSSOReloginServer"))) {
                 $env{'request.sso.reloginserver'} =
@@ -546,6 +557,9 @@ sub sso_login {
             if ($otherserver ne '') {
                 $redirecturl .= '?otherserver='.$otherserver;
             }
+            if ($form{'lcssowin'}) {
+                $redirecturl .= (($redirecturl=~/\?/)?'&':'?') . 'lcssowin=1';
+            }
 	    $r->internal_redirect($redirecturl);
 	    $r->set_handlers('PerlHandler'=> undef);
 	} else {
@@ -558,7 +572,7 @@ sub sso_login {
 		      'server'    => $r->dir_config('lonHostID'),
 		      'sso.login' => 1
 		      );
-            foreach my $item ('role','symb','iptoken','origurl') {
+            foreach my $item ('role','symb','iptoken','origurl','lcssowin') {
                 if (exists($form{$item})) {
                     $info{$item} = $form{$item};
                 } elsif ($sessiondata{$item} ne '') {
@@ -588,6 +602,12 @@ sub sso_login {
                     $info{'linkkey'} = $linkkey;
                 }
             }
+            if (($r->uri eq '/adm/sso') && ($form{'origurl'} eq '/adm/email')) {
+                if ($form{'display'} && ($form{'mailrecip'} eq $user.':'.$domain)) {
+                    $info{'display'} = &escape($form{'display'});
+                    $info{'mailrecip'} = &escape($form{'mailrecip'});
+                }
+            }
             if ($r->dir_config("ssodirecturl") == 1) {
                 $info{'origurl'} = $r->uri;
             }
@@ -624,7 +644,7 @@ sub sso_login {
             $r->subprocess_env->set('SSOUserDomain' => $domain);
             if (grep(/^sso$/,@cancreate)) {
 #FIXME - need to preserve origurl, role and symb, or linkprot or linkkey for use after account
-# creation
+# creation. If lcssowin is 1, createaccount needs to close pop-up and display in main window.
                 $r->set_handlers('PerlHandler'=> [\&Apache::createaccount::handler]);
                 $r->handler('perl-script');
             } else {