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

Diff for /loncom/auth/lonlogin.pm between versions 1.60 and 1.62.2.1

version 1.60, 2004/11/11 22:18:23 version 1.62.2.1, 2005/02/21 18:29:25
Line 141  ENDFAILED Line 141  ENDFAILED
     my $otherserver='http://'.$ENV{'SERVER_NAME'};      my $otherserver='http://'.$ENV{'SERVER_NAME'};
     my $firsturl=      my $firsturl=
     ($ENV{'request.firsturl'}?$ENV{'request.firsturl'}:$ENV{'form.firsturl'});      ($ENV{'request.firsturl'}?$ENV{'request.firsturl'}:$ENV{'form.firsturl'});
       my $escfirsturl=&Apache::lonnet::escape($firsturl);
 # ---------------------------------------- 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))) {
Line 340  ENDSERVERFORM Line 341  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="$pgbg"><img src="$img" border=0 alt="The Learning Online Network with CAPA" /></td>     <td width="100%" colspan=4 bgcolor="$sidebg"><h1><font color="$pgbg">Welcome to the LON-CAPA NSDL Gateway</font></h1><a href="/cgi-bin/signon.pl?$escfirsturl"><h3><font color="$pgbg">Sign up for a Guest Login</font></h3></a></td>
   </tr>    </tr>
   
   <!-- The gray bar that starts the two table frames -->    <!-- The gray bar that starts the two table frames -->
Line 447  ENDNOOPT Line 448  ENDNOOPT
     </form>      </form>
 ENDLOGIN  ENDLOGIN
     if ($fullgraph) {      if ($fullgraph) {
         my $contactblock = &contactdisplay(\%lt,$sysadm,$servadm,$version);          my $helpdeskscript;
           my $contactblock = &contactdisplay(\%lt,$sysadm,$servadm,$version,$authdomain,\$helpdeskscript);
  $r->print(<<ENDDOCUMENT);   $r->print(<<ENDDOCUMENT);
    </td>     </td>
   
Line 534  $domainlogo Line 536  $domainlogo
 // the if prevents the script error if the browser can not 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
 }  }
Line 542  ENDDOCUMENT Line 545  ENDDOCUMENT
 }  }
   
 sub contactdisplay {  sub contactdisplay {
     my ($lt,$sysadm,$servadm,$version) = @_;      my ($lt,$sysadm,$servadm,$version,$authdomain,$helpdeskscript) = @_;
     my $contactblock;      my $contactblock;
     my $showsysadm = 1;      my $showsysadm = 1;
     my $showservadm = 1;      my $showservadm = 1;
     my $showhelpdesk = 1;      my $showhelpdesk = 0;
       my $requestmail = $Apache::lonnet::perlvar{'lonSupportEMail'};
       if ($requestmail =~ m/^[^\@]+\@[^\@]+$/) {
           $showhelpdesk = 1;
       }
     if ($showsysadm) {      if ($showsysadm) {
         $contactblock .= '<b>&nbsp;&nbsp;&nbsp;'.$$lt{'sysadm'}.':</b><br />'.          $contactblock .= '<b>&nbsp;&nbsp;&nbsp;'.$$lt{'sysadm'}.':</b><br />'.
                          '<tt>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;'.$sysadm.'</tt><br />';                           '<tt>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;'.$sysadm.'</tt><br />';
Line 556  sub contactdisplay { Line 563  sub contactdisplay {
                          '<tt>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;'.$servadm.'</tt><br />&nbsp;<br />';                           '<tt>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;'.$servadm.'</tt><br />&nbsp;<br />';
     }      }
     if ($showhelpdesk) {      if ($showhelpdesk) {
         $contactblock .= '<b>&nbsp;&nbsp;&nbsp;<a href="/adm/helpdesk">'.$$lt{'helpdesk'}.'</a></b><br />';          $contactblock .= '<b>&nbsp;&nbsp;&nbsp;<a href="javascript:helpdesk()">'.$$lt{'helpdesk'}.'</a></b><br />';
           my $thisurl = &Apache::lonnet::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";      $contactblock .= <<"ENDBLOCK";
      &nbsp;&nbsp;&nbsp;$version       &nbsp;&nbsp;&nbsp;$version
Removed from v.1.60  
changed lines
  Added in v.1.62.2.1

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