--- loncom/auth/lonlogin.pm	2008/07/08 17:56:21	1.104
+++ loncom/auth/lonlogin.pm	2010/08/22 21:51:11	1.139
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Login Screen
 #
-# $Id: lonlogin.pm,v 1.104 2008/07/08 17:56:21 bisitz Exp $
+# $Id: lonlogin.pm,v 1.139 2010/08/22 21:51:11 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']);
+	  'token','role','symb']);
     if (!defined($env{'form.firsturl'})) {
         &Apache::lonacc::get_posted_cgi($r,['firsturl']);
     }
@@ -72,24 +72,31 @@ sub handler {
 
 # -------------------------------- 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();
-	$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>'.&mt('Please either [_1]continue the current session[_2] or [_3]logout[_4].',
-                  '<a href="/adm/roles">','</a>','<a href="/adm/logout">','</a>').'</p>'
-                 .'<p><a href="/adm/loginproblems.html">'.&mt('Login problems?').'</a></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;
+            return OK;
+        }
     }
 
 # ---------------------------------------------------- No valid token, continue
@@ -102,21 +109,21 @@ sub handler {
 # ----------------------------------------------------------- Process Interface
     $env{'form.interface'}=~s/\W//g;
 
-    my $textbrowsers=$r->dir_config('lonTextBrowsers');
     my $httpbrowser=$ENV{"HTTP_USER_AGENT"};
-    
-    foreach (split(/\:/,$textbrowsers)) {
-	if ($httpbrowser=~/$_/i) {
-	    $env{'form.interface'}='textual';
-        }
-    }
-
-    my $fullgraph=($env{'form.interface'} ne 'textual');
 
     my $iconpath= 
 	&Apache::loncommon::lonhttpdurl($r->dir_config('lonIconsURL'));
 
+    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;
+        } 
+    }
+
     if (($env{'form.domain'}) && 
 	(&Apache::lonnet::domain($env{'form.domain'},'description'))) {
 	$domain=$env{'form.domain'};
@@ -124,7 +131,6 @@ sub handler {
     my $role    = $r->dir_config('lonRole');
     my $loadlim = $r->dir_config('lonLoadLim');
     my $servadm = $r->dir_config('lonAdmEMail');
-    my $lonhost = $r->dir_config('lonHostID');
     my $tabdir  = $r->dir_config('lonTabDir');
     my $include = $r->dir_config('lonIncludes');
     my $expire  = $r->dir_config('lonExpire');
@@ -179,8 +185,18 @@ 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'});
+    }
     my $logtoken=Apache::lonnet::reply(
-       'tmpput:'.$ukey.$lkey.'&'.$firsturl,
+       'tmpput:'.$ukey.$lkey.'&'.$firsturl.$tokenextras,
        $lonhost);
 
 # ------------------- If we cannot talk to ourselves, we are in serious trouble
@@ -201,456 +217,372 @@ sub handler {
                 $hostname.
                 '/adm/login?domain='.$authdomain.'">'.
                 $hostname.'</a>'.
-                ' (preferred)</font>'.$/;
-	    $last=$hostname;
-        }
-        $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>';
+                ' '.&mt('(preferred)').'</font>'.$/;
 	    $last=$hostname;
         }
-	$r->print(
-           '<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" 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;
-    }
+$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(
+   '<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" 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;
+}
 
 # ----------------------------------------------- Apparently we are in business
-    $servadm=~s/\,/\<br \/\>/g;
+$servadm=~s/\,/\<br \/\>/g;
 
 # ----------------------------------------------------------- Front page design
-    my $pgbg=
-      ($fullgraph?&Apache::loncommon::designparm('login.pgbg',$domain):'#FFFFFF');
-    my $font=
-      ($fullgraph?&Apache::loncommon::designparm('login.font',$domain):'#000000');
-    my $link=
-      ($fullgraph?&Apache::loncommon::designparm('login.link',$domain):'#0000FF');
-    my $vlink=
-      ($fullgraph?&Apache::loncommon::designparm('login.vlink',$domain):'#0000FF');
-    my $alink=&Apache::loncommon::designparm('login.alink',$domain);
-    my $mainbg=
-      ($fullgraph?&Apache::loncommon::designparm('login.mainbg',$domain):'#FFFFFF');
-    my $sidebg=
-      ($fullgraph?&Apache::loncommon::designparm('login.sidebg',$domain):'#FFFFFF');
-    my $textcol = 
-      ($fullgraph?&Apache::loncommon::designparm('login.textcol',$domain):'#000000');
-    my $bgcol =
-      ($fullgraph?&Apache::loncommon::designparm('login.bgcol',$domain):'#FFFFFF');
-    my $logo=&Apache::loncommon::designparm('login.logo',$domain);
-    my $img=&Apache::loncommon::designparm('login.img',$domain);
-    my $domainlogo=&Apache::loncommon::domainlogo($domain);
-    my $login=&Apache::loncommon::designparm('login.login',$domain);
-    if ($login eq '') {
-        $login = $iconpath.'/'.&mt('userauthentication.gif');
-    }
-    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);
-
- <script language="JavaScript">
-    function send()
-    {
-        this.document.server.elements.uname.value
-       =this.document.client.elements.uname.value;
-
-        this.document.server.elements.udom.value
-       =this.document.client.elements.udom.value;
-
-        this.document.server.elements.imagesuppress.value
-       =this.document.client.elements.imagesuppress.checked;
-
-        this.document.server.elements.embedsuppress.value
-       =this.document.client.elements.embedsuppress.checked;
-
-        this.document.server.elements.appletsuppress.value
-       =this.document.client.elements.appletsuppress.checked;
-
-        this.document.server.elements.fontenhance.value
-       =this.document.client.elements.fontenhance.checked;
-
-        this.document.server.elements.blackwhite.value
-       =this.document.client.elements.blackwhite.checked;
-
-        this.document.server.elements.remember.value
-       =this.document.client.elements.remember.checked;
+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='<div>'.&Apache::loncommon::domainlogo($domain).'</div>';
+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 $shownewuserlink = 
+&Apache::loncommon::designparm('login.newuser',$domain);
+my $now=time;
+my $js = (<<ENDSCRIPT);
+
+<script type="text/javascript" language="JavaScript">
+// <![CDATA[
+function send()
+{
+this.document.server.elements.uname.value
+=this.document.client.elements.uname.value;
+
+this.document.server.elements.udom.value
+=this.document.client.elements.udom.value;
+
+uextkey=this.document.client.elements.uextkey.value;
+lextkey=this.document.client.elements.lextkey.value;
+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));
 
-        uextkey=this.document.client.elements.uextkey.value;
-        lextkey=this.document.client.elements.lextkey.value;
-        initkeys();
+this.document.client.elements.uname.value='';
+this.document.client.elements.upass$now.value='';
 
-        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));
+this.document.server.submit();
+return false;
+}
 
-        this.document.client.elements.uname.value='';
-        this.document.client.elements.upass$now.value='';
+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;
+}
 
-        this.document.server.submit();
-        return false;
-    }
- </script>
+// ]]>
+</script>
 
 ENDSCRIPT
 
 # --------------------------------------------------- Print login screen header
 
-    my %add_entries = (topmargin    => "0",
-                       leftmargin   => "0",
-                       marginheight => "0",
-                       marginwidth  => "0",
-                       bgcolor      => "$pgbg",
-                       text         => "$font",
-                       link         => "$link",
-                       vlink        => "$vlink",
-                       alink        => "$alink",);
-
-    $r->print(&Apache::loncommon::start_page('The LearningOnline Network with CAPA Login',$js,
-                                       { 'redirect'       => [$expire,'/adm/roles'], 
-                                         'add_entries' => \%add_entries,
-                                         'only_body'   => 1,}));
+my %add_entries = (
+	       bgcolor      => "$mainbg",
+	       text         => "$font",
+	       link         => "$link",
+	       vlink        => "$vlink",
+	       alink        => "$alink",
+               onload       => 'javascript:enableInput();',);
+
+$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(
-		  'un'  => 'Username',
-		  'pw'  => 'Password',
-		  'dom' => 'Domain',
-		  'perc' => 'percent',
-		  'load' => 'Load',
-                  'userload' => 'User Load',
-                  'about'  => 'About LON-CAPA',
-                  'access' => 'Accessibility Options',
-                  'catalog' => 'Course Catalog',
-		  'log' => 'Log in',
-		  'help' => 'Log-in Help',
-		  'serv' => 'Server',
-                  'servadm' => 'Server Administration',
-                  'helpdesk' => 'Contact Helpdesk',
-                  'forgotpw' => 'Forgot password?',
-                  'newuser'  => 'New User?',
-                  'options_headline' => 'Select Accessibility Options',
-                  'sprs_img' => 'Suppress rendering of images',
-                  'sprs_applet' => 'Suppress Java applets',
-                  'sprs_embed' => 'Suppress rendering of embedded multimedia',
-                  'sprs_font' => 'Increase font size',
-                  'sprs_blackwhite' => 'Switch to black and white mode',
-                  'remember' => 'Remember these settings for next login');
+          'un'       => 'Username',
+          'pw'       => 'Password',
+          'dom'      => 'Domain',
+          'perc'     => 'percent',
+          'load'     => 'Server Load',
+          'userload' => 'User Load',
+          'catalog'  => 'Course/Community Catalog',
+          'log'      => 'Log in',
+          'help'     => 'Log-in Help',
+          'serv'     => 'Server',
+          'servadm'  => 'Server Administration',
+          'helpdesk' => 'Contact Helpdesk',
+          'forgotpw' => 'Forgot password?',
+          'newuser'  => 'New User?',
+       );
 # -------------------------------------------------- Change password field name
-    my $forgotpw = &forgotpwdisplay(%lt);
-    my $loginhelp = &loginhelpdisplay(%lt);
+
+my $forgotpw = &forgotpwdisplay(%lt);
+$forgotpw .= '<br />' if $forgotpw;
+my $loginhelp = &loginhelpdisplay($authdomain,%lt);
+$loginhelp .= '<br />' if $loginhelp;
 
 # ---------------------------------------------------- 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
 
-    if ($fullgraph) {
-	$r->print(
-		  '<table width="100%" cellpadding=0 cellspacing=0 border=0>');
-    }
+$r->print(
+    '<div class="LC_Box"'
+   .' style="margin:0 auto; padding:10px; width:90%; height: auto; background-color:#FFFFFF;">'
+);
+
+#
+#  If the loadbalancing yielded just http:// because perhaps there's no loadbalancing?
+#  then just us a relative link to authenticate:
+#
 
-    $r->print(<<ENDSERVERFORM);
-  <form name="server" action="$otherserver/adm/authenticate" method="post" target="_top">
+$r->print(<<ENDSERVERFORM);
+<form name="server" action="$otherserver/adm/authenticate" method="post" target="_top">
    <input type="hidden" name="logtoken" value="$logtoken" />
    <input type="hidden" name="serverid" value="$lonhost" />
-   <input type="hidden" name="interface" value="$env{'form.interface'}" />
    <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="imagesuppress"  value="" />
-   <input type="hidden" name="appletsuppress"  value="" />
-   <input type="hidden" name="embedsuppress"  value="" />
-   <input type="hidden" name="fontenhance"  value="" />
-   <input type="hidden" name="blackwhite"  value="" />
-   <input type="hidden" name="remember"  value="" />
    <input type="hidden" name="localpath" value="$env{'form.localpath'}" />
    <input type="hidden" name="localres" value="$env{'form.localres'}" />
   </form>
 ENDSERVERFORM
-    my $coursecatalog;
-    if (($showcoursecat eq '') || ($showcoursecat)) {
-        $coursecatalog = &coursecatalog_link($lt{'catalog'});
-    }
-    my $newuserlink;
-    if ($shownewuserlink) {
-        $newuserlink = &newuser_link($lt{'newuser'});
-    }
-    if ($fullgraph) { $r->print(<<ENDTOP);
-  <!-- The LON-CAPA Header -->
-  <tr>
-
-   <!-- Row 1 Columns 2-4 -->
-   <td width="100%" height=75 colspan=4 align="left" valign="top" bgcolor="$pgbg"><img src="$img" border=0 alt="The Learning Online Network with CAPA" /></td>
-  </tr>
-
-  <!-- The gray bar that starts the two table frames -->
-  <tr>
-
-   <!-- Row 2 Column 1 -->
-   <td width=182 height=27 bgcolor="$sidebg">&nbsp;</td>
-
-   <!-- Row 2 Column 2 -->
-   <td width=27 height=27 align="left" background="$iconpath/filltop.gif"><img src="$iconpath/upperleft.gif" border=0 alt="" /></td>
-
-   <!-- Row 2 Column 3 -->
-   <td height=27 background="$iconpath/filltop.gif"><img src="$iconpath/filltop.gif" alt="" /></td>
-
-   <!-- Row 2 Column 4 -->
-   <td width=27 height=27 align="right" background="$iconpath/filltop.gif"><img src="$iconpath/upperright.gif" border=0 alt="" /></td>
-  </tr>
-  <tr>
-   
-   <!-- A cell that will hold the 'access', 'about', and 'catalog' links -->
-   <!-- Row 3 Column 1 -->
-   <td valign="top" height="60" align="left" bgcolor="$sidebg">
-    <table cellpadding="0" cellspacing="2" border="0">
-     <tr>
-      <td>&nbsp;</td>
-      <td><a href="/adm/login?interface=textual"><b>$lt{'access'}</b></a></td>
-     </tr>
-     <tr>
-      <td>&nbsp;</td>
-      <td><a href="/adm/about.html"><b>$lt{'about'}</b></a></td>
-     </tr>$coursecatalog
-     <tr>
-      <td colspan="2">&nbsp;</td>
-     </tr>
-    </table>
-   </td>
-   <!-- The shaded space between the two main columns -->
-   <!-- Row 3 Column 2 -->
-   <td width=27 height=60 background="$iconpath/fillleft.gif"><img src="$iconpath/fillleft.gif" alt="" /></td>
-
-   <!-- The right main column holding the large LON-CAPA logo-->
-   <!-- Rows 3-4 Column 3 -->
-   <td align="center" valign="top" width="100%" height="100%" bgcolor="$mainbg">
-    <center>
-     <img src="$logo" alt="" />
-    </center>
-   </td>
-
-   <!-- Row 3 Column 4 -->
-   <td width=27 background="$iconpath/fillright.gif"><img src="$iconpath/fillright.gif" alt="" /></td>
-  </tr>
-  <tr>
-
-   <!-- The entry form -->
-   <!-- Row 4 Column 1 -->
-   <td align="center" valign="middle" bgcolor="$sidebg">
+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);
+
+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" readonly="readonly" /><br />
+  <b><label for="upass$now">$lt{'pw'}</label>:</b><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" readonly="readonly" /><br />
+  <input type="submit" value="$lt{'log'}" />
+</form>
+LFORM
+
+    if ($showbanner) {
+        $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" />
+</div>
+HEADER
+    }
+    $r->print(<<ENDTOP);
+<div style="float:left;">
+<div class="LC_Box" style="background:$loginbox_bg;">
+  $logintitle
+  $loginform
+  $noscript_warning
+</div>
+  
+<div class="LC_Box" style="padding-top: 10px;">
+  $loginhelp
+  $forgotpw
+  $contactblock
+  $newuserlink
+  $coursecatalog
+</div>
+</div>
+
+<div>
 ENDTOP
-} else {
-    $r->print('<h1>The Learning<i>Online</i> Network with CAPA</h1>'
-             .'<h2>'.&mt('Text-based Interface Login').'</h2>'
-             .$announcements);
-}
-    $r->print('<form name="client" onsubmit="return(send())">');
-    unless ($fullgraph) {
-        $r->print(<<ENDACCESSOPTIONS);
-<h3>$lt{'options_headline'}</h3>
-<label><input type="checkbox" name="imagesuppress" /> $lt{'sprs_img'}</label><br />
-<label><input type="checkbox" name="appletsuppress" /> $lt{'sprs_applet'}</label><br />
-<label><input type="checkbox" name="embedsuppress" /> $lt{'sprs_embed'}</label><br />
-<label><input type="checkbox" name="fontenhance" /> $lt{'sprs_font'}</label><br />
-<label><input type="checkbox" name="blackwhite" /> $lt{'sprs_blackwhite'}</label><br />
-<br />
-<input type="checkbox" name="remember" /> $lt{'remember'}<hr />
-ENDACCESSOPTIONS
-} else {
-    $r->print(<<ENDNOOPT);
-<input type="hidden" name="imagesuppress"  value="" />
-<input type="hidden" name="embedsuppress"  value="" />
-<input type="hidden" name="appletsuppress"  value="" />
-<input type="hidden" name="fontenhance"  value="" />
-<input type="hidden" name="blackwhite"  value="" />
-<input type="hidden" name="remember"  value="" />
-ENDNOOPT
-}
-    my $logintitle;
-    if ($loginheader eq 'text') {
-        $logintitle = '<td bgcolor="'.$bgcol.'" colspan="2">&nbsp;&nbsp;&nbsp;<b><font size="+1" color="'.$textcol.'">'.$lt{'log'}.'</font></b></td>';
-    } else {
-        $logintitle = '<td bgcolor="'.$sidebg.'" colspan="2"><img src="'.$login.'" alt="'.
-                      &mt('User Authentication').'" /></td>';
-    }
-    my $noscript_warning='<td colspan="2" bgcolor="'.$mainbg.'">'
-                        .'<noscript><div class="LC_warning"><font size="-1">'
-                        .&mt('Use of LON-CAPA requires Javascript to be enabled in your web browser.')
-                        .'</font></div></noscript></td>';
-    $r->print(<<ENDLOGIN);
-     <input type="hidden" name="lextkey" value="$lextkey">
-     <input type="hidden" name="uextkey" value="$uextkey">
-
-     <!-- Start the sub-table for text and input alignment -->
-     <table border=0 cellspacing=0 cellpadding=0>
-      <tr>$logintitle</tr>
-      <tr>$noscript_warning</tr>
-      <tr>
-       <td bgcolor="$mainbg"><br /><font size=-1><b>&nbsp;&nbsp;&nbsp;<label for="uname">$lt{'un'}</label>:</b></font></td>
-       <td bgcolor="$mainbg"><br /><input type="text" name="uname" size="10" value="$authusername" /></td>
-      </tr>
-      <tr>
-       <td bgcolor="$mainbg"><font size=-1><b>&nbsp;&nbsp;&nbsp;<label for="upass$now">$lt{'pw'}</label>:</b></font></td>
-       <td bgcolor="$mainbg"><input type="password" name="upass$now" size="10" /></td>
-      </tr>
-      <tr>
-       <td bgcolor="$mainbg"><font size=-1><b>&nbsp;&nbsp;&nbsp;<label for="udom">$lt{'dom'}</label>:</b></font></td>
-       <td bgcolor="$mainbg"><input type="text" name="udom" size="10" value="$authdomain" /></td>
-      </tr>
-      <tr>
-       <td bgcolor="$mainbg">&nbsp;</td>
-       <td bgcolor="$mainbg" valign="bottom" align="center">
-        <br />
-        <input type="submit" value="$lt{'log'}" />
-       </td>
-      </tr>
-      <tr>
-       <td bgcolor="$mainbg" valign="bottom" align="left" colspan="2">
-        $loginhelp
-        $forgotpw
-        $newuserlink
-        <br />
-       </td>
-      </tr>
-     </table>
-     <!-- End sub-table -->
-    </form>
-ENDLOGIN
-    if ($fullgraph) {
-        my $helpdeskscript;
-        my $contactblock = &contactdisplay(\%lt,$servadm,$showadminmail,
-                                  $version,$authdomain,\$helpdeskscript);
-	$r->print(<<ENDDOCUMENT);
-   </td>
-
-   <!-- Row 4 Column 2 -->
-   <td width=27 background="$iconpath/fillleft.gif"><img src="$iconpath/fillleft.gif" alt="" /></td>
-
-   <!-- Row 4 Column 3 -->
-<td bgcolor="$mainbg">$announcements</td>
-
-   <!-- Row 4 Column 4 -->
-   <td width=27 background="$iconpath/fillright.gif"><img src="$iconpath/fillright.gif" alt="" /></td>
-  </tr>
-  <tr>
-
-   <!-- Row 5 Column 1 -->
-   <td bgcolor="$sidebg" valign="middle" align="left">
-     <br />
-     <table border=0 cellspacing=0 cellpadding=0>
+    if ($showmainlogo) {
+        $r->print(' <img src="'.$logo.'" alt="" />'."\n");
+    }
+$r->print(<<ENDTOP);
+$announcements
+$domainlogo
+</div>
+<hr style="clear:both;" />
+ENDTOP
+
+$r->print(<<ENDDOCUMENT);
+     <table border="0" cellspacing="0" cellpadding="0">
       <tr>
-       <td bgcolor="$sidebg" align="left" valign="top">
-        <small><b>&nbsp;&nbsp;&nbsp;$lt{'dom'}:&nbsp;</b></small>
+       <td  align="left" valign="top">
+        <small><b>$lt{'dom'}:&nbsp;</b></small>
        </td>
-       <td bgcolor="$sidebg" align="left" valign="top">
+       <td  align="left" valign="top">
         <small><tt>&nbsp;$domain</tt></small>
        </td>
       </tr>
       <tr>
-       <td bgcolor="$sidebg" align="left" valign="top">
-        <small><b>&nbsp;&nbsp;&nbsp;$lt{'serv'}:&nbsp;</b></small>
+       <td  align="left" valign="top">
+        <small><b>$lt{'serv'}:&nbsp;</b></small>
        </td>
-       <td bgcolor="$sidebg" align="left" valign="top">
+       <td align="left" valign="top">
         <small><tt>&nbsp;$lonhost ($role)</tt></small>
        </td>
       </tr>
       <tr>
-       <td bgcolor="$sidebg" align="left" valign="top">
-        <small><b>&nbsp;&nbsp;&nbsp;$lt{'load'}:&nbsp;</b></small>
+       <td align="left" valign="top">
+        <small><b>$lt{'load'}:&nbsp;</b></small>
        </td>
-       <td bgcolor="$sidebg" align="left" valign="top">
+       <td align="left" valign="top">
         <small><tt>&nbsp;$loadpercent $lt{'perc'}</tt></small>
        </td>
       </tr>
       <tr>
-       <td bgcolor="$sidebg" align="left" valign="top">
-        <small><b>&nbsp;&nbsp;&nbsp;$lt{'userload'}:&nbsp;</b></small>
+       <td align="left" valign="top">
+        <small><b>$lt{'userload'}:&nbsp;</b></small>
        </td>
-       <td bgcolor="$sidebg" align="left" valign="top">
+       <td align="left" valign="top">
         <small><tt>&nbsp;$userloadpercent $lt{'perc'}</tt></small>
        </td>
       </tr>
+      <tr>
+       <td colspan="2" align="left">
+        <small>$version</small>
+       </td>
+      </tr>
      </table>
-     <br />
-    $contactblock
-   </td>
-
-   <!-- Row 5 Column 2 -->
-   <td width=27 background="$iconpath/fillleft.gif"><img src="$iconpath/fillleft.gif" alt="" /></td>
-
-   <!-- Row 5 Column 3 -->
-   <td width="100%" valign="bottom" bgcolor="$mainbg">
-$domainlogo
-</td>
-
-   <!-- Row 5 Column 4 -->
-   <td width=27 background="$iconpath/fillright.gif"><img src="$iconpath/fillright.gif" alt="" /></td>
-  </tr>
-  <tr>
-
-   <!-- Row 6 Column 1 -->
-   <td bgcolor="$sidebg">&nbsp;</td>
-
-   <!-- Row 6 Column 2 -->
-   <td align="left" background="$iconpath/fillbottom.gif"><img src="$iconpath/lowerleft.gif" alt="" /></td>
-
-   <!-- Row 6 Column 3 -->
-   <td background="$iconpath/fillbottom.gif"><img src="$iconpath/fillbottom.gif" alt="" /></td>
-
-   <!-- Row 6 Column 4 -->
-   <td align="right" background="$iconpath/fillbottom.gif"><img src="$iconpath/lowerright.gif" alt="" /></td>
-  </tr>
- </table>
+ </div>
 
 <script type="text/javascript">
+// <![CDATA[
 // the if prevents the script error if the browser can not handle this
 if ( document.client.uname ) { document.client.uname.focus(); }
+// ]]>
 </script>
 $helpdeskscript
 
 ENDDOCUMENT
-}
     my %endargs = ( 'noredirectlink' => 1, );
     $r->print(&Apache::loncommon::end_page(\%endargs));
     return OK;
 }
 
+sub check_loginvia {
+    my ($domain,$lonhost) = @_;
+    if ($domain eq '' || $lonhost eq '') {
+        return;
+    }
+    my %domconfhash = &Apache::loncommon::get_domainconf($domain);
+    my $loginvia = $domconfhash{$domain.'.login.loginvia_'.$lonhost};
+    my $loginvia_exempt = $domconfhash{$domain.'.login.loginvia_exempt_'.$lonhost};
+    my $output;
+    if ($loginvia ne '') {
+        my $noredirect;
+        my $ip = $ENV{'REMOTE_ADDR'};
+        if ($ip eq '127.0.0.1') {
+            $noredirect = 1;
+        } else {
+            if ($loginvia_exempt ne '') {
+                my @exempt = split(',',$loginvia_exempt);
+                if (grep(/^\Q$ip\E$/,@exempt)) {
+                    $noredirect = 1;
+                }
+            }
+        }
+        unless ($noredirect) {
+            my ($newhost,$path);
+            if ($loginvia =~ /:/) {
+                ($newhost,$path) = split(':',$loginvia);
+            } else {
+                $newhost = $loginvia;
+            }
+            if ($newhost ne $lonhost) {
+                if (&Apache::lonnet::hostname($newhost) ne '') {
+                    $output = &redirect_page($newhost,$path);
+                }
+            }
+        }
+    }
+    return $output;
+}
+
+sub redirect_page {
+    my ($desthost,$path) = @_;
+    my $protocol = $Apache::lonnet::protocol{$desthost};
+    $protocol = 'http' if ($protocol ne 'https');
+    unless ($path =~ m{^/}) {
+        $path = '/'.$path;
+    }
+    my $url = $protocol.'://'.&Apache::lonnet::hostname($desthost).$path;
+    if ($env{'form.firsturl'} ne '') {
+        $url .='?firsturl='.$env{'form.firsturl'};
+    }
+    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,$version,$authdomain,$helpdeskscript) = @_;
+    my ($lt,$servadm,$showadminmail,$authdomain,$helpdeskscript) = @_;
     my $contactblock;
     my $showhelpdesk = 0;
     my $requestmail = $Apache::lonnet::perlvar{'lonSupportEMail'};
@@ -658,14 +590,15 @@ sub contactdisplay {
         $showhelpdesk = 1;
     }
     if ($servadm && $showadminmail) {
-        $contactblock .= '<b>&nbsp;&nbsp;&nbsp;'.$$lt{'servadm'}.':</b><br />'.
-                         '<tt>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;'.$servadm.'</tt><br />&nbsp;<br />';
+        $contactblock .= $$lt{'servadm'}.':<br />'.
+                         '<tt>'.$servadm.'</tt><br />';
     }
     if ($showhelpdesk) {
-        $contactblock .= '<b>&nbsp;&nbsp;&nbsp;<a href="javascript:helpdesk()"><font size="+1">'.$lt->{'helpdesk'}.'</font></a></b><br />';
+        $contactblock .= '<a href="javascript:helpdesk()">'.$lt->{'helpdesk'}.'</a><br />';
         my $thisurl = &escape('/adm/login');
         $$helpdeskscript = <<"ENDSCRIPT";
 <script type="text/javascript">
+// <![CDATA[
 function helpdesk() {
     var codedom = document.client.udom.value;
     if (codedom == '') {
@@ -675,12 +608,10 @@ function helpdesk() {
     document.location.href = "/adm/helpdesk?"+querystr;
     return;
 }
+// ]]>
 </script>
 ENDSCRIPT
     }
-    $contactblock .= <<"ENDBLOCK";
-     &nbsp;&nbsp;&nbsp;$version
-ENDBLOCK
     return $contactblock;
 }
 
@@ -688,16 +619,26 @@ sub forgotpwdisplay {
     my (%lt) = @_;
     my $prompt_for_resetpw = 1; 
     if ($prompt_for_resetpw) {
-        return '<br />&nbsp;&nbsp;&nbsp;<a href="/adm/resetpw">'.$lt{'forgotpw'}.'</a></b><br />';
+        return '<a href="/adm/resetpw">'.$lt{'forgotpw'}.'</a>';
     }
     return;
 }
 
 sub loginhelpdisplay {
-    my (%lt) = @_;
+    my ($authdomain,%lt) = @_;
     my $login_help = 1;
     if ($login_help) {
-        return '&nbsp;&nbsp;&nbsp;<a href="/adm/loginproblems.html">'.$lt{'help'}.'</a></b>';
+        my $dom = $authdomain;
+        if ($dom eq '') {
+            $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;
 }
@@ -705,16 +646,13 @@ sub loginhelpdisplay {
 sub coursecatalog_link {
     my ($linkname) = @_;
     return <<"END";
-     <tr>
-      <td>&nbsp;</td>
-      <td><a href="/adm/coursecatalog"><b>$linkname</b></a></td>
-     </tr>
+      <a href="/adm/coursecatalog">$linkname</a>
 END
 }
 
 sub newuser_link {
     my ($linkname) = @_;
-    return '&nbsp;&nbsp;&nbsp;<a href="/adm/createaccount"><b>'.$linkname.'</b></a><br />';
+    return '<a href="/adm/createaccount">'.$linkname.'</a>';
 }
 
 1;