--- loncom/interface/createaccount.pm 2009/04/01 14:43:06 1.33
+++ loncom/interface/createaccount.pm 2010/08/16 14:39:20 1.40.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.33 2009/04/01 14:43:06 hauer Exp $
+# $Id: createaccount.pm,v 1.40.2.1 2010/08/16 14:39:20 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -112,10 +112,16 @@ sub handler {
if ($env{'form.udom'} ne '') {
$domain = $env{'form.udom'};
}
+
+ my %domconfig =
+ &Apache::lonnet::get_dom('configuration',['usercreation'],$domain);
+ my ($cancreate,$statustocreate) =
+ &get_creation_controls($domain,$domconfig{'usercreation'});
+
my ($result,$output) =
&username_validation($r,$env{'form.uname'},$domain,$domdesc,
$contact_name,$contact_email,$courseid,
- $lonhost);
+ $lonhost,$statustocreate);
if ($result eq 'existingaccount') {
$r->print($output);
&print_footer($r);
@@ -133,20 +139,10 @@ sub handler {
$start_page =
&Apache::loncommon::start_page($title,$js,
{'no_inline_link' => 1,});
- 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 (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'});
- }
- }
- }
-
- if (@cancreate == 0) {
+ my %domconfig =
+ &Apache::lonnet::get_dom('configuration',['usercreation'],$domain);
+ my ($cancreate,$statustocreate) = &get_creation_controls($domain,$domconfig{'usercreation'});
+ if (@{$cancreate} == 0) {
&print_header($r,$start_page,$courseid);
my $output = '
'.&mt('Account creation unavailable').'
'.
''.
@@ -160,12 +156,13 @@ sub handler {
&print_header($r,$start_page,$courseid);
my ($msg,$sso_logout);
$sso_logout = &sso_logout_frag($r,$domain);
- if (grep(/^sso$/,@cancreate)) {
+ 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.").' ';
$msg .= &username_check($sso_username,$domain,$domdesc,$courseid,
- $lonhost,$contact_email,$contact_name,$sso_logout);
+ $lonhost,$contact_email,$contact_name,
+ $sso_logout,$statustocreate);
} 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).''.
@@ -215,7 +212,7 @@ sub handler {
(my $result,$output) =
&username_validation($r,$env{'form.uname'},$domain,$domdesc,
$contact_name,$contact_email,$courseid,
- $lonhost);
+ $lonhost,$statustocreate);
if ($result eq 'existingaccount') {
$r->print($output);
&print_footer($r);
@@ -226,21 +223,21 @@ sub handler {
} elsif ($env{'form.create_with_email'}) {
&print_header($r,$start_page,$courseid);
$output = &process_email_request($env{'form.useremail'},$domain,$domdesc,
- $contact_name,$contact_email,\@cancreate,
+ $contact_name,$contact_email,$cancreate,
$lonhost,$domconfig{'usercreation'},
$courseid);
} elsif (!$token) {
&print_header($r,$start_page,$courseid);
my $now=time;
- if (grep(/^login$/,@cancreate)) {
+ if (grep(/^login$/,@{$cancreate})) {
my $jsh=Apache::File->new($include."/londes.js");
$r->print(<$jsh>);
$r->print(&javascript_setforms($now));
}
- if (grep(/^email$/,@cancreate)) {
+ if (grep(/^email$/,@{$cancreate})) {
$r->print(&javascript_validmail());
}
- $output = &print_username_form($domain,$domdesc,\@cancreate,$now,$lonhost,
+ $output = &print_username_form($domain,$domdesc,$cancreate,$now,$lonhost,
$courseid);
}
$r->print($output);
@@ -280,7 +277,7 @@ sub selfenroll_crumbs {
my ($r,$courseid,$desc) = @_;
&Apache::lonhtmlcommon::add_breadcrumb
({href=>"javascript:ToCatalog('backupcrumbs','')",
- text=>"Course Catalog"});
+ text=>"Course/Community Catalog"});
if ($env{'form.coursenum'} ne '') {
&Apache::lonhtmlcommon::add_breadcrumb
({href=>"javascript:ToCatalog('backupcrumbs','details')",
@@ -499,8 +496,8 @@ sub login_box {
}
$output .= &Apache::lonhtmlcommon::row_closure(1)."\n".
&Apache::lonhtmlcommon::end_pick_box().' '."\n";
- $output .= ''."\n".
- ''."\n".
+ $output .= ''."\n".
+ ''."\n".
'';
return $output;
}
@@ -549,7 +546,7 @@ sub process_email_request {
if ($uhome eq 'no_host') {
my (%rulematch,%inst_results,%curr_rules,%got_rules,%alerts);
&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'}{$domain}) eq 'HASH') {
if ($alerts{'username'}{$domain}{$useremail}) {
@@ -647,7 +644,7 @@ sub process_mailtoken {
if ($result eq 'ok') {
$msg = $output;
my $shownow = &Apache::lonlocal::locallocaltime($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 $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);
@@ -792,6 +789,32 @@ ENDSERVERFORM
return $output;
}
+sub get_creation_controls {
+ my ($domain,$usercreation) = @_;
+ my (@cancreate,@statustocreate);
+ if (ref($usercreation) eq 'HASH') {
+ if (ref($usercreation->{'cancreate'}) eq 'HASH') {
+ if (ref($usercreation->{'cancreate'}{'statustocreate'}) eq 'ARRAY') {
+ @statustocreate = @{$usercreation->{'cancreate'}{'statustocreate'}};
+ } else {
+ @statustocreate = ('default');
+ my ($othertitle,$usertypes,$types) =
+ &Apache::loncommon::sorted_inst_types($domain);
+ if (ref($types) eq 'ARRAY') {
+ push(@statustocreate,@{$types});
+ }
+ }
+ if (ref($usercreation->{'cancreate'}{'selfcreate'}) eq 'ARRAY') {
+ @cancreate = @{$usercreation->{'cancreate'}{'selfcreate'}};
+ } elsif (($usercreation->{'cancreate'}{'selfcreate'} ne 'none') &&
+ ($usercreation->{'cancreate'}{'selfcreate'} ne '')) {
+ @cancreate = ($usercreation->{'cancreate'}{'selfcreate'});
+ }
+ }
+ }
+ return (\@cancreate,\@statustocreate);
+}
+
sub create_account {
my ($r,$domain,$lonhost,$username,$domdesc) = @_;
my ($retrieved,$output,$upass) = &process_credentials($env{'form.logtoken'},
@@ -829,7 +852,7 @@ sub create_account {
sub username_validation {
my ($r,$username,$domain,$domdesc,$contact_name,$contact_email,$courseid,
- $lonhost) = @_;
+ $lonhost,$statustocreate) = @_;
my ($retrieved,$output,$upass);
$username= &LONCAPA::clean_username($username);
@@ -863,7 +886,8 @@ sub username_validation {
}
if ($authok eq 'authorized') {
$output = &username_check($username,$domain,$domdesc,$courseid,$lonhost,
- $contact_email,$contact_name);
+ $contact_email,$contact_name,undef,
+ $statustocreate);
} else {
$output = &login_failure_msg($courseid);
}
@@ -888,12 +912,12 @@ sub login_failure_msg {
}
sub username_check {
- my ($username,$domain,$domdesc,$courseid,$lonhost,$contact_email,$contact_name,
- $sso_logout) = @_;
+ my ($username,$domain,$domdesc,$courseid,$lonhost,$contact_email,
+ $contact_name,$sso_logout,$statustocreate) = @_;
my (%rulematch,%inst_results,$checkfail,$rowcount,$editable,$output,$msg,
%alerts,%curr_rules,%got_rules);
&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'}{$domain}) eq 'HASH') {
if ($alerts{'username'}{$domain}{$username}) {
@@ -909,6 +933,21 @@ sub username_check {
}
}
if (!$checkfail) {
+ if (ref($statustocreate) eq 'ARRAY') {
+ $checkfail = 'inststatus';
+ if (ref($inst_results{$username.':'.$domain}{inststatus}) eq 'ARRAY') {
+ foreach my $inststatus (@{$inst_results{$username.':'.$domain}{inststatus}}) {
+ if (grep(/^\Q$inststatus\E$/,@{$statustocreate})) {
+ undef($checkfail);
+ last;
+ }
+ }
+ } elsif (grep(/^default$/,@{$statustocreate})) {
+ undef($checkfail);
+ }
+ }
+ }
+ if (!$checkfail) {
$output = '