--- loncom/auth/lonlogin.pm 2023/02/03 23:09:30 1.205 +++ loncom/auth/lonlogin.pm 2025/02/09 22:42:12 1.209 @@ -1,7 +1,7 @@ # The LearningOnline Network # Login Screen # -# $Id: lonlogin.pm,v 1.205 2023/02/03 23:09:30 raeburn Exp $ +# $Id: lonlogin.pm,v 1.209 2025/02/09 22:42:12 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -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}; } @@ -199,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}; } @@ -248,6 +248,9 @@ sub handler { } } + (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 @@ -268,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'; @@ -277,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'}; @@ -287,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); @@ -302,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'}); } @@ -370,9 +387,11 @@ sub handler { } $r->print( $start_page + .'
' .'

'.&mt('You are already logged in!').'

' .'

'.&mt('Please either [_1]continue the current session[_2] or [_3]log out[_4].', '','','','').'

' + .'
' .$end_page ); return OK; @@ -398,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')); @@ -493,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','display'); + 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') { @@ -501,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}); } @@ -607,17 +624,34 @@ sub handler { .'' .'' .&mt('The LearningOnline Network with CAPA') - .'' + .'' + .'' .'' + .'
' .'

'.&mt('The LearningOnline Network with CAPA').'

' .'broken icon' - .'

'.&mt('This LON-CAPA server is temporarily not available for login.').'

'); + .'
' + .'
' + .'

'.&mt('This LON-CAPA server is temporarily not available for login.').'

'); if ($spares) { $r->print('

'.&mt('Please attempt to login to one of the following servers:') .'

' .$spares); } - $r->print('' + $r->print('
' .'' ); return OK; @@ -801,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 @@ -846,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(< +
@@ -905,17 +954,22 @@ LFORM } $r->print(< -
+
+

$alttext +

HEADER + } else { + $r->print(''); } my $stdauthformstyle = 'inline-block'; my $ssoauthstyle = 'none'; my $sso_onclick; my $logintype; - $r->print('
'); + $r->print('
'); if ($saml_landing) { $ssoauthstyle = 'inline-block'; $stdauthformstyle = 'none'; @@ -1084,22 +1138,22 @@ $announcements
ENDTOP - my ($domainrow,$serverrow,$loadrow,$userloadrow,$versionrow); + my ($domainrow,$serverrow,$loadrow,$userloadrow,$versioninfo); $domainrow = <<"END"; - + $lt{'dom'}:  - - + +  $domain END $serverrow = <<"END"; - + $lt{'serv'}:  - +  $lonhost ($role) @@ -1108,9 +1162,9 @@ END if ($loadlim) { $loadrow = <<"END"; - + $lt{'load'}:  - +  $loadpercent $lt{'perc'} @@ -1120,9 +1174,9 @@ END if ($uloadlim) { $userloadrow = <<"END"; - + $lt{'userload'}:  - +  $userloadpercent $lt{'perc'} @@ -1130,28 +1184,24 @@ END END } if (($version ne '') && ($version ne '')) { - $versionrow = <<"END"; - - - $version - - -END + $versioninfo = "$version"; } $r->print(<
$domainrow $serverrow $loadrow $userloadrow -$versionrow
+ $versioninfo
$domainlogo
+

@@ -1260,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}; } @@ -1300,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;