--- loncom/auth/lonlogin.pm 2022/05/25 18:05:56 1.196
+++ loncom/auth/lonlogin.pm 2022/06/01 12:12:32 1.198
@@ -1,7 +1,7 @@
# The LearningOnline Network
# Login Screen
#
-# $Id: lonlogin.pm,v 1.196 2022/05/25 18:05:56 raeburn Exp $
+# $Id: lonlogin.pm,v 1.198 2022/06/01 12:12:32 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -443,7 +443,8 @@ sub handler {
} else {
$tokenextras .= '&'.$name.'='.&escape($env{'form.'.$name});
if (($name eq 'linkkey') || ($name eq 'linkprot')) {
- if (($env{'form.retry'}) && (!$env{'form.ltoken'}) && ($name eq 'linkprot')) {
+ if ((($env{'form.retry'}) || ($env{'form.sso'})) &&
+ (!$env{'form.ltoken'}) && ($name eq 'linkprot')) {
$linkprot_for_login = $env{'form.linkprot'};
}
$tokentype = 'link';
@@ -907,7 +908,7 @@ ENDSAML
my ($linkprotector,$linkproturi) = split(/:/,$linkprot_for_login,2);
if (($linkprotector =~ /^\d+(c|d)$/) && ($linkproturi =~ m{^/+tiny/+$LONCAPA::match_domain/+\w+$})) {
my $set_target;
- if ($env{'form.retry'}) {
+ if (($env{'form.retry'}) || ($env{'form.sso'})) {
if ($linkproturi eq $env{'form.firsturl'}) {
$set_target = " document.server.target = '_self';";
}
@@ -1031,6 +1032,7 @@ $versionrow
+$in_frame_js