version 1.73, 2017/07/26 19:45:45
|
version 1.74, 2017/08/03 16:22:08
|
Line 150 sub handler {
|
Line 150 sub handler {
|
my %domconfig = |
my %domconfig = |
&Apache::lonnet::get_dom('configuration',['usercreation'],$domain); |
&Apache::lonnet::get_dom('configuration',['usercreation'],$domain); |
my ($cancreate,$statustocreate,$statusforemail,$emailusername, |
my ($cancreate,$statustocreate,$statusforemail,$emailusername, |
$verification,$emaildomain,$types,$usertypes,$othertitle) = |
$emailoptions,$verification,$emaildomain,$types,$usertypes,$othertitle) = |
&get_creation_controls($domain,$domconfig{'usercreation'}); |
&get_creation_controls($domain,$domconfig{'usercreation'}); |
my ($additems,$pagetitle); |
my ($additems,$pagetitle); |
if (ref($cancreate) eq 'ARRAY') { |
if (ref($cancreate) eq 'ARRAY') { |
Line 158 sub handler {
|
Line 158 sub handler {
|
($env{'form.create_with_email'})) { |
($env{'form.create_with_email'})) { |
if ((grep(/^email$/,@{$cancreate})) && (ref($statusforemail) eq 'ARRAY')) { |
if ((grep(/^email$/,@{$cancreate})) && (ref($statusforemail) eq 'ARRAY')) { |
my $usertype = &get_usertype($domain); |
my $usertype = &get_usertype($domain); |
if (($usertype ne '') && (grep(/^\Q$usertype\E$/,@{$statusforemail}))) { |
if ((($usertype eq '') || (!grep(/^\Q$usertype\E$/,@{$statusforemail}))) && |
$js .= &username_js(); |
(@{$statusforemail} > 0)) { |
} elsif (($usertype eq '') || (!grep(/^\Q$usertype\E$/,@{$statusforemail}))) { |
|
$js .= &setelements_js($statusforemail,$types,$usertypes,$othertitle); |
$js .= &setelements_js($statusforemail,$types,$usertypes,$othertitle); |
$additems = {'add_entries' => { 'onload' => "setElements();"} }; |
$additems = {'add_entries' => { 'onload' => "setElements();"} }; |
if (@{$cancreate} == 1) { |
if ((@{$cancreate} == 1) && (@{$statusforemail} > 0)) { |
$pagetitle = 'Select affiliation'; |
$pagetitle = 'Select affiliation'; |
} |
} |
|
} else { |
|
$js .= &username_js(); |
} |
} |
} |
} |
} |
} |
Line 255 sub handler {
|
Line 256 sub handler {
|
return OK; |
return OK; |
} |
} |
} |
} |
my ($usernameset,$condition); |
my ($usernameset,$condition,$excluded,$hascustom); |
if ((grep(/^email$/,@{$cancreate})) && (($env{'form.create_with_email'}) || |
if ((grep(/^email$/,@{$cancreate})) && (($env{'form.create_with_email'}) || |
((!$token) && ($env{'form.phase'} eq '')))) { |
((!$token) && ($env{'form.phase'} eq '')))) { |
my $usertype = &get_usertype($domain); |
my $usertype = &get_usertype($domain); |
|
if ($usertype eq '') { |
|
$usertype = 'default'; |
|
} |
if (ref($verification) eq 'HASH') { |
if (ref($verification) eq 'HASH') { |
if ($verification->{$usertype} eq 'other') { |
if ($verification->{$usertype} =~ /^(free|first)$/) { |
$usernameset = 1; |
$usernameset = $verification->{$usertype}; |
|
} |
|
} |
|
if (ref($emailoptions) eq 'HASH') { |
|
if ($emailoptions->{$usertype} =~ /^(inst|noninst)$/) { |
|
my $chosen = $1; |
if (ref($emaildomain) eq 'HASH') { |
if (ref($emaildomain) eq 'HASH') { |
if ($emaildomain->{$usertype} ne '') { |
if (ref($emaildomain->{$usertype}) eq 'HASH') { |
$condition = $emaildomain->{$usertype}; |
if ($chosen eq 'inst') { |
|
$condition = $emaildomain->{$usertype}->{$chosen}; |
|
} else { |
|
$excluded = $emaildomain->{$usertype}->{$chosen}; |
|
} |
} |
} |
} |
} |
|
} elsif ($emailoptions->{$usertype} eq 'custom') { |
|
$hascustom = 1; |
} |
} |
} |
} |
} |
} |
Line 301 sub handler {
|
Line 316 sub handler {
|
} elsif ($env{'form.create_with_email'}) { |
} elsif ($env{'form.create_with_email'}) { |
&print_header($r,$start_page,$courseid); |
&print_header($r,$start_page,$courseid); |
my $usertype = &get_usertype($domain); |
my $usertype = &get_usertype($domain); |
|
if ($usertype eq '') { |
|
$usertype = 'default'; |
|
} |
$output = &process_email_request($env{'form.uname'},$domain,$domdesc, |
$output = &process_email_request($env{'form.uname'},$domain,$domdesc, |
$contact_name,$contact_email,$cancreate, |
$contact_name,$contact_email,$cancreate, |
$lonhost,$domconfig{'usercreation'}, |
$lonhost,$domconfig{'usercreation'}, |
$emailusername,$courseid,$usertype, |
$emailusername,$courseid,$usertype, |
$usernameset,$condition); |
$usernameset,$condition,$excluded,$hascustom); |
} elsif (!$token) { |
} elsif (!$token) { |
&print_header($r,$start_page,$courseid,$pagetitle); |
&print_header($r,$start_page,$courseid,$pagetitle); |
my $now=time; |
my $now=time; |
Line 319 sub handler {
|
Line 337 sub handler {
|
} |
} |
} |
} |
if (grep(/^email$/,@{$cancreate})) { |
if (grep(/^email$/,@{$cancreate})) { |
$r->print(&javascript_validmail()); |
$r->print(&javascript_validmail($condition)); |
} |
} |
my $usertype = &get_usertype($domain); |
my $usertype = &get_usertype($domain); |
$output = &print_username_form($r,$domain,$domdesc,$cancreate,$now,$lonhost, |
$output = &print_username_form($r,$domain,$domdesc,$cancreate,$now,$lonhost, |
$include,$courseid,$emailusername, |
$include,$courseid,$emailusername, |
$statusforemail,$usernameset,$condition, |
$statusforemail,$usernameset,$condition, |
$usertype,$types,$usertypes,$othertitle); |
$excluded,$usertype,$types,$usertypes,$othertitle); |
} |
} |
$r->print($output); |
$r->print($output); |
&print_footer($r); |
&print_footer($r); |
Line 409 sub selfenroll_crumbs {
|
Line 427 sub selfenroll_crumbs {
|
} |
} |
|
|
sub javascript_setforms { |
sub javascript_setforms { |
my ($now,$emailusername,$captcha,$usertype,$recaptchaversion,$usernameset,$condition) = @_; |
my ($now,$emailusername,$captcha,$usertype,$recaptchaversion,$usernameset,$condition,$excluded) = @_; |
my ($setuserinfo,@required,$requiredchk); |
my ($setuserinfo,@required,$requiredchk); |
if (ref($emailusername) eq 'HASH') { |
if (ref($emailusername) eq 'HASH') { |
if (ref($emailusername->{$usertype}) eq 'HASH') { |
if (ref($emailusername->{$usertype}) eq 'HASH') { |
Line 431 sub javascript_setforms {
|
Line 449 sub javascript_setforms {
|
' server.elements.recaptcha_response_field.value=client.elements.recaptcha_response_field.value;'."\n"; |
' server.elements.recaptcha_response_field.value=client.elements.recaptcha_response_field.value;'."\n"; |
} |
} |
} |
} |
if ($usernameset) { |
if ($usernameset eq 'free') { |
$setuserinfo .= |
$setuserinfo .= |
' server.elements.username.value=client.elements.username.value;'."\n"; |
' server.elements.username.value=client.elements.username.value;'."\n"; |
} |
} |
Line 478 $requiredchk
|
Line 496 $requiredchk
|
uextkey=client.elements.uextkey.value; |
uextkey=client.elements.uextkey.value; |
lextkey=client.elements.lextkey.value; |
lextkey=client.elements.lextkey.value; |
initkeys(); |
initkeys(); |
|
|
server.elements.upass.value |
server.elements.upass.value |
= getCrypted(client.elements.upass$now.value); |
= getCrypted(client.elements.upass$now.value); |
|
|
client.elements.uname.value=''; |
client.elements.uname.value=''; |
client.elements.upass$now.value=''; |
client.elements.upass$now.value=''; |
if (context == 'email') { |
if (context == 'email') { |
Line 543 ENDSCRIPT
|
Line 559 ENDSCRIPT
|
} |
} |
|
|
sub javascript_validmail { |
sub javascript_validmail { |
|
my ($condition) = @_; |
my %js_lt = &Apache::lonlocal::texthash ( |
my %js_lt = &Apache::lonlocal::texthash ( |
email => 'The e-mail address you entered', |
email => 'The e-mail address you entered', |
notv => 'is not a valid e-mail address', |
notv => 'is not a valid e-mail address', |
|
avae => 'A valid e-mail address is not formed when the value you entered', |
|
isco => 'is combined with the required domain', |
); |
); |
my $output = "\n".'<script type="text/javascript">'."\n". |
my $output = "\n".'<script type="text/javascript">'."\n". |
'// <![CDATA['."\n". |
'// <![CDATA['."\n". |
Line 554 sub javascript_validmail {
|
Line 573 sub javascript_validmail {
|
$output .= <<"ENDSCRIPT"; |
$output .= <<"ENDSCRIPT"; |
function validate_email(client) { |
function validate_email(client) { |
field = client.uname; |
field = client.uname; |
if (validmail(field) == false) { |
var condition = '$condition'; |
alert("$js_lt{'email'}: "+field.value+" $js_lt{'notv'}."); |
if (validmail(field,condition) == false) { |
|
if ((condition != undefined) && (condition != '')) { |
|
alert("$js_lt{'avae'}: "+field.value+" $js_lt{'isco'}: "+condition); |
|
} else { |
|
alert("$js_lt{'email'}: "+field.value+" $js_lt{'notv'}."); |
|
} |
return false; |
return false; |
} |
} |
return true; |
return true; |
Line 567 ENDSCRIPT
|
Line 591 ENDSCRIPT
|
|
|
sub print_username_form { |
sub print_username_form { |
my ($r,$domain,$domdesc,$cancreate,$now,$lonhost,$include,$courseid,$emailusername, |
my ($r,$domain,$domdesc,$cancreate,$now,$lonhost,$include,$courseid,$emailusername, |
$statusforemail,$usernameset,$condition,$usertype,$types,$usertypes, |
$statusforemail,$usernameset,$condition,$excluded,$usertype,$types,$usertypes, |
$othertitle) = @_; |
$othertitle) = @_; |
my %lt = &Apache::lonlocal::texthash ( |
my %lt = &Apache::lonlocal::texthash ( |
crac => 'Create account with a username provided by this institution', |
crac => 'Create account with a username provided by this institution', |
Line 595 sub print_username_form {
|
Line 619 sub print_username_form {
|
if (grep(/^email$/,@{$cancreate})) { |
if (grep(/^email$/,@{$cancreate})) { |
$output .= '<div class="LC_left_float"><h3>'.$lt{'crae'}.'</h3>'; |
$output .= '<div class="LC_left_float"><h3>'.$lt{'crae'}.'</h3>'; |
if ($usertype ne '') { |
if ($usertype ne '') { |
if (ref($statusforemail) eq 'ARRAY') { |
if ((ref($statusforemail) eq 'ARRAY') && (@{$statusforemail} > 0)) { |
unless (grep(/^\Q$usertype\E$/,@{$statusforemail})) { |
unless (grep(/^\Q$usertype\E$/,@{$statusforemail})) { |
undef($usertype); |
undef($usertype); |
} |
} |
|
} elsif ($usertype ne 'default') { |
|
undef($usertype); |
} |
} |
} |
} |
if (($usertype eq '') && (ref($statusforemail) eq 'ARRAY') && |
if (($usertype eq '') && (ref($statusforemail) eq 'ARRAY') && |
(@{$statusforemail}) && (ref($types) eq 'ARRAY')) { |
(@{$statusforemail} > 0) && (ref($types) eq 'ARRAY') && (@{$types} > 0)) { |
my @posstypes = @{$types}; |
my @posstypes = @{$types}; |
unless (grep(/^default$/,@posstypes)) { |
unless (grep(/^default$/,@posstypes)) { |
push(@posstypes,'default'); |
push(@posstypes,'default'); |
Line 659 sub print_username_form {
|
Line 685 sub print_username_form {
|
$output .= $prompt.'<br />'. |
$output .= $prompt.'<br />'. |
$lt{'yopw'}.'<br />'; |
$lt{'yopw'}.'<br />'; |
} |
} |
|
if ($usertype eq '') { |
|
$usertype = 'default'; |
|
} |
$output .= &print_dataentry_form($r,$domain,$lonhost,$include,$now,$captchaform, |
$output .= &print_dataentry_form($r,$domain,$lonhost,$include,$now,$captchaform, |
$courseid,$emailusername,$captcha,$usertype, |
$courseid,$emailusername,$captcha,$usertype, |
$recaptchaversion,$usernameset,$condition); |
$recaptchaversion,$usernameset,$condition,$excluded); |
} |
} |
} |
} |
$output .= '</div>'; |
$output .= '</div>'; |
Line 729 sub login_box {
|
Line 758 sub login_box {
|
sub process_email_request { |
sub process_email_request { |
my ($useremail,$domain,$domdesc,$contact_name,$contact_email,$cancreate, |
my ($useremail,$domain,$domdesc,$contact_name,$contact_email,$cancreate, |
$server,$settings,$emailusername,$courseid,$usertype,$usernameset, |
$server,$settings,$emailusername,$courseid,$usertype,$usernameset, |
$condition) = @_; |
$condition,$excluded,$hascustom) = @_; |
my ($output,$uname); |
my ($output,$uname); |
if (ref($cancreate) eq 'ARRAY') { |
if (ref($cancreate) eq 'ARRAY') { |
if (!grep(/^email$/,@{$cancreate})) { |
if (!grep(/^email$/,@{$cancreate})) { |
$output = &invalid_state('noemails',$domdesc, |
$output = &invalid_state('noemails',$domdesc, |
$contact_name,$contact_email); |
$contact_name,$contact_email); |
return $output; |
return $output; |
} elsif ($useremail !~ /^[^\@]+\@[^\@]+\.[^\@\.]+$/) { |
} elsif ((($condition ne '') && ($useremail !~ /^[^\@]+$/)) || |
|
(($condition eq '') && ($useremail !~ /^[^\@]+\@[^\@]+\.[^\@\.]+$/))) { |
$output = &invalid_state('baduseremail',$domdesc, |
$output = &invalid_state('baduseremail',$domdesc, |
$contact_name,$contact_email); |
$contact_name,$contact_email); |
return $output; |
return $output; |
} else { |
} else { |
$useremail =~ s/^\s+|\s+$//g; |
$useremail =~ s/^\s+|\s+$//g; |
my $possuname; |
my $possuname; |
if ($env{'form.username'}) { |
if ($condition ne '') { |
|
if ($usernameset eq 'first') { |
|
$possuname = $useremail; |
|
} |
|
$useremail .= $condition; |
|
} elsif ($excluded ne '') { |
|
if ($useremail =~ /^[^\@]+\Q$excluded\E$/) { |
|
$output = &invalid_state('userrules',$domdesc, |
|
$contact_name,$contact_email); |
|
return $output; |
|
} |
|
} |
|
if (($usernameset eq 'free') && ($env{'form.username'} ne '')) { |
$possuname = $env{'form.username'}; |
$possuname = $env{'form.username'}; |
$possuname =~ s/^\s+|\s+$//g; |
} elsif (($usernameset eq 'first') && ($condition eq '')) { |
|
if ($condition eq '') { |
|
($possuname) = ($useremail =~ /^([^\@]+)\@/); |
|
} |
} |
} |
if (($usernameset) && ($possuname ne '')) { |
if ($possuname ne '') { |
if ($condition ne '') { |
$possuname =~ s/^\s+|\s+$//g; |
if ($useremail =~ /\Q$condition\E/) { |
if ($possuname ne '') { |
$uname = &LONCAPA::clean_username($possuname); |
$uname=&LONCAPA::clean_username($possuname); |
} else { |
if ($uname ne $possuname) { |
$output = &invalid_state('emailfail',$domdesc, |
$output = &invalid_state('badusername',$domdesc, |
$contact_name,$contact_email); |
$contact_name,$contact_email); |
return $output; |
return $output; |
} |
} |
} else { |
|
$uname=&LONCAPA::clean_username($possuname); |
|
} |
} |
if ($uname ne $possuname) { |
} |
$output = &invalid_state('badusername',$domdesc, |
if ($possuname eq '') { |
$contact_name,$contact_email); |
|
return $output; |
|
} |
|
} else { |
|
$uname=&LONCAPA::clean_username($useremail); |
$uname=&LONCAPA::clean_username($useremail); |
if ($useremail ne $uname) { |
if ($useremail ne $uname) { |
$output = &invalid_state('badusername',$domdesc, |
$output = &invalid_state('badusername',$domdesc, |
Line 796 sub process_email_request {
|
Line 835 sub process_email_request {
|
} |
} |
} |
} |
} |
} |
if (($usernameset) && ($possuname ne '')) { |
if ($hascustom) { |
my $format_msg = |
my $format_msg = |
&guest_format_check($useremail,$domain,$cancreate, |
&guest_format_check($useremail,$domain,$cancreate, |
$settings); |
$settings,$usertype); |
if ($format_msg) { |
if ($format_msg) { |
$output = &invalid_state('userformat',$domdesc,$contact_name, |
$output = &invalid_state('userformat',$domdesc,$contact_name, |
$contact_email,$format_msg); |
$contact_email,$format_msg); |
Line 940 sub process_mailtoken {
|
Line 979 sub process_mailtoken {
|
$data{'inststatus'} = $usertype; |
$data{'inststatus'} = $usertype; |
} |
} |
} else { |
} else { |
undef($usertype); |
$disposition = 'approval'; |
} |
} |
} |
} |
delete($data{'usertype'}); |
delete($data{'usertype'}); |
Line 948 sub process_mailtoken {
|
Line 987 sub process_mailtoken {
|
if (ref($settings) eq 'HASH') { |
if (ref($settings) eq 'HASH') { |
if (ref($settings->{'cancreate'}) eq 'HASH') { |
if (ref($settings->{'cancreate'}) eq 'HASH') { |
if (ref($settings->{'cancreate'}{'selfcreateprocessing'}) eq 'HASH') { |
if (ref($settings->{'cancreate'}{'selfcreateprocessing'}) eq 'HASH') { |
$disposition = $settings->{'cancreate'}{'selfcreateprocessing'}{$usertype}; |
if ($usertype ne '') { |
|
$disposition = $settings->{'cancreate'}{'selfcreateprocessing'}{$usertype}; |
|
unless ($disposition =~ /^(approval|automatic)$/) { |
|
$disposition = 'approval'; |
|
} |
|
} |
} |
} |
} |
} |
} |
} |
Line 1027 sub start_session {
|
Line 1071 sub start_session {
|
# |
# |
sub print_dataentry_form { |
sub print_dataentry_form { |
my ($r,$domain,$lonhost,$include,$now,$captchaform,$courseid,$emailusername,$captcha, |
my ($r,$domain,$lonhost,$include,$now,$captchaform,$courseid,$emailusername,$captcha, |
$usertype,$recaptchaversion,$usernameset,$condition) = @_; |
$usertype,$recaptchaversion,$usernameset,$condition,$excluded) = @_; |
my ($error,$output); |
my ($error,$output); |
if (open(my $jsh,"<$include/londes.js")) { |
if (open(my $jsh,"<$include/londes.js")) { |
while(my $line = <$jsh>) { |
while(my $line = <$jsh>) { |
Line 1035 sub print_dataentry_form {
|
Line 1079 sub print_dataentry_form {
|
} |
} |
close($jsh); |
close($jsh); |
$output = &javascript_setforms($now,$emailusername,$captcha,$usertype,$recaptchaversion, |
$output = &javascript_setforms($now,$emailusername,$captcha,$usertype,$recaptchaversion, |
$usernameset,$condition). |
$usernameset,$condition,$excluded). |
"\n".&javascript_checkpass($now,'email'); |
"\n".&javascript_checkpass($now,'email'); |
my ($lkey,$ukey) = &Apache::loncommon::des_keys(); |
my ($lkey,$ukey) = &Apache::loncommon::des_keys(); |
my ($lextkey,$uextkey) = &getkeys($lkey,$ukey); |
my ($lextkey,$uextkey) = &getkeys($lkey,$ukey); |
Line 1073 sub print_dataentry_form {
|
Line 1117 sub print_dataentry_form {
|
$output .= '<input type="hidden" name="type" value="'. |
$output .= '<input type="hidden" name="type" value="'. |
&HTML::Entities::encode($usertype,'\'<>"&').'" />'."\n"; |
&HTML::Entities::encode($usertype,'\'<>"&').'" />'."\n"; |
} |
} |
if ($usernameset) { |
if ($usernameset eq 'free') { |
$output .= '<input type="hidden" name="username" value="" />'."\n"; |
$output .= '<input type="hidden" name="username" value="" />'."\n"; |
} |
} |
$output .= <<"ENDSERVERFORM"; |
$output .= <<"ENDSERVERFORM"; |
Line 1097 ENDSERVERFORM
|
Line 1141 ENDSERVERFORM
|
&Apache::loncreateuser::personal_data_display('',$domain,'email','selfcreate', |
&Apache::loncreateuser::personal_data_display('',$domain,'email','selfcreate', |
'','',$now,$captchaform, |
'','',$now,$captchaform, |
$emailusername,$usertype, |
$emailusername,$usertype, |
$usernameset,$condition); |
$usernameset,$condition,$excluded); |
if ($rowcount) { |
if ($rowcount) { |
$output .= '<div class="LC_left_float">'.$beginclientform.$datatable.$endclientform; |
$output .= '<div class="LC_left_float">'.$beginclientform.$datatable.$endclientform; |
} else { |
} else { |
Line 1120 ENDSERVERFORM
|
Line 1164 ENDSERVERFORM
|
sub get_creation_controls { |
sub get_creation_controls { |
my ($domain,$usercreation) = @_; |
my ($domain,$usercreation) = @_; |
my (@cancreate,@statustocreate,@statusforemail,$emailusername,$processing, |
my (@cancreate,@statustocreate,@statusforemail,$emailusername,$processing, |
$verification,$emaildomain,$othertitle,$usertypes,$types); |
$emailoptions,$verification,$emaildomain,$othertitle,$usertypes,$types); |
if (ref($usercreation) eq 'HASH') { |
if (ref($usercreation) eq 'HASH') { |
if (ref($usercreation->{'cancreate'}) eq 'HASH') { |
if (ref($usercreation->{'cancreate'}) eq 'HASH') { |
($othertitle,$usertypes,$types) = |
($othertitle,$usertypes,$types) = |
Line 1152 sub get_creation_controls {
|
Line 1196 sub get_creation_controls {
|
if (ref($usercreation->{'cancreate'}{'selfcreateprocessing'}) eq 'HASH') { |
if (ref($usercreation->{'cancreate'}{'selfcreateprocessing'}) eq 'HASH') { |
$processing = $usercreation->{'cancreate'}{'selfcreateprocessing'}; |
$processing = $usercreation->{'cancreate'}{'selfcreateprocessing'}; |
} |
} |
|
if (ref($usercreation->{'cancreate'}{'emailoptions'}) eq 'HASH') { |
|
$emailoptions = $usercreation->{'cancreate'}{'emailoptions'}; |
|
} |
if (ref($usercreation->{'cancreate'}{'emailverified'}) eq 'HASH') { |
if (ref($usercreation->{'cancreate'}{'emailverified'}) eq 'HASH') { |
$verification = $usercreation->{'cancreate'}{'emailverified'}; |
$verification = $usercreation->{'cancreate'}{'emailverified'}; |
} |
} |
Line 1162 sub get_creation_controls {
|
Line 1209 sub get_creation_controls {
|
my %domdefaults = &Apache::lonnet::get_domain_defaults($domain); |
my %domdefaults = &Apache::lonnet::get_domain_defaults($domain); |
my @emailtypes; |
my @emailtypes; |
if (ref($domdefaults{'inststatusguest'}) eq 'ARRAY') { |
if (ref($domdefaults{'inststatusguest'}) eq 'ARRAY') { |
@emailtypes = @{$domdefaults{'inststatusguest'}}; |
@statusforemail = @{$domdefaults{'inststatusguest'}}; |
if (@emailtypes) { |
unless (@statusforemail) { |
unless (grep(/^default$/,@emailtypes)) { |
my @okcreate; |
push(@emailtypes,'default'); |
foreach my $poss (@cancreate) { |
} |
unless ($poss eq 'email') { |
foreach my $type (@emailtypes) { |
push(@okcreate,$poss); |
if ($processing->{$type} ne 'notinuse') { |
|
unless (grep(/^$type$/,@statusforemail)) { |
|
push(@statusforemail,$type); |
|
} |
|
} |
|
} |
|
unless (@statusforemail) { |
|
my @okcreate; |
|
foreach my $poss (@cancreate) { |
|
unless ($poss eq 'email') { |
|
push(@okcreate,$poss); |
|
} |
|
} |
} |
@cancreate = @okcreate; |
|
} |
} |
|
@cancreate = @okcreate; |
} |
} |
} |
} |
} |
} |
Line 1200 sub get_creation_controls {
|
Line 1235 sub get_creation_controls {
|
} |
} |
} |
} |
return (\@cancreate,\@statustocreate,\@statusforemail,$emailusername, |
return (\@cancreate,\@statustocreate,\@statusforemail,$emailusername, |
$verification,$emaildomain,$types,$usertypes,$othertitle); |
$emailoptions,$verification,$emaildomain,$types,$usertypes,$othertitle); |
} |
} |
|
|
sub create_account { |
sub create_account { |
Line 1240 sub create_account {
|
Line 1275 sub create_account {
|
|
|
my ($key,$caller)=split(/&/,$dataref->{'tmpinfo'}); |
my ($key,$caller)=split(/&/,$dataref->{'tmpinfo'}); |
if ($caller eq 'createaccount') { |
if ($caller eq 'createaccount') { |
my $upass = &Apache::loncommon::des_decrypt($key,$encpass); |
my $upass; |
|
if ($encpass eq '') { |
|
$output = &mt('Password retrieved was blank.'); |
|
return ('fail',$error.$output.$end.$rtnlink); |
|
} else { |
|
$upass = &Apache::loncommon::des_decrypt($key,$encpass); |
|
} |
|
|
# See if we are allowed to use the proposed student/employee ID, |
# See if we are allowed to use the proposed student/employee ID, |
# as per domain rules; if not, student/employee will be left blank. |
# as per domain rules; if not, student/employee will be left blank. |
Line 1785 sub store_request {
|
Line 1826 sub store_request {
|
} |
} |
|
|
sub guest_format_check { |
sub guest_format_check { |
my ($useremail,$domain,$cancreate,$settings) = @_; |
my ($useremail,$domain,$cancreate,$settings,$usertype) = @_; |
my ($login,$format_match,$format_msg,@user_rules); |
my ($login,$format_match,$format_msg,@user_rules); |
if (ref($settings) eq 'HASH') { |
if (ref($settings) eq 'HASH') { |
if (ref($settings->{'email_rule'}) eq 'ARRAY') { |
if (ref($settings->{'email_rule'}) eq 'ARRAY') { |
push(@user_rules,@{$settings->{'email_rule'}}); |
push(@user_rules,@{$settings->{'email_rule'}}); |
|
} elsif (ref($settings->{'email_rule'}) eq 'HASH') { |
|
if (ref($settings->{'email_rule'}->{$usertype}) eq 'ARRAY') { |
|
push(@user_rules,@{$settings->{'email_rule'}->{$usertype}}); |
|
} |
} |
} |
} |
} |
if (@user_rules > 0) { |
if (@user_rules > 0) { |
Line 1974 sub username_js {
|
Line 2019 sub username_js {
|
<script type="text/javascript"> |
<script type="text/javascript"> |
// <![CDATA[ |
// <![CDATA[ |
|
|
function toggleDisplay(caller,divid) { |
function toggleUsernameDisp(caller,divid) { |
if (document.getElementById(divid)) { |
if (document.getElementById(divid)) { |
if (caller.checked) { |
if (caller.checked) { |
if (caller.value == '1') { |
if (caller.value == '1') { |