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

Diff for /loncom/auth/lonlogin.pm between versions 1.150 and 1.151

version 1.150, 2012/04/11 11:40:07 version 1.151, 2012/04/18 18:57:34
Line 229  sub handler { Line 229  sub handler {
         if ($spares) {          if ($spares) {
             $spares.= '<br />';              $spares.= '<br />';
         }          }
 my %all_hostnames = &Apache::lonnet::all_hostnames();          my %all_hostnames = &Apache::lonnet::all_hostnames();
 foreach my $hostid (sort          foreach my $hostid (sort
     {      {
  &Apache::lonnet::hostname($a) cmp   &Apache::lonnet::hostname($a) cmp
     &Apache::lonnet::hostname($b);      &Apache::lonnet::hostname($b);
     }      }
     keys(%all_hostnames)) {      keys(%all_hostnames)) {
     next if ($hostid eq $lonhost || $Apache::lonnet::spareid{$hostid});              next if ($hostid eq $lonhost || $Apache::lonnet::spareid{$hostid});
     my $hostname = &Apache::lonnet::hostname($hostid);              my $hostname = &Apache::lonnet::hostname($hostid);
     next if (($last eq $hostname) || ($hostname eq ''));              next if (($last eq $hostname) || ($hostname eq ''));
     $spares.='<br /><a href="http://'.              $spares.='<br /><a href="http://'.
  $hostname.               $hostname.
  '/adm/login?domain='.$authdomain.'">'.               '/adm/login?domain='.$authdomain.'">'.
  $hostname.'</a>';               $hostname.'</a>';
     $last=$hostname;              $last=$hostname;
 }           }
 $r->print(           $r->print(
    '<html>'     '<html>'
   .'<head><title>'    .'<head><title>'
   .&mt('The LearningOnline Network with CAPA')    .&mt('The LearningOnline Network with CAPA')
Line 254  $r->print( Line 254  $r->print(
   .'<h1>'.&mt('The LearningOnline Network with CAPA').'</h1>'    .'<h1>'.&mt('The LearningOnline Network with CAPA').'</h1>'
   .'<img src="/adm/lonKaputt/lonlogo_broken.gif" align="right" />'    .'<img src="/adm/lonKaputt/lonlogo_broken.gif" align="right" />'
   .'<h3>'.&mt('This LON-CAPA server is temporarily not available for login.').'</h3>');    .'<h3>'.&mt('This LON-CAPA server is temporarily not available for login.').'</h3>');
     if ($spares) {          if ($spares) {
         $r->print('<p>'.&mt('Please attempt to login to one of the following servers:')              $r->print('<p>'.&mt('Please attempt to login to one of the following servers:')
                  .'</p>'                       .'</p>'
                  .$spares);                       .$spares);
     }          }
     $r->print('</body>'          $r->print('</body>'
   .'</html>'                   .'</html>'
     );          );
 return OK;          return OK;
 }      }
   
 # ----------------------------------------------- Apparently we are in business  # ----------------------------------------------- Apparently we are in business
 $servadm=~s/\,/\<br \/\>/g;      $servadm=~s/\,/\<br \/\>/g;
   
 # ----------------------------------------------------------- Front page design  # ----------------------------------------------------------- Front page design
 my $pgbg=&Apache::loncommon::designparm('login.pgbg',$domain);      my $pgbg=&Apache::loncommon::designparm('login.pgbg',$domain);
 my $font=&Apache::loncommon::designparm('login.font',$domain);      my $font=&Apache::loncommon::designparm('login.font',$domain);
 my $link=&Apache::loncommon::designparm('login.link',$domain);      my $link=&Apache::loncommon::designparm('login.link',$domain);
 my $vlink=&Apache::loncommon::designparm('login.vlink',$domain);      my $vlink=&Apache::loncommon::designparm('login.vlink',$domain);
 my $alink=&Apache::loncommon::designparm('login.alink',$domain);      my $alink=&Apache::loncommon::designparm('login.alink',$domain);
 my $mainbg=&Apache::loncommon::designparm('login.mainbg',$domain);      my $mainbg=&Apache::loncommon::designparm('login.mainbg',$domain);
 my $loginbox_bg=&Apache::loncommon::designparm('login.sidebg',$domain);      my $loginbox_bg=&Apache::loncommon::designparm('login.sidebg',$domain);
 my $loginbox_header_bgcol=&Apache::loncommon::designparm('login.bgcol',$domain);      my $loginbox_header_bgcol=&Apache::loncommon::designparm('login.bgcol',$domain);
 my $loginbox_header_textcol=&Apache::loncommon::designparm('login.textcol',$domain);      my $loginbox_header_textcol=&Apache::loncommon::designparm('login.textcol',$domain);
 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=&Apache::loncommon::domainlogo($domain);      my $domainlogo=&Apache::loncommon::domainlogo($domain);
 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))) {
     $showbanner = &Apache::loncommon::designparm('login.showlogo_img',$domain);          $showbanner = &Apache::loncommon::designparm('login.showlogo_img',$domain);
 }      }
 if (defined(&Apache::loncommon::designparm('login.showlogo_logo',$domain))) {      if (defined(&Apache::loncommon::designparm('login.showlogo_logo',$domain))) {
     $showmainlogo = &Apache::loncommon::designparm('login.showlogo_logo',$domain);          $showmainlogo = &Apache::loncommon::designparm('login.showlogo_logo',$domain);
 }      }
 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 $shownewuserlink =       my $shownewuserlink = 
 &Apache::loncommon::designparm('login.newuser',$domain);          &Apache::loncommon::designparm('login.newuser',$domain);
 my $now=time;      my $now=time;
 my $js = (<<ENDSCRIPT);      my $js = (<<ENDSCRIPT);
   
 <script type="text/javascript" language="JavaScript">  <script type="text/javascript" language="JavaScript">
 // <![CDATA[  // <![CDATA[
Line 339  ENDSCRIPT Line 339  ENDSCRIPT
   
 # --------------------------------------------------- Print login screen header  # --------------------------------------------------- Print login screen header
   
 my %add_entries = (      my %add_entries = (
        bgcolor      => "$mainbg",         bgcolor      => "$mainbg",
        text         => "$font",         text         => "$font",
        link         => "$link",         link         => "$link",
Line 347  my %add_entries = ( Line 347  my %add_entries = (
        alink        => "$alink",         alink        => "$alink",
                onload       => 'javascript:enableInput();',);                 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'], 
  'add_entries' => \%add_entries,   'add_entries' => \%add_entries,
  'only_body'   => 1,}));   'only_body'   => 1,}));
   
 # ----------------------------------------------------------------------- Texts  # ----------------------------------------------------------------------- Texts
   
 my %lt=&Apache::lonlocal::texthash(      my %lt=&Apache::lonlocal::texthash(
           'un'       => 'Username',            'un'       => 'Username',
           'pw'       => 'Password',            'pw'       => 'Password',
           'dom'      => 'Domain',            'dom'      => 'Domain',
Line 372  my %lt=&Apache::lonlocal::texthash( Line 372  my %lt=&Apache::lonlocal::texthash(
        );         );
 # -------------------------------------------------- Change password field name  # -------------------------------------------------- Change password field name
   
 my $forgotpw = &forgotpwdisplay(%lt);      my $forgotpw = &forgotpwdisplay(%lt);
 $forgotpw .= '<br />' if $forgotpw;      $forgotpw .= '<br />' if $forgotpw;
 my $loginhelp = &loginhelpdisplay($authdomain,%lt);      my $loginhelp = &loginhelpdisplay($authdomain,%lt);
 $loginhelp .= '<br />' if $loginhelp;      $loginhelp .= '<br />' if $loginhelp;
   
 # ---------------------------------------------------- Serve out DES JavaScript  # ---------------------------------------------------- Serve out DES JavaScript
 {      {
 my $jsh=Apache::File->new($include."/londes.js");      my $jsh=Apache::File->new($include."/londes.js");
 $r->print(<$jsh>);      $r->print(<$jsh>);
 }      }
 # ---------------------------------------------------------- Serve rest of page  # ---------------------------------------------------------- Serve rest of page
   
 $r->print(      $r->print(
     '<div class="LC_Box"'      '<div class="LC_Box"'
    .' style="margin:0 auto; padding:10px; width:90%; height: auto; background-color:#FFFFFF;">'     .' style="margin:0 auto; padding:10px; width:90%; height: auto; background-color:#FFFFFF;">'
 );  );
   
 #      $r->print(<<ENDSERVERFORM);
 #  If the loadbalancing yielded just http:// because perhaps there's no loadbalancing?  
 #  then just us a relative link to authenticate:  
 #  
   
 $r->print(<<ENDSERVERFORM);  
 <form name="server" action="/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" />
Line 407  $r->print(<<ENDSERVERFORM); Line 402  $r->print(<<ENDSERVERFORM);
    <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'}).'<br />';          $coursecatalog = &coursecatalog_link($lt{'catalog'}).'<br />';
 }      }
 my $newuserlink;      my $newuserlink;
 if ($shownewuserlink) {      if ($shownewuserlink) {
     $newuserlink = &newuser_link($lt{'newuser'}).'<br />';          $newuserlink = &newuser_link($lt{'newuser'}).'<br />';
 }      }
 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.'">'
    .$lt{'log'}         .$lt{'log'}
    .'</h2>';         .'</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.')
                     .'</b></span></noscript>';                          .'</b></span></noscript>';
 my $helpdeskscript;      my $helpdeskscript;
 my $contactblock = &contactdisplay(\%lt,$servadm,$showadminmail,      my $contactblock = &contactdisplay(\%lt,$servadm,$showadminmail,
                                    $authdomain,\$helpdeskscript);                                         $authdomain,\$helpdeskscript);
   
 my $loginform=(<<LFORM);      my $loginform=(<<LFORM);
 <form name="client" action="" onsubmit="return(send())">  <form name="client" action="" 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" />
Line 533  END Line 528  END
 END  END
     }      }
   
 $r->print(<<ENDDOCUMENT);      $r->print(<<ENDDOCUMENT);
     <div style="float: left;">      <div style="float: left;">
      <table border="0" cellspacing="0" cellpadding="0">       <table border="0" cellspacing="0" cellpadding="0">
 $domainrow  $domainrow
Removed from v.1.150  
changed lines
  Added in v.1.151

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