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

Diff for /loncom/auth/lonlogin.pm between versions 1.44.2.2 and 1.45

version 1.44.2.2, 2003/08/26 19:48:41 version 1.45, 2003/08/12 19:46:04
Line 73  sub handler { Line 73  sub handler {
     my $iconpath= 'http://'.$ENV{'HTTP_HOST'}.':'.$port_to_use.      my $iconpath= 'http://'.$ENV{'HTTP_HOST'}.':'.$port_to_use.
                   $r->dir_config('lonIconsURL');                    $r->dir_config('lonIconsURL');
     my $domain  = $r->dir_config('lonDefDomain');      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 $role    = $r->dir_config('lonRole');
     my $loadlim = $r->dir_config('lonLoadLim');      my $loadlim = $r->dir_config('lonLoadLim');
     my $servadm = $r->dir_config('lonAdmEMail');      my $servadm = $r->dir_config('lonAdmEMail');
Line 109  sub handler { Line 105  sub handler {
 # ---------------------------------------- Are we access server and overloaded?  # ---------------------------------------- Are we access server and overloaded?
     if (($role eq 'access') &&      if (($role eq 'access') &&
  (($userloadpercent>100.0)||($loadpercent>100.0))) {   (($userloadpercent>100.0)||($loadpercent>100.0))) {
         my $unloaded=Apache::lonnet::spareserver($loadpercent,$userloadpercent);          $otherserver=Apache::lonnet::spareserver($loadpercent,$userloadpercent);
  if ($unloaded) { $otherserver=$unloaded; }  
     }      }
   
   # ----------------------------------------------------------- Get announcements
       my $announcements=&Apache::lonnet::getannounce();
 # -------------------------------------------------------- Set login parameters  # -------------------------------------------------------- Set login parameters
   
     my @hexstr=('0','1','2','3','4','5','6','7',      my @hexstr=('0','1','2','3','4','5','6','7',
Line 188  ENDHEADER Line 185  ENDHEADER
   
 # ----------------------------------------------------------- Front page design  # ----------------------------------------------------------- Front page design
     my $pgbg=      my $pgbg=
       ($fullgraph?&Apache::loncommon::designparm('login.pgbg',$domain):'#FFFFFF');        ($fullgraph?&Apache::loncommon::designparm('login.pgbg'):'#FFFFFF');
     my $font=      my $font=
       ($fullgraph?&Apache::loncommon::designparm('login.font',$domain):'#000000');        ($fullgraph?&Apache::loncommon::designparm('login.font'):'#000000');
     my $link=      my $link=
       ($fullgraph?&Apache::loncommon::designparm('login.link',$domain):'#0000FF');        ($fullgraph?&Apache::loncommon::designparm('login.link'):'#0000FF');
     my $vlink=      my $vlink=
       ($fullgraph?&Apache::loncommon::designparm('login.vlink',$domain):'#0000FF');        ($fullgraph?&Apache::loncommon::designparm('login.vlink'):'#0000FF');
     my $alink=&Apache::loncommon::designparm('login.alink',$domain);      my $alink=&Apache::loncommon::designparm('login.alink');
     my $mainbg=      my $mainbg=
       ($fullgraph?&Apache::loncommon::designparm('login.mainbg',$domain):'#FFFFFF');        ($fullgraph?&Apache::loncommon::designparm('login.mainbg'):'#FFFFFF');
     my $sidebg=      my $sidebg=
       ($fullgraph?&Apache::loncommon::designparm('login.sidebg',$domain):'#FFFFFF');        ($fullgraph?&Apache::loncommon::designparm('login.sidebg'):'#FFFFFF');
     my $logo=&Apache::loncommon::designparm('login.logo',$domain);      my $logo=&Apache::loncommon::designparm('login.logo');
     my $img=&Apache::loncommon::designparm('login.img',$domain);      my $img=&Apache::loncommon::designparm('login.img');
   
   
 # ---------------------------------------------------------- Serve rest of page  # ---------------------------------------------------------- Serve rest of page
Line 312  ENDSERVERFORM Line 309  ENDSERVERFORM
   
    <!-- The right main column holding the large LON-CAPA logo-->     <!-- The right main column holding the large LON-CAPA logo-->
    <!-- Rows 3-4 Column 3 -->     <!-- Rows 3-4 Column 3 -->
    <td align="center" valign="top" width="100%" height="100%" rowspan=2 bgcolor="$mainbg">     <td align="center" valign="top" width="100%" height="100%" bgcolor="$mainbg">
     <center>      <center>
      <img src="$logo" alt="" />       <img src="$logo" alt="" />
     </center>      </center>
Line 328  ENDSERVERFORM Line 325  ENDSERVERFORM
    <td align="center" valign="middle" bgcolor="$sidebg">     <td align="center" valign="middle" bgcolor="$sidebg">
 ENDTOP  ENDTOP
 } else {  } else {
     $r->print('<h1>The Learning<i>Online</i> Network with CAPA</h1><h2>Text-based Interface Login</h2>');      $r->print('<h1>The Learning<i>Online</i> Network with CAPA</h1><h2>Text-based Interface Login</h2>'.$announcements);
 }  }
     $r->print('<form name="client" onsubmit="return(send())">');      $r->print('<form name="client" onsubmit="return(send())">');
     unless ($fullgraph) {      unless ($fullgraph) {
Line 391  ENDLOGIN Line 388  ENDLOGIN
    <!-- Row 4 Column 2 -->     <!-- Row 4 Column 2 -->
    <td width=27 background="$iconpath/fillleft.gif"><img src="$iconpath/fillleft.gif" alt="" /></td>     <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 -->     <!-- Row 4 Column 4 -->
    <td width=27 background="$iconpath/fillright.gif"><img src="$iconpath/fillright.gif" alt="" /></td>     <td width=27 background="$iconpath/fillright.gif"><img src="$iconpath/fillright.gif" alt="" /></td>
   </tr>    </tr>
Removed from v.1.44.2.2  
changed lines
  Added in v.1.45

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