[BACK]Return to lonlogin.pm CVS log [TXT] [DIR] Up to [LON-CAPA] / loncom / auth

Diff for /loncom/auth/lonlogin.pm between versions 1.25 and 1.30

version 1.25, 2002/10/14 16:14:58 version 1.30, 2003/02/04 15:11:44
Line 50  sub handler { Line 50  sub handler {
   
   
     &Apache::loncommon::get_unprocessed_cgi      &Apache::loncommon::get_unprocessed_cgi
                          ($ENV{'QUERY_STRING'},['interface']);       ($ENV{'QUERY_STRING'},['interface','username','domain']);
   
     $ENV{'form.interface'}=~s/\W//g;      $ENV{'form.interface'}=~s/\W//g;
   
     my $fullgraph=($ENV{'form.interface'} ne 'textual');      my $fullgraph=($ENV{'form.interface'} ne 'textual');
   
     my $iconpath= $r->dir_config('lonIconsURL');      my $iconpath= 'http://'.$ENV{'HTTP_HOST'}.':8080'.
                     $r->dir_config('lonIconsURL');
     my $domain  = $r->dir_config('lonDefDomain');      my $domain  = $r->dir_config('lonDefDomain');
     my $role    = $r->dir_config('lonRole');      my $role    = $r->dir_config('lonRole');
     my $loadlim = $r->dir_config('lonLoadLim');      my $loadlim = $r->dir_config('lonLoadLim');
Line 66  sub handler { Line 67  sub handler {
     my $tabdir  = $r->dir_config('lonTabDir');      my $tabdir  = $r->dir_config('lonTabDir');
     my $include = $r->dir_config('lonIncludes');      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 $loadavg;
    {     {
        my $loadfile=Apache::File->new('/proc/loadavg');         my $loadfile=Apache::File->new('/proc/loadavg');
Line 74  sub handler { Line 81  sub handler {
     $loadavg =~ s/\s.*//g;      $loadavg =~ s/\s.*//g;
     my $loadpercent=100*$loadavg/$loadlim;      my $loadpercent=100*$loadavg/$loadlim;
   
   # ------------------------------------------------------- Do the load balancing
     my $otherserver='http://'.$ENV{'SERVER_NAME'};      my $otherserver='http://'.$ENV{'SERVER_NAME'};
     my $firsturl=$ENV{'request.firsturl'};      my $firsturl=$ENV{'request.firsturl'};
 # ---------------------------------------- Are we access server and overloaded?  # ---------------------------------------- Are we access server and overloaded?
Line 134  ENDHEADER Line 142  ENDHEADER
     $r->print(<<ENDSCRIPT);      $r->print(<<ENDSCRIPT);
   
 <body bgcolor="$pgbg" text="$font" link="$link" vlink="$vlink" alink="$alink"  <body bgcolor="$pgbg" text="$font" link="$link" vlink="$vlink" alink="$alink"
  onLoad="init();" topmargin=0 leftmargin=0 marginwidth=0 marginheight=0>    topmargin=0 leftmargin=0 marginwidth=0 marginheight=0>
   
  <script language="JavaScript">   <script language="JavaScript">
     function send()      function send()
Line 178  ENDSERVERFORM Line 186  ENDSERVERFORM
   <tr>    <tr>
   
    <!-- Row 1 Columns 2-4 -->     <!-- Row 1 Columns 2-4 -->
    <td width="100%" height=75 colspan=4 align="left" valign="top" bgcolor="#006600"><img src="$img" border=0 alt="The Learning Online Network with CAPA" /></td>     <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>    </tr>
   
   <!-- The gray bar that starts the two table frames -->    <!-- The gray bar that starts the two table frames -->
Line 238  ENDTOP Line 246  ENDTOP
       <tr><td bgcolor="$sidebg" colspan=2><img src="$iconpath/userauthentication.gif" alt="User Authentication" /></td></tr>        <tr><td bgcolor="$sidebg" colspan=2><img src="$iconpath/userauthentication.gif" alt="User Authentication" /></td></tr>
       <tr>        <tr>
        <td bgcolor="$mainbg"><br /><font size=-1><b>&nbsp;&nbsp;&nbsp;User Name:</b></font></td>         <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>
       <tr>        <tr>
        <td bgcolor="$mainbg"><font size=-1><b>&nbsp;&nbsp;&nbsp;Password:</b></font></td>         <td bgcolor="$mainbg"><font size=-1><b>&nbsp;&nbsp;&nbsp;Password:</b></font></td>
Line 246  ENDTOP Line 254  ENDTOP
       </tr>        </tr>
       <tr>        <tr>
        <td bgcolor="$mainbg"><font size=-1><b>&nbsp;&nbsp;&nbsp;Domain:</b></font></td>         <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>
       <tr>        <tr>
        <td bgcolor="$mainbg" valign="bottom" align="center" colspan=2>         <td bgcolor="$mainbg">&nbsp;&nbsp;&nbsp;<a href="/adm/loginproblems.html">Help</a></td>
          <td bgcolor="$mainbg" valign="bottom" align="center">
         <br />          <br />
         <input type="submit" value="Log In" />          <input type="submit" value="Log In" />
        </td>         </td>
Removed from v.1.25  
changed lines
  Added in v.1.30

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>