--- loncom/interface/createaccount.pm 2010/03/22 20:11:22 1.39
+++ loncom/interface/createaccount.pm 2012/02/06 02:36:29 1.40.2.5.2.1
@@ -3,7 +3,7 @@
# institutional log-in ID (institutional authentication required - localauth
# or kerberos) or an e-mail address.
#
-# $Id: createaccount.pm,v 1.39 2010/03/22 20:11:22 droeschl Exp $
+# $Id: createaccount.pm,v 1.40.2.5.2.1 2012/02/06 02:36:29 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -39,7 +39,7 @@ use Apache::lonhtmlcommon;
use Apache::lonlocal;
use Apache::lonauth;
use Apache::resetpw;
-use Authen::Captcha;
+use Captcha::reCAPTCHA;
use DynaLoader; # for Crypt::DES version
use Crypt::DES;
use LONCAPA qw(:DEFAULT :match);
@@ -128,7 +128,8 @@ sub handler {
return OK;
} else {
$start_page =
- &Apache::loncommon::start_page($title,$js);
+ &Apache::loncommon::start_page($title,$js,
+ {'no_inline_link' => 1,});
&print_header($r,$start_page,$courseid);
$r->print($output);
&print_footer($r);
@@ -136,8 +137,8 @@ sub handler {
}
}
$start_page =
- &Apache::loncommon::start_page($title,$js);
-
+ &Apache::loncommon::start_page($title,$js,
+ {'no_inline_link' => 1,});
my %domconfig =
&Apache::lonnet::get_dom('configuration',['usercreation'],$domain);
my ($cancreate,$statustocreate) = &get_creation_controls($domain,$domconfig{'usercreation'});
@@ -145,7 +146,7 @@ sub handler {
&print_header($r,$start_page,$courseid);
my $output = '
'.&mt('Account creation unavailable').'
'.
''.
- &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).'
';
+ &mt('Creation of a new user account using an e-mail address or an institutional log-in ID as username is not permitted for [_1].',$domdesc).'
';
$r->print($output);
&print_footer($r);
return OK;
@@ -244,6 +245,15 @@ sub handler {
return OK;
}
+sub get_custom_name {
+ my ($domain) = @_;
+ if ($domain eq 'relate') {
+ return 'Learn-Physics';
+ } else {
+ return lc($domain);
+ }
+}
+
sub print_header {
my ($r,$start_page,$courseid) = @_;
$r->print($start_page);
@@ -284,7 +294,7 @@ sub selfenroll_crumbs {
}
my $last_crumb;
if ($desc ne '') {
- $last_crumb = &mt('Self-enroll in [_1]',''.$desc.'');
+ $last_crumb = &mt('Self-enroll in [_1]',"$desc");
} else {
$last_crumb = &mt('Self-enroll');
}
@@ -372,6 +382,13 @@ function validate_email() {
if (validmail(field) == false) {
alert("$lt{'email'}: "+field.value+" $lt{'notv'}.");
return false;
+ } else {
+ var emailaddr = field.value;
+ var lcemail = emailaddr.toLowerCase();
+ if (emailaddr != lcemail) {
+ field.value = lcemail;
+ alert("Learn-Physics usernames are all lower case.\\nAccordingly your username will be "+lcemail+" once activated.");
+ }
}
return true;
}
@@ -401,7 +418,7 @@ sub print_username_form {
}
if (grep(/^email$/,@{$cancreate})) {
$output .= '
'.&mt('Create account with an e-mail address as your username').'
';
- my $captchaform = &create_captcha();
+ my $captchaform = &create_recaptcha();
if ($captchaform) {
my $submit_text = &mt('Request LON-CAPA account');
my $emailform = '';
@@ -410,7 +427,7 @@ sub print_username_form {
} else {
$output .= ' ';
}
- $output .= '