[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.49

version 1.44.2.2, 2003/08/26 19:48:41 version 1.49, 2003/09/11 20:54:11
Line 40  use Apache::Constants qw(:common); Line 40  use Apache::Constants qw(:common);
 use Apache::File ();  use Apache::File ();
 use Apache::lonnet();  use Apache::lonnet();
 use Apache::loncommon();  use Apache::loncommon();
   use Apache::lonauth();
   
 sub handler {  sub handler {
     my $r = shift;      my $r = shift;
Line 49  sub handler { Line 50  sub handler {
     return OK if $r->header_only;      return OK if $r->header_only;
   
   
   # Are we re-routing?
       if (-e '/home/httpd/html/lon-status/reroute.txt') {
    &Apache::lonauth::reroute($r);
    return OK;
       }
   
     &Apache::loncommon::get_unprocessed_cgi      &Apache::loncommon::get_unprocessed_cgi
      ($ENV{'QUERY_STRING'}.'&'.$ENV{'request.querystring'},       ($ENV{'QUERY_STRING'}.'&'.$ENV{'request.querystring'},
       ['interface','username','domain','firsturl','localpath','localres']);        ['interface','username','domain','firsturl','localpath','localres']);
Line 113  sub handler { Line 120  sub handler {
  if ($unloaded) { $otherserver=$unloaded; }   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 168  ENDTROUBLE Line 177  ENDTROUBLE
   
 # ----------------------------------------------- Apparently we are in business  # ----------------------------------------------- Apparently we are in business
   
     my $domainlogo=&Apache::loncommon::domainlogo();      my $domainlogo=&Apache::loncommon::domainlogo($domain);
     $servadm=~s/\,/\<br \/\>/g;      $servadm=~s/\,/\<br \/\>/g;
     $sysadm=~s/\,/\<br \/\>/g;      $sysadm=~s/\,/\<br \/\>/g;
   
Line 312  ENDSERVERFORM Line 321  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 337  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 400  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.49

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