--- loncom/auth/lonlogin.pm	2020/12/18 15:23:03	1.182
+++ loncom/auth/lonlogin.pm	2022/08/24 20:58:50	1.202
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Login Screen
 #
-# $Id: lonlogin.pm,v 1.182 2020/12/18 15:23:03 raeburn Exp $
+# $Id: lonlogin.pm,v 1.202 2022/08/24 20:58:50 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -38,6 +38,8 @@ use Apache::lonlocal;
 use Apache::migrateuser();
 use lib '/home/httpd/lib/perl/';
 use LONCAPA qw(:DEFAULT :match);
+use URI::Escape;
+use HTML::Entities();
 use CGI::Cookie();
  
 sub handler {
@@ -47,23 +49,65 @@ 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','linkkey']);
-    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.linkkey'})) {
-        &Apache::lonacc::get_posted_cgi($r,['linkkey']);
-    }
+	  'token','role','symb','iptoken','btoken','ltoken','ttoken','linkkey',
+          'saml','sso','retry']); 
 
 # -- check if they are a migrating user
     if (defined($env{'form.token'})) {
-	return &Apache::migrateuser::handler($r);
+        return &Apache::migrateuser::handler($r);
+    }
+
+    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'};
+            foreach my $item ('linkprotuser','linkprotexit') {
+                if ($info{$item} ne '') {
+                    $env{'form.'.$item} = $info{$item};
+                }
+            }
+        } elsif ($info{'linkkey'} ne '') {
+            $env{'form.linkkey'} = $info{'linkkey'};
+        }
+    } elsif (($env{'form.sso'}) || ($env{'form.retry'})) {
+        my $infotoken;
+        if ($env{'form.sso'}) {
+            $infotoken = $env{'form.sso'};
+        } else {
+            $infotoken = $env{'form.retry'};
+        }
+        my $data = &Apache::lonnet::reply('tmpget:'.$infotoken,$lonhost);
+        unless (($data=~/^error/) || ($data eq 'con_lost') ||
+                ($data eq 'no_such_host')) {
+            my %info = &decode_token($data);
+            foreach my $item (keys(%info)) {
+                $env{'form.'.$item} = $info{$item};
+            }
+            &Apache::lonnet::tmpdel($infotoken);
+        }
+    } else {
+        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'});
+        }
     }
 
 # For "public user" - remove any exising "public" cookie, as user really wants to log-in
@@ -110,9 +154,6 @@ sub handler {
 	return OK;
     }
 
-    my $lonhost = $r->dir_config('lonHostID');
-    $env{'form.firsturl'} =~ s/(`)/'/g;
-
 # Check if browser sent a LON-CAPA load balancer cookie (and this is a balancer)
 
     my ($found_server,$balancer_cookie) = &Apache::lonnet::check_for_balancer_cookie($r,1);
@@ -123,25 +164,48 @@ sub handler {
             $protocol = 'http' if ($protocol ne 'https');
             my $dest = '/adm/roles';
             if ($env{'form.firsturl'} ne '') {
-                $dest = $env{'form.firsturl'};
+                $dest = &HTML::Entities::encode($env{'form.firsturl'},'\'"<>&');
             }
             my %info = (
                          balcookie => $lonhost.':'.$balancer_cookie,
                        );
-            if ($env{'form.ltoken'}) {
-                my %link_info = &Apache::lonnet::tmpget($env{'form.ltoken'});
-                if ($link_info{'linkprot'}) {
-                    $info{'linkprot'} = $link_info{'linkprot'};
-                }
-                &Apache::lonnet::tmpdel($env{'form.ltoken'});
-                delete($env{'form.ltoken'});
-            } elsif ($env{'form.linkkey'}) {
-                $info{'linkkey'} = $env{'form.linkkey'};
-                delete($env{'form.linkkey'});
+            if ($env{'form.role'}) {
+                $info{'role'} = $env{'form.role'};
+            }
+            if ($env{'form.symb'}) {
+                $info{'symb'} = $env{'form.symb'};
             }
             my $balancer_token = &Apache::lonnet::tmpput(\%info,$found_server);
-            if ($balancer_token) {
-                $dest .=  (($dest=~/\?/)?'&;':'?') . 'btoken='.$balancer_token;
+            unless (($balancer_token eq 'con_lost') || ($balancer_token eq 'refused') ||
+                    ($balancer_token eq 'unknown_cmd') || ($balancer_token eq 'no_such_host')) {
+                $dest .=  (($dest=~/\?/)?'&amp;':'?') . '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'};
+                    foreach my $item ('linkprotuser','linkprotexit') {
+                        if ($env{'form.'.$item} ne '') {
+                            $link_info{$item} = $env{'form.'.$item};
+                        }
+                    }
+                } 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=~/\?/)?'&amp;':'?') . 'ttoken='.$token;
+                    }
+                }
+            }
+            unless ($found_server eq $lonhost) {
+                my $alias = &Apache::lonnet::use_proxy_alias($r,$found_server);
+                $hostname = $alias if ($alias ne '');
             }
             my $url = $protocol.'://'.$hostname.$dest;
             my $start_page =
@@ -158,17 +222,10 @@ sub handler {
 # it a balancer cookie for an active session on this server.
 #
 
-    my ($balcookie,$linkprot,$linkkey);
+    my $balcookie;
     if ($env{'form.btoken'}) {
         my %info = &Apache::lonnet::tmpget($env{'form.btoken'});
         $balcookie = $info{'balcookie'};
-        if ($balcookie) {
-            if ($info{'linkprot'}) {
-                $linkprot = $info{'linkprot'};
-            } elsif ($info{'linkkey'}) {
-                $linkkey = $info{'linkkey'};
-            }
-        }    
         &Apache::lonnet::tmpdel($env{'form.btoken'});
         delete($env{'form.btoken'});
     }
@@ -199,17 +256,41 @@ sub handler {
 	    &Apache::loncommon::end_page();
         my $dest = '/adm/roles';
         if ($env{'form.firsturl'} ne '') {
-            $dest = $env{'form.firsturl'};
+            $dest = &HTML::Entities::encode($env{'form.firsturl'},'\'"<>&');
         }
-        if (($env{'form.ltoken'}) || ($linkprot)) {
-            unless ($linkprot) {
+        if (($env{'form.ltoken'}) || ($env{'form.linkprot'})) {
+            my ($linkprot,$linkprotuser,$linkprotexit);
+            if ($env{'form.ltoken'}) {
                 my %info = &Apache::lonnet::tmpget($env{'form.ltoken'});
                 $linkprot = $info{'linkprot'};
-                my $delete = &Apache::lonnet::tmpdel($env{'form.ltoken'});
-                delete($env{'form.ltoken'});
+                if ($info{'linkprotuser'} ne '') {
+                    $linkprotuser = $info{'linkprotuser'};
+                }
+                if ($info{'linkprotexit'} ne '') {
+                    $linkprotexit = $info{'linkprotexit'};
+                }
+            } else {
+                $linkprot = $env{'form.linkprot'};
+                $linkprotuser = $env{'form.linkprotuser'};
+                $linkprotexit = $env{'form.linkprotexit'};
             }
             if ($linkprot) {
                 my ($linkprotector,$deeplink) = split(/:/,$linkprot,2);
+                if (($deeplink =~ m{^/tiny/$match_domain/\w+$}) &&
+                    ($linkprotuser ne '') && ($linkprotuser ne $env{'user.name'}.':'.$env{'user.domain'})) {
+                    my $ip = &Apache::lonnet::get_requestor_ip();
+                    my %linkprotinfo = (
+                                          origurl => $deeplink,
+                                          linkprot => $linkprot,
+                                          linkprotuser => $linkprotuser,
+                                          linkprotexit => $linkprotexit,
+                                       );    
+                    if ($env{'form.ltoken'}) {
+                        my $delete = &Apache::lonnet::tmpdel($env{'form.ltoken'});
+                    }
+                    &Apache::migrateuser::logout($r,$ip,$handle,undef,undef,\%linkprotinfo);
+                    return OK;
+                }
                 if ($env{'user.linkprotector'}) {
                     my @protectors = split(/,/,$env{'user.linkprotector'});
                     unless (grep(/^\Q$linkprotector\E$/,@protectors)) {
@@ -231,16 +312,14 @@ sub handler {
                     &Apache::lonnet::appenv({'user.linkproturi' => $deeplink});
                 }
             }
-        } elsif (($env{'form.linkkey'}) || ($linkkey)) {
+        } elsif ($env{'form.linkkey'} ne '') {
             if ($env{'form.firsturl'} =~ m{^/tiny/$match_domain/\w+$}) {
-                if ($linkkey eq '') {
-                    $linkkey = $env{'form.linkkey'};
-                }
+                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))});  
+                        &Apache::lonnet::appenv({'user.deeplinkkey' => join(',',sort(@linkkeys))});
                     }
                 } else {
                     &Apache::lonnet::appenv({'user.deeplinkkey' => $linkkey});
@@ -257,6 +336,9 @@ sub handler {
                 }
             }
         }
+        if ($env{'form.ltoken'}) {
+            my $delete = &Apache::lonnet::tmpdel($env{'form.ltoken'});
+        }
 	$r->print(
                   $start_page
                  .'<p class="LC_warning">'.&mt('You are already logged in!').'</p>'
@@ -288,7 +370,7 @@ sub handler {
     $env{'form.interface'}=~s/\W//g;
 
     (undef,undef,undef,undef,undef,undef,my $clientmobile) =
-        &Apache::loncommon::decode_user_agent();
+        &Apache::loncommon::decode_user_agent($r);
 
     my $iconpath= 
 	&Apache::loncommon::lonhttpdurl($r->dir_config('lonIconsURL'));
@@ -297,7 +379,7 @@ sub handler {
     my $defdom = $domain;
     if ($lonhost ne '') {
         unless ($sessiondata{'sessionserver'}) {
-            my $redirect = &check_loginvia($domain,$lonhost,$lonidsdir,$balcookie,$linkprot);
+            my $redirect = &check_loginvia($domain,$lonhost,$lonidsdir,$balcookie);
             if ($redirect) {
                 $r->print($redirect);
                 return OK;
@@ -381,40 +463,40 @@ sub handler {
     if ($uextkey>2147483647) { $uextkey-=4294967296; }
 
 # -------------------------------------------------------- Store away log token
-    my $tokenextras;
-    if ($env{'form.role'}) {
-        $tokenextras = '&role='.&escape($env{'form.role'});
-    }
-    if ($env{'form.symb'}) {
-        if (!$tokenextras) {
-            $tokenextras = '&';
-        }
-        $tokenextras .= '&symb='.&escape($env{'form.symb'});
-    }
-    if ($env{'form.iptoken'}) {
-        if (!$tokenextras) {
-            $tokenextras = '&&';
+    my ($tokenextras,$tokentype,$linkprot_for_login);
+    my @names = ('role','symb','iptoken','ltoken','linkprotuser','linkprotexit','linkprot','linkkey');
+    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'});
+                    foreach my $item ('linkprotuser','linkprotexit') {
+                        if ($info{$item}) {
+                            $tokenextras .= '&'.$item.'='.&escape($info{$item});
+                        }
+                    }
+                    $tokentype = 'link';
+                    last;
+                }
+            } else {
+                $tokenextras .= '&'.$name.'='.&escape($env{'form.'.$name});
+                if (($name eq 'linkkey') || ($name eq 'linkprot')) {
+                    if ((($env{'form.retry'}) || ($env{'form.sso'})) && 
+                        (!$env{'form.ltoken'}) && ($name eq 'linkprot')) {
+                        $linkprot_for_login = $env{'form.linkprot'};
+                    }
+                    $tokentype = 'link';
+                }
+            }
         }
-        $tokenextras .= '&iptoken='.&escape($env{'form.iptoken'});
     }
-    if ($env{'form.ltoken'}) {
-        my %info = &Apache::lonnet::tmpget($env{'form.ltoken'});
-        &Apache::lonnet::tmpdel($env{'form.ltoken'});
-        delete($env{'form.ltoken'});
-        if ($info{'linkprot'}) {
-            if (!$tokenextras) {
-                $tokenextras = '&&&';
-            }
-            $tokenextras .= '&linkprot='.&escape($info{'linkprot'});
-        }
-    } elsif ($env{'form.linkkey'}) {
-        if (!$tokenextras) {
-            $tokenextras = '&&&';
-        }
-        $tokenextras .= '&linkkey='.&escape($env{'form.linkkey'});
+    if ($tokentype) {
+        $tokenextras .= ":$tokentype";
     }
     my $logtoken=Apache::lonnet::reply(
-       'tmpput:'.$ukey.$lkey.'&'.$firsturl.$tokenextras,
+       'tmpput:'.$ukey.$lkey.'&'.&escape($firsturl).$tokenextras,
        $lonhost);
 
 # -- If we cannot talk to ourselves, or hostID does not map to a hostname
@@ -424,6 +506,10 @@ 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);
@@ -577,17 +663,10 @@ function enableInput() {
 
 ENDSCRIPT
 
-# --------------------------------------------------- Print login screen header
-
-    my %add_entries = (
-	       bgcolor      => "$mainbg",
-	       text         => "$font",
-	       link         => "$link",
-	       vlink        => "$vlink",
-	       alink        => "$alink",
-               onload       => 'javascript:enableInput();',);
-
-    my ($lonhost_in_use,$headextra,$headextra_exempt,@hosts,%defaultdomconf);
+    my ($lonhost_in_use,@hosts,%defaultdomconf,$saml_prefix,$saml_landing,
+        $samlssotext,$samlnonsso,$samlssoimg,$samlssoalt,$samlssourl,$samltooltip,
+        $samlnoframe,$samlwindow);
+    %defaultdomconf = &Apache::loncommon::get_domainconf($defdom);
     @hosts = &Apache::lonnet::current_machine_ids();
     $lonhost_in_use = $lonhost;
     if (@hosts > 1) {
@@ -598,7 +677,69 @@ ENDSCRIPT
             }
         }
     }
-    %defaultdomconf = &Apache::loncommon::get_domainconf($defdom);
+    $saml_prefix = $defdom.'.login.saml_';
+    if ($defaultdomconf{$saml_prefix.$lonhost_in_use}) {
+        $saml_landing = 1;
+        $samlssotext = $defaultdomconf{$saml_prefix.'text_'.$lonhost_in_use};
+        $samlnonsso = $defaultdomconf{$saml_prefix.'notsso_'.$lonhost_in_use};
+        $samlssoimg = $defaultdomconf{$saml_prefix.'img_'.$lonhost_in_use};
+        $samlssoalt = $defaultdomconf{$saml_prefix.'alt_'.$lonhost_in_use};
+        $samlssourl = $defaultdomconf{$saml_prefix.'url_'.$lonhost_in_use};
+        $samltooltip = $defaultdomconf{$saml_prefix.'title_'.$lonhost_in_use};
+        $samlwindow = $defaultdomconf{$saml_prefix.'window_'.$lonhost_in_use};
+    }
+    if ($saml_landing) {
+       if ($samlssotext eq '') {
+           $samlssotext = 'SSO Login';
+       }
+       if ($samlnonsso eq '') {
+           $samlnonsso = 'Non-SSO Login';
+       }
+       $js .= <<"ENDSAMLJS";
+
+<script type="text/javascript">
+// <![CDATA[
+function toggleLClogin() {
+    if (document.getElementById('LC_standard_login')) {
+        if (document.getElementById('LC_standard_login').style.display == 'none') {
+            document.getElementById('LC_standard_login').style.display = 'inline-block';
+            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';
+            }
+        } else {
+            document.getElementById('LC_standard_login').style.display = 'none';
+            if (document.getElementById('LC_login_text')) {
+                document.getElementById('LC_login_text').innerHTML = '$samlssotext';
+            }
+            if (document.getElementById('LC_SSO_login')) {
+                document.getElementById('LC_SSO_login').style.display = 'inline-block';
+            }
+        }
+    }
+    return;
+}
+
+// ]]>
+</script>
+
+ENDSAMLJS
+    }
+
+# --------------------------------------------------- Print login screen header
+
+    my %add_entries = (
+	       bgcolor      => "$mainbg",
+	       text         => "$font",
+	       link         => "$link",
+	       vlink        => "$vlink",
+	       alink        => "$alink",
+               onload       => 'javascript:enableInput();',);
+
+    my ($headextra,$headextra_exempt);
     $headextra = $defaultdomconf{$defdom.'.login.headtag_'.$lonhost_in_use};
     $headextra_exempt = $defaultdomconf{$domain.'.login.headtag_exempt_'.$lonhost_in_use};
     if ($headextra) {
@@ -643,6 +784,7 @@ ENDSCRIPT
           'helpdesk' => 'Contact Helpdesk',
           'forgotpw' => 'Forgot password?',
           'newuser'  => 'New User?',
+          'change'   => 'Change?',
        );
 # -------------------------------------------------- Change password field name
 
@@ -704,7 +846,7 @@ ENDSERVERFORM
         $mobileargs = 'autocapitalize="off" autocorrect="off"'; 
     }
     my $loginform=(<<LFORM);
-<form name="client" action="" onsubmit="return(send())">
+<form name="client" action="" onsubmit="return(send())" id="lclogin">
   <input type="hidden" name="lextkey" value="$lextkey" />
   <input type="hidden" name="uextkey" value="$uextkey" />
   <b><label for="uname">$lt{'un'}</label>:</b><br />
@@ -718,15 +860,165 @@ ENDSERVERFORM
 LFORM
 
     if ($showbanner) {
+        my $alttext = &Apache::loncommon::designparm('login.alttext_img',$domain);
+        if ($alttext eq '') {
+            $alttext = 'The Learning Online Network with CAPA';
+        }
         $r->print(<<HEADER);
 <!-- The LON-CAPA Header -->
 <div style="background:$pgbg;margin:0;width:100%;">
-  <img src="$img" border="0" alt="The Learning Online Network with CAPA" class="LC_maxwidth" />
+  <img src="$img" border="0" alt="$alttext" class="LC_maxwidth" id="lcloginbanner" />
 </div>
 HEADER
     }
-    $r->print(<<ENDTOP);
-<div style="float:left;margin-top:0;">
+
+    my $stdauthformstyle = 'inline-block';
+    my $ssoauthstyle = 'none';
+    my $sso_onclick;
+    my $logintype;
+    $r->print('<div style="float:left;margin-top:0;">');
+    if ($saml_landing) {
+        $ssoauthstyle = 'inline-block';
+        $stdauthformstyle = 'none';
+        $logintype = $samlssotext;
+        my $ssologin = '/adm/sso';
+        if ($samlssourl  ne '') {
+            $ssologin = $samlssourl;
+        }
+        my $ssologin_for_js = &js_escape($ssologin);
+        my $querystr_for_js;
+        if (($logtoken eq 'con_lost') || ($logtoken eq 'no_such_host')) {
+            my $querystring;
+            if ($env{'form.firsturl'} ne '') {
+                $querystring = 'origurl=';
+                if ($env{'form.firsturl'} =~ /[^\x00-\xFF]/) {
+                    $querystring .= &uri_escape_utf8($env{'form.firsturl'});
+                } else {
+                    $querystring .= &uri_escape($env{'form.firsturl'});
+                }
+                $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;
+                $querystr_for_js = &js_escape($querystring);
+            }
+        } elsif ($logtoken ne '') {
+            $ssologin .= (($ssologin=~/\?/)?'&amp;':'?') . 'logtoken='.$logtoken;
+            $querystr_for_js = &js_escape('logtoken='.$logtoken);
+        }
+        my $ssohref;
+        if ($samlwindow) {
+            $sso_onclick = <<"ENDJS";
+if (document.getElementById('LC_sso_login_link')) {
+    var ssoelem = document.getElementById('LC_sso_login_link')
+    ssoelem.addEventListener('click',samlWinFunction,false);
+    var windows = {};
+    function samlWinFunction(evt) {
+        evt.preventDefault();
+        var url = '$ssologin_for_js';
+        var name = 'lcssowin';
+        var querystr = '$querystr_for_js';
+        if (querystr) {
+            url += '?'+querystr+'&lcssowin=1';
+        } else {
+            url += '?lcssowin=1';
+        }
+        if ((typeof windows[name] !== 'undefined') && (!windows[name].closed)) {
+            windows[name].close();
+        }
+        windows[name]=window.open(url,name,'width=350,height=600');
+        windows[name].focus();
+        return false;
+    }
+}
+ENDJS
+        }
+        if ($samlssoimg ne '') {
+            $ssohref = '<a href="'.$ssologin.'" title="'.$samltooltip.'" id="LC_sso_login_link">'.
+                       '<img src="'.$samlssoimg.'" alt="'.$samlssoalt.'" id="lcssobutton" /></a>';
+        } else {
+            $ssohref = '<a href="'.$ssologin.'" id="LC_sso_login_link">'.$samlssotext.'</a>';
+        }
+        if (($env{'form.saml'} eq 'no') ||
+            (($env{'form.username'} ne '') && ($env{'form.domain'} ne ''))) {
+            $ssoauthstyle = 'none';
+            $stdauthformstyle = 'inline-block';
+            $logintype = $samlnonsso;
+        }
+        $r->print(<<ENDSAML);
+<p>
+Log-in type:
+<span style="font-weight:bold" id="LC_login_text">$logintype</span><br />
+<span><a href="javascript:toggleLClogin();" style="color:#000000">$lt{'change'}</a></span>
+</p>
+<div style="display:$ssoauthstyle" id="LC_SSO_login">
+<div class="LC_Box" style="padding-top: 10px;">
+$ssohref
+$noscript_warning
+</div>
+<div class="LC_Box" style="padding-top: 10px;">
+$loginhelp
+$contactblock
+$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'}) || ($env{'form.sso'})) {
+                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
+    $sso_onclick
+}
+// ]]>
+</script>
+ENDJS
+        }
+    } elsif ($samlwindow) {
+        $in_frame_js = <<ENDJS;
+<script type="text/javascript">
+// <![CDATA[
+if ((window.self !== window.top) && (document.server.target != '_self')) {
+    $sso_onclick
+}
+// ]]>
+</script>
+ENDJS
+    }
+
+    $r->print(<<ENDLOGIN);
+<div style="display:$stdauthformstyle;" id="LC_standard_login">
 <div class="LC_Box" style="background:$loginbox_bg;">
   $logintitle
   $loginform
@@ -742,10 +1034,11 @@ HEADER
 </div>
 </div>
 
-<div>
-ENDTOP
+ENDLOGIN
+    $r->print('</div><div>'."\n");
     if ($showmainlogo) {
-        $r->print(' <img src="'.$logo.'" alt="" class="LC_maxwidth" />'."\n");
+        my $alttext = &Apache::loncommon::designparm('login.alttext_logo',$domain); 
+        $r->print(' <img src="'.$logo.'" alt="'.$alttext.'" class="LC_maxwidth" id="lcloginmainlogo" />'."\n");
     }
 $r->print(<<ENDTOP);
 $announcements
@@ -823,6 +1116,7 @@ $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
@@ -838,7 +1132,7 @@ ENDDOCUMENT
 }
 
 sub check_loginvia {
-    my ($domain,$lonhost,$lonidsdir,$balcookie,$linkprot) = @_;
+    my ($domain,$lonhost,$lonidsdir,$balcookie) = @_;
     if ($domain eq '' || $lonhost eq '' || $lonidsdir eq '') {
         return;
     }
@@ -898,7 +1192,7 @@ sub check_loginvia {
                             }
                         }
                     }
-                    $output = &redirect_page($newhost,$path,$linkprot);
+                    $output = &redirect_page($newhost,$path);
                 }
             }
         }
@@ -907,7 +1201,7 @@ sub check_loginvia {
 }
 
 sub redirect_page {
-    my ($desthost,$path,$linkprot) = @_;
+    my ($desthost,$path) = @_;
     my $hostname = &Apache::lonnet::hostname($desthost);
     my $protocol = $Apache::lonnet::protocol{$desthost};
     $protocol = 'http' if ($protocol ne 'https');
@@ -915,17 +1209,60 @@ sub redirect_page {
         $path = '/'.$path;
     }
     my $url = $protocol.'://'.$hostname.$path;
-    if ($env{'form.firsturl'} ne '') {
-        $url .='?firsturl='.$env{'form.firsturl'};
-    }
-    if ($linkprot) {
-        my $ltoken = &Apache::lonnet::tmpput({linkprot => $linkprot},$desthost);
-        if ($ltoken) {
-            $url .= (($url =~ /\?/) ? '&' : '?').'ltoken='.$ltoken;
+    my $args = {};
+    if ($env{'form.firsturl'} =~ m{^/tiny/$match_domain/\w+$}) {
+        $url = $protocol.'://'.$hostname.$env{'form.firsturl'};
+        if (($env{'form.ltoken'}) || ($env{'form.linkprot'} ne '') ||
+            ($env{'form.linkkey'} ne '')) {
+            my %link_info;
+            if ($env{'form.ltoken'}) {
+                %link_info = &Apache::lonnet::tmpget($env{'form.ltoken'});
+                &Apache::lonnet::tmpdel($env{'form.ltoken'});
+                $args->{'only_body'} = 1;
+            } elsif ($env{'form.linkprot'}) {
+                $link_info{'linkprot'} = $env{'form.linkprot'};
+                foreach my $item ('linkprotuser','linkprotexit') {
+                    if ($env{'form.'.$item}) {
+                        $link_info{$item} = $env{'form.'.$item};
+                    }
+                }
+                $args->{'only_body'} = 1;
+            } 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 .= '?ltoken='.$token;
+            }
         }
+    } else {
+        my $querystring;
+        if ($env{'form.firsturl'} ne '') {
+            if ($env{'form.firsturl'} =~ /[^\x00-\xFF]/) {
+                $querystring = &uri_escape_utf8($env{'form.firsturl'});
+            } else {
+                $querystring = &uri_escape($env{'form.firsturl'});
+            }
+            $querystring = &HTML::Entities::encode($querystring,"'");
+            $querystring = '?firsturl='.$querystring;
+        }
+        if ($env{'form.ltoken'}) {
+            my %link_info = &Apache::lonnet::tmpget($env{'form.ltoken'});
+            &Apache::lonnet::tmpdel($env{'form.ltoken'});
+            my $token = &Apache::lonnet::tmpput(\%link_info,$desthost,'link');
+            unless (($token eq 'con_lost') || ($token eq 'refused') || ($token =~ /^error:/) ||
+                    ($token eq 'unknown_cmd') || ($token eq 'no_such_host')) {
+                unless (($path eq '/adm/roles') || ($path eq '/adm/login')) {
+                    $url = $protocol.'://'.$hostname.'/adm/roles';
+                }
+                $querystring .= (($querystring =~/^\?/)?'&amp;':'?') . 'ttoken='.$token;
+            }
+        }
+        $url .= $querystring;
     }
-    my $start_page = &Apache::loncommon::start_page('Switching Server ...',undef,
-                                                    {'redirect' => [0,$url],});
+    $args->{'redirect'} = [0,$url];
+    my $start_page = &Apache::loncommon::start_page('Switching Server ...',undef,$args);
     my $end_page   = &Apache::loncommon::end_page();
     return $start_page.$end_page;
 }
@@ -998,5 +1335,19 @@ sub newuser_link {
     return '<a href="/adm/createaccount">'.$linkname.'</a>';
 }
 
+sub decode_token {
+    my ($info) = @_;
+    my ($firsturl,@rest)=split(/\&/,$info);
+    my %form;
+    if ($firsturl ne '') {
+        $form{'firsturl'} = &unescape($firsturl);
+    }
+    foreach my $item (@rest) {
+        my ($key,$value) = split(/=/,$item);
+        $form{$key} = &unescape($value);
+    }
+    return %form;
+}
+
 1;
 __END__