--- loncom/auth/lonlogin.pm	2009/12/04 13:50:48	1.131
+++ loncom/auth/lonlogin.pm	2010/03/03 17:00:01	1.133
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Login Screen
 #
-# $Id: lonlogin.pm,v 1.131 2009/12/04 13:50:48 jms Exp $
+# $Id: lonlogin.pm,v 1.133 2010/03/03 17:00:01 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -121,15 +121,12 @@ sub handler {
 
     my $lonhost = $r->dir_config('lonHostID');
     my $domain = &Apache::lonnet::default_login_domain();
-    my %domconfhash = &Apache::loncommon::get_domainconf($domain);
     if ($lonhost ne '') {
-        my $loginvia = $domconfhash{$domain.'.login.loginvia_'.$lonhost};
-        if (($loginvia ne '') && ($loginvia ne $lonhost)) {
-            if (&Apache::lonnet::hostname($loginvia) ne '') {
-                $r->print(&redirect_page($loginvia));
-                return OK;
-            }
-        }
+        my $redirect = &check_loginvia($domain,$lonhost);
+        if ($redirect) {
+            $r->print($redirect);
+            return OK;
+        } 
     }
 
     if (($env{'form.domain'}) && 
@@ -274,7 +271,7 @@ my $alink=&Apache::loncommon::designparm
 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=&Apache::loncommon::domainlogo($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');
@@ -363,7 +360,9 @@ 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;
 
 # ---------------------------------------------------- Serve out DES JavaScript
 {
@@ -395,11 +394,11 @@ $r->print(<<ENDSERVERFORM);
 ENDSERVERFORM
 my $coursecatalog;
 if (($showcoursecat eq '') || ($showcoursecat)) {
-    $coursecatalog = &coursecatalog_link($lt{'catalog'});
+    $coursecatalog = &coursecatalog_link($lt{'catalog'}).'<br />';
 }
 my $newuserlink;
 if ($shownewuserlink) {
-    $newuserlink = &newuser_link($lt{'newuser'});
+    $newuserlink = &newuser_link($lt{'newuser'}).'<br />';
 }
 my $logintitle;
 if ($loginheader eq 'text') {
@@ -414,7 +413,7 @@ my $noscript_warning='<noscript><span cl
                     .'</b></span></noscript>';
 my $helpdeskscript;
 my $contactblock = &contactdisplay(\%lt,$servadm,$showadminmail,
-                            $version,$authdomain,\$helpdeskscript);
+                                   $authdomain,\$helpdeskscript);
 
 my $loginform=(<<LFORM);
 <form name="client" action="" onsubmit="return(send())">
@@ -433,13 +432,9 @@ LFORM
     if ($showbanner) {
         $r->print(<<HEADER);
 <!-- The LON-CAPA Header -->
-<table border="0" align="left" width="100%" cellspacing="0" cellpadding="1">
- <tr>
-  <td align="left" valign="top" bgcolor="$pgbg">
-      <img src="$img" border="0" alt="The Learning Online Network with CAPA" />
-  </td>
- </tr>
-</table>
+<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);
@@ -458,12 +453,10 @@ HEADER
 </div>
   
 <div class="LC_loginpage_loginInfo">
-  $loginhelp<br />
-  $forgotpw<br />
-  <br />
-  $contactblock<br />
-  <br />
-  $newuserlink<br />
+  $loginhelp
+  $forgotpw
+  $contactblock
+  $newuserlink
   $coursecatalog
 </div>
 </div>
@@ -481,7 +474,7 @@ $r->print(<<ENDDOCUMENT);
      <table border="0" cellspacing="0" cellpadding="0">
       <tr>
        <td  align="left" valign="top">
-        <small><b>&nbsp;&nbsp;&nbsp;$lt{'dom'}:&nbsp;</b></small>
+        <small><b>$lt{'dom'}:&nbsp;</b></small>
        </td>
        <td  align="left" valign="top">
         <small><tt>&nbsp;$domain</tt></small>
@@ -489,7 +482,7 @@ $r->print(<<ENDDOCUMENT);
       </tr>
       <tr>
        <td  align="left" valign="top">
-        <small><b>&nbsp;&nbsp;&nbsp;$lt{'serv'}:&nbsp;</b></small>
+        <small><b>$lt{'serv'}:&nbsp;</b></small>
        </td>
        <td align="left" valign="top">
         <small><tt>&nbsp;$lonhost ($role)</tt></small>
@@ -497,7 +490,7 @@ $r->print(<<ENDDOCUMENT);
       </tr>
       <tr>
        <td align="left" valign="top">
-        <small><b>&nbsp;&nbsp;&nbsp;$lt{'load'}:&nbsp;</b></small>
+        <small><b>$lt{'load'}:&nbsp;</b></small>
        </td>
        <td align="left" valign="top">
         <small><tt>&nbsp;$loadpercent $lt{'perc'}</tt></small>
@@ -505,12 +498,17 @@ $r->print(<<ENDDOCUMENT);
       </tr>
       <tr>
        <td align="left" valign="top">
-        <small><b>&nbsp;&nbsp;&nbsp;$lt{'userload'}:&nbsp;</b></small>
+        <small><b>$lt{'userload'}:&nbsp;</b></small>
        </td>
        <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>
  </div>
 
@@ -528,11 +526,53 @@ ENDDOCUMENT
     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) = @_;
+    my ($desthost,$path) = @_;
     my $protocol = $Apache::lonnet::protocol{$desthost};
     $protocol = 'http' if ($protocol ne 'https');
-    my $url = $protocol.'://'.&Apache::lonnet::hostname($desthost).'/';
+    unless ($path =~ m{^/}) {
+        $path = '/'.$path;
+    }
+    my $url = $protocol.'://'.&Apache::lonnet::hostname($desthost).$path;
     if ($env{'form.firsturl'} ne '') {
         $url .='?firsturl='.$env{'form.firsturl'};
     }
@@ -543,7 +583,7 @@ sub redirect_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'};
@@ -573,7 +613,6 @@ function helpdesk() {
 </script>
 ENDSCRIPT
     }
-    $contactblock .= $version;
     return $contactblock;
 }