version 1.14, 2008/07/09 17:30:59
|
version 1.16, 2008/07/11 15:44:32
|
Line 65 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 110 sub handler {
|
Line 114 sub handler {
|
&print_header($r,$start_page); |
&print_header($r,$start_page); |
my $output = '<h3>'.&mt('Account creation unavailable').'</h3>'. |
my $output = '<h3>'.&mt('Account creation unavailable').'</h3>'. |
'<span class="LC_warning">'. |
'<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 in the domain: [_1] ([_2]).',$domain,$domdesc).'</span><br /><br />'; |
&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 126 sub handler {
|
Line 130 sub handler {
|
my ($output,$msg); |
my ($output,$msg); |
if (grep(/^sso$/,@cancreate)) { |
if (grep(/^sso$/,@cancreate)) { |
$msg = '<h3>'.&mt('Account creation').'</h3>'. |
$msg = '<h3>'.&mt('Account creation').'</h3>'. |
&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.").'<br /><br />'; |
&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 /><br />'; |
($output, my $checkfail) = &username_check($sso_username,$domain, |
($output, my $checkfail) = &username_check($sso_username,$domain, |
$domdesc,$courseid, |
$domdesc,$courseid, |
$lonhost,$contact_email); |
$lonhost,$contact_email); |
if ($checkfail) { |
if ($checkfail) { |
|
$msg .= '<h4>'.&mt('Account creation unavailable');'</h4>'; |
if ($checkfail eq 'username') { |
if ($checkfail eq 'username') { |
$msg .= '<span class="LC_warning">'. |
$msg .= '<span class="LC_warning">'. |
&mt('A LON-CAPA account may not be created with the username you use.').'</span>'; |
&mt('A LON-CAPA account may not be created with the username you use.').'</span>'; |
Line 144 sub handler {
|
Line 149 sub handler {
|
} |
} |
} else { |
} else { |
$msg .= '<h3>'.&mt('Account creation unavailable').'</h3>'. |
$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 in this domain, and you are not permitted to create one.").'</span><br /><br />'.&mt('Please contact the [_1] ([_2]) for assistance.',$contact_name,$contact_email); |
'<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); |
} |
} |
$r->print('<h4>'.$msg.'</h4>'.$output); |
$r->print($msg.'<br />'.$output); |
$r->print(&Apache::loncommon::end_page()); |
$r->print(&Apache::loncommon::end_page()); |
return OK; |
return OK; |
} |
} |
Line 323 sub print_username_form {
|
Line 328 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 381 sub print_username_form {
|
Line 386 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 477 sub send_token {
|
Line 482 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 520 sub process_mailtoken {
|
Line 525 sub process_mailtoken {
|
if ($result eq 'ok') { |
if ($result eq 'ok') { |
$msg = $output; |
$msg = $output; |
my $shownow = localtime($now); |
my $shownow = localtime($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 906 sub invalid_state {
|
Line 911 sub invalid_state {
|
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>'; |
$msg .= '</span>'; |
if ($msgtext) { |
if ($msgtext) { |
Line 929 sub linkto_email_help {
|
Line 934 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); |
} 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 LON-CAPA server administrator: [_1] for [_2].',$Apache::lonnet::perlvar{'AdminEmail'},$domdesc); |
} |
} |
return $msg; |
return $msg; |
} |
} |