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

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

version 1.92, 2008/05/30 19:09:50 version 1.97, 2009/04/01 14:43:19
Line 126  sub failed { Line 126  sub failed {
     $r->print(      $r->print(
        $start_page         $start_page
       .'<h1>'.&mt('Sorry ...').'</h1>'        .'<h1>'.&mt('Sorry ...').'</h1>'
       .'<p><b>'.&mt($message).'</b></p>'        .'<p class="LC_warning">'.&mt($message).'</p>'
       .'<p>'.&mt('Please [_1]log in again[_2].'        .'<p>'.&mt('Please [_1]log in again[_2].'
                 ,"<a href=\"/adm/login?username=$form->{'uname'}&domain=$form->{'udom'}\">",'</a>')                  ,"<a href=\"/adm/login?username=$form->{'uname'}&domain=$form->{'udom'}\">",'</a>')
       .'</p>'        .'</p>'
Line 172  sub handler { Line 172  sub handler {
         $r->print(          $r->print(
            $start_page             $start_page
           .'<h1>'.&mt('You are already logged in!').'</h1>'            .'<h1>'.&mt('You are already logged in!').'</h1>'
           .'<p>'.&mt('Please either [_1]continue the current session[_2] or [_3]logout[_4].'            .'<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>'            .'<p><a href="/adm/loginproblems.html">'.&mt('Login problems?').'</a></p>'
Line 212  sub handler { Line 212  sub handler {
     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 230  sub handler { Line 231  sub handler {
     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 287  sub handler { Line 292  sub handler {
                 &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 = &Apache::createaccount::username_check($form{'uname'}, 
                                                                   $form{'udom'},$domdesc,'',
                                                                   $lonhost,$contact_email,$contact_name);
             &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 />';              $r->print('<h3>'.&mt('Account creation').'</h3>'.
             if ($checkfail) {                        &mt('Although your username and password were authenticated, you do not currently have a LON-CAPA account at this institution.').'<br />'.
                 $msg .= &mt('A LON-CAPA account may not be created with the username you used.');                        $output.&Apache::loncommon::end_page());
             } 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.');  
             }  
             $r->print('<h4>'.$msg.'</h4>'.$output);  
             $r->print(&Apache::loncommon::end_page());  
             return OK;              return OK;
         } else {          } else {
             &failed($r,'Although your username and password were authenticated, you do not currently have a LON-CAPA account in this domain, and you are not permitted to create one.',\%form);              &failed($r,'Although your username and password were authenticated, you do not currently have a LON-CAPA account in this domain, and you are not permitted to create one.',\%form);
Removed from v.1.92  
changed lines
  Added in v.1.97

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