--- loncom/auth/lonlogin.pm	2003/03/10 14:29:37	1.38
+++ loncom/auth/lonlogin.pm	2003/08/26 19:47:33	1.44.2.1
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Login Screen
 #
-# $Id: lonlogin.pm,v 1.38 2003/03/10 14:29:37 www Exp $
+# $Id: lonlogin.pm,v 1.44.2.1 2003/08/26 19:47:33 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -50,8 +50,9 @@ sub handler {
 
 
     &Apache::loncommon::get_unprocessed_cgi
-     ($ENV{'QUERY_STRING'},['interface','username','domain','firsturl']);
-
+     ($ENV{'QUERY_STRING'}.'&'.$ENV{'request.querystring'},
+      ['interface','username','domain','firsturl','localpath','localres']);
+ 
 # ----------------------------------------------------------- Process Interface
     $ENV{'form.interface'}=~s/\W//g;
 
@@ -65,10 +66,17 @@ sub handler {
     }
 
     my $fullgraph=($ENV{'form.interface'} ne 'textual');
-
-    my $iconpath= 'http://'.$ENV{'HTTP_HOST'}.':8080'.
+    my $port_to_use=$r->dir_config('lonhttpdPort');
+    if (!defined($port_to_use)) {
+	$port_to_use='8080';
+    }
+    my $iconpath= 'http://'.$ENV{'HTTP_HOST'}.':'.$port_to_use.
                   $r->dir_config('lonIconsURL');
     my $domain  = $r->dir_config('lonDefDomain');
+    if (($ENV{'form.domain'}) && 
+	 ($Apache::lonnet::domaindescription{$ENV{'form.domain'}})) {
+	$domain=$ENV{'form.domain'};
+    }
     my $role    = $r->dir_config('lonRole');
     my $loadlim = $r->dir_config('lonLoadLim');
     my $servadm = $r->dir_config('lonAdmEMail');
@@ -77,6 +85,7 @@ sub handler {
     my $tabdir  = $r->dir_config('lonTabDir');
     my $include = $r->dir_config('lonIncludes');
     my $expire  = $r->dir_config('lonExpire');
+    my $version = $r->dir_config('lonVersion');
 
 # --------------------------------------------- Default values for login fields
 
@@ -85,20 +94,22 @@ sub handler {
 
 # ---------------------------------------------------------- Determine own load
     my $loadavg;
-   {
-       my $loadfile=Apache::File->new('/proc/loadavg');
-       $loadavg=<$loadfile>;
-   }
+    {
+	my $loadfile=Apache::File->new('/proc/loadavg');
+	$loadavg=<$loadfile>;
+    }
     $loadavg =~ s/\s.*//g;
     my $loadpercent=100*$loadavg/$loadlim;
+    my $userloadpercent=&Apache::lonnet::userload();
 
 # ------------------------------------------------------- Do the load balancing
     my $otherserver='http://'.$ENV{'SERVER_NAME'};
     my $firsturl=
     ($ENV{'request.firsturl'}?$ENV{'request.firsturl'}:$ENV{'form.firsturl'});
 # ---------------------------------------- Are we access server and overloaded?
-    if (($role eq 'access') && ($loadpercent>100.0)) {
-        $otherserver=Apache::lonnet::spareserver($loadpercent);
+    if (($role eq 'access') &&
+	(($userloadpercent>100.0)||($loadpercent>100.0))) {
+        $otherserver=Apache::lonnet::spareserver($loadpercent,$userloadpercent);
     }
 
 # -------------------------------------------------------- Set login parameters
@@ -176,20 +187,20 @@ ENDHEADER
 
 # ----------------------------------------------------------- Front page design
     my $pgbg=
-      ($fullgraph?&Apache::loncommon::designparm('login.pgbg'):'#FFFFFF');
+      ($fullgraph?&Apache::loncommon::designparm('login.pgbg',$domain):'#FFFFFF');
     my $font=
-      ($fullgraph?&Apache::loncommon::designparm('login.font'):'#000000');
+      ($fullgraph?&Apache::loncommon::designparm('login.font',$domain):'#000000');
     my $link=
-      ($fullgraph?&Apache::loncommon::designparm('login.link'):'#0000FF');
+      ($fullgraph?&Apache::loncommon::designparm('login.link',$domain):'#0000FF');
     my $vlink=
-      ($fullgraph?&Apache::loncommon::designparm('login.vlink'):'#0000FF');
-    my $alink=&Apache::loncommon::designparm('login.alink');
+      ($fullgraph?&Apache::loncommon::designparm('login.vlink',$domain):'#0000FF');
+    my $alink=&Apache::loncommon::designparm('login.alink',$domain);
     my $mainbg=
-      ($fullgraph?&Apache::loncommon::designparm('login.mainbg'):'#FFFFFF');
+      ($fullgraph?&Apache::loncommon::designparm('login.mainbg',$domain):'#FFFFFF');
     my $sidebg=
-      ($fullgraph?&Apache::loncommon::designparm('login.sidebg'):'#FFFFFF');
-    my $logo=&Apache::loncommon::designparm('login.logo');
-    my $img=&Apache::loncommon::designparm('login.img');
+      ($fullgraph?&Apache::loncommon::designparm('login.sidebg',$domain):'#FFFFFF');
+    my $logo=&Apache::loncommon::designparm('login.logo',$domain);
+    my $img=&Apache::loncommon::designparm('login.img',$domain);
 
 
 # ---------------------------------------------------------- Serve rest of page
@@ -257,6 +268,8 @@ ENDSCRIPT
    <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
     if ($fullgraph) { $r->print(<<ENDTOP);
@@ -410,13 +423,22 @@ ENDLOGIN
         <small><tt>&nbsp;$loadpercent percent</tt></small>
        </td>
       </tr>
+      <tr>
+       <td bgcolor="$sidebg" align="left" valign="top">
+        <small><b>&nbsp;&nbsp;&nbsp;User&nbsp;Load:&nbsp;</b></small>
+       </td>
+       <td bgcolor="$sidebg" align="left" valign="top">
+        <small><tt>&nbsp;$userloadpercent percent</tt></small>
+       </td>
+      </tr>
      </table>
      <br />
     <small>
      <b>&nbsp;&nbsp;&nbsp;System Administration:</b><br />
      <tt>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;$sysadm</tt><br />
      <b>&nbsp;&nbsp;&nbsp;Server Administration:</b><br />
-     <tt>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;$servadm<br />&nbsp;</tt>
+     <tt>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;$servadm</tt><br />&nbsp;<br />
+     &nbsp;&nbsp;&nbsp;$version
     </small>
    </td>