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

Diff for /loncom/auth/lonauth.pm between versions 1.101.4.1 and 1.104

version 1.101.4.1, 2009/08/12 19:28:09 version 1.104, 2010/03/22 20:11:08
Line 111  sub success { Line 111  sub success {
         }          }
     }      }
   
     my $windowinfo=&Apache::lonmenu::open($env{'browser.os'});      my $windowinfo = Apache::lonhtmlcommon::scripttag('self.name="loncapaclient";');
     my $startupremote=&Apache::lonmenu::startupremote($destination);      my $header = '<meta HTTP-EQUIV="Refresh" CONTENT="0; url='.$destination.'" />';
     my $remoteinfo=&Apache::lonmenu::load_remote_msg($lowerurl);      my $brcrum = [{'href' => '',
     my $setflags=&Apache::lonmenu::setflags();                     'text' => 'Successful Login'},];
     my $maincall=&Apache::lonmenu::maincall();  
     my $start_page=&Apache::loncommon::start_page('Successful Login',      my $start_page=&Apache::loncommon::start_page('Successful Login',
                                                   $startupremote,                                                    $header,
                                                   {'no_inline_link' => 1,});                                                    {'bread_crumbs' => $brcrum,});
     my $end_page  =&Apache::loncommon::end_page();      my $end_page  =&Apache::loncommon::end_page();
   
     my $continuelink;   my $continuelink='<a href="'.$destination.'">'.&mt('Continue').'</a>';
     if (($env{'browser.interface'} eq 'textual') ||  
         ($env{'environment.remote'} eq 'off')) {  
  $continuelink='<a href="'.$destination.'">'.&mt('Continue').'</a>';  
     }  
 # ------------------------------------------------- Output for successful login  # ------------------------------------------------- Output for successful login
   
     &Apache::loncommon::content_type($r,'text/html');      &Apache::loncommon::content_type($r,'text/html');
Line 140  sub success { Line 135  sub success {
        );         );
     $r->print(<<ENDSUCCESS);      $r->print(<<ENDSUCCESS);
 $start_page  $start_page
 $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  
 $maincall  
 $continuelink  $continuelink
 $end_page  $end_page
 ENDSUCCESS  ENDSUCCESS
Line 156  ENDSUCCESS Line 148  ENDSUCCESS
   
 sub failed {  sub failed {
     my ($r,$message,$form) = @_;      my ($r,$message,$form) = @_;
     my $start_page = &Apache::loncommon::start_page('Unsuccessful Login',undef,      my $start_page = &Apache::loncommon::start_page('Unsuccessful Login',undef);
     {'no_inline_link' => 1,});  
     my $retry = '/adm/login?username='.$form->{'uname'}.      my $retry = '/adm/login?username='.$form->{'uname'}.
                 '&domain='.$form->{'udom'};                  '&domain='.$form->{'udom'};
     if (exists($form->{role})) {      if (exists($form->{role})) {
Line 207  sub handler { Line 198  sub handler {
 # -------------------------------- Prevent users from attempting to login twice  # -------------------------------- Prevent users from attempting to login twice
     my $handle = &Apache::lonnet::check_for_valid_session($r);      my $handle = &Apache::lonnet::check_for_valid_session($r);
     if ($handle ne '') {      if ($handle ne '') {
           my $lonidsdir=$r->dir_config('lonIDsDir');
           if ($handle=~/^publicuser\_/) {
   # For "public user" - remove it, we apparently really want to login
               unlink($r->dir_config('lonIDsDir')."/$handle.id");
           } else {
 # Indeed, a valid token is found  # Indeed, a valid token is found
  &Apache::loncommon::content_type($r,'text/html');              &Apache::lonnet::transfer_profile_to_env($lonidsdir,$handle);
  $r->send_http_header;      &Apache::loncommon::content_type($r,'text/html');
  my $start_page =       $r->send_http_header;
     &Apache::loncommon::start_page('Already logged in');      my $start_page = 
  my $end_page =           &Apache::loncommon::start_page('Already logged in');
     &Apache::loncommon::end_page();      my $end_page = 
         $r->print(          &Apache::loncommon::end_page();
            $start_page              $r->print(
           .'<h1>'.&mt('You are already logged in!').'</h1>'                 $start_page
           .'<p>'.&mt('Please either [_1]continue the current session[_2] or [_3]log out[_4].'                .'<h1>'.&mt('You are already logged in!').'</h1>'
                 .'<p>'.&mt('Please either [_1]continue the current session[_2] or [_3]log out[_4].'
                     ,'<a href="/adm/roles">','</a>','<a href="/adm/logout">','</a>')                      ,'<a href="/adm/roles">','</a>','<a href="/adm/logout">','</a>')
           .'</p>'                .'</p>'
           .'<p><a href="/adm/loginproblems.html">'.&mt('Login problems?').'</a></p>'                .$end_page
           .$end_page              );
         );              return OK;
         return OK;          }
     }      }
   
 # ---------------------------------------------------- No valid token, continue  # ---------------------------------------------------- No valid token, continue
Line 348  sub handler { Line 345  sub handler {
             &Apache::lonnet::get_dom('configuration',['usercreation'],$form{'udom'});              &Apache::lonnet::get_dom('configuration',['usercreation'],$form{'udom'});
         if (grep(/^login$/,@cancreate)) {          if (grep(/^login$/,@cancreate)) {
             my $start_page =               my $start_page = 
                 &Apache::loncommon::start_page('Create a user account in LON-CAPA',                  &Apache::loncommon::start_page('Create a user account in LON-CAPA');
                                                '',{'no_inline_link'   => 1,});  
             my $domdesc = &Apache::lonnet::domain($form{'udom'},'description');              my $domdesc = &Apache::lonnet::domain($form{'udom'},'description');
             my $lonhost = $r->dir_config('lonHostID');              my $lonhost = $r->dir_config('lonHostID');
             my $origmail = $Apache::lonnet::perlvar{'lonSupportEMail'};              my $origmail = $Apache::lonnet::perlvar{'lonSupportEMail'};
Removed from v.1.101.4.1  
changed lines
  Added in v.1.104

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