version 1.38, 2010/02/19 15:41:39
|
version 1.42, 2010/11/29 15:12:25
|
Line 128 sub handler {
|
Line 128 sub handler {
|
return OK; |
return OK; |
} else { |
} else { |
$start_page = |
$start_page = |
&Apache::loncommon::start_page($title,$js, |
&Apache::loncommon::start_page($title,$js); |
{'no_inline_link' => 1,}); |
|
&print_header($r,$start_page,$courseid); |
&print_header($r,$start_page,$courseid); |
$r->print($output); |
$r->print($output); |
&print_footer($r); |
&print_footer($r); |
Line 137 sub handler {
|
Line 136 sub handler {
|
} |
} |
} |
} |
$start_page = |
$start_page = |
&Apache::loncommon::start_page($title,$js, |
&Apache::loncommon::start_page($title,$js); |
{'no_inline_link' => 1,}); |
|
|
|
my %domconfig = |
my %domconfig = |
&Apache::lonnet::get_dom('configuration',['usercreation'],$domain); |
&Apache::lonnet::get_dom('configuration',['usercreation'],$domain); |
Line 461 sub login_box {
|
Line 459 sub login_box {
|
); |
); |
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:createaccount', |
$lonhost); |
$lonhost); |
$output = &serverform($logtoken,$lonhost,undef,$courseid,$context); |
$output = &serverform($logtoken,$lonhost,undef,$courseid,$context); |
my $unameform = '<input type="text" name="uname" size="20" value="" />'; |
my $unameform = '<input type="text" name="uname" size="20" value="" />'; |
Line 547 sub process_email_request {
|
Line 545 sub process_email_request {
|
if ($uhome eq 'no_host') { |
if ($uhome eq 'no_host') { |
my (%rulematch,%inst_results,%curr_rules,%got_rules,%alerts); |
my (%rulematch,%inst_results,%curr_rules,%got_rules,%alerts); |
&call_rulecheck($useremail,$domain,\%alerts,\%rulematch, |
&call_rulecheck($useremail,$domain,\%alerts,\%rulematch, |
\%inst_results,\%curr_rules,%got_rules,'username'); |
\%inst_results,\%curr_rules,\%got_rules,'username'); |
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}{$useremail}) { |
if ($alerts{'username'}{$domain}{$useremail}) { |
Line 599 sub send_token {
|
Line 597 sub send_token {
|
'domain' => $domain, |
'domain' => $domain, |
'username' => $email, |
'username' => $email, |
'courseid' => $courseid); |
'courseid' => $courseid); |
my $token = &Apache::lonnet::tmpput(\%info,$server); |
my $token = &Apache::lonnet::tmpput(\%info,$server,'createaccount'); |
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); |
Line 723 sub print_dataentry_form {
|
Line 721 sub print_dataentry_form {
|
$output .= &javascript_setforms($now)."\n".&javascript_checkpass($now); |
$output .= &javascript_setforms($now)."\n".&javascript_checkpass($now); |
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:createaccount', |
$lonhost); |
$lonhost); |
my $formtag = '<form name="server" method="post" target="_top" action="/adm/createaccount">'; |
my $formtag = '<form name="server" method="post" target="_top" action="/adm/createaccount">'; |
my ($datatable,$rowcount) = |
my ($datatable,$rowcount) = |
Line 918 sub username_check {
|
Line 916 sub username_check {
|
my (%rulematch,%inst_results,$checkfail,$rowcount,$editable,$output,$msg, |
my (%rulematch,%inst_results,$checkfail,$rowcount,$editable,$output,$msg, |
%alerts,%curr_rules,%got_rules); |
%alerts,%curr_rules,%got_rules); |
&call_rulecheck($username,$domain,\%alerts,\%rulematch, |
&call_rulecheck($username,$domain,\%alerts,\%rulematch, |
\%inst_results,\%curr_rules,%got_rules,'username'); |
\%inst_results,\%curr_rules,\%got_rules,'username'); |
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}) { |
Line 964 sub username_check {
|
Line 962 sub username_check {
|
'time' => $now, |
'time' => $now, |
'domain' => $domain, |
'domain' => $domain, |
'username' => $username); |
'username' => $username); |
my $authtoken = &Apache::lonnet::tmpput(\%info,$lonhost); |
my $authtoken = &Apache::lonnet::tmpput(\%info,$lonhost,'createaccount'); |
if ($authtoken !~ /^error/ && $authtoken ne 'no_such_host') { |
if ($authtoken !~ /^error/ && $authtoken ne 'no_such_host') { |
$output .= '<input type="hidden" name="authtoken" value="'.&HTML::Entities::encode($authtoken,'&<>"').'" />'; |
$output .= '<input type="hidden" name="authtoken" value="'.&HTML::Entities::encode($authtoken,'&<>"').'" />'; |
} else { |
} else { |
Line 1065 sub username_activation {
|
Line 1063 sub username_activation {
|
# Call modifyuser |
# Call modifyuser |
my (%rulematch,%inst_results,%curr_rules,%got_rules,%alerts,%info); |
my (%rulematch,%inst_results,%curr_rules,%got_rules,%alerts,%info); |
&call_rulecheck($username,$domain,\%alerts,\%rulematch, |
&call_rulecheck($username,$domain,\%alerts,\%rulematch, |
\%inst_results,\%curr_rules,%got_rules); |
\%inst_results,\%curr_rules,\%got_rules); |
my @userinfo = ('firstname','middlename','lastname','generation', |
my @userinfo = ('firstname','middlename','lastname','generation', |
'permanentemail','id'); |
'permanentemail','id'); |
my %canmodify = |
my %canmodify = |
Line 1138 sub invalid_state {
|
Line 1136 sub invalid_state {
|
my ($error,$domdesc,$contact_name,$contact_email,$msgtext) = @_; |
my ($error,$domdesc,$contact_name,$contact_email,$msgtext) = @_; |
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.'); |
$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 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 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 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) { |