'.$end_page);
+ return OK;
+ }
+ $start_page =
+ &Apache::loncommon::start_page('Create a user account in LON-CAPA','',
+ {'no_inline_link' => 1,});
+ if ($env{'form.phase'} eq 'username_activation') {
+ if ($env{'form.udom'} ne '') {
+ $domain = $env{'form.udom'};
+ }
+ }
+ my @cancreate;
my %domconfig = &Apache::lonnet::get_dom('configuration',['usercreation'],$domain);
if (ref($domconfig{'usercreation'}) eq 'HASH') {
- if (ref($domconfig{'usercreation'}{'cancreate'}) eq 'HASH') {
- if ($domconfig{'usercreation'}{'cancreate'}{'selfcreate'} ne 'none') {
- $cancreate = $domconfig{'usercreation'}{'cancreate'}{'selfcreate'};
+ if (ref($domconfig{'usercreation'}{'cancreate'}) eq 'HASH') {
+ if (ref($domconfig{'usercreation'}{'cancreate'}{'selfcreate'}) eq 'ARRAY') {
+ @cancreate = @{$domconfig{'usercreation'}{'cancreate'}{'selfcreate'}};
+ } elsif (($domconfig{'usercreation'}{'cancreate'}{'selfcreate'} ne 'none') &&
+ ($domconfig{'usercreation'}{'cancreate'}{'selfcreate'} ne '')) {
+ @cancreate = ($domconfig{'usercreation'}{'cancreate'}{'selfcreate'});
}
}
}
- $r->print(&Apache::lonhtmlcommon::breadcrumbs('Create account'));
- if (!$cancreate) {
- $output = &mt('Creation of a new user account using an e-mail address as username or a loginID from your institution is not permitted in the domain: [_1] ([_2])',$domain,$domdesc);
- } elsif ($token) {
- $output = &process_mailtoken($r,$token,$contact_name,$contact_email,$domain,
- $domdesc,$lonhost,$include);
- } elsif ($env{'form.create_with_email'}) {
+
+ if (@cancreate == 0) {
+ &print_header($r,$start_page);
+ 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).'
';
+ $r->print($output);
+ $r->print(&Apache::loncommon::end_page());
+ return OK;
+ }
+
+ my $courseid;
+ if (defined($env{'form.courseid'})) {
+ $courseid = &validate_course($env{'form.courseid'});
+ }
+
+ if ($sso_username ne '') {
+ &print_header($r,$start_page);
+ my ($output,$msg);
+ if (grep(/^sso$/,@cancreate)) {
+ $msg = '
'.&mt('Account creation').'
'.
+ &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.").'
';
+ ($output, my $checkfail) = &username_check($sso_username,$domain,
+ $domdesc,$courseid,
+ $lonhost,$contact_email);
+ if ($checkfail) {
+ $msg .= '
'.&mt('Account creation unavailable');'
';
+ if ($checkfail eq 'username') {
+ $msg .= ''.
+ &mt('A LON-CAPA account may not be created with the username you use.').'';
+ } elsif ($checkfail eq 'authtoken') {
+ $msg .= ''.&mt('Error creating token.').'';
+ }
+ $msg .= '
'.
+ &mt('Please contact the [_1] ([_2]) for assistance.',$contact_name,$contact_email);
+ } else {
+ $msg .= &mt('To create one, use the table below to provide information about yourself (if appropriate), then click the "Create LON-CAPA account" button.');
+ }
+ } else {
+ $msg .= '
'.&mt('Account creation unavailable').'
'.
+ ''.&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.").'
'.&mt('Please contact the [_1] ([_2]) for assistance.',$contact_name,$contact_email);
+ }
+ $r->print($msg.' '.$output);
+ $r->print(&Apache::loncommon::end_page());
+ return OK;
+ }
+
+ my ($output,$nostart,$noend);
+ my $token = $env{'form.token'};
+ if ($token) {
+ ($output,$nostart,$noend) =
+ &process_mailtoken($r,$token,$contact_name,$contact_email,$domain,
+ $domdesc,$lonhost,$include,$start_page);
+ if ($nostart) {
+ if ($noend) {
+ return OK;
+ } else {
+ $r->print($output);
+ $r->print(&Apache::loncommon::end_page());
+ return OK;
+ }
+ } else {
+ &print_header($r,$start_page);
+ $r->print($output);
+ $r->print(&Apache::loncommon::end_page());
+ return OK;
+ }
+ }
+
+ if ($env{'form.phase'} eq 'username_activation') {
+ (my $result,$output,$nostart) =
+ &username_activation($r,$env{'form.uname'},$domain,$domdesc,
+ $lonhost,$courseid);
+ if ($result eq 'ok') {
+ if ($nostart) {
+ return OK;
+ }
+ }
+ &print_header($r,$start_page);
+ $r->print($output);
+ $r->print(&Apache::loncommon::end_page());
+ return OK;
+ }
+
+ &print_header($r,$start_page);
+ if ($env{'form.create_with_email'}) {
$output = &process_email_request($env{'form.useremail'},$domain,$domdesc,
- $contact_name,$contact_email,$cancreate,
- $lonhost,$domconfig{'usercreation'});
+ $contact_name,$contact_email,\@cancreate,
+ $lonhost,$domconfig{'usercreation'},
+ $courseid);
} elsif ($env{'form.phase'} eq 'username_validation') {
$output = &username_validation($env{'form.uname'},$domain,$domdesc,
- $contact_name,$contact_email);
- } elsif ($env{'form.phase'} eq 'username_activation') {
- (my $result,$output) = &username_activation($env{'form.uname'},
- $domain,$domdesc);
- } else {
+ $contact_name,$contact_email,$courseid,
+ $lonhost);
+ } elsif (!$token) {
my $now=time;
- if ($cancreate eq 'any' || $cancreate eq 'login') {
+ if (grep(/^login$/,@cancreate)) {
my $jsh=Apache::File->new($include."/londes.js");
$r->print(<$jsh>);
$r->print(&javascript_setforms($now));
}
- $output = &print_username_form($domain,$domdesc,$cancreate,$now,$lonhost);
+ if (grep(/^email$/,@cancreate)) {
+ $r->print(&javascript_validmail());
+ }
+ $output = &print_username_form($domain,$domdesc,\@cancreate,$now,$lonhost,
+ $courseid);
}
$r->print($output);
$r->print(&Apache::loncommon::end_page());
return OK;
}
+sub print_header {
+ my ($r,$start_page) = @_;
+ $r->print($start_page);
+ &Apache::lonhtmlcommon::clear_breadcrumbs();
+ &Apache::lonhtmlcommon::add_breadcrumb
+ ({href=>"/adm/createuser",
+ text=>"New username"});
+ $r->print(&Apache::lonhtmlcommon::breadcrumbs('Create account'));
+ return;
+}
+
+sub validate_course {
+ my ($courseid) = @_;
+ my ($cdom,$cnum) = ($courseid =~ /^($match_domain)_($match_courseid)$/);
+ if (($cdom ne '') && ($cnum ne '')) {
+ if (&Apache::lonnet::is_course($cdom,$cnum)) {
+ return ($courseid);
+ }
+ }
+ return;
+}
+
sub javascript_setforms {
my ($now) = @_;
my $js = < 'The e-mail address you entered',
+ notv => 'is not a valid e-mail address',
+ );
+ my $output = "\n".''."\n";
+ return $output;
+}
+
sub print_username_form {
- my ($domain,$domdesc,$cancreate,$now,$lonhost) = @_;
+ my ($domain,$domdesc,$cancreate,$now,$lonhost,$courseid) = @_;
my %lt = &Apache::lonlocal::texthash(
unam => 'username',
udom => 'domain',
uemail => 'Email address in LON-CAPA',
proc => 'Proceed');
my $output;
- if ($cancreate eq 'any' || $cancreate eq 'login') {
- my %domdefaults = &Apache::lonnet::get_domain_defaults($domain);
- if ((($domdefaults{'auth_def'} =~/^krb/) && ($domdefaults{'auth_arg_def'} ne '')) || ($domdefaults{'auth_def'} eq 'localauth')) {
- $output = '
'.&mt('Create account with a username provided by your institution').'
';
- $output .= &mt('If you already have a Log-in ID at your institution, you may be able to use it[_1] for LON-CAPA.',' ').' '.&mt('Type in your Log-in ID and password to find out.').'
';
- my ($lkey,$ukey) = &Apache::lonpreferences::des_keys();
- my ($lextkey,$uextkey) = &getkeys($lkey,$ukey);
- my $logtoken=Apache::lonnet::reply('tmpput:'.$ukey.$lkey.'&createaccount',
- $lonhost);
- $output .= &serverform($logtoken,$lonhost);
- my $unameform = '';
- my $upassform = '';
- my $submit_text = &mt('Create LON-CAPA account');
- $output .= ''."\n".
- &Apache::lonhtmlcommon::start_pick_box()."\n".
- &Apache::lonhtmlcommon::row_title(&mt('Log-in ID'),
+ if (ref($cancreate) eq 'ARRAY') {
+ if (grep(/^login$/,@{$cancreate})) {
+ my %domdefaults = &Apache::lonnet::get_domain_defaults($domain);
+ if ((($domdefaults{'auth_def'} =~/^krb/) && ($domdefaults{'auth_arg_def'} ne '')) || ($domdefaults{'auth_def'} eq 'localauth')) {
+ $output = '
'.&mt('Create account with a username provided by this institution').'
';
+ $output .= &mt('If you already have a log-in ID at this institution,[_1] you may be able to use it for LON-CAPA.',' ').'
'.&mt('Type in your log-in ID and password to find out.').'
';
+ my ($lkey,$ukey) = &Apache::lonpreferences::des_keys();
+ my ($lextkey,$uextkey) = &getkeys($lkey,$ukey);
+ my $logtoken=Apache::lonnet::reply('tmpput:'.$ukey.$lkey.'&createaccount',
+ $lonhost);
+ $output .= &serverform($logtoken,$lonhost,undef,$courseid);
+ my $unameform = '';
+ my $upassform = '';
+ my $submit_text = &mt('Create LON-CAPA account');
+ $output .= '
'.&mt('Create account with an e-mail address as your username').'
';
- if ($cancreate eq 'any') {
- $output .= &mt('Provide your e-mail address to request a LON-CAPA account if you do not have [_1] a log-in ID at your institution.',' ').'
'.&mt('Create account with an e-mail address as your username').'
';
+ if (grep(/^login$/,@{$cancreate})) {
+ $output .= &mt('Provide your e-mail address to request a LON-CAPA account,[_1] if you do not have a log-in ID at your institution.',' ').'
';
+ }
}
if ($output eq '') {
- $output = &mt('Creation of a new user account using either an e-mail address or 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 {
$output .= '';
}
@@ -234,126 +395,137 @@ sub print_username_form {
sub process_email_request {
my ($useremail,$domain,$domdesc,$contact_name,$contact_email,$cancreate,
- $server,$settings) = @_;
+ $server,$settings,$courseid) = @_;
my $useremail = $env{'form.useremail'};
my $output;
- if ($cancreate ne 'any' && $cancreate ne 'email') {
- $output = &invalid_state('noemails',$domdesc,
- $contact_name,$contact_email);
- return $output;
- } elsif ($useremail !~ /^[^\@]+\@[^\@]+\.[^\@\.]+$/) {
- $output = &invalid_state('baduseremail',$domdesc,
- $contact_name,$contact_email);
- return $output;
- } else {
- my $uhome = &Apache::lonnet::homeserver($useremail,$domain);
- if ($uhome ne 'no_host') {
- $output = &invalid_state('existinguser',$domdesc,
+ if (ref($cancreate) eq 'ARRAY') {
+ if (!grep(/^email$/,@{$cancreate})) {
+ $output = &invalid_state('noemails',$domdesc,
+ $contact_name,$contact_email);
+ return $output;
+ } elsif ($useremail !~ /^[^\@]+\@[^\@]+\.[^\@\.]+$/) {
+ $output = &invalid_state('baduseremail',$domdesc,
$contact_name,$contact_email);
return $output;
} else {
- my $code = $env{'form.code'};
- my $md5sum = $env{'form.crypt'};
- my %captcha_params = &captcha_settings();
- my $captcha = Authen::Captcha->new(
- output_folder => $captcha_params{'output_dir'},
- data_folder => $captcha_params{'db_dir'},
- );
- my $captcha_chk = $captcha->check_code($code,$md5sum);
- my %captcha_hash = (
- 0 => 'Code not checked (file error)',
- -1 => 'Failed: code expired',
- -2 => 'Failed: invalid code (not in database)',
- -3 => 'Failed: invalid code (code does not match crypt)',
- );
- if ($captcha_chk != 1) {
- $output = &invalid_state('captcha',$domdesc,$contact_name,
- $contact_email,$captcha_hash{$captcha_chk});
+ my $uhome = &Apache::lonnet::homeserver($useremail,$domain);
+ if ($uhome ne 'no_host') {
+ $output = &invalid_state('existinguser',$domdesc,
+ $contact_name,$contact_email);
return $output;
- }
- my (%rulematch,%inst_results,%curr_rules,%got_rules,%alerts);
- my $uhome=&Apache::lonnet::homeserver($useremail,$domain);
- if ($uhome eq 'no_host') {
- my $checkhash;
- my $checks = { 'username' => 1 };
- $checkhash->{$useremail.':'.$domain} = { 'newuser' => 1, };
- &Apache::loncommon::user_rule_check($checkhash,$checks,
- \%alerts,\%rulematch,\%inst_results,\%curr_rules,
- \%got_rules);
- if (ref($alerts{'useremail'}) eq 'HASH') {
- if (ref($alerts{'useremail'}{$domain}) eq 'HASH') {
- if ($alerts{'username'}{$domain}{$useremail}) {
- $output = &invalid_state('userrules',$domdesc,
- $contact_name,$contact_email);
- return $output;
+ } else {
+ my $code = $env{'form.code'};
+ my $md5sum = $env{'form.crypt'};
+ my %captcha_params = &captcha_settings();
+ my $captcha = Authen::Captcha->new(
+ output_folder => $captcha_params{'output_dir'},
+ data_folder => $captcha_params{'db_dir'},
+ );
+ my $captcha_chk = $captcha->check_code($code,$md5sum);
+ my %captcha_hash = (
+ 0 => 'Code not checked (file error)',
+ -1 => 'Failed: code expired',
+ -2 => 'Failed: invalid code (not in database)',
+ -3 => 'Failed: invalid code (code does not match crypt)',
+ );
+ if ($captcha_chk != 1) {
+ $output = &invalid_state('captcha',$domdesc,$contact_name,
+ $contact_email,$captcha_hash{$captcha_chk});
+ return $output;
+ }
+ my (%rulematch,%inst_results,%curr_rules,%got_rules,%alerts);
+ my $uhome=&Apache::lonnet::homeserver($useremail,$domain);
+ if ($uhome eq 'no_host') {
+ my $checkhash;
+ my $checks = { 'username' => 1 };
+ $checkhash->{$useremail.':'.$domain} = { 'newuser' => 1, };
+ &Apache::loncommon::user_rule_check($checkhash,$checks,
+ \%alerts,\%rulematch,\%inst_results,\%curr_rules,
+ \%got_rules);
+ if (ref($alerts{'useremail'}) eq 'HASH') {
+ if (ref($alerts{'useremail'}{$domain}) eq 'HASH') {
+ if ($alerts{'username'}{$domain}{$useremail}) {
+ $output = &invalid_state('userrules',$domdesc,
+ $contact_name,$contact_email);
+ return $output;
+ }
}
}
- }
- my $format_msg =
- &guest_format_check($useremail,$domain,$cancreate,
- $settings);
- if ($format_msg) {
- $output = &invalid_state('userformat',$domdesc,$contact_name,
- $contact_email,$format_msg);
- return $output;
+ my $format_msg =
+ &guest_format_check($useremail,$domain,$cancreate,
+ $settings);
+ if ($format_msg) {
+ $output = &invalid_state('userformat',$domdesc,$contact_name,
+ $contact_email,$format_msg);
+ return $output;
+ }
}
}
}
+ $output = &send_token($domain,$useremail,$server,$domdesc,$contact_name,
+ $contact_email,$courseid);
}
- $output = &send_token($domain,$useremail,$server,$domdesc,$contact_name,
- $contact_email);
return $output;
}
sub send_token {
- my ($domain,$email,$server,$domdesc,$contact_name,$contact_email) = @_;
- my $msg = &mt('Thank you for your request to create a new LON-CAPA account.').'
';
+ my ($domain,$email,$server,$domdesc,$contact_name,$contact_email,$courseid) = @_;
+ my $msg = '
'.&mt('Account creation status').'
'.
+ &mt('Thank you for your request to create a new LON-CAPA account.').
+ '
';
my $now = time;
my %info = ('ip' => $ENV{'REMOTE_ADDR'},
'time' => $now,
'domain' => $domain,
- 'username' => $email);
+ 'username' => $email,
+ 'courseid' => $courseid);
my $token = &Apache::lonnet::tmpput(\%info,$server);
if ($token !~ /^error/ && $token ne 'no_such_host') {
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).' '.
- &mt('To complete this process please open a web browser and enter the following ".
- "URL in the address/location box: ').&Apache::lonnet::absolute_url()."/adm/createaccount?token=$esc_token";
+ 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'
+ .' URL in the address/location box: [_1]'
+ ,&Apache::lonnet::absolute_url().'/adm/createaccount?token='.$esc_token);
my $result = &Apache::resetpw::send_mail($domdesc,$email,$mailmsg,$contact_name,
$contact_email);
if ($result eq 'ok') {
$msg .= &mt('A message has been sent to the e-mail address you provided.').' '.&mt('The message includes the web address for the link you will use to complete the account creation process.').' '.&mt("The link included in the message will be valid for the next [_1]two[_2] hours.",'','');
} else {
- $msg .= &mt('An error occurred when sending a message to the e-mail address you provided. Please contact the [_1] ([_2]) for assistance.',$contact_name,$contact_email);
+ $msg .= ''.
+ &mt('An error occurred when sending a message to the e-mail address you provided.').' '.
+ ' '.&mt('Please contact the [_1] ([_2]) for assistance.',$contact_name,$contact_email);
}
} else {
- $msg .= &mt('An error occurred creating a token required for the account creation process. Please contact the [_1] ([_2]) for assistance.',$contact_name,$contact_email);
+ $msg .= ''.
+ &mt('An error occurred creating a token required for the account creation process.').' '.
+ ' '.&mt('Please contact the [_1] ([_2]) for assistance.',$contact_name,$contact_email);
}
return $msg;
}
sub process_mailtoken {
- my ($r,$token,$contact_name,$contact_email,$domain,$domdesc,$lonhost,$include) = @_;
- my $msg;
+ my ($r,$token,$contact_name,$contact_email,$domain,$domdesc,$lonhost,
+ $include,$start_page) = @_;
+ my ($msg,$nostart,$noend);
my %data = &Apache::lonnet::tmpget($token);
my $now = time;
if (keys(%data) == 0) {
- $msg = &mt('Sorry, the URL you provided to complete creation of a new LON-CAPA account was invalid. Either the token included in the URL has been deleted or the URL you provided was invalid. Please submit a new request for account creation and follow the link to the new URL included in the e-mail that will be sent to you.');
+ $msg = &mt('Sorry, the URL you provided to complete creation of a new LON-CAPA account was invalid.')
+ .' '.&mt('Either the token included in the URL has been deleted or the URL you provided was invalid.')
+ .' '.&mt('Please submit a [_1]new request[_2] for account creation and follow the new link page included in the e-mail that will be sent to you.','','');
return $msg;
}
if (($data{'time'} =~ /^\d+$/) &&
($data{'domain'} ne '') &&
($data{'username'} =~ /^[^\@]+\@[^\@]+\.[^\@\.]+$/)) {
- my $reqtime = localtime($data{'time'});
if ($now - $data{'time'} < 7200) {
if ($env{'form.phase'} eq 'createaccount') {
- my ($result,$output) = &create_account($r,$domain,$lonhost,$token,
+ my ($result,$output) = &create_account($r,$domain,$lonhost,
$data{'username'},$domdesc);
if ($result eq 'ok') {
$msg = $output;
- my $delete = &Apache::lonnet::tmpdel($token);
- my $now = localtime(time);
- 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,$now,$ENV{'REMOTE_ADDR'},$contact_name,$contact_email)."\n";
+ my $shownow = localtime($now);
+ 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'},
$mailmsg,$contact_name,
$contact_email);
@@ -362,33 +534,71 @@ sub process_mailtoken {
} else {
$msg .= &mt('An error occurred when sending e-mail to [_1] confirming creation of your LON-CAPA account.',$data{'username'});
}
- $msg .= '
'.&mt('Go to the login page.');
+ my %form = &start_session($r,$data{'username'},$domain,
+ $lonhost,$data{'courseid'},
+ $token);
+ $nostart = 1;
+ $noend = 1;
} else {
- $msg .= &mt('A problem occurred when attempting to create your new LON-CAPA account').' '.$output.&mt('Please contact the [_1] - ([_2]) for assistance.',$contact_name,$contact_email);
+ $msg .= &mt('A problem occurred when attempting to create your new LON-CAPA account.')
+ .' '.$output
+# .&mt('Please contact the [_1] ([_2]) for assistance.',$contact_name,''.$contact_email.'');
+ .&mt('Please contact the [_1] ([_2]) for assistance.',$contact_name,$contact_email);
}
+ my $delete = &Apache::lonnet::tmpdel($token);
} else {
- $r->print(&mt('Please provide user information and a password for your new account.').' '.&mt('Your password, which must contain at least seven characters, will be sent to the LON-CAPA server in an encrypted form.').' ');
- &print_dataentry_form($r,$domain,$lonhost,$include,$token,$now,$data{'username'});
-
+ $msg .= &mt('Please provide user information and a password for your new account.').' '.&mt('Your password, which must contain at least seven characters, will be sent to the LON-CAPA server in an encrypted form.').' ';
+ $msg .= &print_dataentry_form($r,$domain,$lonhost,$include,$token,$now,$data{'username'},$start_page);
+ $nostart = 1;
}
} else {
- $msg = &mt('Sorry, the token generated when you requested creation of an account has expired. Please submit a new request, and follow the link to the web page included in the new e-mail that will be sent to you, to allow you to create the account.');
+ $msg = &mt('Sorry, the token generated when you requested creation of an account has expired.')
+ .' '.&mt('Please submit a [_1]new request[_2] for account creation and follow the new link included in the e-mail that will be sent to you.','','');
+ }
+ } else {
+ $msg .= &mt('Sorry, the URL generated when you requested creation of an account contained incomplete information.')
+ .' '.&mt('Please submit a [_1]new request[_2] for account creation and follow the new link included in the e-mail that will be sent to you.','','');
+ }
+ return ($msg,$nostart,$noend);
+}
+
+sub start_session {
+ my ($r,$username,$domain,$lonhost,$courseid,$token) = @_;
+ my %form = (
+ uname => $username,
+ udom => $domain,
+ );
+ my $firsturl = '/adm/roles';
+ if (defined($courseid)) {
+ $courseid = &validate_course($courseid);
+ if ($courseid ne '') {
+ $form{'courseid'} = $courseid;
+ $firsturl = '/adm/selfenroll?cid='.$courseid;
}
+ }
+ if ($r->dir_config('lonBalancer') eq 'yes') {
+ &Apache::lonauth::success($r,$form{'uname'},$form{'udom'},
+ $lonhost,'noredirect',undef,\%form);
+ my $delete = &Apache::lonnet::tmpdel($token);
+ $r->internal_redirect('/adm/switchserver');
} else {
- $msg .= &mt('Sorry, the URL generated when you requested creation of an accountcontained incomplete information. Please submit a new request for creation of an account, and use the new URL that will be sent to your e-mail address to complete the process.');
+ &Apache::lonauth::success($r,$form{'uname'},$form{'udom'},
+ $lonhost,$firsturl,undef,\%form);
}
- return $msg;
+ return %form;
}
+
sub print_dataentry_form {
- my ($r,$domain,$lonhost,$include,$mailtoken,$now,$username) = @_;
+ my ($r,$domain,$lonhost,$include,$mailtoken,$now,$username,$start_page) = @_;
my ($error,$output);
+ &print_header($r,$start_page);
if (open(my $jsh,"<$include/londes.js")) {
while(my $line = <$jsh>) {
$r->print($line);
}
close($jsh);
- $r->print(&javascript_setforms($now)."\n".&javascript_checkpass($now));
+ $output .= &javascript_setforms($now)."\n".&javascript_checkpass($now);
my ($lkey,$ukey) = &Apache::lonpreferences::des_keys();
my ($lextkey,$uextkey) = &getkeys($lkey,$ukey);
my $logtoken=Apache::lonnet::reply('tmpput:'.$ukey.$lkey.'&createaccount',
@@ -413,8 +623,8 @@ sub print_dataentry_form {
id => '15',
);
my $genhelp=&Apache::loncommon::help_open_topic('Generation');
- $output = '
'.$lt{'pd'}.'
'.
- '
ENDSERVERFORM
return $output;
@@ -724,7 +997,8 @@ sub process_credentials {
my $tmpinfo=Apache::lonnet::reply('tmpget:'.$logtoken,$lonhost);
my ($retrieved,$output,$upass);
if (($tmpinfo=~/^error/) || ($tmpinfo eq 'con_lost')) {
- $output = &mt('Information needed to retrieve your log-in information is missing, inaccessible or expired.').' '.&mt('You may need to reload the previous page to obtain a new token.');
+ $output = &mt('Information needed to verify your login information is missing, inaccessible or expired.')
+ .' '.&mt('You may need to reload the previous page to obtain a new token.');
return ($retrieved,$output,$upass);
} else {
my $reply = &Apache::lonnet::reply('tmpdel:'.$logtoken,$lonhost);
@@ -767,8 +1041,10 @@ sub guest_format_check {
if ($format_match) {
($login) = ($useremail =~ /^([^\@]+)\@/);
$format_msg = ' '.&mt("Your e-mail address uses the same internet domain as your institution's LON-CAPA service.").' '.&mt('Creation of a LON-CAPA account with this type of e-mail address as username is not permitted.').' ';
- if ($cancreate eq 'any' || $cancreate eq 'login') {
- $format_msg .= &mt('You should request creation of a LON-CAPA account for a Log-in ID of "[_1]" at your institution instead.',$login).' ';
+ if (ref($cancreate) eq 'ARRAY') {
+ if (grep(/^login$/,@{$cancreate})) {
+ $format_msg .= &mt('You should request creation of a LON-CAPA account for a log-in ID of "[_1]" at your institution instead.',$login).' ';
+ }
}
}
return $format_msg;