--- loncom/auth/lonlogin.pm	2010/03/03 17:00:01	1.133
+++ loncom/auth/lonlogin.pm	2015/03/06 22:36:56	1.158.2.2
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Login Screen
 #
-# $Id: lonlogin.pm,v 1.133 2010/03/03 17:00:01 raeburn Exp $
+# $Id: lonlogin.pm,v 1.158.2.2 2015/03/06 22:36:56 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -46,7 +46,7 @@ sub handler {
 	(join('&',$ENV{'QUERY_STRING'},$env{'request.querystring'},
 	      $ENV{'REDIRECT_QUERY_STRING'}),
 	 ['interface','username','domain','firsturl','localpath','localres',
-	  'token','role','symb']);
+	  'token','role','symb','iptoken']);
     if (!defined($env{'form.firsturl'})) {
         &Apache::lonacc::get_posted_cgi($r,['firsturl']);
     }
@@ -64,57 +64,65 @@ sub handler {
 
 
 # Are we re-routing?
-    if (-e '/home/httpd/html/lon-status/reroute.txt') {
+    my $londocroot = $r->dir_config('lonDocRoot'); 
+    if (-e "$londocroot/lon-status/reroute.txt") {
 	&Apache::lonauth::reroute($r);
 	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=~/^publicuser\_/) {
+    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");
-    } elsif ($handle ne '') {
+	    unlink($r->dir_config('lonIDsDir')."/$handle.id");
+        } else {
 # Indeed, a valid token is found
-	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'}; 
-        }
-        
-    my $dom = &Apache::lonnet::default_login_domain();
-    my %helpconfig = &Apache::lonnet::get_dom('configuration',['helpsettings'],$dom);
-    
-    my $loginhelp_page = $helpconfig{'helpsettings'}{'loginhelpurl'};
-    if ($loginhelp_page eq '') {
-		$loginhelp_page = '/adm/loginproblems.html';
-    }
-	$r->print(
+            &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
-                 .'<h1>'.&mt('You are already logged in!').'</h1>'
+                 .'<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>'
-                 .'<p><a href="'.$loginhelp_page.'">'.&mt('Login problems?').'</a></p>'
-                 .$dom.' '.$end_page
+                 .$end_page
                  );
-        return OK;
+            return OK;
+        }
     }
 
 # ---------------------------------------------------- No valid token, continue
 
- # ---------------------------- Not possible to really login to domain "public"
+# ---------------------------- Not possible to really login to domain "public"
     if ($env{'form.domain'} eq 'public') {
 	$env{'form.domain'}='';
 	$env{'form.username'}='';
     }
+
+# ------ Is this page requested because /adm/migrateuser detected an IP change?
+    my %sessiondata;
+    if ($env{'form.iptoken'}) {
+        %sessiondata = &Apache::lonnet::tmpget($env{'form.iptoken'});
+        unless ($sessiondata{'sessionserver'}) {
+            my $delete = &Apache::lonnet::tmpdel($env{'form.iptoken'});
+            delete($env{'form.iptoken'});
+        }
+    }
 # ----------------------------------------------------------- Process Interface
     $env{'form.interface'}=~s/\W//g;
 
-    my $httpbrowser=$ENV{"HTTP_USER_AGENT"};
+    (undef,undef,undef,undef,undef,undef,my $clientmobile) =
+        &Apache::loncommon::decode_user_agent();
 
     my $iconpath= 
 	&Apache::loncommon::lonhttpdurl($r->dir_config('lonIconsURL'));
@@ -122,19 +130,26 @@ sub handler {
     my $lonhost = $r->dir_config('lonHostID');
     my $domain = &Apache::lonnet::default_login_domain();
     if ($lonhost ne '') {
-        my $redirect = &check_loginvia($domain,$lonhost);
-        if ($redirect) {
-            $r->print($redirect);
-            return OK;
-        } 
+        unless ($sessiondata{'sessionserver'}) {
+            my $redirect = &check_loginvia($domain,$lonhost);
+            if ($redirect) {
+                $r->print($redirect);
+                return OK;
+            }
+        }
     }
 
-    if (($env{'form.domain'}) && 
+    if (($sessiondata{'domain'}) &&
+        (&Apache::lonnet::domain($env{'form.domain'},'description'))) {
+        $domain=$sessiondata{'domain'};
+    } elsif (($env{'form.domain'}) && 
 	(&Apache::lonnet::domain($env{'form.domain'},'description'))) {
 	$domain=$env{'form.domain'};
     }
+
     my $role    = $r->dir_config('lonRole');
     my $loadlim = $r->dir_config('lonLoadLim');
+    my $uloadlim= $r->dir_config('lonUserLoadLim');
     my $servadm = $r->dir_config('lonAdmEMail');
     my $tabdir  = $r->dir_config('lonTabDir');
     my $include = $r->dir_config('lonIncludes');
@@ -143,9 +158,20 @@ sub handler {
     my $host_name = &Apache::lonnet::hostname($lonhost);
 
 # --------------------------------------------- Default values for login fields
-
-    my $authusername=($env{'form.username'}?$env{'form.username'}:'');
-    my $authdomain=($env{'form.domain'}?$env{'form.domain'}:$domain);
+    
+    my ($authusername,$authdomain);
+    if ($sessiondata{'username'}) {
+        $authusername=$sessiondata{'username'};
+    } else {
+        $env{'form.username'} = &Apache::loncommon::cleanup_html($env{'form.username'});
+        $authusername=($env{'form.username'}?$env{'form.username'}:'');
+    }
+    if ($sessiondata{'domain'}) {
+        $authdomain=$sessiondata{'domain'};
+    } else {
+        $env{'form.domain'} = &Apache::loncommon::cleanup_html($env{'form.domain'});
+        $authdomain=($env{'form.domain'}?$env{'form.domain'}:$domain);
+    }
 
 # ---------------------------------------------------------- Determine own load
     my $loadavg;
@@ -154,18 +180,17 @@ sub handler {
 	$loadavg=<$loadfile>;
     }
     $loadavg =~ s/\s.*//g;
-    my $loadpercent=sprintf("%.1f",100*$loadavg/$loadlim);
-    my $userloadpercent=&Apache::lonnet::userload();
 
-# ------------------------------------------------------- Do the load balancing
-    my $otherserver= &Apache::lonnet::absolute_url($host_name);
+    my ($loadpercent,$userloadpercent);
+    if ($loadlim) {
+        $loadpercent=sprintf("%.1f",100*$loadavg/$loadlim);
+    }
+    if ($uloadlim) {
+        $userloadpercent=&Apache::lonnet::userload();
+    }
+
     my $firsturl=
     ($env{'request.firsturl'}?$env{'request.firsturl'}:$env{'form.firsturl'});
-# ---------------------------------------------------------- Are we overloaded?
-    if ((($userloadpercent>100.0)||($loadpercent>100.0))) {
-        my $unloaded=Apache::lonnet::spareserver($loadpercent,$userloadpercent);
-	if ($unloaded) { $otherserver=$unloaded; }
-    }
 
 # ----------------------------------------------------------- Get announcements
     my $announcements=&Apache::lonnet::getannounce();
@@ -200,13 +225,23 @@ 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);
 
-# ------------------- If we cannot talk to ourselves, we are in serious trouble
+# -- If we cannot talk to ourselves, or hostID does not map to a hostname
+#    we are in serious trouble
 
-    if ($logtoken eq 'con_lost') {
+    if (($logtoken eq 'con_lost') || ($logtoken eq 'no_such_host')) {
+        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');
+        }
         my $spares='';
 	my $last;
         foreach my $hostid (sort
@@ -217,7 +252,7 @@ sub handler {
 			    keys(%Apache::lonnet::spareid)) {
             next if ($hostid eq $lonhost);
 	    my $hostname = &Apache::lonnet::hostname($hostid);
-	    next if ($last eq $hostname);
+	    next if (($last eq $hostname) || ($hostname eq ''));
             $spares.='<br /><font size="+1"><a href="http://'.
                 $hostname.
                 '/adm/login?domain='.$authdomain.'">'.
@@ -225,24 +260,26 @@ sub handler {
                 ' '.&mt('(preferred)').'</font>'.$/;
 	    $last=$hostname;
         }
-$spares.= '<br />';
-my %all_hostnames = &Apache::lonnet::all_hostnames();
-foreach my $hostid (sort
+        if ($spares) {
+            $spares.= '<br />';
+        }
+        my %all_hostnames = &Apache::lonnet::all_hostnames();
+        foreach my $hostid (sort
 		    {
 			&Apache::lonnet::hostname($a) cmp
 			    &Apache::lonnet::hostname($b);
 		    }
 		    keys(%all_hostnames)) {
-    next if ($hostid eq $lonhost || $Apache::lonnet::spareid{$hostid});
-    my $hostname = &Apache::lonnet::hostname($hostid);
-    next if ($last eq $hostname);
-    $spares.='<br /><a href="http://'.
-	$hostname.
-	'/adm/login?domain='.$authdomain.'">'.
-	$hostname.'</a>';
-    $last=$hostname;
-}
-$r->print(
+            next if ($hostid eq $lonhost || $Apache::lonnet::spareid{$hostid});
+            my $hostname = &Apache::lonnet::hostname($hostid);
+            next if (($last eq $hostname) || ($hostname eq ''));
+            $spares.='<br /><a href="http://'.
+	             $hostname.
+	             '/adm/login?domain='.$authdomain.'">'.
+	             $hostname.'</a>';
+            $last=$hostname;
+         }
+         $r->print(
    '<html>'
   .'<head><title>'
   .&mt('The LearningOnline Network with CAPA')
@@ -250,48 +287,55 @@ $r->print(
   .'<body bgcolor="#FFFFFF">'
   .'<h1>'.&mt('The LearningOnline Network with CAPA').'</h1>'
   .'<img src="/adm/lonKaputt/lonlogo_broken.gif" align="right" />'
-  .'<h3>'.&mt('This LON-CAPA server is temporarily not available for login.').'</h3>'
-  .'<p>'.&mt('Please attempt to login to one of the following servers:').'</p>'
-  .$spares
-  .'</body>'
-  .'</html>'
-);
-return OK;
-}
+  .'<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:')
+                     .'</p>'
+                     .$spares);
+        }
+        $r->print('</body>'
+                 .'</html>'
+        );
+        return OK;
+    }
 
 # ----------------------------------------------- Apparently we are in business
-$servadm=~s/\,/\<br \/\>/g;
+    $servadm=~s/\,/\<br \/\>/g;
 
 # ----------------------------------------------------------- Front page design
-my $pgbg=&Apache::loncommon::designparm('login.pgbg',$domain);
-my $font=&Apache::loncommon::designparm('login.font',$domain);
-my $link=&Apache::loncommon::designparm('login.link',$domain);
-my $vlink=&Apache::loncommon::designparm('login.vlink',$domain);
-my $alink=&Apache::loncommon::designparm('login.alink',$domain);
-my $mainbg=&Apache::loncommon::designparm('login.mainbg',$domain);
-my $logo=&Apache::loncommon::designparm('login.logo',$domain);
-my $img=&Apache::loncommon::designparm('login.img',$domain);
-my $domainlogo='<div>'.&Apache::loncommon::domainlogo($domain).'</div>';
-my $login=&Apache::loncommon::designparm('login.login',$domain);
-if ($login eq '') {
-$login = $iconpath.'/'.&mt('userauthentication.gif');
-}
-my $showbanner = 1;
-my $showmainlogo = 1;
-if (defined(&Apache::loncommon::designparm('login.showlogo_img',$domain))) {
-    $showbanner = &Apache::loncommon::designparm('login.showlogo_img',$domain);
-}
-if (defined(&Apache::loncommon::designparm('login.showlogo_logo',$domain))) {
-    $showmainlogo = &Apache::loncommon::designparm('login.showlogo_logo',$domain);
-}
-my $showadminmail=&Apache::loncommon::designparm('login.adminmail',$domain);
-my $showcoursecat =
-&Apache::loncommon::designparm('login.coursecatalog',$domain);
-my $loginheader =&Apache::loncommon::designparm('login.loginheader',$domain);
-my $shownewuserlink = 
-&Apache::loncommon::designparm('login.newuser',$domain);
-my $now=time;
-my $js = (<<ENDSCRIPT);
+    my $pgbg=&Apache::loncommon::designparm('login.pgbg',$domain);
+    my $font=&Apache::loncommon::designparm('login.font',$domain);
+    my $link=&Apache::loncommon::designparm('login.link',$domain);
+    my $vlink=&Apache::loncommon::designparm('login.vlink',$domain);
+    my $alink=&Apache::loncommon::designparm('login.alink',$domain);
+    my $mainbg=&Apache::loncommon::designparm('login.mainbg',$domain);
+    my $loginbox_bg=&Apache::loncommon::designparm('login.sidebg',$domain);
+    my $loginbox_header_bgcol=&Apache::loncommon::designparm('login.bgcol',$domain);
+    my $loginbox_header_textcol=&Apache::loncommon::designparm('login.textcol',$domain);
+    my $logo=&Apache::loncommon::designparm('login.logo',$domain);
+    my $img=&Apache::loncommon::designparm('login.img',$domain);
+    my $domainlogo=&Apache::loncommon::domainlogo($domain);
+    my $showbanner = 1;
+    my $showmainlogo = 1;
+    if (defined(&Apache::loncommon::designparm('login.showlogo_img',$domain))) {
+        $showbanner = &Apache::loncommon::designparm('login.showlogo_img',$domain);
+    }
+    if (defined(&Apache::loncommon::designparm('login.showlogo_logo',$domain))) {
+        $showmainlogo = &Apache::loncommon::designparm('login.showlogo_logo',$domain);
+    }
+    my $showadminmail;
+    my @possdoms = &Apache::lonnet::current_machine_domains();
+    if (grep(/^\Q$domain\E$/,@possdoms)) {
+        $showadminmail=&Apache::loncommon::designparm('login.adminmail',$domain);
+    }
+    my $showcoursecat =
+        &Apache::loncommon::designparm('login.coursecatalog',$domain);
+    my $shownewuserlink = 
+        &Apache::loncommon::designparm('login.newuser',$domain);
+    my $showhelpdesk =
+        &Apache::loncommon::designparm('login.helpdesk',$domain);
+    my $now=time;
+    my $js = (<<ENDSCRIPT);
 
 <script type="text/javascript" language="JavaScript">
 // <![CDATA[
@@ -320,6 +364,14 @@ this.document.client.elements.upass$now.
 this.document.server.submit();
 return false;
 }
+
+function enableInput() {
+    this.document.client.elements.upass$now.removeAttribute("readOnly");
+    this.document.client.elements.uname.removeAttribute("readOnly");
+    this.document.client.elements.udom.removeAttribute("readOnly");
+    return;
+}
+
 // ]]>
 </script>
 
@@ -327,21 +379,45 @@ ENDSCRIPT
 
 # --------------------------------------------------- Print login screen header
 
-my %add_entries = (
+    my %add_entries = (
 	       bgcolor      => "$mainbg",
 	       text         => "$font",
 	       link         => "$link",
 	       vlink        => "$vlink",
-	       alink        => "$alink",);
+	       alink        => "$alink",
+               onload       => 'javascript:enableInput();',);
 
-$r->print(&Apache::loncommon::start_page('The LearningOnline Network with CAPA Login',$js,
+    my %defaultdomconf = &Apache::loncommon::get_domainconf($defdom);
+    my $headextra = $defaultdomconf{$defdom.'.login.headtag_'.$lonhost};
+    my $headextra_exempt = $defaultdomconf{$domain.'.login.headtag_exempt_'.$lonhost};
+    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/\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,
 				 'only_body'   => 1,}));
 
 # ----------------------------------------------------------------------- Texts
 
-my %lt=&Apache::lonlocal::texthash(
+    my %lt=&Apache::lonlocal::texthash(
           'un'       => 'Username',
           'pw'       => 'Password',
           'dom'      => 'Domain',
@@ -359,28 +435,27 @@ my %lt=&Apache::lonlocal::texthash(
        );
 # -------------------------------------------------- Change password field name
 
-my $forgotpw = &forgotpwdisplay(%lt);
-$forgotpw .= '<br />' if $forgotpw;
-my $loginhelp = &loginhelpdisplay(%lt);
-$loginhelp .= '<br />' if $loginhelp;
+    my $forgotpw = &forgotpwdisplay(%lt);
+    $forgotpw .= '<br />' if $forgotpw;
+    my $loginhelp = &Apache::lonauth::loginhelpdisplay($authdomain);
+    if ($loginhelp) {
+        $loginhelp = '<a href="'.$loginhelp.'">'.$lt{'help'}.'</a><br />';
+    }
 
 # ---------------------------------------------------- Serve out DES JavaScript
-{
-my $jsh=Apache::File->new($include."/londes.js");
-$r->print(<$jsh>);
-}
+    {
+    my $jsh=Apache::File->new($include."/londes.js");
+    $r->print(<$jsh>);
+    }
 # ---------------------------------------------------------- Serve rest of page
 
-$r->print(
-	  '<div class="LC_loginpage_container">');
-
-#
-#  If the loadbalancing yielded just http:// because perhaps there's no loadbalancing?
-#  then just us a relative link to authenticate:
-#
+    $r->print(
+    '<div class="LC_Box"'
+   .' style="margin:0 auto; padding:10px; width:90%; height: auto; background-color:#FFFFFF;">'
+);
 
-$r->print(<<ENDSERVERFORM);
-<form name="server" action="$otherserver/adm/authenticate" method="post" target="_top">
+    $r->print(<<ENDSERVERFORM);
+<form name="server" action="/adm/authenticate" method="post" target="_top">
    <input type="hidden" name="logtoken" value="$logtoken" />
    <input type="hidden" name="serverid" value="$lonhost" />
    <input type="hidden" name="uname" value="" />
@@ -392,39 +467,43 @@ $r->print(<<ENDSERVERFORM);
    <input type="hidden" name="localres" value="$env{'form.localres'}" />
   </form>
 ENDSERVERFORM
-my $coursecatalog;
-if (($showcoursecat eq '') || ($showcoursecat)) {
-    $coursecatalog = &coursecatalog_link($lt{'catalog'}).'<br />';
-}
-my $newuserlink;
-if ($shownewuserlink) {
-    $newuserlink = &newuser_link($lt{'newuser'}).'<br />';
-}
-my $logintitle;
-if ($loginheader eq 'text') {
-    $logintitle ='<h2>'.$lt{'log'}.'</h2>';
-} else {
-    $logintitle = '<img src="'.$login.'" alt="'.
-                  &mt('User Authentication').'" />';
-}
-
-my $noscript_warning='<noscript><span class="LC_warning"><b>'
-                     .&mt('Use of LON-CAPA requires Javascript to be enabled in your web browser.')
-                    .'</b></span></noscript>';
-my $helpdeskscript;
-my $contactblock = &contactdisplay(\%lt,$servadm,$showadminmail,
-                                   $authdomain,\$helpdeskscript);
-
-my $loginform=(<<LFORM);
+    my $coursecatalog;
+    if (($showcoursecat eq '') || ($showcoursecat)) {
+        $coursecatalog = &coursecatalog_link($lt{'catalog'}).'<br />';
+    }
+    my $newuserlink;
+    if ($shownewuserlink) {
+        $newuserlink = &newuser_link($lt{'newuser'}).'<br />';
+    }
+    my $logintitle =
+        '<h2 class="LC_hcell"'
+       .' style="background:'.$loginbox_header_bgcol.';'
+       .' color:'.$loginbox_header_textcol.'">'
+       .$lt{'log'}
+       .'</h2>';
+
+    my $noscript_warning='<noscript><span class="LC_warning"><b>'
+                        .&mt('Use of LON-CAPA requires Javascript to be enabled in your web browser.')
+                        .'</b></span></noscript>';
+    my $helpdeskscript;
+    my $contactblock = &contactdisplay(\%lt,$servadm,$showadminmail,
+                                       $authdomain,\$helpdeskscript,
+                                       $showhelpdesk,\@possdoms);
+
+    my $mobileargs;
+    if ($clientmobile) {
+        $mobileargs = 'autocapitalize="off" autocorrect="off"'; 
+    }
+    my $loginform=(<<LFORM);
 <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 />
-  <input type="text" name="uname" id="uname" size="15" value="$authusername" /><br />
+  <input type="text" name="uname" id="uname" size="15" value="$authusername" readonly="readonly" $mobileargs /><br />
   <b><label for="upass$now">$lt{'pw'}</label>:</b><br />
-  <input type="password" name="upass$now" id="upass$now" size="15" /><br />
+  <input type="password" name="upass$now" id="upass$now" size="15" readonly="readonly" /><br />
   <b><label for="udom">$lt{'dom'}</label>:</b><br />
-  <input type="text" name="udom" id="udom" size="15" value="$authdomain" /><br />
+  <input type="text" name="udom" id="udom" size="15" value="$authdomain" readonly="readonly" $mobileargs /><br />
   <input type="submit" value="$lt{'log'}" />
 </form>
 LFORM
@@ -438,21 +517,14 @@ LFORM
 HEADER
     }
     $r->print(<<ENDTOP);
-<div class="LC_loginpage_space">&nbsp;</div>
-<div class="LC_loginpage_floatLeft">
-<div class="LC_loginpage_loginContainer">
+<div style="float:left;margin-top:0;">
+<div class="LC_Box" style="background:$loginbox_bg;">
   $logintitle
-   <table border="0" align="left" cellspacing="1" cellpadding="2" width="100%">
-      <tr>
-	   <td>
-		$loginform
-           </td>
-      </tr>
-   </table>   	
-   $noscript_warning
+  $loginform
+  $noscript_warning
 </div>
   
-<div class="LC_loginpage_loginInfo">
+<div class="LC_Box" style="padding-top: 10px;">
   $loginhelp
   $forgotpw
   $contactblock
@@ -460,18 +532,19 @@ HEADER
   $coursecatalog
 </div>
 </div>
+
+<div>
 ENDTOP
     if ($showmainlogo) {
         $r->print(' <img src="'.$logo.'" alt="" />'."\n");
     }
 $r->print(<<ENDTOP);
 $announcements
-$domainlogo
-<div class="LC_loginpage_space">&nbsp;</div>
+</div>
+<hr style="clear:both;" />
 ENDTOP
-
-$r->print(<<ENDDOCUMENT);
-     <table border="0" cellspacing="0" cellpadding="0">
+    my ($domainrow,$serverrow,$loadrow,$userloadrow,$versionrow);
+    $domainrow = <<"END";
       <tr>
        <td  align="left" valign="top">
         <small><b>$lt{'dom'}:&nbsp;</b></small>
@@ -480,6 +553,8 @@ $r->print(<<ENDDOCUMENT);
         <small><tt>&nbsp;$domain</tt></small>
        </td>
       </tr>
+END
+    $serverrow = <<"END";
       <tr>
        <td  align="left" valign="top">
         <small><b>$lt{'serv'}:&nbsp;</b></small>
@@ -488,6 +563,9 @@ $r->print(<<ENDDOCUMENT);
         <small><tt>&nbsp;$lonhost ($role)</tt></small>
        </td>
       </tr>
+END
+    if ($loadlim) {
+        $loadrow = <<"END";
       <tr>
        <td align="left" valign="top">
         <small><b>$lt{'load'}:&nbsp;</b></small>
@@ -496,6 +574,10 @@ $r->print(<<ENDDOCUMENT);
         <small><tt>&nbsp;$loadpercent $lt{'perc'}</tt></small>
        </td>
       </tr>
+END
+    }
+    if ($uloadlim) {
+        $userloadrow = <<"END";
       <tr>
        <td align="left" valign="top">
         <small><b>$lt{'userload'}:&nbsp;</b></small>
@@ -504,12 +586,32 @@ $r->print(<<ENDDOCUMENT);
         <small><tt>&nbsp;$userloadpercent $lt{'perc'}</tt></small>
        </td>
       </tr>
+END
+    }
+    if (($version ne '') && ($version ne '<!-- VERSION -->')) {
+        $versionrow = <<"END";
       <tr>
        <td colspan="2" align="left">
         <small>$version</small>
        </td>
       </tr>
+END
+    }
+
+    $r->print(<<ENDDOCUMENT);
+    <div style="float: left;">
+     <table border="0" cellspacing="0" cellpadding="0">
+$domainrow
+$serverrow
+$loadrow    
+$userloadrow
+$versionrow
      </table>
+    </div>
+    <div style="float: right;">
+    $domainlogo
+    </div>
+    <br style="clear:both;" />
  </div>
 
 <script type="text/javascript">
@@ -576,19 +678,31 @@ sub redirect_page {
     if ($env{'form.firsturl'} ne '') {
         $url .='?firsturl='.$env{'form.firsturl'};
     }
-    my $start_page = &Apache::loncommon::start_page('Switching Server',undef,
+    my $start_page = &Apache::loncommon::start_page('Switching Server ...',undef,
                                                     {'redirect' => [0,$url],});
     my $end_page   = &Apache::loncommon::end_page();
     return $start_page.$end_page;
 }
 
 sub contactdisplay {
-    my ($lt,$servadm,$showadminmail,$authdomain,$helpdeskscript) = @_;
+    my ($lt,$servadm,$showadminmail,$authdomain,$helpdeskscript,$showhelpdesk,
+        $possdoms) = @_;
     my $contactblock;
-    my $showhelpdesk = 0;
-    my $requestmail = $Apache::lonnet::perlvar{'lonSupportEMail'};
-    if ($requestmail =~ m/^[^\@]+\@[^\@]+$/) {
-        $showhelpdesk = 1;
+    my $origmail;
+    if (ref($possdoms) eq 'ARRAY') {
+        if (grep(/^\Q$authdomain\E$/,@{$possdoms})) { 
+            $origmail = $Apache::lonnet::perlvar{'lonSupportEMail'};
+        }
+    }
+    my $requestmail = 
+        &Apache::loncommon::build_recipient_list(undef,'helpdeskmail',
+                                                 $authdomain,$origmail);
+    unless ($showhelpdesk eq '0') {
+        if ($requestmail =~ m/[^\@]+\@[^\@]+/) {
+            $showhelpdesk = 1;
+        } else {
+            $showhelpdesk = 0;
+        }
     }
     if ($servadm && $showadminmail) {
         $contactblock .= $$lt{'servadm'}.':<br />'.
@@ -601,7 +715,8 @@ sub contactdisplay {
 <script type="text/javascript">
 // <![CDATA[
 function helpdesk() {
-    var codedom = document.client.udom.value;
+    var possdom = document.client.udom.value;
+    var codedom = possdom.replace( new RegExp("[^A-Za-z0-9.\\-]","g"),'');
     if (codedom == '') {
         codedom = "$authdomain";
     }
@@ -624,22 +739,6 @@ sub forgotpwdisplay {
     }
     return;
 }
-
-sub loginhelpdisplay {
-    my (%lt) = @_;
-    my $login_help = 1;
-    if ($login_help) {
-    	my $dom = &Apache::lonnet::default_login_domain();
-		my %helpconfig = &Apache::lonnet::get_dom('configuration',['helpsettings'],$dom);
-		my $loginhelp_url = $helpconfig{'helpsettings'}{'loginhelpurl'};
-		if ($loginhelp_url ne '') {
-        	return '<a href="'.$loginhelp_url.'">'.$lt{'help'}.'</a>';
-        } else {
-        	return '<a href="/adm/loginproblems.html">'.$lt{'help'}.'</a>';
-       	}
-    }
-    return;
-}
 
 sub coursecatalog_link {
     my ($linkname) = @_;