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

Diff for /loncom/auth/lonlogin.pm between versions 1.97 and 1.117

version 1.97, 2007/10/09 16:27:08 version 1.117, 2009/04/01 14:43:19
Line 47  sub handler { Line 47  sub handler {
       $ENV{'REDIRECT_QUERY_STRING'}),        $ENV{'REDIRECT_QUERY_STRING'}),
  ['interface','username','domain','firsturl','localpath','localres',   ['interface','username','domain','firsturl','localpath','localres',
   'token']);    'token']);
       if (!defined($env{'form.firsturl'})) {
           &Apache::lonacc::get_posted_cgi($r,['firsturl']);
       }
   
 # -- check if they are a migrating user  # -- check if they are a migrating user
     if (defined($env{'form.token'})) {      if (defined($env{'form.token'})) {
Line 78  sub handler { Line 81  sub handler {
     &Apache::loncommon::start_page('Already logged in');      &Apache::loncommon::start_page('Already logged in');
  my $end_page =    my $end_page = 
     &Apache::loncommon::end_page();      &Apache::loncommon::end_page();
  $r->print(<<ENDFAILED);   $r->print(
 $start_page                    $start_page
 <h1>You are already logged in</h1>                   .'<h1>'.&mt('You are already logged in!').'</h1>'
 <p>Please either <a href="/adm/roles">continue the current session</a> or                   .'<p>'.&mt('Please either [_1]continue the current session[_2] or [_3]log out[_4].',
 <a href="/adm/logout">logout</a>.</p>                    '<a href="/adm/roles">','</a>','<a href="/adm/logout">','</a>').'</p>'
 <p>                   .'<p><a href="/adm/loginproblems.html">'.&mt('Login problems?').'</a></p>'
 <a href="/adm/loginproblems.html">Problems?</a></p>                   .$end_page
 $end_page                   );
 ENDFAILED  
         return OK;          return OK;
     }      }
   
Line 100  ENDFAILED Line 102  ENDFAILED
 # ----------------------------------------------------------- Process Interface  # ----------------------------------------------------------- Process Interface
     $env{'form.interface'}=~s/\W//g;      $env{'form.interface'}=~s/\W//g;
   
     my $textbrowsers=$r->dir_config('lonTextBrowsers');  
     my $httpbrowser=$ENV{"HTTP_USER_AGENT"};      my $httpbrowser=$ENV{"HTTP_USER_AGENT"};
           
     foreach (split(/\:/,$textbrowsers)) {  
  if ($httpbrowser=~/$_/i) {  
     $env{'form.interface'}='textual';  
         }  
     }  
   
     my $fullgraph=($env{'form.interface'} ne 'textual');      my $fullgraph=($env{'form.interface'} ne 'textual');
   
     my $iconpath=       my $iconpath= 
Line 199  ENDFAILED Line 194  ENDFAILED
                 $hostname.                  $hostname.
                 '/adm/login?domain='.$authdomain.'">'.                  '/adm/login?domain='.$authdomain.'">'.
                 $hostname.'</a>'.                  $hostname.'</a>'.
                 ' (preferred)</font>'.$/;                  ' '.&mt('(preferred)').'</font>'.$/;
     $last=$hostname;  
         }  
         $spares.= '<br />';  
  my %all_hostnames = &Apache::lonnet::all_hostnames();  
         foreach my $hostid (sort  
     {  
  &Apache::lonnet::hostname($a) cmp  
     &Apache::lonnet::hostname($b);  
     }  
     keys(%all_hostnames)) {  
             next if ($hostid eq $lonhost || $Apache::lonnet::spareid{$hostid});  
     my $hostname = &Apache::lonnet::hostname($hostid);  
             next if ($last eq $hostname);  
             $spares.='<br /><a href="http://'.  
                 $hostname.  
                 '/adm/login?domain='.$authdomain.'">'.  
                 $hostname.'</a>';  
     $last=$hostname;      $last=$hostname;
         }          }
  $r->print(<<ENDTROUBLE);  $spares.= '<br />';
 <html>  my %all_hostnames = &Apache::lonnet::all_hostnames();
 <head><title>The LearningOnline Network with CAPA</title></head>  foreach my $hostid (sort
 <body bgcolor="#FFFFFF">      {
 <img src="/adm/lonKaputt/lonlogo_broken.gif" align="right" />   &Apache::lonnet::hostname($a) cmp
 <h3>This LON-CAPA server is temporarily not available for login</h3>      &Apache::lonnet::hostname($b);
 <p>Please attempt to login to one of the following servers:</p>$spares      }
 </body>      keys(%all_hostnames)) {
 </html>      next if ($hostid eq $lonhost || $Apache::lonnet::spareid{$hostid});
 ENDTROUBLE      my $hostname = &Apache::lonnet::hostname($hostid);
         return OK;      next if ($last eq $hostname);
     }      $spares.='<br /><a href="http://'.
    $hostname.
    '/adm/login?domain='.$authdomain.'">'.
    $hostname.'</a>';
       $last=$hostname;
   }
   $r->print(
      '<html>'
     .'<head><title>'
     .&mt('The LearningOnline Network with CAPA')
     .'</title></head>'
     .'<body bgcolor="#FFFFFF">'
     .'<h1>'.&mt('The LearningOnline Network with CAPA').'</h1>'
     .'<img src="/adm/lonKaputt/lonlogo_broken.gif" align="right" />'
     .'<h3>'.&mt('This LON-CAPA server is temporarily not available for login.').'</h3>'
     .'<p>'.&mt('Please attempt to login to one of the following servers:').'</p>'
     .$spares
     .'</body>'
     .'</html>'
   );
   return OK;
   }
   
 # ----------------------------------------------- Apparently we are in business  # ----------------------------------------------- Apparently we are in business
     $servadm=~s/\,/\<br \/\>/g;  $servadm=~s/\,/\<br \/\>/g;
   
 # --------------------------------------------------- Print login screen header  
     $r->print(<<ENDHEADER);  
 <html>  
 <head>  
 <meta HTTP-EQUIV="Refresh" CONTENT="$expire; url=/adm/roles" />  
 <title>The LearningOnline Network with CAPA Login</title>  
 </head>  
 ENDHEADER  
 # ---------------------------------------------------- Serve out DES JavaScript  
     {  
  my $jsh=Apache::File->new($include."/londes.js");  
         $r->print(<$jsh>);  
     }  
   
 # ----------------------------------------------------------- Front page design  # ----------------------------------------------------------- Front page design
     my $pgbg=  my $pgbg=
       ($fullgraph?&Apache::loncommon::designparm('login.pgbg',$domain):'#FFFFFF');  ($fullgraph?&Apache::loncommon::designparm('login.pgbg',$domain):'#FFFFFF');
     my $font=  my $font=
       ($fullgraph?&Apache::loncommon::designparm('login.font',$domain):'#000000');  ($fullgraph?&Apache::loncommon::designparm('login.font',$domain):'#000000');
     my $link=  my $link=
       ($fullgraph?&Apache::loncommon::designparm('login.link',$domain):'#0000FF');  ($fullgraph?&Apache::loncommon::designparm('login.link',$domain):'#0000FF');
     my $vlink=  my $vlink=
       ($fullgraph?&Apache::loncommon::designparm('login.vlink',$domain):'#0000FF');  ($fullgraph?&Apache::loncommon::designparm('login.vlink',$domain):'#0000FF');
     my $alink=&Apache::loncommon::designparm('login.alink',$domain);  my $alink=&Apache::loncommon::designparm('login.alink',$domain);
     my $mainbg=  my $mainbg=
       ($fullgraph?&Apache::loncommon::designparm('login.mainbg',$domain):'#FFFFFF');  ($fullgraph?&Apache::loncommon::designparm('login.mainbg',$domain):'#FFFFFF');
     my $sidebg=  my $logo=&Apache::loncommon::designparm('login.logo',$domain);
       ($fullgraph?&Apache::loncommon::designparm('login.sidebg',$domain):'#FFFFFF');  my $img=&Apache::loncommon::designparm('login.img',$domain);
     my $logo=&Apache::loncommon::designparm('login.logo',$domain);  my $domainlogo=&Apache::loncommon::domainlogo($domain);
     my $img=&Apache::loncommon::designparm('login.img',$domain);  my $login=&Apache::loncommon::designparm('login.login',$domain);
     my $domainlogo=&Apache::loncommon::domainlogo($domain);  if ($login eq '') {
     my $showadminmail=&Apache::loncommon::designparm('login.adminmail',                                                      $domain);  $login = $iconpath.'/'.&mt('userauthentication.gif');
     my $showcoursecat =  }
         &Apache::loncommon::designparm('login.coursecatalog',$domain);  my $showbanner = 1;
   my $showmainlogo = 1;
   if (defined(&Apache::loncommon::designparm('login.showlogo_img',$domain))) {
 # ----------------------------------------------------------------------- Texts      $showbanner = &Apache::loncommon::designparm('login.showlogo_img',$domain);
   }
 my %lt=&Apache::lonlocal::texthash(  if (defined(&Apache::loncommon::designparm('login.showlogo_logo',$domain))) {
   'un'  => 'Username',      $showmainlogo = &Apache::loncommon::designparm('login.showlogo_logo',$domain);
   'pw'  => 'Password',  }
   'dom' => 'Domain',  my $showadminmail=&Apache::loncommon::designparm('login.adminmail',$domain);
   'perc' => 'percent',  my $showcoursecat =
   'load' => 'Load',  &Apache::loncommon::designparm('login.coursecatalog',$domain);
                   'userload' => 'User Load',  my $loginheader =&Apache::loncommon::designparm('login.loginheader',$domain);
                   'about'  => 'About LON-CAPA',  my $shownewuserlink = 
                   'access' => 'Accessibility Options',  &Apache::loncommon::designparm('login.newuser',$domain);
                   'catalog' => 'Course Catalog',  my $now=time;
   'auth' => 'userauthentication.gif',  my $js = (<<ENDSCRIPT);
   'log' => 'Log in',  
   'help' => 'Log-in Help',  <script type="text/javascript" language="JavaScript">
   'serv' => 'Server',  function send()
                   'servadm' => 'Server Administration',  {
                   'helpdesk' => 'Contact Helpdesk',  this.document.server.elements.uname.value
                   'forgotpw' => 'Forgot password?');  =this.document.client.elements.uname.value;
 # -------------------------------------------------- Change password field name  
     my $now=time;  this.document.server.elements.udom.value
     my $forgotpw = &forgotpwdisplay(%lt);  =this.document.client.elements.udom.value;
     my $loginhelp = &loginhelpdisplay(%lt);  
 # ---------------------------------------------------------- Serve rest of page  uextkey=this.document.client.elements.uextkey.value;
     $r->print(<<ENDSCRIPT);  lextkey=this.document.client.elements.lextkey.value;
   initkeys();
 <body bgcolor="$pgbg" text="$font" link="$link" vlink="$vlink" alink="$alink"  
   topmargin=0 leftmargin=0 marginwidth=0 marginheight=0>  this.document.server.elements.upass0.value
       =crypted(this.document.client.elements.upass$now.value.substr(0,15));
  <script language="JavaScript">  this.document.server.elements.upass1.value
     function send()      =crypted(this.document.client.elements.upass$now.value.substr(15,15));
     {  this.document.server.elements.upass2.value
  this.document.server.elements.uname.value      =crypted(this.document.client.elements.upass$now.value.substr(30,15));
        =this.document.client.elements.uname.value;  
   
         this.document.server.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.uname.value='';
        =this.document.client.elements.appletsuppress.checked;  this.document.client.elements.upass$now.value='';
   
         this.document.server.elements.fontenhance.value  this.document.server.submit();
        =this.document.client.elements.fontenhance.checked;  return false;
   }
   </script>
   
         this.document.server.elements.blackwhite.value  ENDSCRIPT
        =this.document.client.elements.blackwhite.checked;  
   
         this.document.server.elements.remember.value  # --------------------------------------------------- Print login screen header
        =this.document.client.elements.remember.checked;  
   
         uextkey=this.document.client.elements.uextkey.value;  my %add_entries = (topmargin    => "0",
         lextkey=this.document.client.elements.lextkey.value;         leftmargin   => "0",
         initkeys();         marginheight => "0",
          marginwidth  => "0",
          bgcolor      => "$mainbg",
          text         => "$font",
          link         => "$link",
          vlink        => "$vlink",
          alink        => "$alink",);
   
   $r->print(&Apache::loncommon::start_page('The LearningOnline Network with CAPA Login',$js,
          { 'redirect'       => [$expire,'/adm/roles'], 
    'add_entries' => \%add_entries,
    'only_body'   => 1,}));
   
         this.document.server.elements.upass0.value  # ----------------------------------------------------------------------- Texts
     =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='';  my %lt=&Apache::lonlocal::texthash(
         this.document.client.elements.upass$now.value='';    'un'  => 'Username',
     'pw'  => 'Password',
     'dom' => 'Domain',
     'perc' => 'percent',
     'load' => 'Server Load',
     'userload' => 'User Load',
     'about'  => 'About LON-CAPA',
     'catalog' => 'Course Catalog',
     'log' => 'Log in',
     'help' => 'Log-in Help',
     'serv' => 'Server',
     'servadm' => 'Server Administration',
     'helpdesk' => 'Contact Helpdesk',
     'forgotpw' => 'Forgot password?',
     'newuser'  => 'New User?',
     );
   # -------------------------------------------------- Change password field name
   my $forgotpw = &forgotpwdisplay(%lt);
   my $loginhelp = &loginhelpdisplay(%lt);
   
         this.document.server.submit();  # ---------------------------------------------------- Serve out DES JavaScript
  return false;  {
     }  my $jsh=Apache::File->new($include."/londes.js");
  </script>  $r->print(<$jsh>);
 ENDSCRIPT  }
   # ---------------------------------------------------------- Serve rest of page
   
     if ($fullgraph) {  if ($fullgraph) {
  $r->print(  $r->print(
   '<table width="100%" cellpadding=0 cellspacing=0 border=0>');    '<div class="LC_loginpage_container">');
     }  }
   
     $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="uname" value="" />     <input type="hidden" name="uname" value="" />
    <input type="hidden" name="upass0" value="" />     <input type="hidden" name="upass0" value="" />
    <input type="hidden" name="upass1" value="" />     <input type="hidden" name="upass1" value="" />
    <input type="hidden" name="upass2" value="" />     <input type="hidden" name="upass2" value="" />
    <input type="hidden" name="udom" 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="localpath" value="$env{'form.localpath'}" />
    <input type="hidden" name="localres" value="$env{'form.localres'}" />     <input type="hidden" name="localres" value="$env{'form.localres'}" />
   </form>    </form>
 ENDSERVERFORM  ENDSERVERFORM
     my $coursecatalog;  my $coursecatalog;
     if (($showcoursecat eq '') || ($showcoursecat)) {  if (($showcoursecat eq '') || ($showcoursecat)) {
         $coursecatalog = &coursecatalog_link($lt{'catalog'});      $coursecatalog = &coursecatalog_link($lt{'catalog'});
     }  }
     if ($fullgraph) { $r->print(<<ENDTOP);  my $newuserlink;
   <!-- The LON-CAPA Header -->  if ($shownewuserlink) {
   <tr>      $newuserlink = &newuser_link($lt{'newuser'}).'<br />';
   
    <!-- 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>  
   </tr>  
   
   <!-- The gray bar that starts the two table frames -->  
   <tr>  
   
    <!-- Row 2 Column 1 -->  
    <td width=182 height=27 bgcolor="$sidebg">&nbsp;</td>  
   
    <!-- Row 2 Column 2 -->  
    <td width=27 height=27 align="left" background="$iconpath/filltop.gif"><img src="$iconpath/upperleft.gif" border=0 alt="" /></td>  
   
    <!-- Row 2 Column 3 -->  
    <td height=27 background="$iconpath/filltop.gif"><img src="$iconpath/filltop.gif" alt="" /></td>  
   
    <!-- Row 2 Column 4 -->  
    <td width=27 height=27 align="right" background="$iconpath/filltop.gif"><img src="$iconpath/upperright.gif" border=0 alt="" /></td>  
   </tr>  
   <tr>  
      
    <!-- A cell that will hold the 'access', 'about', and 'catalog' links -->  
    <!-- Row 3 Column 1 -->  
    <td valign="top" height="60" align="left" bgcolor="$sidebg">  
     <table cellpadding="0" cellspacing="2" border="0">  
      <tr>  
       <td>&nbsp;</td>  
       <td><a href="/adm/login?interface=textual"><b>$lt{'access'}</b></a></td>  
      </tr>  
      <tr>  
       <td>&nbsp;</td>  
       <td><a href="/adm/about.html"><b>$lt{'about'}</b></a></td>  
      </tr>$coursecatalog  
      <tr>  
       <td colspan="2">&nbsp;</td>  
      </tr>  
     </table>  
    </td>  
    <!-- The shaded space between the two main columns -->  
    <!-- Row 3 Column 2 -->  
    <td width=27 height=60 background="$iconpath/fillleft.gif"><img src="$iconpath/fillleft.gif" alt="" /></td>  
   
    <!-- The right main column holding the large LON-CAPA logo-->  
    <!-- Rows 3-4 Column 3 -->  
    <td align="center" valign="top" width="100%" height="100%" bgcolor="$mainbg">  
     <center>  
      <img src="$logo" alt="" />  
     </center>  
    </td>  
   
    <!-- Row 3 Column 4 -->  
    <td width=27 background="$iconpath/fillright.gif"><img src="$iconpath/fillright.gif" alt="" /></td>  
   </tr>  
   <tr>  
   
    <!-- The entry form -->  
    <!-- Row 4 Column 1 -->  
    <td align="center" valign="middle" bgcolor="$sidebg">  
 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())">');  my $logintitle;
     unless ($fullgraph) {  if ($loginheader eq 'text') {
         $r->print(<<ENDACCESSOPTIONS);      $logintitle ='<h2>'.$lt{'log'}.'</h2>';
 <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 />  
 <input type="checkbox" name="remember" /> Remember these settings for next login<hr />  
 ENDACCESSOPTIONS  
 } else {  } else {
     $r->print(<<ENDNOOPT);      $logintitle = '<img src="'.$login.'" alt="'.
 <input type="hidden" name="imagesuppress"  value="" />                    &mt('User Authentication').'" />';
 <input type="hidden" name="embedsuppress"  value="" />  }
 <input type="hidden" name="appletsuppress"  value="" />  
 <input type="hidden" name="fontenhance"  value="" />  my $noscript_warning='<noscript><span class="LC_warning"><b>'
 <input type="hidden" name="blackwhite"  value="" />                       .&mt('Use of LON-CAPA requires Javascript to be enabled in your web browser.')
 <input type="hidden" name="remember"  value="" />                      .'</b></span></noscript>';
 ENDNOOPT  my $helpdeskscript;
 }  my $contactblock = &contactdisplay(\%lt,$servadm,$showadminmail,
     $r->print(<<ENDLOGIN);                              $version,$authdomain,\$helpdeskscript);
      <input type="hidden" name="lextkey" value="$lextkey">  
      <input type="hidden" name="uextkey" value="$uextkey">  my $loginform=(<<LFORM);
   <form name="client" onsubmit="return(send())">
      <!-- Start the sub-table for text and input alignment -->    <input type="hidden" name="lextkey" value="$lextkey" />
      <table border=0 cellspacing=0 cellpadding=0>    <input type="hidden" name="uextkey" value="$uextkey" />
       <tr><td bgcolor="$sidebg" colspan=2><img src="$iconpath/$lt{'auth'}" alt="User Authentication" /></td></tr>    <b><label for="uname">$lt{'un'}</label>:</b><br />
       <tr>    <input type="text" name="uname" size="15" value="$authusername" /><br />
        <td bgcolor="$mainbg"><br /><font size=-1><b>&nbsp;&nbsp;&nbsp;<label for="uname">$lt{'un'}</label>:</b></font></td>    <b><label for="upass$now">$lt{'pw'}</label>:</b><br />
        <td bgcolor="$mainbg"><br /><input type="text" name="uname" size="10" value="$authusername" /></td>    <input type="password" name="upass$now" size="15" /><br />
       </tr>    <b><label for="udom">$lt{'dom'}</label>:</b><br />
       <tr>    <input type="text" name="udom" size="15" value="$authdomain" /><br />
        <td bgcolor="$mainbg"><font size=-1><b>&nbsp;&nbsp;&nbsp;<label for="upass$now">$lt{'pw'}</label>:</b></font></td>    <input type="submit" value="$lt{'log'}" />
        <td bgcolor="$mainbg"><input type="password" name="upass$now" size="10" /></td>  </form>
       </tr>  LFORM
       <tr>  
        <td bgcolor="$mainbg"><font size=-1><b>&nbsp;&nbsp;&nbsp;<label for="udom">$lt{'dom'}</label>:</b></font></td>  if ($fullgraph) {
        <td bgcolor="$mainbg"><input type="text" name="udom" size="10" value="$authdomain" /></td>      if ($showbanner) {
       </tr>          $r->print(<<HEADER);
       <tr>  <!-- The LON-CAPA Header -->
        <td bgcolor="$mainbg">&nbsp;</td>  <table border="0" align="left" width="100%" cellspacing="0" cellpadding="1">
        <td bgcolor="$mainbg" valign="bottom" align="center">   <tr>
         <br />    <td align="left" valign="top" bgcolor="$pgbg">
         <input type="submit" value="$lt{'log'}" />        <img src="$img" border="0" alt="The Learning Online Network with CAPA" />
        </td>    </td>
       </tr>   </tr>
   </table>
   HEADER
       }
       if ($showmainlogo) {
           $r->print('<div class="LC_loginpage_space">&nbsp;</div>'."\n".
                     '    <img src="'.$logo.'" alt="" />'."\n");
       }
       $r->print(<<ENDTOP);
   <div class="LC_loginpage_loginDomain">$domainlogo</div>
   <div class="LC_loginpage_loginContainer">
     $logintitle
      <table border="0" align="left" cellspacing="1" cellpadding="2" width="100%">
       <tr>        <tr>
        <td bgcolor="$mainbg" valign="bottom" align="left" colspan="2">     <td>
         $loginhelp   $loginform
         $forgotpw             </td>
        </td>  
       </tr>        </tr>
      </table>     </table>  
      <!-- End sub-table -->     $noscript_warning
     </form>  </div>
 ENDLOGIN    
     if ($fullgraph) {  <div class="LC_loginpage_loginInfo">
         my $helpdeskscript;          $loginhelp<br />
         my $contactblock = &contactdisplay(\%lt,$servadm,$showadminmail,          $forgotpw<br />
                                   $version,$authdomain,\$helpdeskscript);   $contactblock<br />
  $r->print(<<ENDDOCUMENT);          $newuserlink
    </td>          $coursecatalog<br /><br />
           <a href="/adm/about.html"><b>$lt{'about'}</b></a>
    <!-- Row 4 Column 2 -->  </div>
    <td width=27 background="$iconpath/fillleft.gif"><img src="$iconpath/fillleft.gif" alt="" /></td>  
   <div class="LC_loginpage_space">&nbsp;</div>
    <!-- Row 4 Column 3 -->  $announcements
 <td bgcolor="$mainbg">$announcements</td>  ENDTOP
   }
    <!-- Row 4 Column 4 -->  
    <td width=27 background="$iconpath/fillright.gif"><img src="$iconpath/fillright.gif" alt="" /></td>  if($announcements){$r->print('<div class="LC_loginpage_space">&nbsp;</div>');}
   </tr>  
   <tr>  if ($fullgraph) {
   $r->print(<<ENDDOCUMENT);
    <!-- Row 5 Column 1 -->       <table border="0" cellspacing="0" cellpadding="0">
    <td bgcolor="$sidebg" valign="middle" align="left">  
      <br />  
      <table border=0 cellspacing=0 cellpadding=0>  
       <tr>        <tr>
        <td bgcolor="$sidebg" align="left" valign="top">         <td  align="left" valign="top">
         <small><b>&nbsp;&nbsp;&nbsp;$lt{'dom'}:&nbsp;</b></small>          <small><b>&nbsp;&nbsp;&nbsp;$lt{'dom'}:&nbsp;</b></small>
        </td>         </td>
        <td bgcolor="$sidebg" align="left" valign="top">         <td  align="left" valign="top">
         <small><tt>&nbsp;$domain</tt></small>          <small><tt>&nbsp;$domain</tt></small>
        </td>         </td>
       </tr>        </tr>
       <tr>        <tr>
        <td bgcolor="$sidebg" align="left" valign="top">         <td  align="left" valign="top">
         <small><b>&nbsp;&nbsp;&nbsp;$lt{'serv'}:&nbsp;</b></small>          <small><b>&nbsp;&nbsp;&nbsp;$lt{'serv'}:&nbsp;</b></small>
        </td>         </td>
        <td bgcolor="$sidebg" align="left" valign="top">         <td align="left" valign="top">
         <small><tt>&nbsp;$lonhost ($role)</tt></small>          <small><tt>&nbsp;$lonhost ($role)</tt></small>
        </td>         </td>
       </tr>        </tr>
       <tr>        <tr>
        <td bgcolor="$sidebg" align="left" valign="top">         <td align="left" valign="top">
         <small><b>&nbsp;&nbsp;&nbsp;$lt{'load'}:&nbsp;</b></small>          <small><b>&nbsp;&nbsp;&nbsp;$lt{'load'}:&nbsp;</b></small>
        </td>         </td>
        <td bgcolor="$sidebg" align="left" valign="top">         <td align="left" valign="top">
         <small><tt>&nbsp;$loadpercent $lt{'perc'}</tt></small>          <small><tt>&nbsp;$loadpercent $lt{'perc'}</tt></small>
        </td>         </td>
       </tr>        </tr>
       <tr>        <tr>
        <td bgcolor="$sidebg" align="left" valign="top">         <td align="left" valign="top">
         <small><b>&nbsp;&nbsp;&nbsp;$lt{'userload'}:&nbsp;</b></small>          <small><b>&nbsp;&nbsp;&nbsp;$lt{'userload'}:&nbsp;</b></small>
        </td>         </td>
        <td bgcolor="$sidebg" align="left" valign="top">         <td align="left" valign="top">
         <small><tt>&nbsp;$userloadpercent $lt{'perc'}</tt></small>          <small><tt>&nbsp;$userloadpercent $lt{'perc'}</tt></small>
        </td>         </td>
       </tr>        </tr>
      </table>       </table>
      <br />   </div>
     $contactblock  
    </td>  
   
    <!-- Row 5 Column 2 -->  
    <td width=27 background="$iconpath/fillleft.gif"><img src="$iconpath/fillleft.gif" alt="" /></td>  
   
    <!-- Row 5 Column 3 -->  
    <td width="100%" valign="bottom" bgcolor="$mainbg">  
 $domainlogo  
 </td>  
   
    <!-- Row 5 Column 4 -->  
    <td width=27 background="$iconpath/fillright.gif"><img src="$iconpath/fillright.gif" alt="" /></td>  
   </tr>  
   <tr>  
   
    <!-- Row 6 Column 1 -->  
    <td bgcolor="$sidebg">&nbsp;</td>  
   
    <!-- Row 6 Column 2 -->  
    <td align="left" background="$iconpath/fillbottom.gif"><img src="$iconpath/lowerleft.gif" alt="" /></td>  
   
    <!-- Row 6 Column 3 -->  
    <td background="$iconpath/fillbottom.gif"><img src="$iconpath/fillbottom.gif" alt="" /></td>  
   
    <!-- Row 6 Column 4 -->  
    <td align="right" background="$iconpath/fillbottom.gif"><img src="$iconpath/lowerright.gif" alt="" /></td>  
   </tr>  
  </table>  
   
 <script type="text/javascript">  <script type="text/javascript">
 // 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
Line 593  $helpdeskscript Line 495  $helpdeskscript
   
 ENDDOCUMENT  ENDDOCUMENT
 }  }
     $r->print('</body></html>');      my %endargs = ( 'noredirectlink' => 1, );
       $r->print(&Apache::loncommon::end_page(\%endargs));
     return OK;      return OK;
 }  }
   
Line 610  sub contactdisplay { Line 513  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="javascript:helpdesk()"><font size="+1">'.$lt->{'helpdesk'}.'</font></a></b><br />';          $contactblock .= '<a href="javascript:helpdesk()">'.$lt->{'helpdesk'}.'</a><br />';
         my $thisurl = &escape('/adm/login');          my $thisurl = &escape('/adm/login');
         $$helpdeskscript = <<"ENDSCRIPT";          $$helpdeskscript = <<"ENDSCRIPT";
 <script type="text/javascript">  <script type="text/javascript">
Line 636  sub forgotpwdisplay { Line 539  sub forgotpwdisplay {
     my (%lt) = @_;      my (%lt) = @_;
     my $prompt_for_resetpw = 1;       my $prompt_for_resetpw = 1; 
     if ($prompt_for_resetpw) {      if ($prompt_for_resetpw) {
         return '<br />&nbsp;&nbsp;&nbsp;<a href="/adm/resetpw">'.$lt{'forgotpw'}.'</a></b><br /><br />';          return '<a href="/adm/resetpw">'.$lt{'forgotpw'}.'</a>';
     }      }
     return;      return;
 }  }
Line 645  sub loginhelpdisplay { Line 548  sub loginhelpdisplay {
     my (%lt) = @_;      my (%lt) = @_;
     my $login_help = 1;      my $login_help = 1;
     if ($login_help) {      if ($login_help) {
         return '&nbsp;&nbsp;&nbsp;<a href="/adm/loginproblems.html">'.$lt{'help'}.'</a></b>';          return '<a href="/adm/loginproblems.html">'.$lt{'help'}.'</a>';
     }      }
     return;      return;
 }  }
Line 653  sub loginhelpdisplay { Line 556  sub loginhelpdisplay {
 sub coursecatalog_link {  sub coursecatalog_link {
     my ($linkname) = @_;      my ($linkname) = @_;
     return <<"END";      return <<"END";
      <tr>        <a href="/adm/coursecatalog">$linkname</a>
       <td>&nbsp;</td>  
       <td><a href="/adm/coursecatalog"><b>$linkname</b></a></td>  
      </tr>  
 END  END
 }  }
   
   sub newuser_link {
       my ($linkname) = @_;
       return '&nbsp;&nbsp;&nbsp;<a href="/adm/createaccount"><b>'.$linkname.'</b></a><br />';
   }
   
 1;  1;
 __END__  __END__
Removed from v.1.97  
changed lines
  Added in v.1.117

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