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

Diff for /loncom/auth/lonlogin.pm between versions 1.98 and 1.105

version 1.98, 2008/01/16 20:42:44 version 1.105, 2008/09/24 17:05:37
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]logout[_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 219  ENDFAILED Line 221  ENDFAILED
                 $hostname.'</a>';                  $hostname.'</a>';
     $last=$hostname;      $last=$hostname;
         }          }
  $r->print(<<ENDTROUBLE);   $r->print(
 <html>             '<html>'
 <head><title>The LearningOnline Network with CAPA</title></head>            .'<head><title>'
 <body bgcolor="#FFFFFF">            .&mt('The LearningOnline Network with CAPA')
 <img src="/adm/lonKaputt/lonlogo_broken.gif" align="right" />            .'</title></head>'
 <h3>This LON-CAPA server is temporarily not available for login</h3>            .'<body bgcolor="#FFFFFF">'
 <p>Please attempt to login to one of the following servers:</p>$spares            .'<h1>'.&mt('The LearningOnline Network with CAPA').'</h1>'
 </body>            .'<img src="/adm/lonKaputt/lonlogo_broken.gif" align="right" />'
 </html>            .'<h3>'.&mt('This LON-CAPA server is temporarily not available for login.').'</h3>'
 ENDTROUBLE            .'<p>'.&mt('Please attempt to login to one of the following servers:').'</p>'
             .$spares
             .'</body>'
             .'</html>'
           );
         return OK;          return OK;
     }      }
   
Line 264  ENDTROUBLE Line 270  ENDTROUBLE
     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 $loginheader =&Apache::loncommon::designparm('login.loginheader',$domain);
       my $shownewuserlink = 
           &Apache::loncommon::designparm('login.newuser',$domain);
     my $now=time;      my $now=time;
     my $js = (<<ENDSCRIPT);      my $js = (<<ENDSCRIPT);
   
Line 339  my %lt=&Apache::lonlocal::texthash( Line 347  my %lt=&Apache::lonlocal::texthash(
   'pw'  => 'Password',    'pw'  => 'Password',
   'dom' => 'Domain',    'dom' => 'Domain',
   'perc' => 'percent',    'perc' => 'percent',
   'load' => 'Load',    'load' => 'Server Load',
                   'userload' => 'User Load',                    'userload' => 'User Load',
                   'about'  => 'About LON-CAPA',                    'about'  => 'About LON-CAPA',
                   'access' => 'Accessibility Options',                    'access' => 'Accessibility Options',
Line 349  my %lt=&Apache::lonlocal::texthash( Line 357  my %lt=&Apache::lonlocal::texthash(
   'serv' => 'Server',    'serv' => 'Server',
                   'servadm' => 'Server Administration',                    'servadm' => 'Server Administration',
                   'helpdesk' => 'Contact Helpdesk',                    'helpdesk' => 'Contact Helpdesk',
                   'forgotpw' => 'Forgot password?');                    'forgotpw' => 'Forgot password?',
                     'newuser'  => 'New User?',
                     'options_headline' => 'Select Accessibility Options',
                     'sprs_img' => 'Suppress rendering of images',
                     'sprs_applet' => 'Suppress Java applets',
                     'sprs_embed' => 'Suppress rendering of embedded multimedia',
                     'sprs_font' => 'Increase font size',
                     'sprs_blackwhite' => 'Switch to black and white mode',
                     'remember' => 'Remember these settings for next login');
 # -------------------------------------------------- Change password field name  # -------------------------------------------------- Change password field name
     my $forgotpw = &forgotpwdisplay(%lt);      my $forgotpw = &forgotpwdisplay(%lt);
     my $loginhelp = &loginhelpdisplay(%lt);      my $loginhelp = &loginhelpdisplay(%lt);
Line 390  ENDSERVERFORM Line 406  ENDSERVERFORM
     if (($showcoursecat eq '') || ($showcoursecat)) {      if (($showcoursecat eq '') || ($showcoursecat)) {
         $coursecatalog = &coursecatalog_link($lt{'catalog'});          $coursecatalog = &coursecatalog_link($lt{'catalog'});
     }      }
       my $newuserlink;
       if ($shownewuserlink) {
           $newuserlink = &newuser_link($lt{'newuser'});
       }
     if ($fullgraph) { $r->print(<<ENDTOP);      if ($fullgraph) { $r->print(<<ENDTOP);
   <!-- The LON-CAPA Header -->    <!-- The LON-CAPA Header -->
   <tr>    <tr>
Line 454  ENDSERVERFORM Line 474  ENDSERVERFORM
    <td align="center" valign="middle" bgcolor="$sidebg">     <td align="center" valign="middle" bgcolor="$sidebg">
 ENDTOP  ENDTOP
 } else {  } else {
     $r->print('<h1>The Learning<i>Online</i> Network with CAPA</h1><h2>Text-based Interface Login</h2>'.$announcements);      $r->print('<h1>The Learning<i>Online</i> Network with CAPA</h1>'
                .'<h2>'.&mt('Text-based Interface Login').'</h2>'
                .$announcements);
 }  }
     $r->print('<form name="client" onsubmit="return(send())">');      $r->print('<form name="client" onsubmit="return(send())">');
     unless ($fullgraph) {      unless ($fullgraph) {
         $r->print(<<ENDACCESSOPTIONS);          $r->print(<<ENDACCESSOPTIONS);
 <h3>Select Accessibility Options</h3>  <h3>$lt{'options_headline'}</h3>
 <label><input type="checkbox" name="imagesuppress" /> Suppress rendering of images</label><br />  <label><input type="checkbox" name="imagesuppress" /> $lt{'sprs_img'}</label><br />
 <label><input type="checkbox" name="appletsuppress" /> Suppress Java applets</label><br />  <label><input type="checkbox" name="appletsuppress" /> $lt{'sprs_applet'}</label><br />
 <label><input type="checkbox" name="embedsuppress" /> Suppress rendering of embedded multimedia</label><br />  <label><input type="checkbox" name="embedsuppress" /> $lt{'sprs_embed'}</label><br />
 <label><input type="checkbox" name="fontenhance" /> Increase font size</label><br />  <label><input type="checkbox" name="fontenhance" /> $lt{'sprs_font'}</label><br />
 <label><input type="checkbox" name="blackwhite" /> Switch to black and white mode</label><br />  <label><input type="checkbox" name="blackwhite" /> $lt{'sprs_blackwhite'}</label><br />
 <input type="checkbox" name="remember" /> Remember these settings for next login<hr />  <br />
   <input type="checkbox" name="remember" /> $lt{'remember'}<hr />
 ENDACCESSOPTIONS  ENDACCESSOPTIONS
 } else {  } else {
     $r->print(<<ENDNOOPT);      $r->print(<<ENDNOOPT);
Line 484  ENDNOOPT Line 507  ENDNOOPT
         $logintitle = '<td bgcolor="'.$sidebg.'" colspan="2"><img src="'.$login.'" alt="'.          $logintitle = '<td bgcolor="'.$sidebg.'" colspan="2"><img src="'.$login.'" alt="'.
                       &mt('User Authentication').'" /></td>';                        &mt('User Authentication').'" /></td>';
     }      }
       my $noscript_warning='<td colspan="2" bgcolor="'.$mainbg.'">'
                           .'<noscript><div class="LC_warning"><font size="-1">'
                           .&mt('Use of LON-CAPA requires Javascript to be enabled in your web browser.')
                           .'</font></div></noscript></td>';
     $r->print(<<ENDLOGIN);      $r->print(<<ENDLOGIN);
      <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 491  ENDNOOPT Line 518  ENDNOOPT
      <!-- 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>$logintitle</tr>        <tr>$logintitle</tr>
         <tr>$noscript_warning</tr>
       <tr>        <tr>
        <td bgcolor="$mainbg"><br /><font size=-1><b>&nbsp;&nbsp;&nbsp;<label for="uname">$lt{'un'}</label>:</b></font></td>         <td bgcolor="$mainbg"><br /><font size=-1><b>&nbsp;&nbsp;&nbsp;<label for="uname">$lt{'un'}</label>:</b></font></td>
        <td bgcolor="$mainbg"><br /><input type="text" name="uname" size="10" value="$authusername" /></td>         <td bgcolor="$mainbg"><br /><input type="text" name="uname" size="10" value="$authusername" /></td>
Line 514  ENDNOOPT Line 542  ENDNOOPT
        <td bgcolor="$mainbg" valign="bottom" align="left" colspan="2">         <td bgcolor="$mainbg" valign="bottom" align="left" colspan="2">
         $loginhelp          $loginhelp
         $forgotpw          $forgotpw
           $newuserlink
           <br />
        </td>         </td>
       </tr>        </tr>
      </table>       </table>
Line 658  sub forgotpwdisplay { Line 688  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 '<br />&nbsp;&nbsp;&nbsp;<a href="/adm/resetpw">'.$lt{'forgotpw'}.'</a></b><br />';
     }      }
     return;      return;
 }  }
Line 682  sub coursecatalog_link { Line 712  sub coursecatalog_link {
 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.98  
changed lines
  Added in v.1.105

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