version 1.40.2.1, 2010/08/16 14:39:20
|
version 1.40.2.3, 2010/12/24 20:36:11
|
Line 285 sub selfenroll_crumbs {
|
Line 285 sub selfenroll_crumbs {
|
} |
} |
my $last_crumb; |
my $last_crumb; |
if ($desc ne '') { |
if ($desc ne '') { |
$last_crumb = &mt('Self-enroll in [_1]','<span class="LC_cusr_emph">'.$desc.'</span>'); |
$last_crumb = &mt('Self-enroll in [_1]',"<span class='LC_cusr_emph'>$desc</span>"); |
} else { |
} else { |
$last_crumb = &mt('Self-enroll'); |
$last_crumb = &mt('Self-enroll'); |
} |
} |
Line 460 sub login_box {
|
Line 460 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 598 sub send_token {
|
Line 598 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 722 sub print_dataentry_form {
|
Line 722 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 963 sub username_check {
|
Line 963 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 1137 sub invalid_state {
|
Line 1137 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 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; |
|
my $href = '/adm/helpdesk'; |
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 />'; |
$href .= '?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 />'; |
} |
} |