[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.93

version 1.91, 2008/05/14 18:27:30 version 1.93, 2008/07/10 00:26:40
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
Line 222  ENDFAILED Line 212  ENDFAILED
     my $role   = $r->dir_config('lonRole');      my $role   = $r->dir_config('lonRole');
     my $domain = $r->dir_config('lonDefDomain');      my $domain = $r->dir_config('lonDefDomain');
     my $prodir = $r->dir_config('lonUsersDir');      my $prodir = $r->dir_config('lonUsersDir');
       my $contact_name = &mt('LON-CAPA helpdesk');
   
 # ---------------------------------------- Get the information from login token  # ---------------------------------------- Get the information from login token
   
Line 240  ENDFAILED Line 231  ENDFAILED
     return OK;      return OK;
  }   }
     }      }
       if (!&Apache::lonnet::domain($form{'udom'})) {
           &failed($r,'The domain you provided is not a valid LON-CAPA domain.',\%form);
           return OK;
       }
     my ($key,$firsturl)=split(/&/,$tmpinfo);      my ($key,$firsturl)=split(/&/,$tmpinfo);
   
     my $keybin=pack("H16",$key);      my $keybin=pack("H16",$key);
Line 297  ENDFAILED Line 292  ENDFAILED
                 &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,});                                                 '',{'no_inline_link'   => 1,});
             my $domdesc = &Apache::lonnet::domain($form{'udom'},'description');              my $domdesc = &Apache::lonnet::domain($form{'udom'},'description');
             my ($output,$checkfail) = &Apache::createaccount::username_check($form{'uname'},              my $lonhost = $r->dir_config('lonHostID');
                                                                   $form{'udom'},$domdesc);              my $origmail = $Apache::lonnet::perlvar{'lonSupportEMail'};
               my $contacts = 
                   &Apache::loncommon::build_recipient_list(undef,'helpdeskmail',
                                                           $form{'udom'},$origmail);
               my ($contact_email) = split(',',$contacts); 
               my ($output,$checkfail) = 
                   &Apache::createaccount::username_check($form{'uname'},$form{'udom'},
                                                         $domdesc,undef,$lonhost,
                                                         $contact_email);
             &Apache::loncommon::content_type($r,'text/html');              &Apache::loncommon::content_type($r,'text/html');
             $r->send_http_header;              $r->send_http_header;
             &Apache::createaccount::print_header($r,$start_page);              &Apache::createaccount::print_header($r,$start_page);
             my $msg = '<h4>'.&mt('Although your username and password were authenticated, you do not currently have a LON-CAPA account in this domain.').'<br />';              my $msg = '<h3>'.&mt('Account creation').'</h3>'.
                         '<span class="LC_cusr_emph">'.&mt('Although your username and password were authenticated, you do not currently have a LON-CAPA account in this domain.').'</span><br />';
             if ($checkfail) {              if ($checkfail) {
                 $msg .= &mt('A LON-CAPA account may not be created with the username you used.');                  $msg .= '<h4>'.&mt('Account creation unavailable').'</h4>';
                   if ($checkfail eq 'username') {
                       $msg .= '<span class="LC_warning">'.
                               &mt('A LON-CAPA account may not be created with the username you use.').'</span>';
                   } elsif ($checkfail eq 'authtoken') {
                       $msg .= '<span class="LC_error">'.&mt('Error creating token.').'</span>';
                   }
                   &Apache::lonnet::logthis("ERROR: failure type of '$checkfail' when performing username check to create account for authenticated user: $form{'uname'}, in domain $form{'udom'}");
                   $msg .= '<br /><br />'.
                            &mt('Please contact the [_1] ([_2]) for assistance.',
                                $contact_name,$contact_email);
             } else {              } else {
                 $msg .= &mt('To create one, use the table below to provide information about yourself (if appropriate), then click the "Create LON-CAPA account" button.');                  $msg .= &mt('To create one, use the table below to provide information about yourself (if appropriate), then click the "Create LON-CAPA account" button.');
             }              }
             $r->print('<h4>'.$msg.'</h4>'.$output);              $r->print($msg.$output);
             $r->print(&Apache::loncommon::end_page());              $r->print(&Apache::loncommon::end_page());
             return OK;              return OK;
         } else {          } else {
Removed from v.1.91  
changed lines
  Added in v.1.93

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