[LON-CAPA-cvs] cvs: loncom /auth lonlogin.pm

[www]

www		Tue Feb  4 10:11:44 2003 EDT

  Modified files:              
    /loncom/auth	lonlogin.pm 
  Log:
  The plan was to be able to pass username and domain (NOT PASSWORD!!!) in the
  query string to support "Switch Server" better. Unfortunately, as expected,
  the query string is not available to this module if it is called by
  "/priv/username/..." as an error document.
  
  
Index: loncom/auth/lonlogin.pm
diff -u loncom/auth/lonlogin.pm:1.29 loncom/auth/lonlogin.pm:1.30
--- loncom/auth/lonlogin.pm:1.29	Fri Jan 31 16:51:36 2003
+++ loncom/auth/lonlogin.pm	Tue Feb  4 10:11:44 2003
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Login Screen
 #
-# $Id: lonlogin.pm,v 1.29 2003/01/31 21:51:36 www Exp $
+# $Id: lonlogin.pm,v 1.30 2003/02/04 15:11:44 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -50,7 +50,7 @@
 
 
     &Apache::loncommon::get_unprocessed_cgi
-                         ($ENV{'QUERY_STRING'},['interface']);
+     ($ENV{'QUERY_STRING'},['interface','username','domain']);
 
     $ENV{'form.interface'}=~s/\W//g;
 
@@ -67,6 +67,12 @@
     my $tabdir  = $r->dir_config('lonTabDir');
     my $include = $r->dir_config('lonIncludes');
 
+# --------------------------------------------- Default values for login fields
+
+    my $authusername=($ENV{'form.username'}?$ENV{'form.username'}:'');
+    my $authdomain=($ENV{'form.domain'}?$ENV{'form.domain'}:$domain);
+
+# ---------------------------------------------------------- Determine own load
     my $loadavg;
    {
        my $loadfile=Apache::File->new('/proc/loadavg');
@@ -75,6 +81,7 @@
     $loadavg =~ s/\s.*//g;
     my $loadpercent=100*$loadavg/$loadlim;
 
+# ------------------------------------------------------- Do the load balancing
     my $otherserver='http://'.$ENV{'SERVER_NAME'};
     my $firsturl=$ENV{'request.firsturl'};
 # ---------------------------------------- Are we access server and overloaded?
@@ -239,7 +246,7 @@
       <tr><td bgcolor="$sidebg" colspan=2><img src="$iconpath/userauthentication.gif" alt="User Authentication" /></td></tr>
       <tr>
        <td bgcolor="$mainbg"><br /><font size=-1><b>&nbsp;&nbsp;&nbsp;User Name:</b></font></td>
-       <td bgcolor="$mainbg"><br /><input type="text" name="uname" size="10" /></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;Password:</b></font></td>
@@ -247,7 +254,7 @@
       </tr>
       <tr>
        <td bgcolor="$mainbg"><font size=-1><b>&nbsp;&nbsp;&nbsp;Domain:</b></font></td>
-       <td bgcolor="$mainbg"><input type="text" name="udom" size="10" value=$domain /></td>
+       <td bgcolor="$mainbg"><input type="text" name="udom" size="10" value="$authdomain" /></td>
       </tr>
       <tr>
        <td bgcolor="$mainbg">&nbsp;&nbsp;&nbsp;<a href="/adm/loginproblems.html">Help</a></td>