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

version 1.92, 2008/05/30 19:09:50 version 1.93, 2008/07/10 00:26:40
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,$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.92  
changed lines
  Added in v.1.93

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