--- loncom/auth/lonauth.pm	2022/06/26 04:03:47	1.175
+++ loncom/auth/lonauth.pm	2022/09/17 23:38:50	1.178
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # User Authentication Module
 #
-# $Id: lonauth.pm,v 1.175 2022/06/26 04:03:47 raeburn Exp $
+# $Id: lonauth.pm,v 1.178 2022/09/17 23:38:50 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -47,7 +47,7 @@ use CGI::Cookie();
 # ------------------------------------------------------------ Successful login
 sub success {
     my ($r, $username, $domain, $authhost, $lowerurl, $extra_env,
-	$form,$skipcritical,$cid,$expirepub) = @_;
+	$form,$skipcritical,$cid,$expirepub,$write_to_opener) = @_;
 
 # ------------------------------------------------------------ Get cookie ready
     my $cookie =
@@ -147,6 +147,10 @@ sub success {
                 $destination .= 'selectrole=1&'.$newrole.'=1';
             }
         }
+    } elsif (defined($form->{display})) {
+        if ($destination =~ m{^/adm/email($|\?)}) {
+            $destination  .= ($destination =~ /\?/) ? '&' : '?' .'display='.&escape($form->{display});
+        }
     }
     if (defined($form->{symb})) {
         my $destsymb = $form->{symb};
@@ -188,8 +192,10 @@ sub success {
         my %info;
         if ($env{'request.linkprot'}) {
             $info{'linkprot'} = $env{'request.linkprot'};
-            if ($form->{'linkprotuser'}) {
-                $info{'linkprotuser'} = $form->{'linkprotuser'};
+            foreach my $item ('linkprotuser','linkprotexit') {
+                if ($form->{$item}) {
+                    $info{$item} = $form->{$item};
+                }
             }
             $args = {'only_body' => 1,};
         } elsif ($env{'request.linkkey'} ne '') {
@@ -278,7 +284,7 @@ ENDJS
         }
         $start_page=&Apache::loncommon::start_page('',$js,$args);
     } else {
-        $args->{'redirect'} = [0,$destination];
+        $args->{'redirect'} = [0,$destination,'',$write_to_opener];
         $start_page=&Apache::loncommon::start_page('Successful Login',
                                                    $js,$args);
         unless ($env{'request.linkprot'}) {
@@ -371,8 +377,10 @@ sub failed {
             my %info = (
                          'linkprot' => $form->{'linkprot'},
                        );
-            if ($form->{linkprotuser} ne '') {
-                $info{'linkprotuser'} = $form->{linkprotuser};
+            foreach my $item ('linkprotuser','linkprotexit') {
+                if ($form->{$item} ne '') {
+                    $info{$item} = $form->{$item};
+                }
             }
             my $ltoken = &Apache::lonnet::tmpput(\%info,
                                                  $r->dir_config('lonHostID'),'retry');
@@ -815,14 +823,21 @@ sub handler {
             }
             if ($form{'linkprot'}) {
                 $env{'request.linkprot'} = $form{'linkprot'};
-                if ($form{'linkprotuser'}) {
-                    $env{'request.linkprotuser'} = $form{'linkprotuser'};
+                foreach my $item ('linkprotuser','linkprotexit') {
+                    if ($form{$item}) {
+                        $env{'request.'.$item} = $form{$item};
+                    }
                 }
             } elsif ($form{'linkkey'} ne '') {
                 $env{'request.linkkey'} = $form{'linkkey'};
             }
             if ($form{'firsturl'} =~ m{^/tiny/$match_domain/\w+$}) {
                 &set_deeplink_login(%form);
+            } elsif ($firsturl eq '/adm/email') {
+                if ($form{'display'} && ($form{'mailrecip'} eq "$form{'uname'}:$form{'udom'}")) {
+                    $env{'request.display'} = $form{'display'};
+                    $env{'request.mailrecip'} = $form{'mailrecip'};
+                }
             }
             $r->internal_redirect($switchto);
         } else {
@@ -849,14 +864,21 @@ sub handler {
                 }
                 if ($form{'linkprot'}) {
                     $env{'request.linkprot'} = $form{'linkprot'};
-                    if ($form{'linkprotuser'}) {
-                        $env{'request.linkprotuser'} = $form{'linkprotuser'};
+                    foreach my $item ('linkprotuser','linkprotexit') {
+                        if ($form{$item}) {
+                            $env{'request.'.$item} = $form{$item};
+                        }
                     }
                 } elsif ($form{'linkkey'} ne '') {
                     $env{'request.linkkey'} = $form{'linkkey'};
                 }
                 if ($form{'firsturl'} =~ m{^/tiny/$match_domain/\w+$}) {
                     &set_deeplink_login(%form);
+                } elsif ($firsturl eq '/adm/email') {
+                    if ($form{'display'} && ($form{'mailrecip'} eq "$form{'uname'}:$form{'udom'}")) {
+                        $env{'request.display'} = $form{'display'};
+                        $env{'request.mailrecip'} = $form{'mailrecip'};
+                    }
                 }
                 $r->internal_redirect($switchto);
             } else {
@@ -896,6 +918,11 @@ sub handler {
                 }
                 if ($form{'firsturl'} =~ m{^/tiny/$match_domain/\w+$}) {
                     &set_deeplink_login(%form);
+                } elsif ($firsturl eq '/adm/email') {
+                    if ($form{'display'} && ($form{'mailrecip'} eq "$form{'uname'}:$form{'udom'}")) {
+                        $env{'request.display'} = $form{'display'};
+                        $env{'request.mailrecip'} = $form{'mailrecip'};
+                    }
                 }
                 $r->internal_redirect('/adm/switchserver?otherserver='.$unloaded.'&origurl='.$firsturl);
                 return OK;
@@ -915,6 +942,14 @@ sub handler {
                         $form{$item} = $sessiondata{$item};
                     }
                 }
+                if ($sessiondata{'origurl'} eq '/adm/email') {
+                    if (($sessiondata{'display'}) && ($sessiondata{'mailrecip'})) {
+                        if (&unescape($sessiondata{'mailrecip'}) eq "$form{'uname'}:$form{'udom'}") {
+                            $form{'display'} = &unescape($sessiondata{'display'});
+                            $form{'mailrecip'} = &unescape($sessiondata{'mailrecip'});
+                        }
+                    }
+                }
             }
         }
         if ($form{'linkprot'}) {
@@ -935,6 +970,9 @@ sub handler {
                 } else {
                     $extra_env = {'request.linkprot' => $form{'linkprot'}};
                 }
+                if ($form{'linkprotexit'}) {
+                    $extra_env->{'request.linkprotexit'} = $form{'linkprotexit'};
+                }
             } elsif ($form{'linkkey'} ne '') {
                 if (ref($extra_env) eq 'HASH') {
                     %{$extra_env} = ( %{$extra_env}, 'request.linkkey' => $form{'linkkey'} );
@@ -1023,7 +1061,7 @@ sub set_retry_token {
     my ($form,$lonhost,$querystr) = @_;
     if (ref($form) eq 'HASH') {
         my ($firsturl,$token,$extras,@names);
-        @names = ('role','symb','linkprotuser','linkprot','linkkey','iptoken');
+        @names = ('role','symb','linkprotuser','linkprotexit','linkprot','linkkey','iptoken');
         foreach my $name (@names) {
             if ($form->{$name} ne '') {
                 $extras .= '&'.$name.'='.&escape($form->{$name});
@@ -1110,6 +1148,11 @@ sub check_can_host {
                      $form);
             if ($form->{'firsturl'} =~ m{^/tiny/$match_domain/\w+$}) {
                 $env{'request.deeplink.login'} = $form->{'firsturl'};
+            } elsif ($form->{'firsturl'} eq '/adm/email') {
+                if ($form->{'display'} && ($form->{'mailrecip'} eq $form->{'uname'}.':'.$form->{'udom'})) {
+                    $env{'request.display'} = $form->{'mailrecip'};
+                    $env{'request.mailrecip'} = $form->{'mailrecip'};
+                }
             }
             if ($form->{'linkprot'}) {
                 $env{'request.linkprot'} = $form->{'linkprot'};