--- loncom/auth/lonlogin.pm	2022/05/29 12:44:12	1.158.2.13.2.4
+++ loncom/auth/lonlogin.pm	2022/01/16 19:43:41	1.158.2.14
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Login Screen
 #
-# $Id: lonlogin.pm,v 1.158.2.13.2.4 2022/05/29 12:44:12 raeburn Exp $
+# $Id: lonlogin.pm,v 1.158.2.14 2022/01/16 19:43:41 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -49,8 +49,7 @@ sub handler {
 	(join('&',$ENV{'QUERY_STRING'},$env{'request.querystring'},
 	      $ENV{'REDIRECT_QUERY_STRING'}),
 	 ['interface','username','domain','firsturl','localpath','localres',
-	  'token','role','symb','iptoken','btoken','ltoken','ttoken','linkkey',
-          'saml','sso','retry']);
+	  'token','role','symb','iptoken','btoken','saml','sso','retry']);
 
 # -- check if they are a migrating user
     if (defined($env{'form.token'})) {
@@ -58,20 +57,7 @@ sub handler {
     }
 
     my $lonhost = $r->dir_config('lonHostID');
-    if ($env{'form.ttoken'}) {
-        my %info = &Apache::lonnet::tmpget($env{'form.ttoken'});
-        &Apache::lonnet::tmpdel($env{'form.ttoken'});
-        if ($info{'origurl'}) {
-            $env{'form.firsturl'} = $info{'origurl'};
-        }
-        if ($info{'ltoken'}) {
-            $env{'form.ltoken'} = $info{'ltoken'};
-        } elsif ($info{'linkprot'}) {
-            $env{'form.linkprot'} = $info{'linkprot'};
-        } elsif ($info{'linkkey'} ne '') {
-            $env{'form.linkkey'} = $info{'linkkey'};
-        }
-    } elsif (($env{'form.sso'}) || ($env{'form.retry'})) {
+    if (($env{'form.sso'}) || ($env{'form.retry'})) {
         my $infotoken;
         if ($env{'form.sso'}) {
             $infotoken = $env{'form.sso'};
@@ -91,15 +77,6 @@ sub handler {
         if (!defined($env{'form.firsturl'})) {
             &Apache::lonacc::get_posted_cgi($r,['firsturl']);
         }
-        if (!defined($env{'form.firsturl'})) {
-            if ($ENV{'REDIRECT_URL'} =~ m{^/+tiny/+$LONCAPA::match_domain/+\w+$}) {
-                $env{'form.firsturl'} = $ENV{'REDIRECT_URL'};
-            }
-        }
-        if (($env{'form.firsturl'} =~ m{^/+tiny/+$LONCAPA::match_domain/+\w+$}) &&
-            (!$env{'form.ltoken'}) && (!$env{'form.linkprot'}) && (!$env{'form.linkkey'})) {
-            &Apache::lonacc::get_posted_cgi($r,['linkkey']);
-        }
         if ($env{'form.firsturl'} eq '/adm/logout') {
             delete($env{'form.firsturl'});
         }
@@ -175,24 +152,6 @@ sub handler {
                     ($balancer_token eq 'unknown_cmd') || ($balancer_token eq 'no_such_host')) {
                 $dest .=  (($dest=~/\?/)?'&':'?') . 'btoken='.$balancer_token;
             }
-            if ($env{'form.firsturl'} =~ m{^/tiny/$match_domain/\w+$}) {
-                my %link_info;
-                if ($env{'form.ltoken'}) {
-                    $link_info{'ltoken'} = $env{'form.ltoken'};
-                } elsif ($env{'form.linkprot'}) {
-                    $link_info{'linkprot'} = $env{'form.linkprot'};
-                } elsif ($env{'form.linkkey'} ne '') {
-                    $link_info{'linkkey'} = $env{'form.linkkey'};
-                }
-                if (keys(%link_info)) {
-                    $link_info{'origurl'} = $env{'form.firsturl'};
-                    my $token = &Apache::lonnet::tmpput(\%link_info,$found_server,'link');
-                    unless (($token eq 'con_lost') || ($token eq 'refused') ||
-                            ($token eq 'unknown_cmd') || ($token eq 'no_such_host')) {
-                        $dest .=  (($dest=~/\?/)?'&':'?') . 'ttoken='.$token;
-                    }
-                }
-            }
             unless ($found_server eq $lonhost) {
                 my $alias = &Apache::lonnet::use_proxy_alias($r,$found_server);
                 $hostname = $alias if ($alias ne '');
@@ -248,62 +207,6 @@ sub handler {
         if ($env{'form.firsturl'} ne '') {
             $dest = &HTML::Entities::encode($env{'form.firsturl'},'\'"<>&');
         }
-        if (($env{'form.ltoken'}) || ($env{'form.linkprot'})) {
-            my $linkprot;
-            if ($env{'form.ltoken'}) {
-                my %info = &Apache::lonnet::tmpget($env{'form.ltoken'});
-                $linkprot = $info{'linkprot'};
-                my $delete = &Apache::lonnet::tmpdel($env{'form.ltoken'});
-            } else {
-                $linkprot = $env{'form.linkprot'};
-            }
-            if ($linkprot) {
-                my ($linkprotector,$deeplink) = split(/:/,$linkprot,2);
-                if ($env{'user.linkprotector'}) {
-                    my @protectors = split(/,/,$env{'user.linkprotector'});
-                    unless (grep(/^\Q$linkprotector\E$/,@protectors)) {
-                        push(@protectors,$linkprotector);
-                        @protectors = sort { $a <=> $b } @protectors;
-                        &Apache::lonnet::appenv({'user.linkprotector' => join(',',@protectors)});
-                    }
-                } else {
-                    &Apache::lonnet::appenv({'user.linkprotector' => $linkprotector });
-                }
-                if ($env{'user.linkproturi'}) {
-                    my @proturis = split(/,/,$env{'user.linkproturi'});
-                    unless (grep(/^\Q$deeplink\E$/,@proturis)) {
-                        push(@proturis,$deeplink);
-                        @proturis = sort @proturis;
-                        &Apache::lonnet::appenv({'user.linkproturi' => join(',',@proturis)});
-                    }
-                } else {
-                    &Apache::lonnet::appenv({'user.linkproturi' => $deeplink});
-                }
-            }
-        } elsif ($env{'form.linkkey'} ne '') {
-            if ($env{'form.firsturl'} =~ m{^/tiny/$match_domain/\w+$}) {
-                my $linkkey = $env{'form.linkkey'};
-                if ($env{'user.deeplinkkey'}) {
-                    my @linkkeys = split(/,/,$env{'user.deeplinkkey'});
-                    unless (grep(/^\Q$linkkey\E$/,@linkkeys)) {
-                        push(@linkkeys,$linkkey);
-                        &Apache::lonnet::appenv({'user.deeplinkkey' => join(',',sort(@linkkeys))});
-                    }
-                } else {
-                    &Apache::lonnet::appenv({'user.deeplinkkey' => $linkkey});
-                }
-                my $deeplink = $env{'form.firsturl'};
-                if ($env{'user.keyedlinkuri'}) {
-                    my @keyeduris = split(/,/,$env{'user.keyedlinkuri'});
-                    unless (grep(/^\Q$deeplink\E$/,@keyeduris)) {
-                        push(@keyeduris,$deeplink);
-                        &Apache::lonnet::appenv({'user.keyedlinkuri' => join(',',sort(@keyeduris))});
-                    }
-                } else {
-                    &Apache::lonnet::appenv({'user.keyedlinkuri' => $deeplink});
-                }
-            }
-        }
 	$r->print(
               $start_page
              .'<p class="LC_warning">'.&mt('You are already logged in!').'</p>'
@@ -428,32 +331,13 @@ sub handler {
     if ($uextkey>2147483647) { $uextkey-=4294967296; }
 
 # -------------------------------------------------------- Store away log token
-    my ($tokenextras,$tokentype,$linkprot_for_login);
-    my @names = ('role','symb','iptoken','ltoken','linkprot','linkkey');
+    my $tokenextras;
+    my @names = ('role','symb','iptoken');
     foreach my $name (@names) {
         if ($env{'form.'.$name} ne '') {
-            if ($name eq 'ltoken') {
-                my %info = &Apache::lonnet::tmpget($env{'form.'.$name});
-                if ($info{'linkprot'}) {
-                    $linkprot_for_login = $info{'linkprot'};
-                    $tokenextras .= '&linkprot='.&escape($info{'linkprot'});
-                    $tokentype = 'link';
-                    last;
-                }
-            } else {
-                $tokenextras .= '&'.$name.'='.&escape($env{'form.'.$name});
-                if (($name eq 'linkkey') || ($name eq 'linkprot')) {
-                    if (($env{'form.retry'}) && (!$env{'form.ltoken'}) && ($name eq 'linkprot')) {
-                        $linkprot_for_login = $env{'form.linkprot'};
-                    }
-                    $tokentype = 'link';
-                }
-            }
+            $tokenextras .= '&'.$name.'='.&escape($env{'form.'.$name});
         }
     }
-    if ($tokentype) {
-        $tokenextras .= ":$tokentype";
-    }
     my $logtoken=Apache::lonnet::reply(
        'tmpput:'.$ukey.$lkey.'&'.&escape($firsturl).$tokenextras,
        $lonhost);
@@ -465,10 +349,6 @@ sub handler {
         if ($logtoken eq 'no_such_host') {
             &Apache::lonnet::logthis('No valid logtoken for log-in page -- unable to determine hostname for hostID: '.$lonhost.'. Check entry in hosts.tab');
         }
-        if ($env{'form.ltoken'}) {
-            &Apache::lonnet::tmpdel($env{'form.ltoken'});
-            delete($env{'form.ltoken'});
-        }
         my $spares='';
         my (@sparehosts,%spareservers);
         my $sparesref = &Apache::lonnet::this_host_spares($defdom);
@@ -658,7 +538,6 @@ function toggleLClogin() {
             if (document.getElementById('LC_login_text')) {
                 document.getElementById('LC_login_text').innerHTML = '$samlnonsso';
             }
-            if ( document.client.uname ) { document.client.uname.focus(); }
             if (document.getElementById('LC_SSO_login')) {
                 document.getElementById('LC_SSO_login').style.display = 'none';
             }
@@ -847,13 +726,6 @@ HEADER
                 }
                 $querystring = &HTML::Entities::encode($querystring,"'");
             }
-            if ($env{'form.ltoken'} ne '') {
-                $querystring .= (($querystring eq '')?'':'&amp;') . 'ltoken='.
-                                  &HTML::Entities::encode(&uri_escape($env{'form.ltoken'}));
-            } elsif ($env{'form.linkkey'}) {
-                $querystring .= (($querystring eq '')?'':'&amp;') . 'linkkey='.
-                                  &HTML::Entities::encode(&uri_escape($env{'form.linkkey'}));
-            }
             if ($querystring ne '') {
                 $ssologin .= (($ssologin=~/\?/)?'&amp;':'?') . $querystring;
             }
@@ -891,40 +763,6 @@ $coursecatalog
 </div>
 </div>
 ENDSAML
-    } else {
-        if ($env{'form.ltoken'}) {
-            &Apache::lonnet::tmpdel($env{'form.ltoken'});
-            delete($env{'form.ltoken'});
-        }
-    }
-    my $in_frame_js;
-    if ($linkprot_for_login) {
-        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 ($linkproturi eq $env{'form.firsturl'}) {
-                    $set_target = "    document.server.target = '_self';";
-                }
-            } else {
-                $set_target = <<ENDTARG;
-    var linkproturi = '$linkproturi';
-    var path = document.location.pathname.replace( new RegExp('^/adm/launch'),'');
-    if (linkproturi == path) {
-        document.server.target = '_self';
-    }
-ENDTARG
-            }
-            $in_frame_js = <<ENDJS;
-<script type="text/javascript">
-// <![CDATA[
-if ((window.self !== window.top) && (document.server.target != '_self')) {
-    $set_target
-}
-// ]]>
-</script>
-ENDJS
-        }
     }
 
     $r->print(<<ENDLOGIN);
@@ -1026,7 +864,6 @@ $versionrow
     <br style="clear:both;" />
  </div>
 
-$in_frame_js
 <script type="text/javascript">
 // <![CDATA[
 // the if prevents the script error if the browser can not handle this
@@ -1129,19 +966,6 @@ sub redirect_page {
         $querystring = &HTML::Entities::encode($querystring,"'");
         $url .='?firsturl='.$querystring;
     }
-    if (($env{'form.ltoken'}) || ($env{'form.linkkey'} ne '')) {
-        my %link_info;
-        if ($env{'form.ltoken'}) {
-            $link_info{'ltoken'} = $env{'form.ltoken'};
-        } elsif ($env{'form.linkkey'} ne '') {
-            $link_info{'linkkey'} = $env{'form.linkkey'};
-        }
-        my $token = &Apache::lonnet::tmpput(\%link_info,$desthost,'link');
-        unless (($token eq 'con_lost') || ($token eq 'refused') ||
-                ($token eq 'unknown_cmd') || ($token eq 'no_such_host')) {
-            $url .= (($url=~/\?/)?'&amp;':'?') . 'ttoken='.$token;
-        }
-    }
     my $start_page = &Apache::loncommon::start_page('Switching Server ...',undef,
                                                     {'redirect' => [0,$url],});
     my $end_page   = &Apache::loncommon::end_page();