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

Diff for /loncom/auth/lonauth.pm between versions 1.91 and 1.92

version 1.91, 2008/05/14 18:27:30 version 1.92, 2008/05/30 19:09:50
Line 96  sub success { Line 96  sub success {
   
     my %lt=&Apache::lonlocal::texthash(      my %lt=&Apache::lonlocal::texthash(
        'wel' => 'Welcome',         'wel' => 'Welcome',
        'mes' => 'Welcome to the Learning<i>Online</i> Network with CAPA. Please wait while your session is being set up',         'mes' => 'Welcome to the Learning<i>Online</i> Network with CAPA. Please wait while your session is being set up.',
        'pro' => 'Problems',         'pro' => 'Login problems?',
        'log' => 'loginproblems.html',         'log' => 'loginproblems.html',
        );         );
     $r->print(<<ENDSUCCESS);      $r->print(<<ENDSUCCESS);
Line 105  $start_page Line 105  $start_page
 $setflags  $setflags
 $windowinfo  $windowinfo
 <h1>$lt{'wel'}</h1>  <h1>$lt{'wel'}</h1>
 $lt{'mes'}.<p>  $lt{'mes'}<p>
 <a href="/adm/$lt{'log'}">$lt{'pro'}?</a></p>  <a href="/adm/$lt{'log'}">$lt{'pro'}</a></p>
 $remoteinfo  $remoteinfo
 $maincall  $maincall
 $continuelink  $continuelink
Line 121  sub failed { Line 121  sub failed {
     my $start_page = &Apache::loncommon::start_page('Unsuccessful Login',undef,      my $start_page = &Apache::loncommon::start_page('Unsuccessful Login',undef,
     {'no_inline_link' => 1,});      {'no_inline_link' => 1,});
     my $end_page   = &Apache::loncommon::end_page();      my $end_page   = &Apache::loncommon::end_page();
   
     $message = &mt($message);  
     my %lt=('sorry'  => &mt('Sorry ...'),  
     'please' =>   
     &mt('Please [_1]log in again[_2].',  
  "<a href=\"/adm/login?username=$form->{'uname'}&domain=$form->{'udom'}\">",  
  '</a>'),  
     'problemspage' => &mt('loginproblems.html'),  
     'problems'     => 'Problems',  
     );  
     &Apache::loncommon::content_type($r,'text/html');      &Apache::loncommon::content_type($r,'text/html');
     $r->send_http_header;      $r->send_http_header;
       $r->print(
     $r->print(<<ENDFAILED);         $start_page
 $start_page        .'<h1>'.&mt('Sorry ...').'</h1>'
 <h1>$lt{'sorry'}</h1>        .'<p><b>'.&mt($message).'</b></p>'
 <p><b>$message</b></p>        .'<p>'.&mt('Please [_1]log in again[_2].'
 <p>$lt{'please'}</p>                  ,"<a href=\"/adm/login?username=$form->{'uname'}&domain=$form->{'udom'}\">",'</a>')
 <p>        .'</p>'
 <a href="/adm/$lt{'problemspage'}">$lt{'problems'}</a></p>        .'<p><a href="/adm/loginproblems.html">'.&mt('Login problems?').'</a></p>'
 $end_page        .$end_page
 ENDFAILED      );
 }   }
   
 # ------------------------------------------------------------------ Rerouting!  # ------------------------------------------------------------------ Rerouting!
   
Line 151  sub reroute { Line 141  sub reroute {
     my ($r) = @_;      my ($r) = @_;
     &Apache::loncommon::content_type($r,'text/html');      &Apache::loncommon::content_type($r,'text/html');
     $r->send_http_header;      $r->send_http_header;
     my $msg='<h1>Sorry ...</h1>      my $msg='<h1>'.&mt('Sorry ...').'</h1>'
              Please <a href="/">log in again</a>.';             .&mt('Please [_1]log in again[_2].');
     &Apache::loncommon::simple_error_page($r,'Rerouting',$msg);      &Apache::loncommon::simple_error_page($r,'Rerouting',$msg);
 }  }
   
Line 179  sub handler { Line 169  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>'
 <a href="/adm/loginproblems.html">Problems?</a></p>            .'<p><a href="/adm/loginproblems.html">'.&mt('Login problems?').'</a></p>'
 $end_page            .$end_page
 ENDFAILED          );
        return OK;          return OK;
     }      }
   
 # ---------------------------------------------------- No valid token, continue  # ---------------------------------------------------- No valid token, continue
Removed from v.1.91  
changed lines
  Added in v.1.92

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