version 1.37.2.2, 2010/11/29 14:57:20
|
version 1.37.2.6, 2010/12/02 22:51:27
|
Line 520 sub process_email_request {
|
Line 520 sub process_email_request {
|
my $uhome = &Apache::lonnet::homeserver($useremail,$domain); |
my $uhome = &Apache::lonnet::homeserver($useremail,$domain); |
if ($uhome ne 'no_host') { |
if ($uhome ne 'no_host') { |
$output = &invalid_state('existinguser',$domdesc, |
$output = &invalid_state('existinguser',$domdesc, |
$contact_name,$contact_email); |
$contact_name,$contact_email,'',$useremail); |
return $output; |
return $output; |
} else { |
} else { |
my $captcha = Captcha::reCAPTCHA->new; |
my $captcha = Captcha::reCAPTCHA->new; |
Line 597 sub send_token {
|
Line 597 sub send_token {
|
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 $showtime = localtime(time); |
my $showtime = localtime(time); |
my $mailmsg = &mt('A request was submitted on [_1] for creation of a GCI WebCenter account.',$showtime).' '. |
my $mailmsg = &mt('A request was submitted on [_1] for creation of a GCI WebCenter account.',$showtime)." \n". |
&mt('To complete this process please open a web browser and enter the following URL in the address/location box: [_1]', |
&mt('To complete this process please open a web browser and enter the following URL in the address/location box: [_1]', |
&Apache::lonnet::absolute_url().'/adm/createaccount?token='.$esc_token); |
"\n\n".&Apache::lonnet::absolute_url().'/adm/createaccount?token='.$esc_token); |
my $result = &Apache::resetpw::send_mail($domdesc,$email,$mailmsg,$contact_name, |
my $result = &Apache::resetpw::send_mail($domdesc,$email,$mailmsg,$contact_name, |
$contact_email); |
$contact_email); |
if ($result eq 'ok') { |
if ($result eq 'ok') { |
Line 1129 sub check_id {
|
Line 1129 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,$useremail) = @_; |
my $msg = '<h3>'.&mt('Account creation unavailable').'</h3><span class="LC_error">'; |
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 LON-CAPA at this institution.'); |
my $uname = &HTML::Entities::encode($useremail); |
|
$msg .= &mt('The e-mail address you provided is already in use as a username in LON-CAPA at this institution.').'</span><br /><br /><span class="LC_warning">'.&mt('You can either:').'<ul>'. |
|
'<li>'.&mt('Return to the [_1]log-in page[_2] and enter your password.','<a href="/adm/login?username='.$uname.'">','</a>').'</li>'. |
|
'<li>'.&mt('or, if you do not remember your password, visit the "[_1]Forgot your password?[_2]" page.','<a href="/adm/resetpw?uname='.$uname.'&useremail='.$uname.'&referrer=createaccount">','</a>'). |
|
'</li></ul>'; |
} elsif ($error eq 'userrules') { |
} elsif ($error eq 'userrules') { |
$msg = &mt('Username rules at this institution do not allow the e-mail address you provided to be used as a username.'); |
$msg .= &mt('Username rules 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 at this LON-CAPA institution.'); |
$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 you 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 at this LON-CAPA institution.'); |
$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>'; |
$msg .= '</span>'; |
if ($msgtext) { |
if ($msgtext) { |
$msg .= '<br />'.$msgtext; |
$msg .= '<br />'.$msgtext; |
} |
} |
$msg .= &linkto_email_help($contact_email,$domdesc); |
$msg .= &linkto_email_help($contact_email,$domdesc,$error); |
return $msg; |
return $msg; |
} |
} |
|
|
sub linkto_email_help { |
sub linkto_email_help { |
my ($contact_email,$domdesc) = @_; |
my ($contact_email,$domdesc,$error) = @_; |
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 [_3].','<a href="/adm/helpdesk?origurl='.$escuri.'">','</a>',$domdesc).'<br />'; |
my $href = '/adm/helpdesk?origurl='.$escuri; |
|
if ($error eq 'existinguser') { |
|
my $escemail = &HTML::Entities::encode($env{'form.useremail'}); |
|
$href .= '&useremail='.$escemail.'&useraccount='.$escemail; |
|
} |
|
$msg .= '<br />'.&mt('You may wish to contact the [_1]LON-CAPA helpdesk[_2] for [_3].','<a href="'.$href.'">','</a>',$domdesc).'<br />'; |
} else { |
} else { |
$msg .= '<br />'.&mt('You may wish to send an e-mail to the server administrator: [_1] for [_2].',$Apache::lonnet::perlvar{'AdminEmail'},$domdesc).'<br />'; |
$msg .= '<br />'.&mt('You may wish to send an e-mail to the server administrator: [_1] for [_2].',$Apache::lonnet::perlvar{'AdminEmail'},$domdesc).'<br />'; |
} |
} |