--- loncom/auth/lonlogin.pm	2022/08/30 12:25:03	1.203
+++ loncom/auth/lonlogin.pm	2025/02/09 22:49:11	1.210
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Login Screen
 #
-# $Id: lonlogin.pm,v 1.203 2022/08/30 12:25:03 raeburn Exp $
+# $Id: lonlogin.pm,v 1.210 2025/02/09 22:49:11 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -50,7 +50,7 @@ sub handler {
 	      $ENV{'REDIRECT_QUERY_STRING'}),
 	 ['interface','username','domain','firsturl','localpath','localres',
 	  'token','role','symb','iptoken','btoken','ltoken','ttoken','linkkey',
-          'saml','sso','retry']); 
+          'saml','sso','retry','display']); 
 
 # -- check if they are a migrating user
     if (defined($env{'form.token'})) {
@@ -68,7 +68,7 @@ sub handler {
             $env{'form.ltoken'} = $info{'ltoken'};
         } elsif ($info{'linkprot'}) {
             $env{'form.linkprot'} = $info{'linkprot'};
-            foreach my $item ('linkprotuser','linkprotexit') {
+            foreach my $item ('linkprotuser','linkprotexit','linkprotpbid','linkprotpburl') {
                 if ($info{$item} ne '') {
                     $env{'form.'.$item} = $info{$item};
                 }
@@ -175,6 +175,19 @@ sub handler {
             if ($env{'form.symb'}) {
                 $info{'symb'} = $env{'form.symb'};
             }
+            if (($env{'form.firsturl'} eq '/adm/email') && ($env{'form.display'} ne '')) {
+                if ($env{'form.sso'}) {
+                    if ($env{'form.mailrecip'}) {
+                        $info{'display'} = &escape($env{'form.display'});
+                        $info{'mailrecip'} = &escape($env{'form.mailrecip'});
+                    }
+                } else {
+                    if (($env{'form.username'}) && ($env{'form.domain'})) {
+                        $info{'display'} = &escape($env{'form.display'});
+                        $info{'mailrecip'} = &escape($env{'form.username'}.':'.$env{'form.domain'});
+                    }
+                }
+            }
             my $balancer_token = &Apache::lonnet::tmpput(\%info,$found_server);
             unless (($balancer_token eq 'con_lost') || ($balancer_token eq 'refused') ||
                     ($balancer_token eq 'unknown_cmd') || ($balancer_token eq 'no_such_host')) {
@@ -186,7 +199,7 @@ sub handler {
                     $link_info{'ltoken'} = $env{'form.ltoken'};
                 } elsif ($env{'form.linkprot'}) {
                     $link_info{'linkprot'} = $env{'form.linkprot'};
-                    foreach my $item ('linkprotuser','linkprotexit') {
+                    foreach my $item ('linkprotuser','linkprotexit','linkprotpbid','linkprotpburl') {
                         if ($env{'form.'.$item} ne '') {
                             $link_info{$item} = $env{'form.'.$item};
                         }
@@ -228,8 +241,16 @@ sub handler {
         $balcookie = $info{'balcookie'};
         &Apache::lonnet::tmpdel($env{'form.btoken'});
         delete($env{'form.btoken'});
+        if (($env{'form.firsturl'} eq '/adm/email') &&
+            (exists($info{'display'})) && (exists($info{'mailrecip'}))) {
+            $env{'form.display'} = &unescape($info{'display'});
+            $env{'form.mailrecip'} = &unescape($info{'mailrecip'});
+        }
     }
 
+    (undef,undef,undef,my $clientmathml,my $clientunicode,undef,my $clientmobile) =
+        &Apache::loncommon::decode_user_agent($r);
+
 #
 # If browser sent an old cookie for which the session file had been removed
 # check if configuration for user's domain has a portal URL set.  If so
@@ -250,8 +271,12 @@ sub handler {
 # -------------------------------- Prevent users from attempting to login twice
     if ($handle ne '') {
         &Apache::lonnet::transfer_profile_to_env($lonidsdir,$handle);
+        my $args = {};
+        if ($clientunicode && !$clientmathml) {
+            $args->{'browser.unicode'} = 1;
+        }
 	my $start_page = 
-	    &Apache::loncommon::start_page('Already logged in');
+	    &Apache::loncommon::start_page('Already logged in','',$args);
 	my $end_page = 
 	    &Apache::loncommon::end_page();
         my $dest = '/adm/roles';
@@ -259,7 +284,7 @@ sub handler {
             $dest = &HTML::Entities::encode($env{'form.firsturl'},'\'"<>&');
         }
         if (($env{'form.ltoken'}) || ($env{'form.linkprot'})) {
-            my ($linkprot,$linkprotuser,$linkprotexit);
+            my ($linkprot,$linkprotuser,$linkprotexit,$linkprotpbid,$linkprotpburl);
             if ($env{'form.ltoken'}) {
                 my %info = &Apache::lonnet::tmpget($env{'form.ltoken'});
                 $linkprot = $info{'linkprot'};
@@ -269,10 +294,18 @@ sub handler {
                 if ($info{'linkprotexit'} ne '') {
                     $linkprotexit = $info{'linkprotexit'};
                 }
+                if ($info{'linkprotpbid'} ne '') {
+                    $linkprotpbid = $info{'linkprotpbid'};
+                }
+                if ($info{'linkprotpburl'} ne '') {
+                    $linkprotpburl = $info{'linkprotpburl'};
+                }
             } else {
                 $linkprot = $env{'form.linkprot'};
                 $linkprotuser = $env{'form.linkprotuser'};
                 $linkprotexit = $env{'form.linkprotexit'};
+                $linkprotpbid = $env{'form.linkprotpbid'};
+                $linkprotpburl = $env{'form.linkprotpburl'}; 
             }
             if ($linkprot) {
                 my ($linkprotector,$deeplink) = split(/:/,$linkprot,2);
@@ -284,7 +317,9 @@ sub handler {
                                           linkprot => $linkprot,
                                           linkprotuser => $linkprotuser,
                                           linkprotexit => $linkprotexit,
-                                       );    
+                                          linkprotpbid => $linkprotpbid,
+                                          linkprotpburl => $linkprotpburl,
+                                       );
                     if ($env{'form.ltoken'}) {
                         my $delete = &Apache::lonnet::tmpdel($env{'form.ltoken'});
                     }
@@ -339,11 +374,24 @@ sub handler {
         if ($env{'form.ltoken'}) {
             my $delete = &Apache::lonnet::tmpdel($env{'form.ltoken'});
         }
+        if (($env{'form.firsturl'} eq '/adm/email') && ($env{'form.display'})) {
+            if ($env{'form.mailrecip'}) {
+                if ($env{'form.mailrecip'} eq "$env{'user.name'}:$env{'user.domain'}") {
+                    $dest .= (($dest=~/\?/)?'&amp;':'?') . 'display='.&escape($env{'form.display'}).
+                                                           '&amp;mailrecip='.&escape($env{'form.mailrecip'});
+                }
+            } elsif (($env{'form.username'} eq $env{'user.name'}) && ($env{'form.domain'} eq $env{'user.domain'})) {
+                $dest .= (($dest=~/\?/)?'&amp;':'?') . 'display='.&escape($env{'form.display'}).
+                                                       '&amp;mailrecip='.&escape("$env{'user.name'}:$env{'form.domain'}");
+            }
+        }
 	$r->print(
                   $start_page
+                 .'<div role="main">'
                  .'<p class="LC_warning">'.&mt('You are already logged in!').'</p>'
                  .'<p>'.&mt('Please either [_1]continue the current session[_2] or [_3]log out[_4].',
                   '<a href="'.$dest.'">','</a>','<a href="/adm/logout">','</a>').'</p>'
+                 .'</div>'
                  .$end_page
                  );
         return OK;
@@ -369,9 +417,6 @@ sub handler {
 # ----------------------------------------------------------- Process Interface
     $env{'form.interface'}=~s/\W//g;
 
-    (undef,undef,undef,undef,undef,undef,my $clientmobile) =
-        &Apache::loncommon::decode_user_agent($r);
-
     my $iconpath= 
 	&Apache::loncommon::lonhttpdurl($r->dir_config('lonIconsURL'));
 
@@ -464,7 +509,8 @@ sub handler {
 
 # -------------------------------------------------------- Store away log token
     my ($tokenextras,$tokentype,$linkprot_for_login);
-    my @names = ('role','symb','iptoken','ltoken','linkprotuser','linkprotexit','linkprot','linkkey');
+    my @names = ('role','symb','iptoken','ltoken','linkprotuser','linkprotexit',
+                 'linkprot','linkkey','display','linkprotpbid','linkprotpburl');
     foreach my $name (@names) {
         if ($env{'form.'.$name} ne '') {
             if ($name eq 'ltoken') {
@@ -472,7 +518,7 @@ sub handler {
                 if ($info{'linkprot'}) {
                     $linkprot_for_login = $info{'linkprot'};
                     $tokenextras .= '&linkprot='.&escape($info{'linkprot'});
-                    foreach my $item ('linkprotuser','linkprotexit') {
+                    foreach my $item ('linkprotuser','linkprotexit','linkprotpbid','linkprotpburl') {
                         if ($info{$item}) {
                             $tokenextras .= '&'.$item.'='.&escape($info{$item});
                         }
@@ -480,6 +526,16 @@ sub handler {
                     $tokentype = 'link';
                     last;
                 }
+            } elsif ($env{'form.display'} && ($env{'form.firsturl'} eq '/adm/email')) {
+                if (($env{'form.mailrecip'}) ||
+                    ($env{'form.username'} =~ /^$match_username$/) && ($env{'form.domain'} =~ /^$match_domain$/)) {
+                    $tokenextras .= '&'.$name.'='.&escape($env{'form.display'});
+                    if ($env{'form.mailrecip'}) {
+                        $tokenextras .= '&mailrecip='.&escape($env{'form.mailrecip'});
+                    } else {
+                        $tokenextras .= '&mailrecip='.&escape($env{'form.username'}.':'.$env{'form.domain'});
+                    }
+                }
             } else {
                 $tokenextras .= '&'.$name.'='.&escape($env{'form.'.$name});
                 if (($name eq 'linkkey') || ($name eq 'linkprot')) {
@@ -568,17 +624,34 @@ sub handler {
   .'<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">'
   .'<head><meta http-equiv="Content-Type" content="text/html; charset=utf-8" /><title>'
   .&mt('The LearningOnline Network with CAPA')
-  .'</title></head>'
+  .'</title>'
+  .'<style type="text/css">
+body {
+  background-color:"#FFFFFF";
+}
+h2 {
+  display: block;
+  font-size: 1.17em;
+  margin-top: 1em;
+  margin-bottom: 1em;
+  margin-left: 0;
+  margin-right: 0;
+  font-weight: bold;
+}
+</style></head>'
   .'<body bgcolor="#FFFFFF">'
+  .'<div role="banner">'
   .'<h1>'.&mt('The LearningOnline Network with CAPA').'</h1>'
   .'<img src="/adm/lonKaputt/lonlogo_broken.gif" alt="broken icon" align="right" />'
-  .'<h3>'.&mt('This LON-CAPA server is temporarily not available for login.').'</h3>');
+  .'</div>'
+  .'<div role="main">'
+  .'<h2>'.&mt('This LON-CAPA server is temporarily not available for login.').'</h2>');
         if ($spares) {
             $r->print('<p>'.&mt('Please attempt to login to one of the following servers:')
                      .'</p>'
                      .$spares);
         }
-        $r->print('</body>'
+        $r->print('</div></body>'
                  .'</html>'
         );
         return OK;
@@ -762,10 +835,16 @@ ENDSAMLJS
         }
     }
 
-    $r->print(&Apache::loncommon::start_page('The LearningOnline Network with CAPA Login',$js,
-			       { 'redirect'       => [$expire,'/adm/roles'], 
-				 'add_entries' => \%add_entries,
-				 'only_body'   => 1,}));
+    my $args = {
+                 'redirect'    => [$expire,'/adm/roles'],
+                 'add_entries' => \%add_entries,
+                 'only_body'   => 1,
+               };
+    if ($clientunicode && !$clientmathml) {
+        $args->{'browser.unicode'} = 1;
+    }
+    $r->print(&Apache::loncommon::start_page('The LearningOnline Network with CAPA Login',
+                                             $js,$args));
 
 # ----------------------------------------------------------------------- Texts
 
@@ -807,8 +886,17 @@ ENDSAMLJS
    .' style="margin:0 auto; padding:10px; width:90%; height: auto; background-color:#FFFFFF;">'
 );
 
+    my $target = '_top';
+    if ($sessiondata{'linkprot'}) {
+        my ($linkprotector,$deeplink) = split(/:/,$sessiondata{'linkprot'},2);
+        if (($deeplink eq $sessiondata{'origurl'}) &&
+            (($sessiondata{'linkprotuser'} eq $sessiondata{'username'}.':'.$sessiondata{'domain'}) ||
+             ($sessiondata{'linkprotuser'} eq $sessiondata{'username'}))) {
+            $target = '_self';
+        }
+    }
     $r->print(<<ENDSERVERFORM);
-<form name="server" action="/adm/authenticate" method="post" target="_top">
+<form name="server" action="/adm/authenticate" method="post" target="$target">
    <input type="hidden" name="logtoken" value="$logtoken" />
    <input type="hidden" name="serverid" value="$lonhost" />
    <input type="hidden" name="uname" value="" />
@@ -866,17 +954,22 @@ LFORM
         }
         $r->print(<<HEADER);
 <!-- The LON-CAPA Header -->
-<div style="background:$pgbg;margin:0;width:100%;">
+<div style="background:$pgbg;margin:0;width:100%;" role="banner">
+  <h1 style="padding:0;margin:0">
   <img src="$img" border="0" alt="$alttext" class="LC_maxwidth" id="lcloginbanner" />
+  </h1>
 </div>
 HEADER
+    } else {
+        $r->print('<div role="banner" class="LC_visually_hidden" tabindex="-1">'.
+                  '<h1>'.&mt('LON-CAPA Login Page').'</h1></div>');
     }
 
     my $stdauthformstyle = 'inline-block';
     my $ssoauthstyle = 'none';
     my $sso_onclick;
     my $logintype;
-    $r->print('<div style="float:left;margin-top:0;">');
+    $r->print('<div style="float:left;margin-top:0;" role="main">');
     if ($saml_landing) {
         $ssoauthstyle = 'inline-block';
         $stdauthformstyle = 'none';
@@ -1045,22 +1138,22 @@ $announcements
 </div>
 <hr style="clear:both;" />
 ENDTOP
-    my ($domainrow,$serverrow,$loadrow,$userloadrow,$versionrow);
+    my ($domainrow,$serverrow,$loadrow,$userloadrow,$versioninfo);
     $domainrow = <<"END";
       <tr>
-       <td  align="left" valign="top">
+       <th align="left" valign="top">
         <small><b>$lt{'dom'}:&nbsp;</b></small>
-       </td>
-       <td  align="left" valign="top">
+       </th>
+       <td align="left" valign="top">
         <small><tt>&nbsp;$domain</tt></small>
        </td>
       </tr>
 END
     $serverrow = <<"END";
       <tr>
-       <td  align="left" valign="top">
+       <th align="left" valign="top">
         <small><b>$lt{'serv'}:&nbsp;</b></small>
-       </td>
+       </th>
        <td align="left" valign="top">
         <small><tt>&nbsp;$lonhost ($role)</tt></small>
        </td>
@@ -1069,9 +1162,9 @@ END
     if ($loadlim) {
         $loadrow = <<"END";
       <tr>
-       <td align="left" valign="top">
+       <th align="left" valign="top">
         <small><b>$lt{'load'}:&nbsp;</b></small>
-       </td>
+       </th>
        <td align="left" valign="top">
         <small><tt>&nbsp;$loadpercent $lt{'perc'}</tt></small>
        </td>
@@ -1081,9 +1174,9 @@ END
     if ($uloadlim) {
         $userloadrow = <<"END";
       <tr>
-       <td align="left" valign="top">
+       <th align="left" valign="top">
         <small><b>$lt{'userload'}:&nbsp;</b></small>
-       </td>
+       </th>
        <td align="left" valign="top">
         <small><tt>&nbsp;$userloadpercent $lt{'perc'}</tt></small>
        </td>
@@ -1091,28 +1184,24 @@ END
 END
     }
     if (($version ne '') && ($version ne '<!-- VERSION -->')) {
-        $versionrow = <<"END";
-      <tr>
-       <td colspan="2" align="left">
-        <small>$version</small>
-       </td>
-      </tr>
-END
+        $versioninfo = "<small>$version</small>";
     }
 
     $r->print(<<ENDDOCUMENT);
+    <div role="contentinfo" style="padding:0;clear:both;margin:0;border:0">
     <div style="float: left;">
      <table border="0" cellspacing="0" cellpadding="0">
 $domainrow
 $serverrow
 $loadrow    
 $userloadrow
-$versionrow
      </table>
+    $versioninfo
     </div>
     <div style="float: right;">
     $domainlogo
     </div>
+    </div>
     <br style="clear:both;" />
  </div>
 
@@ -1221,7 +1310,7 @@ sub redirect_page {
                 $args->{'only_body'} = 1;
             } elsif ($env{'form.linkprot'}) {
                 $link_info{'linkprot'} = $env{'form.linkprot'};
-                foreach my $item ('linkprotuser','linkprotexit') {
+                foreach my $item ('linkprotuser','linkprotexit','linkprotpbid','linkprotpburl') {
                     if ($env{'form.'.$item}) {
                         $link_info{$item} = $env{'form.'.$item};
                     }
@@ -1261,7 +1350,7 @@ sub redirect_page {
         }
         $url .= $querystring;
     }
-    $args->{'redirect'} = [0,$url];
+    $args->{'redirect'} = [0,$url,'','',1];
     my $start_page = &Apache::loncommon::start_page('Switching Server ...',undef,$args);
     my $end_page   = &Apache::loncommon::end_page();
     return $start_page.$end_page;