--- loncom/auth/lonlogin.pm	2013/11/26 03:17:09	1.158
+++ loncom/auth/lonlogin.pm	2018/09/04 01:10:29	1.158.2.7
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Login Screen
 #
-# $Id: lonlogin.pm,v 1.158 2013/11/26 03:17:09 raeburn Exp $
+# $Id: lonlogin.pm,v 1.158.2.7 2018/09/04 01:10:29 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -38,6 +38,7 @@ use Apache::lonlocal;
 use Apache::migrateuser();
 use lib '/home/httpd/lib/perl/';
 use LONCAPA;
+use CGI::Cookie();
  
 sub handler {
     my $r = shift;
@@ -56,9 +57,35 @@ sub handler {
 	return &Apache::migrateuser::handler($r);
     }
 
+# For "public user" - remove any exising "public" cookie, as user really wants to log-in
+    my ($handle,$lonidsdir,$expirepub,$userdom);
+    unless ($r->header_only) {
+        $handle = &Apache::lonnet::check_for_valid_session($r,'lonID',undef,\$userdom);
+        if ($handle ne '') {
+            $lonidsdir=$r->dir_config('lonIDsDir');
+            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    => 'lonID',
+                                -value   => '',
+                                -expires => '-10y',);
+        $r->header_out('Set-cookie' => $c);
+    } elsif (($handle eq '') && ($userdom ne '')) {
+        my $c = new CGI::Cookie(-name    => 'lonID',
+                                -value   => '',
+                                -expires => '-10y',);
+        $r->headers_out->add('Set-cookie' => $c);
+    }
     $r->send_http_header;
     return OK if $r->header_only;
 
@@ -70,35 +97,44 @@ sub handler {
 	return OK;
     }
 
+#
+# 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);
+            return OK;
+        }
+    }
+
     $env{'form.firsturl'} =~ s/(`)/'/g;
 
 # -------------------------------- 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 = $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;
+        &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 = $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
@@ -113,7 +149,10 @@ sub handler {
     my %sessiondata;
     if ($env{'form.iptoken'}) {
         %sessiondata = &Apache::lonnet::tmpget($env{'form.iptoken'});
-        my $delete = &Apache::lonnet::tmpdel($env{'form.token'});
+        unless ($sessiondata{'sessionserver'}) {
+            my $delete = &Apache::lonnet::tmpdel($env{'form.iptoken'});
+            delete($env{'form.iptoken'});
+        }
     }
 # ----------------------------------------------------------- Process Interface
     $env{'form.interface'}=~s/\W//g;
@@ -126,6 +165,7 @@ sub handler {
 
     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);
@@ -222,6 +262,12 @@ sub handler {
         }
         $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.'&'.$firsturl.$tokenextras,
        $lonhost);
@@ -343,11 +389,7 @@ lextkey=this.document.client.elements.le
 initkeys();
 
 this.document.server.elements.upass0.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));
+    =getCrypted(this.document.client.elements.upass$now.value);
 
 this.document.client.elements.uname.value='';
 this.document.client.elements.upass$now.value='';
@@ -378,6 +420,40 @@ ENDSCRIPT
 	       alink        => "$alink",
                onload       => 'javascript:enableInput();',);
 
+    my ($lonhost_in_use,$headextra,$headextra_exempt,@hosts,%defaultdomconf);
+    @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;
+            }
+        }
+    }
+    %defaultdomconf = &Apache::loncommon::get_domainconf($defdom);
+    $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 = $ENV{'REMOTE_ADDR'};
+            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,
@@ -428,8 +504,6 @@ ENDSCRIPT
    <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'}" />
@@ -480,7 +554,7 @@ LFORM
         $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" />
+  <img src="$img" border="0" alt="The Learning Online Network with CAPA" class="LC_maxwidth" />
 </div>
 HEADER
     }
@@ -504,7 +578,7 @@ HEADER
 <div>
 ENDTOP
     if ($showmainlogo) {
-        $r->print(' <img src="'.$logo.'" alt="" />'."\n");
+        $r->print(' <img src="'.$logo.'" alt="" class="LC_maxwidth" />'."\n");
     }
 $r->print(<<ENDTOP);
 $announcements