--- loncom/auth/lonlogin.pm	2023/07/05 17:03:27	1.158.2.13.2.10
+++ loncom/auth/lonlogin.pm	2024/09/18 16:35:51	1.158.2.13.2.12
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Login Screen
 #
-# $Id: lonlogin.pm,v 1.158.2.13.2.10 2023/07/05 17:03:27 raeburn Exp $
+# $Id: lonlogin.pm,v 1.158.2.13.2.12 2024/09/18 16:35:51 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -852,8 +852,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="" />
@@ -1306,7 +1315,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;