--- loncom/auth/lonlogin.pm	2024/07/13 20:59:10	1.158.2.17
+++ loncom/auth/lonlogin.pm	2014/10/04 02:59:32	1.159
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Login Screen
 #
-# $Id: lonlogin.pm,v 1.158.2.17 2024/07/13 20:59:10 raeburn Exp $
+# $Id: lonlogin.pm,v 1.159 2014/10/04 02:59:32 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -37,10 +37,7 @@ use Apache::lonauth();
 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();
+use LONCAPA;
  
 sub handler {
     my $r = shift;
@@ -49,72 +46,19 @@ sub handler {
 	(join('&',$ENV{'QUERY_STRING'},$env{'request.querystring'},
 	      $ENV{'REDIRECT_QUERY_STRING'}),
 	 ['interface','username','domain','firsturl','localpath','localres',
-	  'token','role','symb','iptoken','btoken','saml','sso','retry']);
+	  'token','role','symb','iptoken']);
+    if (!defined($env{'form.firsturl'})) {
+        &Apache::lonacc::get_posted_cgi($r,['firsturl']);
+    }
 
 # -- check if they are a migrating user
     if (defined($env{'form.token'})) {
 	return &Apache::migrateuser::handler($r);
     }
 
-    my $lonhost = $r->dir_config('lonHostID');
-    if (($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 ($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
-    my ($handle,$lonidsdir,$expirepub,$userdom);
-    $lonidsdir=$r->dir_config('lonIDsDir');
-    unless ($r->header_only) {
-        $handle = &Apache::lonnet::check_for_valid_session($r,'lonID',undef,\$userdom);
-        if ($handle ne '') {
-            if ($handle=~/^publicuser\_/) {
-                unlink($r->dir_config('lonIDsDir')."/$handle.id");
-                undef($handle);
-                undef($userdom);
-                $expirepub = 1;
-            }
-        }
-    }
-
     &Apache::loncommon::no_cache($r);
     &Apache::lonlocal::get_language_handle($r);
     &Apache::loncommon::content_type($r,'text/html');
-    if ($expirepub) {
-        my $c = new CGI::Cookie(-name    => 'lonPubID',
-                                -value   => '',
-                                -expires => '-10y',);
-        $r->header_out('Set-cookie' => $c);
-    } elsif (($handle eq '') && ($userdom ne '')) {
-        my %cookies=CGI::Cookie->parse($r->header_in('Cookie'));
-        foreach my $name (keys(%cookies)) {
-            next unless ($name =~ /^lon(|S|Link|Pub)ID$/);
-            my $c = new CGI::Cookie(-name    => $name,
-                                    -value   => '',
-                                    -expires => '-10y',);
-            $r->headers_out->add('Set-cookie' => $c);
-        }
-    }
     $r->send_http_header;
     return OK if $r->header_only;
 
@@ -126,97 +70,37 @@ sub handler {
 	return OK;
     }
 
-# Check if browser sent a LON-CAPA load balancer cookie (and this is a balancer)
+    $env{'form.firsturl'} =~ s/(`)/'/g;
 
-    my ($found_server,$balancer_cookie) = &Apache::lonnet::check_for_balancer_cookie($r,1);
-    if ($found_server) {
-        my $hostname = &Apache::lonnet::hostname($found_server);
-        if ($hostname ne '') {
-            my $protocol = $Apache::lonnet::protocol{$found_server};
-            $protocol = 'http' if ($protocol ne 'https');
+# -------------------------------- Prevent users from attempting to login twice
+    my $handle = &Apache::lonnet::check_for_valid_session($r);
+    if ($handle ne '') {
+        my $lonidsdir=$r->dir_config('lonIDsDir');
+        if ($handle=~/^publicuser\_/) {
+# For "public user" - remove it, we apparently really want to login
+	    unlink($r->dir_config('lonIDsDir')."/$handle.id");
+        } else {
+# Indeed, a valid token is found
+            &Apache::lonnet::transfer_profile_to_env($lonidsdir,$handle);
+	    my $start_page = 
+	        &Apache::loncommon::start_page('Already logged in');
+	    my $end_page = 
+	        &Apache::loncommon::end_page();
             my $dest = '/adm/roles';
             if ($env{'form.firsturl'} ne '') {
-                $dest = &HTML::Entities::encode($env{'form.firsturl'},'\'"<>&');
+                $dest = $env{'form.firsturl'}; 
             }
-            my %info = (
-                         balcookie => $lonhost.':'.$balancer_cookie,
-                       );
-            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);
-            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;
-            }
-            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 =
-                &Apache::loncommon::start_page('Switching Server ...',undef,
-                                               {'redirect'       => [0,$url],});
-            my $end_page   = &Apache::loncommon::end_page();
-            $r->print($start_page.$end_page);
-            return OK;
-        }
-    }
-
-#
-# Check if a LON-CAPA load balancer sent user here because user's browser sent
-# it a balancer cookie for an active session on this server.
-#
-
-    my $balcookie;
-    if ($env{'form.btoken'}) {
-        my %info = &Apache::lonnet::tmpget($env{'form.btoken'});
-        $balcookie = $info{'balcookie'};
-        &Apache::lonnet::tmpdel($env{'form.btoken'});
-        delete($env{'form.btoken'});
-    }
-
-#
-# 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
-# switch user's log-in to the portal.
-#
-
-    if (($handle eq '') && ($userdom ne '')) {
-        my %domdefaults = &Apache::lonnet::get_domain_defaults($userdom);
-        if ($domdefaults{'portal_def'} =~ /^https?\:/) {
-            my $start_page = &Apache::loncommon::start_page('Switching Server ...',undef,
-                                          {'redirect' => [0,$domdefaults{'portal_def'}],});
-            my $end_page   = &Apache::loncommon::end_page();
-            $r->print($start_page.$end_page);
+	    $r->print(
+                  $start_page
+                 .'<p class="LC_warning">'.&mt('You are already logged in!').'</p>'
+                 .'<p>'.&mt('Please either [_1]continue the current session[_2] or [_3]log out[_4].',
+                  '<a href="'.$dest.'">','</a>','<a href="/adm/logout">','</a>').'</p>'
+                 .$end_page
+                 );
             return OK;
         }
     }
 
-# -------------------------------- Prevent users from attempting to login twice
-    if ($handle ne '') {
-        &Apache::lonnet::transfer_profile_to_env($lonidsdir,$handle);
-	my $start_page = 
-	    &Apache::loncommon::start_page('Already logged in');
-	my $end_page = 
-	    &Apache::loncommon::end_page();
-        my $dest = '/adm/roles';
-        if ($env{'form.firsturl'} ne '') {
-            $dest = &HTML::Entities::encode($env{'form.firsturl'},'\'"<>&');
-        }
-	$r->print(
-              $start_page
-             .'<p class="LC_warning">'.&mt('You are already logged in!').'</p>'
-             .'<p>'.&mt('Please either [_1]continue the current session[_2] or [_3]log out[_4].',
-              '<a href="'.$dest.'">','</a>','<a href="/adm/logout">','</a>').'</p>'
-             .$end_page
-             );
-        return OK;
-    }
-
 # ---------------------------------------------------- No valid token, continue
 
 # ---------------------------- Not possible to really login to domain "public"
@@ -238,16 +122,16 @@ sub handler {
     $env{'form.interface'}=~s/\W//g;
 
     (undef,undef,undef,undef,undef,undef,my $clientmobile) =
-        &Apache::loncommon::decode_user_agent($r);
+        &Apache::loncommon::decode_user_agent();
 
     my $iconpath= 
 	&Apache::loncommon::lonhttpdurl($r->dir_config('lonIconsURL'));
 
+    my $lonhost = $r->dir_config('lonHostID');
     my $domain = &Apache::lonnet::default_login_domain();
-    my $defdom = $domain;
     if ($lonhost ne '') {
         unless ($sessiondata{'sessionserver'}) {
-            my $redirect = &check_loginvia($domain,$lonhost,$lonidsdir,$balcookie);
+            my $redirect = &check_loginvia($domain,$lonhost);
             if ($redirect) {
                 $r->print($redirect);
                 return OK;
@@ -256,7 +140,7 @@ sub handler {
     }
 
     if (($sessiondata{'domain'}) &&
-        (&Apache::lonnet::domain($sessiondata{'domain'},'description'))) {
+        (&Apache::lonnet::domain($env{'form.domain'},'description'))) {
         $domain=$sessiondata{'domain'};
     } elsif (($env{'form.domain'}) && 
 	(&Apache::lonnet::domain($env{'form.domain'},'description'))) {
@@ -332,14 +216,23 @@ sub handler {
 
 # -------------------------------------------------------- Store away log token
     my $tokenextras;
-    my @names = ('role','symb','iptoken');
-    foreach my $name (@names) {
-        if ($env{'form.'.$name} ne '') {
-            $tokenextras .= '&'.$name.'='.&escape($env{'form.'.$name});
+    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 = '&&';
+        }
+        $tokenextras .= '&iptoken='.&escape($env{'form.iptoken'});
     }
     my $logtoken=Apache::lonnet::reply(
-       'tmpput:'.$ukey.$lkey.'&'.&escape($firsturl).$tokenextras,
+       'tmpput:'.$ukey.$lkey.'&'.$firsturl.$tokenextras,
        $lonhost);
 
 # -- If we cannot talk to ourselves, or hostID does not map to a hostname
@@ -350,36 +243,22 @@ sub handler {
             &Apache::lonnet::logthis('No valid logtoken for log-in page -- unable to determine hostname for hostID: '.$lonhost.'. Check entry in hosts.tab');
         }
         my $spares='';
-        my (@sparehosts,%spareservers);
-        my $sparesref = &Apache::lonnet::this_host_spares($defdom);
-        if (ref($sparesref) eq 'HASH') {
-            foreach my $key (keys(%{$sparesref})) {
-                if (ref($sparesref->{$key}) eq 'ARRAY') {
-                    my @sorted = sort { &Apache::lonnet::hostname($a) cmp
-                                        &Apache::lonnet::hostname($b);
-                                      } @{$sparesref->{$key}};
-                    if (@sorted) {
-                        if ($key eq 'primary') {
-                            unshift(@sparehosts,@sorted);
-                        } elsif ($key eq 'default') {
-                            push(@sparehosts,@sorted);
-                        }
-                    }
-                }
-            }
-        }
-        foreach my $hostid (@sparehosts) {
+	my $last;
+        foreach my $hostid (sort
+			    {
+				&Apache::lonnet::hostname($a) cmp
+				    &Apache::lonnet::hostname($b);
+			    }
+			    keys(%Apache::lonnet::spareid)) {
             next if ($hostid eq $lonhost);
 	    my $hostname = &Apache::lonnet::hostname($hostid);
-	    next if (($hostname eq '') || ($spareservers{$hostname}));
-            $spareservers{$hostname} = 1;
-            my $protocol = $Apache::lonnet::protocol{$hostid};
-            $protocol = 'http' if ($protocol ne 'https');
-            $spares.='<br /><span style="font-size: larger;"><a href="'.$protocol.'://'.
+	    next if (($last eq $hostname) || ($hostname eq ''));
+            $spares.='<br /><font size="+1"><a href="http://'.
                 $hostname.
                 '/adm/login?domain='.$authdomain.'">'.
                 $hostname.'</a>'.
-                ' '.&mt('(preferred)').'</span>'.$/;
+                ' '.&mt('(preferred)').'</font>'.$/;
+	    $last=$hostname;
         }
         if ($spares) {
             $spares.= '<br />';
@@ -391,26 +270,23 @@ sub handler {
 			    &Apache::lonnet::hostname($b);
 		    }
 		    keys(%all_hostnames)) {
-            next if ($hostid eq $lonhost);
+            next if ($hostid eq $lonhost || $Apache::lonnet::spareid{$hostid});
             my $hostname = &Apache::lonnet::hostname($hostid);
-            next if (($hostname eq '') || ($spareservers{$hostname}));
-            $spareservers{$hostname} = 1;
-            my $protocol = $Apache::lonnet::protocol{$hostid};
-            $protocol = 'http' if ($protocol ne 'https');
-            $spares.='<br /><a href="'.$protocol.'://'.
+            next if (($last eq $hostname) || ($hostname eq ''));
+            $spares.='<br /><a href="http://'.
 	             $hostname.
 	             '/adm/login?domain='.$authdomain.'">'.
 	             $hostname.'</a>';
+            $last=$hostname;
          }
          $r->print(
-   '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">'
-  .'<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">'
-  .'<head><meta http-equiv="Content-Type" content="text/html; charset=utf-8" /><title>'
+   '<html>'
+  .'<head><title>'
   .&mt('The LearningOnline Network with CAPA')
   .'</title></head>'
   .'<body bgcolor="#FFFFFF">'
   .'<h1>'.&mt('The LearningOnline Network with CAPA').'</h1>'
-  .'<img src="/adm/lonKaputt/lonlogo_broken.gif" alt="broken icon" align="right" />'
+  .'<img src="/adm/lonKaputt/lonlogo_broken.gif" align="right" />'
   .'<h3>'.&mt('This LON-CAPA server is temporarily not available for login.').'</h3>');
         if ($spares) {
             $r->print('<p>'.&mt('Please attempt to login to one of the following servers:')
@@ -476,7 +352,11 @@ lextkey=this.document.client.elements.le
 initkeys();
 
 this.document.server.elements.upass0.value
-    =getCrypted(this.document.client.elements.upass$now.value);
+    =crypted(this.document.client.elements.upass$now.value.substr(0,15));
+this.document.server.elements.upass1.value
+    =crypted(this.document.client.elements.upass$now.value.substr(15,15));
+this.document.server.elements.upass2.value
+    =crypted(this.document.client.elements.upass$now.value.substr(30,15));
 
 this.document.client.elements.uname.value='';
 this.document.client.elements.upass$now.value='';
@@ -497,70 +377,6 @@ function enableInput() {
 
 ENDSCRIPT
 
-    my ($lonhost_in_use,@hosts,%defaultdomconf,$saml_prefix,$saml_landing,
-        $samlssotext,$samlnonsso,$samlssoimg,$samlssoalt,$samlssourl,$samltooltip);
-    %defaultdomconf = &Apache::loncommon::get_domainconf($defdom);
-    @hosts = &Apache::lonnet::current_machine_ids();
-    $lonhost_in_use = $lonhost;
-    if (@hosts > 1) {
-        foreach my $hostid (@hosts) {
-            if (&Apache::lonnet::host_domain($hostid) eq $defdom) {
-                $lonhost_in_use = $hostid;
-                last;
-            }
-        }
-    }
-    $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};
-    }
-    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 = (
@@ -571,29 +387,6 @@ ENDSAMLJS
 	       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) {
-        my $omitextra;
-        if ($headextra_exempt ne '') {
-            my @exempt = split(',',$headextra_exempt);
-            my $ip = &Apache::lonnet::get_requestor_ip();
-            if (grep(/^\Q$ip\E$/,@exempt)) {
-                $omitextra = 1;
-            }
-        }
-        unless ($omitextra) {
-            my $confname = $defdom.'-domainconfig';
-            if ($headextra =~ m{^\Q/res/$defdom/$confname/login/headtag/$lonhost_in_use/\E}) {
-                my $extra = &Apache::lonnet::getfile(&Apache::lonnet::filelocation("",$headextra));
-                unless ($extra eq '-1') {
-                    $js .= "\n".$extra."\n";
-                }
-            }
-        }
-    }
-
     $r->print(&Apache::loncommon::start_page('The LearningOnline Network with CAPA Login',$js,
 			       { 'redirect'       => [$expire,'/adm/roles'], 
 				 'add_entries' => \%add_entries,
@@ -616,7 +409,6 @@ ENDSAMLJS
           'helpdesk' => 'Contact Helpdesk',
           'forgotpw' => 'Forgot password?',
           'newuser'  => 'New User?',
-          'change'   => 'Change?',
        );
 # -------------------------------------------------- Change password field name
 
@@ -645,6 +437,8 @@ ENDSAMLJS
    <input type="hidden" name="serverid" value="$lonhost" />
    <input type="hidden" name="uname" value="" />
    <input type="hidden" name="upass0" value="" />
+   <input type="hidden" name="upass1" value="" />
+   <input type="hidden" name="upass2" value="" />
    <input type="hidden" name="udom" value="" />
    <input type="hidden" name="localpath" value="$env{'form.localpath'}" />
    <input type="hidden" name="localres" value="$env{'form.localres'}" />
@@ -678,7 +472,7 @@ ENDSERVERFORM
         $mobileargs = 'autocapitalize="off" autocorrect="off"'; 
     }
     my $loginform=(<<LFORM);
-<form name="client" action="" onsubmit="return(send())" id="lclogin">
+<form name="client" action="" onsubmit="return(send())">
   <input type="hidden" name="lextkey" value="$lextkey" />
   <input type="hidden" name="uextkey" value="$uextkey" />
   <b><label for="uname">$lt{'un'}</label>:</b><br />
@@ -692,82 +486,15 @@ 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="$alttext" class="LC_maxwidth" id="lcloginbanner" />
+  <img src="$img" border="0" alt="The Learning Online Network with CAPA" />
 </div>
 HEADER
     }
-
-    my $stdauthformstyle = 'inline-block';
-    my $ssoauthstyle = 'none';
-    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;
-        }
-        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 ($querystring ne '') {
-                $ssologin .= (($ssologin=~/\?/)?'&amp;':'?') . $querystring;
-            }
-        } elsif ($logtoken ne '') {
-            $ssologin .= (($ssologin=~/\?/)?'&amp;':'?') . 'logtoken='.$logtoken;
-        }
-        my $ssohref;
-        if ($samlssoimg ne '') {
-            $ssohref = '<a href="'.$ssologin.'" title="'.$samltooltip.'">'.
-                       '<img src="'.$samlssoimg.'" alt="'.$samlssoalt.'" id="lcssobutton" /></a>';
-        } else {
-            $ssohref = '<a href="'.$ssologin.'">'.$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
-    }
-
-    $r->print(<<ENDLOGIN);
-<div style="display:$stdauthformstyle;" id="LC_standard_login">
+    $r->print(<<ENDTOP);
+<div style="float:left;margin-top:0;">
 <div class="LC_Box" style="background:$loginbox_bg;">
   $logintitle
   $loginform
@@ -783,11 +510,10 @@ ENDSAML
 </div>
 </div>
 
-ENDLOGIN
-    $r->print('</div><div>'."\n");
+<div>
+ENDTOP
     if ($showmainlogo) {
-        my $alttext = &Apache::loncommon::designparm('login.alttext_logo',$domain);
-        $r->print(' <img src="'.$logo.'" alt="'.$alttext.'" class="LC_maxwidth" id="lcloginmainlogo" />'."\n");
+        $r->print(' <img src="'.$logo.'" alt="" />'."\n");
     }
 $r->print(<<ENDTOP);
 $announcements
@@ -880,8 +606,8 @@ ENDDOCUMENT
 }
 
 sub check_loginvia {
-    my ($domain,$lonhost,$lonidsdir,$balcookie) = @_;
-    if ($domain eq '' || $lonhost eq '' || $lonidsdir eq '') {
+    my ($domain,$lonhost) = @_;
+    if ($domain eq '' || $lonhost eq '') {
         return;
     }
     my %domconfhash = &Apache::loncommon::get_domainconf($domain);
@@ -890,7 +616,7 @@ sub check_loginvia {
     my $output;
     if ($loginvia ne '') {
         my $noredirect;
-        my $ip = &Apache::lonnet::get_requestor_ip();
+        my $ip = $ENV{'REMOTE_ADDR'};
         if ($ip eq '127.0.0.1') {
             $noredirect = 1;
         } else {
@@ -910,36 +636,6 @@ sub check_loginvia {
             }
             if ($newhost ne $lonhost) {
                 if (&Apache::lonnet::hostname($newhost) ne '') {
-                    if ($balcookie) {
-                        my ($balancer,$cookie) = split(/:/,$balcookie);
-                        if ($cookie =~ /^($match_domain)_($match_username)_([a-f0-9]+)$/) {
-                            my ($udom,$uname,$cookieid) = ($1,$2,$3);
-                            unless (&Apache::lonnet::delbalcookie($cookie,$balancer) eq 'ok') {
-                                if ((-d $lonidsdir) && (opendir(my $dh,$lonidsdir))) {
-                                    while (my $filename=readdir($dh)) {
-                                        if ($filename=~/^(\Q$uname\E_\d+_\Q$udom\E_$match_lonid)\.id$/) {
-                                            my $handle = $1;
-                                            my %hash =
-                                                &Apache::lonnet::get_sessionfile_vars($handle,$lonidsdir,
-                                                                                     ['request.balancercookie',
-                                                                                      'user.linkedenv']);
-                                            if ($hash{'request.balancercookie'} eq "$balancer:$cookieid") {
-                                                if (unlink("$lonidsdir/$filename")) {
-                                                    if (($hash{'user.linkedenv'} =~ /^[a-f0-9]+_linked$/) &&
-                                                        (-l "$lonidsdir/$hash{'user.linkedenv'}.id") &&
-                                                        (readlink("$lonidsdir/$hash{'user.linkedenv'}.id") eq "$lonidsdir/$filename")) {
-                                                        unlink("$lonidsdir/$hash{'user.linkedenv'}.id");
-                                                    }
-                                                }
-                                            }
-                                            last;
-                                        }
-                                    }
-                                    closedir($dh);
-                                }
-                            }
-                        }
-                    }
                     $output = &redirect_page($newhost,$path);
                 }
             }
@@ -950,25 +646,17 @@ sub check_loginvia {
 
 sub redirect_page {
     my ($desthost,$path) = @_;
-    my $hostname = &Apache::lonnet::hostname($desthost);
     my $protocol = $Apache::lonnet::protocol{$desthost};
     $protocol = 'http' if ($protocol ne 'https');
     unless ($path =~ m{^/}) {
         $path = '/'.$path;
     }
-    my $url = $protocol.'://'.$hostname.$path;
+    my $url = $protocol.'://'.&Apache::lonnet::hostname($desthost).$path;
     if ($env{'form.firsturl'} ne '') {
-        my $querystring;
-        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,"'");
-        $url .='?firsturl='.$querystring;
+        $url .='?firsturl='.$env{'form.firsturl'};
     }
     my $start_page = &Apache::loncommon::start_page('Switching Server ...',undef,
-                                                    {'redirect' => [0,$url,'',1]});
+                                                    {'redirect' => [0,$url],});
     my $end_page   = &Apache::loncommon::end_page();
     return $start_page.$end_page;
 }
@@ -1041,19 +729,5 @@ 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__