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

Diff for /loncom/auth/lonlogin.pm between versions 1.28 and 1.79

version 1.28, 2003/01/16 01:37:26 version 1.79, 2006/08/29 20:12:43
Line 25 Line 25
 #  #
 # http://www.lon-capa.org/  # http://www.lon-capa.org/
 #  #
 # 5/21/99,5/22,5/25,5/26,5/31,6/2,6/10,7/12,7/14,  
 # 1/14/00,5/29,5/30,6/1,6/29,7/1,11/9,  
 # 1/17/01 Gerd Kortemeyer  
 #  
 # 2/7/02,2/8,2/12,2/14,2/15,2/19 Josh Brunskole  
 #   
 # 7/10/02 Jeremy Bowers  
   
 package Apache::lonlogin;  package Apache::lonlogin;
   
 use strict;  use strict;
 use Apache::Constants qw(:common);  use Apache::Constants qw(:common);
   use CGI::Cookie();
 use Apache::File ();  use Apache::File ();
 use Apache::lonnet();  use Apache::lonnet;
 use Apache::loncommon();  use Apache::loncommon();
   use Apache::lonauth();
   use Apache::lonlocal;
   use Apache::migrateuser();
   use lib '/home/httpd/lib/perl/';
   use LONCAPA;
    
   
 sub handler {  sub handler {
     my $r = shift;      my $r = shift;
     $r->content_type('text/html');  
       &Apache::loncommon::get_unprocessed_cgi
    (join('&',$ENV{'QUERY_STRING'},$env{'request.querystring'},
         $ENV{'REDIRECT_QUERY_STRING'}),
    ['interface','username','domain','firsturl','localpath','localres',
     'token']);
   
   # -- check if they are a migrating user
       if (defined($env{'form.token'})) {
    return &Apache::migrateuser::handler($r);
       }
   
     &Apache::loncommon::no_cache($r);      &Apache::loncommon::no_cache($r);
       &Apache::lonlocal::get_language_handle($r);
       &Apache::loncommon::content_type($r,'text/html');
     $r->send_http_header;      $r->send_http_header;
     return OK if $r->header_only;      return OK if $r->header_only;
   
   
     &Apache::loncommon::get_unprocessed_cgi  # Are we re-routing?
                          ($ENV{'QUERY_STRING'},['interface']);      if (-e '/home/httpd/html/lon-status/reroute.txt') {
    &Apache::lonauth::reroute($r);
    return OK;
       }
   
     $ENV{'form.interface'}=~s/\W//g;  
   
     my $fullgraph=($ENV{'form.interface'} ne 'textual');  # -------------------------------- Prevent users from attempting to login twice
       my %cookies=CGI::Cookie->parse($r->header_in('Cookie'));
       my $lonid=$cookies{'lonID'};
       my $cookie;
       if ($lonid) {
    my $handle=$lonid->value;
           $handle=~s/\W//g;
           my $lonidsdir=$r->dir_config('lonIDsDir');
    if (-e "$lonidsdir/$handle.id") {
   # Is there an existing token file?
       if ($handle=~/^publicuser\_/) {
   # For "public user" - remove it, we apparently really want to login
    unlink("$lonidsdir/$handle.id");
       } elsif ($handle ne '') {
   # Indeed, a valid token is found
    my $start_page = 
       &Apache::loncommon::start_page('Already logged in');
    my $end_page = 
       &Apache::loncommon::end_page();
    $r->print(<<ENDFAILED);
   $start_page
   <h1>You are already logged in</h1>
   <p>Please either <a href="/adm/roles">continue the current session</a> or
   <a href="/adm/logout">logout</a>.</p>
   <p>
   <a href="/adm/loginproblems.html">Problems?</a></p>
   $end_page
   ENDFAILED
                   return OK;
        }  
    }
       }
   
   # ---------------------------------------------------- No valid token, continue
   
    # ---------------------------- Not possible to really login to domain "public"
       if ($env{'form.domain'} eq 'public') {
    $env{'form.domain'}='';
    $env{'form.username'}='';
       }
   # ----------------------------------------------------------- Process Interface
       $env{'form.interface'}=~s/\W//g;
   
     my $iconpath= 'http://'.$ENV{'HTTP_HOST'}.':8080'.      my $textbrowsers=$r->dir_config('lonTextBrowsers');
       my $httpbrowser=$ENV{"HTTP_USER_AGENT"};
       
       foreach (split(/\:/,$textbrowsers)) {
    if ($httpbrowser=~/$_/i) {
       $env{'form.interface'}='textual';
           }
       }
   
       my $fullgraph=($env{'form.interface'} ne 'textual');
       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');                    $r->dir_config('lonIconsURL');
     my $domain  = $r->dir_config('lonDefDomain');      my $domain  = $r->dir_config('lonDefDomain');
       my $testdomain=(split(/\./,$ENV{'HTTP_HOST'}))[0];
       foreach my $posdom (&Apache::lonnet::current_machine_domains()) {
    if (lc($posdom) eq lc($testdomain)) { $domain=$posdom; }
       }
       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 66  sub handler { Line 144  sub handler {
     my $lonhost = $r->dir_config('lonHostID');      my $lonhost = $r->dir_config('lonHostID');
     my $tabdir  = $r->dir_config('lonTabDir');      my $tabdir  = $r->dir_config('lonTabDir');
     my $include = $r->dir_config('lonIncludes');      my $include = $r->dir_config('lonIncludes');
       my $expire  = $r->dir_config('lonExpire');
       my $version = $r->dir_config('lonVersion');
       my $host_name = $Apache::lonnet::hostname{$lonhost};
   
   # --------------------------------------------- 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');
        $loadavg=<$loadfile>;   $loadavg=<$loadfile>;
    }      }
     $loadavg =~ s/\s.*//g;      $loadavg =~ s/\s.*//g;
     my $loadpercent=100*$loadavg/$loadlim;      my $loadpercent=sprintf("%.1f",100*$loadavg/$loadlim);
       my $userloadpercent=&Apache::lonnet::userload();
   
     my $otherserver='http://'.$ENV{'SERVER_NAME'};  # ------------------------------------------------------- Do the load balancing
     my $firsturl=$ENV{'request.firsturl'};      my $otherserver= &Apache::loncommon::absolute_url($host_name);
       my $firsturl=
       ($env{'request.firsturl'}?$env{'request.firsturl'}:$env{'form.firsturl'});
 # ---------------------------------------- Are we access server and overloaded?  # ---------------------------------------- Are we access server and overloaded?
     if (($role eq 'access') && ($loadpercent>100.0)) {      if (($role eq 'access') &&
         $otherserver=Apache::lonnet::spareserver($loadpercent);   (($userloadpercent>100.0)||($loadpercent>100.0))) {
           my $unloaded=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 102  sub handler { Line 196  sub handler {
     my $uextkey=hex($ukey);      my $uextkey=hex($ukey);
     if ($uextkey>2147483647) { $uextkey-=4294967296; }      if ($uextkey>2147483647) { $uextkey-=4294967296; }
   
   # -------------------------------------------------------- Store away log token
     my $logtoken=Apache::lonnet::reply(      my $logtoken=Apache::lonnet::reply(
        'tmpput:'.$ukey.$lkey.'&'.$firsturl,         'tmpput:'.$ukey.$lkey.'&'.$firsturl,
        $lonhost);         $lonhost);
     my $domainlogo=&Apache::loncommon::domainlogo();  
   # ------------------- If we cannot talk to ourselves, we are in serious trouble
   
       if ($logtoken eq 'con_lost') {
           my $spares='';
    my $last;
           foreach my $hostid (sort
       {
    $Apache::lonnet::hostname{$a} cmp
       $Apache::lonnet::hostname{$b};
       }
       keys(%Apache::lonnet::spareid)) {
               next if ($hostid eq $lonhost);
               next if ($last eq $Apache::lonnet::hostname{$hostid});
               $spares.='<br /><font size="+1"><a href="http://'.
                   $Apache::lonnet::hostname{$hostid}.
                   '/adm/login?domain='.$authdomain.'">'.
                   $Apache::lonnet::hostname{$hostid}.'</a>'.
                   ' (preferred)</font>'.$/;
       $last=$Apache::lonnet::hostname{$hostid};
           }
           $spares.= '<br />';
           foreach my $hostid (sort
       {
    $Apache::lonnet::hostname{$a} cmp
       $Apache::lonnet::hostname{$b};
       }
       keys(%Apache::lonnet::hostname)) {
               next if ($hostid eq $lonhost || $Apache::lonnet::spareid{$hostid});
               next if ($last eq $Apache::lonnet::hostname{$hostid});
               $spares.='<br /><a href="http://'.
                   $Apache::lonnet::hostname{$hostid}.
                   '/adm/login?domain='.$authdomain.'">'.
                   $Apache::lonnet::hostname{$hostid}.'</a>';
       $last=$Apache::lonnet::hostname{$hostid};
           }
    $r->print(<<ENDTROUBLE);
   <html>
   <head><title>The LearningOnline Network with CAPA</title></head>
   <body bgcolor="#FFFFFF">
   <img src="/adm/lonKaputt/lonlogo_broken.gif" align="right" />
   <h3>This LON-CAPA server is temporarily not available for login</h3>
   <p>Please attempt to login to one of the following servers:</p>$spares
   <p>If the problem persists, please contact <tt>$servadm</tt>.</p>
   </body>
   </html>
   ENDTROUBLE
           return OK;
       }
   
   # ----------------------------------------------- Apparently we are in business
   
       my $domainlogo=&Apache::loncommon::domainlogo($domain);
       $servadm=~s/\,/\<br \/\>/g;
       $sysadm=~s/\,/\<br \/\>/g;
   
 # --------------------------------------------------- Print login screen header  # --------------------------------------------------- Print login screen header
     $r->print(<<ENDHEADER);      $r->print(<<ENDHEADER);
 <html>  <html>
 <head>  <head>
   <meta HTTP-EQUIV="Refresh" CONTENT="$expire; url=/adm/roles" />
 <title>The LearningOnline Network with CAPA Login</title>  <title>The LearningOnline Network with CAPA Login</title>
 </head>  </head>
 ENDHEADER  ENDHEADER
Line 120  ENDHEADER Line 271  ENDHEADER
     }      }
   
 # ----------------------------------------------------------- Front page design  # ----------------------------------------------------------- Front page design
     my $pgbg=&Apache::loncommon::designparm('login.pgbg');      my $pgbg=
     my $font=&Apache::loncommon::designparm('login.font');        ($fullgraph?&Apache::loncommon::designparm('login.pgbg',$domain):'#FFFFFF');
     my $link=&Apache::loncommon::designparm('login.link');      my $font=
     my $vlink=&Apache::loncommon::designparm('login.vlink');        ($fullgraph?&Apache::loncommon::designparm('login.font',$domain):'#000000');
     my $alink=&Apache::loncommon::designparm('login.alink');      my $link=
     my $mainbg=&Apache::loncommon::designparm('login.mainbg');        ($fullgraph?&Apache::loncommon::designparm('login.link',$domain):'#0000FF');
     my $sidebg=&Apache::loncommon::designparm('login.sidebg');      my $vlink=
     my $logo=&Apache::loncommon::designparm('login.logo');        ($fullgraph?&Apache::loncommon::designparm('login.vlink',$domain):'#0000FF');
     my $img=&Apache::loncommon::designparm('login.img');      my $alink=&Apache::loncommon::designparm('login.alink',$domain);
       my $mainbg=
         ($fullgraph?&Apache::loncommon::designparm('login.mainbg',$domain):'#FFFFFF');
       my $sidebg=
         ($fullgraph?&Apache::loncommon::designparm('login.sidebg',$domain):'#FFFFFF');
       my $logo=&Apache::loncommon::designparm('login.logo',$domain);
       my $img=&Apache::loncommon::designparm('login.img',$domain);
   
   # ----------------------------------------------------------------------- Texts
   
   my %lt=&Apache::lonlocal::texthash(
     'un'  => 'Username',
     'pw'  => 'Password',
     'dom' => 'Domain',
     'perc' => 'percent',
     'load' => 'Load',
                     'userload' => 'User Load',
                     'about'  => 'aboutlon.gif',
                     'access' => 'accessbutton.gif',
     'auth' => 'userauthentication.gif',
     'log' => 'Log in',
     'help' => 'Help',
     'serv' => 'Server',
                     'servadm' => 'Server Administration',
                     'sysadm' => 'System Administration',
                     'helpdesk' => 'Contact Helpdesk');
   # -------------------------------------------------- Change password field name
       my $now=time;
 # ---------------------------------------------------------- Serve rest of page  # ---------------------------------------------------------- Serve rest of page
     $r->print(<<ENDSCRIPT);      $r->print(<<ENDSCRIPT);
   
Line 146  ENDHEADER Line 322  ENDHEADER
         this.document.server.elements.udom.value          this.document.server.elements.udom.value
        =this.document.client.elements.udom.value;         =this.document.client.elements.udom.value;
   
           this.document.server.elements.imagesuppress.value
          =this.document.client.elements.imagesuppress.checked;
   
           this.document.server.elements.embedsuppress.value
          =this.document.client.elements.embedsuppress.checked;
   
           this.document.server.elements.appletsuppress.value
          =this.document.client.elements.appletsuppress.checked;
   
           this.document.server.elements.fontenhance.value
          =this.document.client.elements.fontenhance.checked;
   
           this.document.server.elements.blackwhite.value
          =this.document.client.elements.blackwhite.checked;
   
           this.document.server.elements.remember.value
          =this.document.client.elements.remember.checked;
   
         uextkey=this.document.client.elements.uextkey.value;          uextkey=this.document.client.elements.uextkey.value;
         lextkey=this.document.client.elements.lextkey.value;          lextkey=this.document.client.elements.lextkey.value;
         initkeys();          initkeys();
   
         this.document.server.elements.upass.value          this.document.server.elements.upass0.value
     =crypted(this.document.client.elements.upass.value);      =crypted(this.document.client.elements.upass$now.value.substr(0,15));
    this.document.server.elements.upass1.value
       =crypted(this.document.client.elements.upass$now.value.substr(15,15));
    this.document.server.elements.upass2.value
       =crypted(this.document.client.elements.upass$now.value.substr(30,15));
   
           this.document.client.elements.uname.value='';
           this.document.client.elements.upass$now.value='';
   
         this.document.server.submit();          this.document.server.submit();
  return false;   return false;
Line 166  ENDSCRIPT Line 367  ENDSCRIPT
   
     $r->print(<<ENDSERVERFORM);      $r->print(<<ENDSERVERFORM);
   <form name="server" action="$otherserver/adm/authenticate" method="post" target="_top">    <form name="server" action="$otherserver/adm/authenticate" method="post" target="_top">
    <input type=hidden name=logtoken value="$logtoken">     <input type="hidden" name="logtoken" value="$logtoken" />
    <input type=hidden name=serverid value="$lonhost">     <input type="hidden" name="serverid" value="$lonhost" />
    <input type=hidden name=interface value="$ENV{'form.interface'}">     <input type="hidden" name="interface" value="$env{'form.interface'}" />
    <input type=hidden name=uname value="">     <input type="hidden" name="uname" value="" />
    <input type=hidden name=upass value="">     <input type="hidden" name="upass0" value="" />
    <input type=hidden name=udom value="">     <input type="hidden" name="upass1" value="" />
      <input type="hidden" name="upass2" value="" />
      <input type="hidden" name="udom" value="" />
      <input type="hidden" name="imagesuppress"  value="" />
      <input type="hidden" name="appletsuppress"  value="" />
      <input type="hidden" name="embedsuppress"  value="" />
      <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>    </form>
 ENDSERVERFORM  ENDSERVERFORM
     if ($fullgraph) { $r->print(<<ENDTOP);      if ($fullgraph) { $r->print(<<ENDTOP);
Line 179  ENDSERVERFORM Line 390  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 202  ENDSERVERFORM Line 413  ENDSERVERFORM
    <!-- A cell that will hold the 'access' and 'about' buttons -->     <!-- A cell that will hold the 'access' and 'about' buttons -->
    <!-- Row 3 Column 1 -->     <!-- Row 3 Column 1 -->
    <td valign="top" height=60 align="center" bgcolor="$sidebg">     <td valign="top" height=60 align="center" bgcolor="$sidebg">
     <a href="/adm/login?interface=textual"><img src="$iconpath/accessbutton.gif" border=0 alt="Accessibility Options" /></a>      <a href="/adm/login?interface=textual"><img src="$iconpath/$lt{'access'}" border=0 alt="Accessibility Options" /></a>
     <br />      <br />
     <a href="/adm/about.html"><img src="$iconpath/aboutlon.gif" border=0 alt="About LON-CAPA" /></a>      <a href="/adm/about.html"><img src="$iconpath/$lt{'about'}" border=0 alt="About LON-CAPA" /></a>
    </td>     </td>
   
    <!-- The shaded space between the two main columns -->     <!-- The shaded space between the two main columns -->
Line 213  ENDSERVERFORM Line 424  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 228  ENDSERVERFORM Line 439  ENDSERVERFORM
    <!-- Row 4 Column 1 -->     <!-- Row 4 Column 1 -->
    <td align="center" valign="middle" bgcolor="$sidebg">     <td align="center" valign="middle" bgcolor="$sidebg">
 ENDTOP  ENDTOP
   } else {
       $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())">');
       unless ($fullgraph) {
           $r->print(<<ENDACCESSOPTIONS);
   <h3>Select Accessibility Options</h3>
   <label><input type="checkbox" name="imagesuppress" /> Suppress rendering of images</label><br />
   <label><input type="checkbox" name="appletsuppress" /> Suppress Java applets</label><br />
   <label><input type="checkbox" name="embedsuppress" /> Suppress rendering of embedded multimedia</label><br />
   <label><input type="checkbox" name="fontenhance" /> Increase font size</label><br />
   <label><input type="checkbox" name="blackwhite" /> Switch to black and white mode</label><br />
   <p>If you have accessibility needs that are not addressed by this interface, 
   please
   contact the system administrator at <tt>$sysadm</tt>.</p><br />
   <input type="checkbox" name="remember" /> Remember these settings for next login<hr />
   ENDACCESSOPTIONS
   } else {
       $r->print(<<ENDNOOPT);
   <input type="hidden" name="imagesuppress"  value="" />
   <input type="hidden" name="embedsuppress"  value="" />
   <input type="hidden" name="appletsuppress"  value="" />
   <input type="hidden" name="fontenhance"  value="" />
   <input type="hidden" name="blackwhite"  value="" />
   <input type="hidden" name="remember"  value="" />
   ENDNOOPT
 }  }
     $r->print(<<ENDLOGIN);      $r->print(<<ENDLOGIN);
     <form name="client" onsubmit="return(send())">  
      <input type="hidden" name="lextkey" value="$lextkey">       <input type="hidden" name="lextkey" value="$lextkey">
      <input type="hidden" name="uextkey" value="$uextkey">       <input type="hidden" name="uextkey" value="$uextkey">
   
      <!-- Start the sub-table for text and input alignment -->       <!-- Start the sub-table for text and input alignment -->
      <table border=0 cellspacing=0 cellpadding=0>       <table border=0 cellspacing=0 cellpadding=0>
       <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/$lt{'auth'}" 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;$lt{'un'}:</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;$lt{'pw'}:</b></font></td>
        <td bgcolor="$mainbg"><input type="password" name="upass" size="10" /></td>         <td bgcolor="$mainbg"><input type="password" name="upass$now" size="10" /></td>
       </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;$lt{'dom'}:</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">&nbsp;&nbsp;&nbsp;<a href="/adm/loginproblems.html">Help</a></td>         <td bgcolor="$mainbg">&nbsp;&nbsp;&nbsp;<a href="/adm/loginproblems.html">$lt{'help'}</a></td>
        <td bgcolor="$mainbg" valign="bottom" align="center">         <td bgcolor="$mainbg" valign="bottom" align="center">
         <br />          <br />
         <input type="submit" value="Log In" />          <input type="submit" value="$lt{'log'}" />
        </td>         </td>
       </tr>        </tr>
      </table>       </table>
Line 261  ENDTOP Line 497  ENDTOP
     </form>      </form>
 ENDLOGIN  ENDLOGIN
     if ($fullgraph) {      if ($fullgraph) {
           my $helpdeskscript;
           my $contactblock = &contactdisplay(\%lt,$sysadm,$servadm,$version,$authdomain,\$helpdeskscript);
  $r->print(<<ENDDOCUMENT);   $r->print(<<ENDDOCUMENT);
    </td>     </td>
   
    <!-- 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>
Line 278  ENDLOGIN Line 519  ENDLOGIN
      <table border=0 cellspacing=0 cellpadding=0>       <table border=0 cellspacing=0 cellpadding=0>
       <tr>        <tr>
        <td bgcolor="$sidebg" align="left" valign="top">         <td bgcolor="$sidebg" align="left" valign="top">
         <small><b>&nbsp;&nbsp;&nbsp;Domain:&nbsp;</b></small>          <small><b>&nbsp;&nbsp;&nbsp;$lt{'dom'}:&nbsp;</b></small>
        </td>         </td>
        <td bgcolor="$sidebg" align="left" valign="top">         <td bgcolor="$sidebg" align="left" valign="top">
         <small><tt>&nbsp;$domain</tt></small>          <small><tt>&nbsp;$domain</tt></small>
Line 286  ENDLOGIN Line 527  ENDLOGIN
       </tr>        </tr>
       <tr>        <tr>
        <td bgcolor="$sidebg" align="left" valign="top">         <td bgcolor="$sidebg" align="left" valign="top">
         <small><b>&nbsp;&nbsp;&nbsp;Server:&nbsp;</b></small>          <small><b>&nbsp;&nbsp;&nbsp;$lt{'serv'}:&nbsp;</b></small>
        </td>         </td>
        <td bgcolor="$sidebg" align="left" valign="top">         <td bgcolor="$sidebg" align="left" valign="top">
         <small><tt>&nbsp;$lonhost ($role)</tt></small>          <small><tt>&nbsp;$lonhost ($role)</tt></small>
Line 294  ENDLOGIN Line 535  ENDLOGIN
       </tr>        </tr>
       <tr>        <tr>
        <td bgcolor="$sidebg" align="left" valign="top">         <td bgcolor="$sidebg" align="left" valign="top">
         <small><b>&nbsp;&nbsp;&nbsp;Load:&nbsp;</b></small>          <small><b>&nbsp;&nbsp;&nbsp;$lt{'load'}:&nbsp;</b></small>
        </td>         </td>
        <td bgcolor="$sidebg" align="left" valign="top">         <td bgcolor="$sidebg" align="left" valign="top">
         <small><tt>&nbsp;$loadpercent percent</tt></small>          <small><tt>&nbsp;$loadpercent $lt{'perc'}</tt></small>
          </td>
         </tr>
         <tr>
          <td bgcolor="$sidebg" align="left" valign="top">
           <small><b>&nbsp;&nbsp;&nbsp;$lt{'userload'}:&nbsp;</b></small>
          </td>
          <td bgcolor="$sidebg" align="left" valign="top">
           <small><tt>&nbsp;$userloadpercent $lt{'perc'}</tt></small>
        </td>         </td>
       </tr>        </tr>
      </table>       </table>
      <br />       <br />
     <small>      $contactblock
      <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>  
     </small>  
    </td>     </td>
   
    <!-- Row 5 Column 2 -->     <!-- Row 5 Column 2 -->
Line 337  $domainlogo Line 581  $domainlogo
   </tr>    </tr>
  </table>   </table>
   
 <script>  <script type="text/javascript">
 // the if prevents the script error if the browser can't handle this  // the if prevents the script error if the browser can not handle this
 if ( document.client.uname ) { document.client.uname.focus(); }  if ( document.client.uname ) { document.client.uname.focus(); }
 </script>  </script>
   $helpdeskscript
   
 ENDDOCUMENT  ENDDOCUMENT
 }  }
     $r->print('</body></html>');      $r->print('</body></html>');
     return OK;      return OK;
 }   }
   
   sub contactdisplay {
       my ($lt,$sysadm,$servadm,$version,$authdomain,$helpdeskscript) = @_;
       my $contactblock;
       my $showsysadm = 1;
       my $showservadm = 1;
       my $showhelpdesk = 0;
       my $requestmail = $Apache::lonnet::perlvar{'lonSupportEMail'};
       if ($requestmail =~ m/^[^\@]+\@[^\@]+$/) {
           $showhelpdesk = 1;
       }
       if ($showsysadm) {
           $contactblock .= '<b>&nbsp;&nbsp;&nbsp;'.$$lt{'sysadm'}.':</b><br />'.
                            '<tt>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;'.$sysadm.'</tt><br />';
       }
       if ($showservadm) {
           $contactblock .= '<b>&nbsp;&nbsp;&nbsp;'.$$lt{'servadm'}.':</b><br />'.
                            '<tt>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;'.$servadm.'</tt><br />&nbsp;<br />';
       }
       if ($showhelpdesk) {
           $contactblock .= '<b>&nbsp;&nbsp;&nbsp;<a href="javascript:helpdesk()">'.$$lt{'helpdesk'}.'</a></b><br />';
           my $thisurl = &escape('/adm/login');
           $$helpdeskscript = <<"ENDSCRIPT";
   <script type="text/javascript">
   function helpdesk() {
       var codedom = document.client.udom.value;
       if (codedom == '') {
           codedom = "$authdomain";
       }
       var querystr = "origurl=$thisurl&codedom="+codedom;
       document.location.href = "/adm/helpdesk?"+querystr;
       return;
   }
   </script>
   ENDSCRIPT
       }
       $contactblock .= <<"ENDBLOCK";
        &nbsp;&nbsp;&nbsp;$version
   ENDBLOCK
       return $contactblock;
   }
    
   
 1;  1;
 __END__  __END__
Removed from v.1.28  
changed lines
  Added in v.1.79

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