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

Diff for /loncom/auth/lonlogin.pm between versions 1.137 and 1.140

version 1.137, 2010/05/06 16:15:59 version 1.140, 2010/08/25 16:34:32
Line 152  sub handler { Line 152  sub handler {
     my $loadpercent=sprintf("%.1f",100*$loadavg/$loadlim);      my $loadpercent=sprintf("%.1f",100*$loadavg/$loadlim);
     my $userloadpercent=&Apache::lonnet::userload();      my $userloadpercent=&Apache::lonnet::userload();
   
 # ------------------------------------------------------- Do the load balancing  
     my $otherserver= &Apache::lonnet::absolute_url($host_name);  
     my $firsturl=      my $firsturl=
     ($env{'request.firsturl'}?$env{'request.firsturl'}:$env{'form.firsturl'});      ($env{'request.firsturl'}?$env{'request.firsturl'}:$env{'form.firsturl'});
 # ---------------------------------------------------------- Are we overloaded?  
     if ((($userloadpercent>100.0)||($loadpercent>100.0))) {  
         my $unloaded=Apache::lonnet::spareserver($loadpercent,$userloadpercent);  
  if ($unloaded) { $otherserver=$unloaded; }  
     }  
   
 # ----------------------------------------------------------- Get announcements  # ----------------------------------------------------------- Get announcements
     my $announcements=&Apache::lonnet::getannounce();      my $announcements=&Apache::lonnet::getannounce();
 # -------------------------------------------------------- Set login parameters  # -------------------------------------------------------- Set login parameters
Line 270  my $loginbox_header_textcol=&Apache::lon Line 262  my $loginbox_header_textcol=&Apache::lon
 my $logo=&Apache::loncommon::designparm('login.logo',$domain);  my $logo=&Apache::loncommon::designparm('login.logo',$domain);
 my $img=&Apache::loncommon::designparm('login.img',$domain);  my $img=&Apache::loncommon::designparm('login.img',$domain);
 my $domainlogo='<div>'.&Apache::loncommon::domainlogo($domain).'</div>';  my $domainlogo='<div>'.&Apache::loncommon::domainlogo($domain).'</div>';
 my $login=&Apache::loncommon::designparm('login.login',$domain);  
 if ($login eq '') {  
 $login = $iconpath.'/'.&mt('userauthentication.gif');  
 }  
 my $showbanner = 1;  my $showbanner = 1;
 my $showmainlogo = 1;  my $showmainlogo = 1;
 if (defined(&Apache::loncommon::designparm('login.showlogo_img',$domain))) {  if (defined(&Apache::loncommon::designparm('login.showlogo_img',$domain))) {
Line 285  if (defined(&Apache::loncommon::designpa Line 273  if (defined(&Apache::loncommon::designpa
 my $showadminmail=&Apache::loncommon::designparm('login.adminmail',$domain);  my $showadminmail=&Apache::loncommon::designparm('login.adminmail',$domain);
 my $showcoursecat =  my $showcoursecat =
 &Apache::loncommon::designparm('login.coursecatalog',$domain);  &Apache::loncommon::designparm('login.coursecatalog',$domain);
 my $loginheader =&Apache::loncommon::designparm('login.loginheader',$domain);  
 my $shownewuserlink =   my $shownewuserlink = 
 &Apache::loncommon::designparm('login.newuser',$domain);  &Apache::loncommon::designparm('login.newuser',$domain);
 my $now=time;  my $now=time;
Line 318  this.document.client.elements.upass$now. Line 305  this.document.client.elements.upass$now.
 this.document.server.submit();  this.document.server.submit();
 return false;  return false;
 }  }
   
   function enableInput() {
       this.document.client.elements.upass$now.removeAttribute("readonly");
       this.document.client.elements.uname.removeAttribute("readonly");
       this.document.client.elements.udom.removeAttribute("readonly");
       return;
   }
   
 // ]]>  // ]]>
 </script>  </script>
   
Line 330  my %add_entries = ( Line 325  my %add_entries = (
        text         => "$font",         text         => "$font",
        link         => "$link",         link         => "$link",
        vlink        => "$vlink",         vlink        => "$vlink",
        alink        => "$alink",);         alink        => "$alink",
                  onload       => 'javascript:enableInput();',);
   
 $r->print(&Apache::loncommon::start_page('The LearningOnline Network with CAPA Login',$js,  $r->print(&Apache::loncommon::start_page('The LearningOnline Network with CAPA Login',$js,
        { 'redirect'       => [$expire,'/adm/roles'],          { 'redirect'       => [$expire,'/adm/roles'], 
Line 380  $r->print( Line 376  $r->print(
 #  #
   
 $r->print(<<ENDSERVERFORM);  $r->print(<<ENDSERVERFORM);
 <form name="server" action="$otherserver/adm/authenticate" method="post" target="_top">  <form name="server" action="/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="uname" value="" />     <input type="hidden" name="uname" value="" />
Line 403  if ($shownewuserlink) { Line 399  if ($shownewuserlink) {
 my $logintitle =  my $logintitle =
     '<h2 class="LC_hcell"'      '<h2 class="LC_hcell"'
    .' style="background:'.$loginbox_header_bgcol.';'     .' style="background:'.$loginbox_header_bgcol.';'
    .' color:'.$loginbox_header_textcol.'">';     .' color:'.$loginbox_header_textcol.'">'
 if ($loginheader eq 'text') {     .$lt{'log'}
     $logintitle .= $lt{'log'};     .'</h2>';
 } else {  
     $logintitle .= '<img src="'.$login.'"'.  
                    ' alt="'.&mt('User Authentication').'" />';  
 }  
 $logintitle .= '</h2>';  
   
 my $noscript_warning='<noscript><span class="LC_warning"><b>'  my $noscript_warning='<noscript><span class="LC_warning"><b>'
                      .&mt('Use of LON-CAPA requires Javascript to be enabled in your web browser.')                       .&mt('Use of LON-CAPA requires Javascript to be enabled in your web browser.')
Line 424  my $loginform=(<<LFORM); Line 415  my $loginform=(<<LFORM);
   <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" />
   <b><label for="uname">$lt{'un'}</label>:</b><br />    <b><label for="uname">$lt{'un'}</label>:</b><br />
   <input type="text" name="uname" id="uname" size="15" value="$authusername" /><br />    <input type="text" name="uname" id="uname" size="15" value="$authusername" readonly="readonly" /><br />
   <b><label for="upass$now">$lt{'pw'}</label>:</b><br />    <b><label for="upass$now">$lt{'pw'}</label>:</b><br />
   <input type="password" name="upass$now" id="upass$now" size="15" /><br />    <input type="password" name="upass$now" id="upass$now" size="15" readonly="readonly" /><br />
   <b><label for="udom">$lt{'dom'}</label>:</b><br />    <b><label for="udom">$lt{'dom'}</label>:</b><br />
   <input type="text" name="udom" id="udom" size="15" value="$authdomain" /><br />    <input type="text" name="udom" id="udom" size="15" value="$authdomain" readonly="readonly" /><br />
   <input type="submit" value="$lt{'log'}" />    <input type="submit" value="$lt{'log'}" />
 </form>  </form>
 LFORM  LFORM
Removed from v.1.137  
changed lines
  Added in v.1.140

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