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

Diff for /loncom/interface/createaccount.pm between versions 1.10 and 1.19

version 1.10, 2008/07/08 03:00:43 version 1.19, 2008/07/13 17:57:58
Line 35  use Apache::Constants qw(:common); Line 35  use Apache::Constants qw(:common);
 use Apache::lonacc;  use Apache::lonacc;
 use Apache::lonnet;  use Apache::lonnet;
 use Apache::loncommon;  use Apache::loncommon;
   use Apache::lonhtmlcommon;
 use Apache::lonlocal;  use Apache::lonlocal;
 use Apache::lonauth;  use Apache::lonauth;
 use Apache::resetpw;  use Apache::resetpw;
Line 64  sub handler { Line 65  sub handler {
     }      }
     my $domdesc = &Apache::lonnet::domain($domain,'description');      my $domdesc = &Apache::lonnet::domain($domain,'description');
     my $contact_name = &mt('LON-CAPA helpdesk');      my $contact_name = &mt('LON-CAPA helpdesk');
     my $contact_email =  $r->dir_config('lonSupportEMail');      my $origmail = $Apache::lonnet::perlvar{'lonSupportEMail'};
       my $contacts =
           &Apache::loncommon::build_recipient_list(undef,'helpdeskmail',
                                                    $domain,$origmail);
       my ($contact_email) = split(',',$contacts);
     my $lonhost = $r->dir_config('lonHostID');      my $lonhost = $r->dir_config('lonHostID');
     my $include = $r->dir_config('lonIncludes');      my $include = $r->dir_config('lonIncludes');
     my $start_page;      my $start_page;
Line 107  sub handler { Line 112  sub handler {
   
     if (@cancreate == 0) {      if (@cancreate == 0) {
         &print_header($r,$start_page);          &print_header($r,$start_page);
         my $output = &mt('Creation of a new user account using an e-mail address or an institutional log-in ID as username is not permitted in the domain: [_1] ([_2]).',$domain,$domdesc);          my $output = '<h3>'.&mt('Account creation unavailable').'</h3>'.
                        '<span class="LC_warning">'.
                        &mt('Creation of a new user account using an e-mail address or an institutional log-in ID as username is not permitted at this institution ([_1]).',$domdesc).'</span><br /><br />';
         $r->print($output);          $r->print($output);
         $r->print(&Apache::loncommon::end_page());          $r->print(&Apache::loncommon::end_page());
         return OK;          return OK;
Line 120  sub handler { Line 127  sub handler {
   
     if ($sso_username ne '') {      if ($sso_username ne '') {
         &print_header($r,$start_page);          &print_header($r,$start_page);
         my ($output,$msg);          my ($msg,$sso_logout);
           $sso_logout = &sso_logout_frag($r,$domain);
         if (grep(/^sso$/,@cancreate)) {          if (grep(/^sso$/,@cancreate)) {
             $msg = &mt("Although your username and password were authenticated by your institution's Single Sign On system, you do not currently have a LON-CAPA account in this domain.");              $msg = '<h3>'.&mt('Account creation').'</h3>'.
             ($output, my $checkfail) = &username_check($sso_username,$domain,                     &mt("Although your username and password were authenticated by your institution's Single Sign On system, you do not currently have a LON-CAPA account at this institution.").'<br />';
                                                        $domdesc,$courseid,  
                                                        $lonhost,$contact_email);               $msg .= &username_check($sso_username,$domain,$domdesc,$courseid, 
             if ($checkfail eq 'username') {                                      $lonhost,$contact_email,$contact_name,$sso_logout);
                 $msg .= &mt('A LON-CAPA account may not be created with the username you use.');  
             } elsif ($checkfail eq 'authtoken') {  
                 $msg .= &mt('Error creating token.');  
             } 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.');  
             }  
         } else {          } else {
             $msg = &mt("Although your username and password were authenticated by your institution's Single Sign On system, you do not currently have a LON-CAPA account in this domain, and you are not permitted to create one.");              $msg = '<h3>'.&mt('Account creation unavailable').'</h3>'.
                      '<span class="LC_warning">'.&mt("Although your username and password were authenticated by your institution's Single Sign On system, you do not currently have a LON-CAPA account at this institution, and you are not permitted to create one.").'</span><br /><br />'.&mt('Please contact the [_1] ([_2]) for assistance.',$contact_name,$contact_email).'<hr />'.
                      $sso_logout;
         }          }
         $r->print('<h4>'.$msg.'</h4>'.$output);          $r->print($msg);
         $r->print(&Apache::loncommon::end_page());          $r->print(&Apache::loncommon::end_page());
         return OK;          return OK;
     }      }
Line 176  sub handler { Line 180  sub handler {
         $r->print($output);          $r->print($output);
         $r->print(&Apache::loncommon::end_page());          $r->print(&Apache::loncommon::end_page());
         return OK;          return OK;
     }      } elsif ($env{'form.phase'} eq 'username_validation') { 
           (my $result,$output) = 
     &print_header($r,$start_page);              &username_validation($r,$env{'form.uname'},$domain,$domdesc,
     if ($env{'form.create_with_email'}) {                                   $contact_name,$contact_email,$courseid,
                                    $lonhost);
           if ($result eq 'existingaccount') {
               $r->print($output);
               $r->print(&Apache::loncommon::end_page());
               return OK;
           } else {
               &print_header($r,$start_page);
           }
       } elsif ($env{'form.create_with_email'}) {
           &print_header($r,$start_page);
         $output = &process_email_request($env{'form.useremail'},$domain,$domdesc,          $output = &process_email_request($env{'form.useremail'},$domain,$domdesc,
                                          $contact_name,$contact_email,\@cancreate,                                           $contact_name,$contact_email,\@cancreate,
                                          $lonhost,$domconfig{'usercreation'},                                           $lonhost,$domconfig{'usercreation'},
                                          $courseid);                                           $courseid);
     } elsif ($env{'form.phase'} eq 'username_validation') {  
         $output = &username_validation($env{'form.uname'},$domain,$domdesc,  
                                        $contact_name,$contact_email,$courseid,  
                                        $lonhost);  
     } elsif (!$token) {      } elsif (!$token) {
           &print_header($r,$start_page);
         my $now=time;          my $now=time;
         if (grep(/^login$/,@cancreate)) {          if (grep(/^login$/,@cancreate)) {
             my $jsh=Apache::File->new($include."/londes.js");              my $jsh=Apache::File->new($include."/londes.js");
             $r->print(<$jsh>);              $r->print(<$jsh>);
             $r->print(&javascript_setforms($now));              $r->print(&javascript_setforms($now));
         }          }
           if (grep(/^email$/,@cancreate)) {
               $r->print(&javascript_validmail());
           }
         $output = &print_username_form($domain,$domdesc,\@cancreate,$now,$lonhost,          $output = &print_username_form($domain,$domdesc,\@cancreate,$now,$lonhost,
                                        $courseid);                                          $courseid); 
     }      }
Line 277  ENDSCRIPT Line 291  ENDSCRIPT
     return $js;      return $js;
 }  }
   
   sub javascript_validmail {
       my %lt = &Apache::lonlocal::texthash (
                  email => 'The e-mail address you entered',
                  notv  => 'is not a valid e-mail address',
       );
       my $output =  "\n".'<script type="text/javascript">'."\n".
                     &Apache::lonhtmlcommon::javascript_valid_email()."\n";
       $output .= <<"ENDSCRIPT";
   function validate_email() {
       field = document.createaccount.useremail;
       if (validmail(field) == false) {
           alert("$lt{'email'}: "+field.value+" $lt{'notv'}.");
           return false;
       }
       return true;
   }
   ENDSCRIPT
       $output .= "\n".'</script>'."\n";
       return $output;
   }
   
 sub print_username_form {  sub print_username_form {
     my ($domain,$domdesc,$cancreate,$now,$lonhost,$courseid) = @_;      my ($domain,$domdesc,$cancreate,$now,$lonhost,$courseid) = @_;
     my %lt = &Apache::lonlocal::texthash(      my %lt = &Apache::lonlocal::texthash(
Line 289  sub print_username_form { Line 324  sub print_username_form {
         if (grep(/^login$/,@{$cancreate})) {          if (grep(/^login$/,@{$cancreate})) {
             my %domdefaults = &Apache::lonnet::get_domain_defaults($domain);              my %domdefaults = &Apache::lonnet::get_domain_defaults($domain);
             if ((($domdefaults{'auth_def'} =~/^krb/) && ($domdefaults{'auth_arg_def'} ne '')) || ($domdefaults{'auth_def'} eq 'localauth')) {              if ((($domdefaults{'auth_def'} =~/^krb/) && ($domdefaults{'auth_arg_def'} ne '')) || ($domdefaults{'auth_def'} eq 'localauth')) {
                 $output = '<div class="LC_left_float"><h3>'.&mt('Create account with a username provided by your institution').'</h3>';                  $output = '<div class="LC_left_float"><h3>'.&mt('Create account with a username provided by this institution').'</h3>';
                 $output .= &mt('If you already have a log-in ID at your institution,[_1] you may be able to use it for LON-CAPA.','<br />').'<br /><br />'.&mt('Type in your log-in ID and password to find out.').'<br /><br />';                  $output .= &mt('If you already have a log-in ID at this institution,[_1] you may be able to use it for LON-CAPA.','<br />').'<br /><br />'.&mt('Type in your log-in ID and password to find out.').'<br /><br />';
                 my ($lkey,$ukey) = &Apache::lonpreferences::des_keys();                  my ($lkey,$ukey) = &Apache::lonpreferences::des_keys();
                 my ($lextkey,$uextkey) = &getkeys($lkey,$ukey);                  my ($lextkey,$uextkey) = &getkeys($lkey,$ukey);
                 my $logtoken=Apache::lonnet::reply('tmpput:'.$ukey.$lkey.'&createaccount',                  my $logtoken=Apache::lonnet::reply('tmpput:'.$ukey.$lkey.'&createaccount',
Line 327  sub print_username_form { Line 362  sub print_username_form {
             my $emailform = '<input type="text" name="useremail" size="25" value="" />';              my $emailform = '<input type="text" name="useremail" size="25" value="" />';
             my $captchaform = &create_captcha();              my $captchaform = &create_captcha();
             my $submit_text = &mt('Request LON-CAPA account');              my $submit_text = &mt('Request LON-CAPA account');
             $output .=  '<form name="createaccount" method="post" onsubmit="validate_email();" action="/adm/createaccount">'.              $output .=  '<form name="createaccount" method="post" onSubmit="return validate_email()" action="/adm/createaccount">'.
                         &Apache::lonhtmlcommon::start_pick_box()."\n".                          &Apache::lonhtmlcommon::start_pick_box()."\n".
                         &Apache::lonhtmlcommon::row_title(&mt('E-mail address'),                          &Apache::lonhtmlcommon::row_title(&mt('E-mail address'),
                                                          'LC_pick_box_title')."\n".                                                           'LC_pick_box_title')."\n".
Line 347  sub print_username_form { Line 382  sub print_username_form {
         }          }
     }      }
     if ($output eq '') {      if ($output eq '') {
         $output = &mt('Creation of a new user account using an e-mail address or an institutional log-in ID as your username is not permitted in the domain: [_1] ([_2])',$domain,$domdesc);          $output = &mt('Creation of a new LON-CAPA user account using an e-mail address or an institutional log-in ID as your username is not permitted at [_1].',$domdesc);
     } else {      } else {
         $output .= '<div class="LC_clear_float_footer"></div>';          $output .= '<div class="LC_clear_float_footer"></div>';
     }      }
Line 431  sub process_email_request { Line 466  sub process_email_request {
   
 sub send_token {  sub send_token {
     my ($domain,$email,$server,$domdesc,$contact_name,$contact_email,$courseid) = @_;      my ($domain,$email,$server,$domdesc,$contact_name,$contact_email,$courseid) = @_;
     my $msg = &mt('Thank you for your request to create a new LON-CAPA account.').'<br /><br />';      my $msg = '<h3>'.&mt('Account creation status').'</h3>'.
                 &mt('Thank you for your request to create a new LON-CAPA account.').
                 '<br /><br />';
     my $now = time;      my $now = time;
     my %info = ('ip'         => $ENV{'REMOTE_ADDR'},      my %info = ('ip'         => $ENV{'REMOTE_ADDR'},
                 'time'       => $now,                  'time'       => $now,
Line 441  sub send_token { Line 478  sub send_token {
     my $token = &Apache::lonnet::tmpput(\%info,$server);      my $token = &Apache::lonnet::tmpput(\%info,$server);
     if ($token !~ /^error/ && $token ne 'no_such_host') {      if ($token !~ /^error/ && $token ne 'no_such_host') {
         my $esc_token = &escape($token);          my $esc_token = &escape($token);
         my $mailmsg = &mt('A request was submitted on [_1] for creation of a LON-CAPA account in the [_2] domain.',localtime(time),$domdesc).' '.          my $mailmsg = &mt('A request was submitted on [_1] for creation of a LON-CAPA account at the following institution: [_2].',localtime(time),$domdesc).' '.
              &mt('To complete this process please open a web browser and enter the following'               &mt('To complete this process please open a web browser and enter the following'
                 .' URL in the address/location box: [_1]'                  .' URL in the address/location box: [_1]'
                 ,&Apache::lonnet::absolute_url().'/adm/createaccount?token='.$esc_token);                  ,&Apache::lonnet::absolute_url().'/adm/createaccount?token='.$esc_token);
Line 450  sub send_token { Line 487  sub send_token {
         if ($result eq 'ok') {          if ($result eq 'ok') {
             $msg .= &mt('A message has been sent to the e-mail address you provided.').'<br />'.&mt('The message includes the web address for the link you will use to complete the account creation process.').'<br />'.&mt("The link included in the message will be valid for the next [_1]two[_2] hours.",'<b>','</b>');              $msg .= &mt('A message has been sent to the e-mail address you provided.').'<br />'.&mt('The message includes the web address for the link you will use to complete the account creation process.').'<br />'.&mt("The link included in the message will be valid for the next [_1]two[_2] hours.",'<b>','</b>');
         } else {          } else {
             $msg .= &mt('An error occurred when sending a message to the e-mail address you provided.')              $msg .= '<span class="LC_error">'.
                    .' '.&mt('Please contact the [_1] ([_2]) for assistance.',$contact_name,$contact_email);                      &mt('An error occurred when sending a message to the e-mail address you provided.').'</span><br />'.
                       ' '.&mt('Please contact the [_1] ([_2]) for assistance.',$contact_name,$contact_email);
         }          }
     } else {      } else {
         $msg .= &mt('An error occurred creating a token required for the account creation process.')          $msg .= '<span class="LC_error">'.
                .' '.&mt('Please contact the [_1] ([_2]) for assistance.',$contact_name,$contact_email);                  &mt('An error occurred creating a token required for the account creation process.').'</span><br />'.
                   ' '.&mt('Please contact the [_1] ([_2]) for assistance.',$contact_name,$contact_email);
     }      }
     return $msg;      return $msg;
 }  }
Line 481  sub process_mailtoken { Line 520  sub process_mailtoken {
                                                        $data{'username'},$domdesc);                                                         $data{'username'},$domdesc);
                 if ($result eq 'ok') {                  if ($result eq 'ok') {
                     $msg = $output;                       $msg = $output; 
                     my $shownow = localtime($now);                      my $shownow = &Apache::lonlocal::locallocaltime($now);
                     my $mailmsg = &mt('A LON-CAPA account in the [_1] domain has been created [_2] from IP address: [_3].  If you did not perform this action or authorize it, please contact the [_4] ([_5]).',$domdesc,$shownow,$ENV{'REMOTE_ADDR'},$contact_name,$contact_email)."\n";                      my $mailmsg = &mt('A LON-CAPA account for the institution: [_1] has been created [_2] from IP address: [_3].  If you did not perform this action or authorize it, please contact the [_4] ([_5]).',$domdesc,$shownow,$ENV{'REMOTE_ADDR'},$contact_name,$contact_email)."\n";
                     my $mailresult = &Apache::resetpw::send_mail($domdesc,$data{'email'},                      my $mailresult = &Apache::resetpw::send_mail($domdesc,$data{'email'},
                                                                  $mailmsg,$contact_name,                                                                   $mailmsg,$contact_name,
                                                                  $contact_email);                                                                   $contact_email);
Line 536  sub start_session { Line 575  sub start_session {
     if ($r->dir_config('lonBalancer') eq 'yes') {      if ($r->dir_config('lonBalancer') eq 'yes') {
         &Apache::lonauth::success($r,$form{'uname'},$form{'udom'},          &Apache::lonauth::success($r,$form{'uname'},$form{'udom'},
                                   $lonhost,'noredirect',undef,\%form);                                    $lonhost,'noredirect',undef,\%form);
         my $delete = &Apache::lonnet::tmpdel($token);          if ($token ne '') { 
               my $delete = &Apache::lonnet::tmpdel($token);
           }
         $r->internal_redirect('/adm/switchserver');          $r->internal_redirect('/adm/switchserver');
     } else {      } else {
         &Apache::lonauth::success($r,$form{'uname'},$form{'udom'},          &Apache::lonauth::success($r,$form{'uname'},$form{'udom'},
Line 675  sub create_account { Line 716  sub create_account {
 }  }
   
 sub username_validation {  sub username_validation {
     my ($username,$domain,$domdesc,$contact_name,$contact_email,$courseid,$lonhost) = @_;      my ($r,$username,$domain,$domdesc,$contact_name,$contact_email,$courseid,
           $lonhost) = @_;
     my ($retrieved,$output,$upass);      my ($retrieved,$output,$upass);
   
     $username= &LONCAPA::clean_username($username);      $username= &LONCAPA::clean_username($username);
     $domain = &LONCAPA::clean_domain($domain);      $domain = &LONCAPA::clean_domain($domain);
     my $uhome = &Apache::lonnet::homeserver($username,$domain);      my $uhome = &Apache::lonnet::homeserver($username,$domain);
   
     if ($uhome ne 'no_host') {  
         $output = &invalid_state('existinguser',$domdesc,  
                                  $contact_name,$contact_email);  
         return $output;  
     }  
     ($retrieved,$output,$upass) = &process_credentials($env{'form.logtoken'},      ($retrieved,$output,$upass) = &process_credentials($env{'form.logtoken'},
                                                        $env{'form.serverid'});                                                         $env{'form.serverid'});
     if ($retrieved eq 'ok') {      if ($retrieved ne 'ok') {
           return ('fail',$output);
       }
       if ($uhome ne 'no_host') {
           my $result = &Apache::lonnet::authenticate($username,$upass,$domain);
           if ($result ne 'no_host') { 
               my %form = &start_session($r,$username,$domain,$lonhost,$courseid);
               $output = '<br /><br />'.&mt('A LON-CAPA account already exists for username [_1] at this institution ([_2]).','<tt>'.$username.'</tt>',$domdesc).'<br />'.&mt('The password entered was also correct so you have been logged in.');
               return ('existingaccount',$output);
           } else {
               $output = '<div class="LC_warning">'.
                         &mt('Username and/or password could not be authenticated.').
                         '</div>'.
                         &mt('Please check the username and password.');
           }
       } else {
         my $primlibserv = &Apache::lonnet::domain($domain,'primary');          my $primlibserv = &Apache::lonnet::domain($domain,'primary');
         my $authok;          my $authok;
         my %domdefaults = &Apache::lonnet::get_domain_defaults($domain);          my %domdefaults = &Apache::lonnet::get_domain_defaults($domain);
Line 701  sub username_validation { Line 753  sub username_validation {
             $authok = 'non_authorized';              $authok = 'non_authorized';
         }          }
         if ($authok eq 'authorized') {          if ($authok eq 'authorized') {
             ($output,undef) = &username_check($username,$domain,$domdesc,              $output = &username_check($username,$domain,$domdesc,$courseid,$lonhost,
                                               $courseid,$lonhost,$contact_email);                                         $contact_email,$contact_name);
         } else {          } else {
             $output = '<div class="LC_warning">'              $output = '<div class="LC_warning">'.
                      .&mt('Username and/or password could not be authenticated.')                        &mt('Username and/or password could not be authenticated.').
                      .'</div>'                        '</div>'.
                      .&mt('Please check the username and password.');                         &mt('Please check the username and password.'); 
         }          }
     }      }
     return $output;      return ('ok',$output);
 }  }
   
 sub username_check {  sub username_check {
     my ($username,$domain,$domdesc,$courseid,$lonhost,$contact_email) = @_;      my ($username,$domain,$domdesc,$courseid,$lonhost,$contact_email,$contact_name,
     my (%rulematch,%inst_results,$newuser,%alerts,%curr_rules,%got_rules);          $sso_logout) = @_;
       my (%rulematch,%inst_results,$newuser,$checkfail,$rowcount,$editable,$output,$msg,
           %alerts,%curr_rules,%got_rules);
     $newuser = 1;      $newuser = 1;
     my $checkhash;      my $checkhash;
     my $checks = { 'username' => 1 };      my $checks = { 'username' => 1 };
Line 725  sub username_check { Line 779  sub username_check {
     if (ref($alerts{'username'}) eq 'HASH') {      if (ref($alerts{'username'}) eq 'HASH') {
         if (ref($alerts{'username'}{$domain}) eq 'HASH') {          if (ref($alerts{'username'}{$domain}) eq 'HASH') {
             if ($alerts{'username'}{$domain}{$username}) {              if ($alerts{'username'}{$domain}{$username}) {
                 my ($userchkmsg,$checkfail);  
                 if (ref($curr_rules{$domain}) eq 'HASH') {                  if (ref($curr_rules{$domain}) eq 'HASH') {
                     $userchkmsg =                      $output =
                         &Apache::loncommon::instrule_disallow_msg('username',$domdesc,1).                          &Apache::loncommon::instrule_disallow_msg('username',$domdesc,1,
                                                                     'selfcreate').
                         &Apache::loncommon::user_rule_formats($domain,$domdesc,                          &Apache::loncommon::user_rule_formats($domain,$domdesc,
                                 $curr_rules{$domain}{'username'},'username');                                  $curr_rules{$domain}{'username'},'username');
                     if ($userchkmsg) {  
                         $checkfail = 'username';  
                     }  
                 }                  }
                 return ($userchkmsg,$checkfail);                  $checkfail = 'username';
             }              }
         }          }
     }      }
     my $submit_text = &mt('Create LON-CAPA account');      if (!$checkfail) {
     my $output = '<form method="post" action="/adm/createaccount">'.          $output = '<form method="post" action="/adm/createaccount">';
                  &Apache::loncreateuser::personal_data_display($username,$domain,1,          (my $datatable,$rowcount,$editable) = 
                                     undef,$inst_results{$username.':'.$domain}).              &Apache::loncreateuser::personal_data_display($username,$domain,1,'selfcreate',
                 '<br /><br /><input type="hidden" name="uname" value="'.$username.'" />'."\n".                                                           $inst_results{$username.':'.$domain});
                 '<input type="hidden" name="udom" value="'.$domain.'" />'."\n".          if ($rowcount > 0) {
                 '<input type="hidden" name="phase" value="username_activation" />';              $output .= $datatable;
     my $now = time;          }
     my %info = ('ip'         => $ENV{'REMOTE_ADDR'},          $output .=  '<br /><br /><input type="hidden" name="uname" value="'.$username.'" />'."\n".
                 'time'       => $now,                      '<input type="hidden" name="udom" value="'.$domain.'" />'."\n".
                 'domain'     => $domain,                      '<input type="hidden" name="phase" value="username_activation" />';
                 'username'   => $username);          my $now = time;
     my $authtoken = &Apache::lonnet::tmpput(\%info,$lonhost);          my %info = ('ip'         => $ENV{'REMOTE_ADDR'},
     if ($authtoken !~ /^error/ && $authtoken ne 'no_such_host') {                      'time'       => $now,
         $output .= '<input type="hidden" name="authtoken" value="'.&HTML::Entities::encode($authtoken,'&<>"').'" />';                      'domain'     => $domain,
     } else {                      'username'   => $username);
         $output = &mt('An error occurred when storing a token').'<br />'.          my $authtoken = &Apache::lonnet::tmpput(\%info,$lonhost);
                   &mt('You will not be able to proceed to the next stage of account creation').          if ($authtoken !~ /^error/ && $authtoken ne 'no_such_host') {
                   &linkto_email_help($contact_email,$domdesc);              $output .= '<input type="hidden" name="authtoken" value="'.&HTML::Entities::encode($authtoken,'&<>"').'" />';
         return($output,'authtoken');          } else {
     }              $output = &mt('An error occurred when storing a token').'<br />'.
     if ($courseid ne '') {                        &mt('You will not be able to proceed to the next stage of account creation').
         $output .= '<input type="hidden" name="courseid" value="'.$courseid.'" />';                        &linkto_email_help($contact_email,$domdesc);
     }              $checkfail = 'authtoken';
     $output .= '<input type="submit" name="newaccount" value="'.          }
                $submit_text.'" /></form>';      }
     return ($output,'');      if ($checkfail) { 
           $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><br /><br />'.$output;
           } elsif ($checkfail eq 'authtoken') {
               $msg .= '<span class="LC_error">'.&mt('Error creating token.').'</span>'.
                       '<br />'.$output;
           }
           $msg .= &mt('Please contact the [_1] ([_2]) for assistance.',
                   $contact_name,$contact_email).'<br /><hr />'.
                   $sso_logout;
           &Apache::lonnet::logthis("ERROR: failure type of '$checkfail' when performing username check to create account for authenticated user: $username, in domain $domain");
       } else {
           if ($courseid ne '') {
               $output .= '<input type="hidden" name="courseid" value="'.$courseid.'" />';
           }
           $output .= '<input type="submit" name="newaccount" value="'.
                      &mt('Create LON-CAPA account').'" /></form>';
           if ($rowcount) {
               if ($editable) {
                   $msg = &mt('To create one, use the table below to provide information about yourself, then click the [_1]Create LON-CAPA account[_2] button.','<span class="LC_cusr_emph">','</span>').'<br />';
               } else {
                    $msg = &mt('A user account will be created with information displayed in the table below, when you click the [_1]Create LON-CAPA account[_2] button.','<span class="LC_cusr_emph">','</span>').'<br />';
               }
           } else {
               $msg = '<br />'.&mt('Confirm that you wish to create an account.');
           }
           $msg .= $output;
       }
       return $msg;
 }  }
   
 sub username_activation {  sub username_activation {
Line 864  sub check_id { Line 946  sub check_id {
   
 sub invalid_state {  sub invalid_state {
     my ($error,$domdesc,$contact_name,$contact_email,$msgtext) = @_;      my ($error,$domdesc,$contact_name,$contact_email,$msgtext) = @_;
     my $msg;      my $msg = '<h3>'.&mt('Account creation unavailable').'</h3><span class="LC_error">';
     if ($error eq 'baduseremail') {      if ($error eq 'baduseremail') {
         $msg = &mt('The e-mail address you provided does not appear to be a valid address.');          $msg = &mt('The e-mail address you provided does not appear to be a valid address.');
     } elsif ($error eq 'existinguser') {      } elsif ($error eq 'existinguser') {
         $msg = &mt('The e-mail address you provided is already in use as a username in this LON-CAPA domain.');          $msg = &mt('The e-mail address you provided is already in use as a username in LON-CAPA at this institution.');
     } elsif ($error eq 'userrules') {      } elsif ($error eq 'userrules') {
         $msg = &mt('Username rules for this LON-CAPA domain do not allow the e-mail address you provided to be used as a username.');          $msg = &mt('Username rules for this LON-CAPA at this institution do not allow the e-mail address you provided to be used as a username.');
     } elsif ($error eq 'userformat') {      } elsif ($error eq 'userformat') {
         $msg = &mt('The e-mail address you provided may not be used as a username in this LON-CAPA domain.');          $msg = &mt('The e-mail address you provided may not be used as a username at this LON-CAPA institution.');
     } elsif ($error eq 'captcha') {      } elsif ($error eq 'captcha') {
         $msg = &mt('Validation of the code your entered failed.');          $msg = &mt('Validation of the code your entered failed.');
     } elsif ($error eq 'noemails') {      } elsif ($error eq 'noemails') {
         $msg = &mt('Creation of a new user account using an e-mail address as username is not permitted in this LON-CAPA domain.');          $msg = &mt('Creation of a new user account using an e-mail address as username is not permitted at this LON-CAPA institution.');
     }      }
       $msg .= '</span>';
     if ($msgtext) {      if ($msgtext) {
         $msg .= '<br />'.$msgtext;          $msg .= '<br />'.$msgtext;
     }      }
Line 890  sub linkto_email_help { Line 973  sub linkto_email_help {
     my $msg;      my $msg;
     if ($contact_email ne '') {      if ($contact_email ne '') {
         my $escuri = &HTML::Entities::encode('/adm/createaccount','&<>"');          my $escuri = &HTML::Entities::encode('/adm/createaccount','&<>"');
         $msg .= '<br />'.&mt('You may wish to contact the [_1]LON-CAPA helpdesk[_2] for the [_3] domain.','<a href="/adm/helpdesk?origurl='.$escuri.'">','</a>',$domdesc);          $msg .= '<br />'.&mt('You may wish to contact the [_1]LON-CAPA helpdesk[_2] for [_3].','<a href="/adm/helpdesk?origurl='.$escuri.'">','</a>',$domdesc).'<br />';
     } else {      } else {
         $msg .= '<br />'.&mt('You may wish to send an e-mail to the server administrator: [_1] for the [_2] domain.',$Apache::lonnet::perlvar{'AdminEmail'},$domdesc);          $msg .= '<br />'.&mt('You may wish to send an e-mail to the server administrator: [_1] for [_2].',$Apache::lonnet::perlvar{'AdminEmail'},$domdesc).'<br />';
     }      }
     return $msg;      return $msg;
 }  }
Line 914  sub create_captcha { Line 997  sub create_captcha {
   
 sub captcha_settings {  sub captcha_settings {
     my %captcha_params = (       my %captcha_params = ( 
                            output_dir     => "/home/httpd/html/captcha",                             output_dir     => $Apache::lonnet::perlvar{'lonCaptchaDir'},
                            www_output_dir => "/captcha",                             www_output_dir => "/captchaspool",
                            db_dir         => "/home/www/captchadb",                             db_dir         => $Apache::lonnet::perlvar{'lonCaptchaDb'},
                            numchars       => '5',                             numchars       => '5',
                          );                           );
     return %captcha_params;      return %captcha_params;
Line 1006  sub guest_format_check { Line 1089  sub guest_format_check {
     return $format_msg;      return $format_msg;
 }  }
   
   sub sso_logout_frag {
       my ($r,$domain) = @_;
       my $endsessionmsg;
       if (defined($r->dir_config('lonSSOUserLogoutMessageFile_'.$domain))) {
           my $msgfile = $r->dir_config('lonSSOUserLogoutMessageFile_'.$domain);
           if (-e $msgfile) {
               open(my $fh,"<$msgfile");
               $endsessionmsg = join('',<$fh>);
               close($fh);
           }
       } elsif (defined($r->dir_config('lonSSOUserLogoutMessageFile'))) {
           my $msgfile = $r->dir_config('lonSSOUserLogoutMessageFile');
           if (-e $msgfile) {     
               open(my $fh,"<$msgfile");
               $endsessionmsg = join('',<$fh>);
               close($fh);
           }
       }
       return $endsessionmsg;
   }
   
 1;  1;
Removed from v.1.10  
changed lines
  Added in v.1.19

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