version 1.16, 2008/07/11 15:44:32
|
version 1.19, 2008/07/13 17:57:58
|
Line 127 sub handler {
|
Line 127 sub handler {
|
|
|
if ($sso_username ne '') { |
if ($sso_username ne '') { |
&print_header($r,$start_page); |
&print_header($r,$start_page); |
my ($output,$msg); |
my ($msg,$sso_logout); |
|
$sso_logout = &sso_logout_frag($r,$domain); |
if (grep(/^sso$/,@cancreate)) { |
if (grep(/^sso$/,@cancreate)) { |
$msg = '<h3>'.&mt('Account creation').'</h3>'. |
$msg = '<h3>'.&mt('Account creation').'</h3>'. |
&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.").'<br /><br />'; |
&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.").'<br />'; |
($output, my $checkfail) = &username_check($sso_username,$domain, |
|
$domdesc,$courseid, |
$msg .= &username_check($sso_username,$domain,$domdesc,$courseid, |
$lonhost,$contact_email); |
$lonhost,$contact_email,$contact_name,$sso_logout); |
if ($checkfail) { |
|
$msg .= '<h4>'.&mt('Account creation unavailable');'</h4>'; |
|
if ($checkfail eq 'username') { |
|
$msg .= '<span class="LC_warning">'. |
|
&mt('A LON-CAPA account may not be created with the username you use.').'</span>'; |
|
} elsif ($checkfail eq 'authtoken') { |
|
$msg .= '<span class="LC_error">'.&mt('Error creating token.').'</span>'; |
|
} |
|
$msg .= '<br /><br />'. |
|
&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 { |
} else { |
$msg .= '<h3>'.&mt('Account creation unavailable').'</h3>'. |
$msg = '<h3>'.&mt('Account creation unavailable').'</h3>'. |
'<span class="LC_warning">'.&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.").'</span><br /><br />'.&mt('Please contact the [_1] ([_2]) for assistance.',$contact_name,$contact_email); |
'<span class="LC_warning">'.&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.").'</span><br /><br />'.&mt('Please contact the [_1] ([_2]) for assistance.',$contact_name,$contact_email).'<hr />'. |
|
$sso_logout; |
} |
} |
$r->print($msg.'<br />'.$output); |
$r->print($msg); |
$r->print(&Apache::loncommon::end_page()); |
$r->print(&Apache::loncommon::end_page()); |
return OK; |
return OK; |
} |
} |
Line 191 sub handler {
|
Line 180 sub handler {
|
$r->print($output); |
$r->print($output); |
$r->print(&Apache::loncommon::end_page()); |
$r->print(&Apache::loncommon::end_page()); |
return OK; |
return OK; |
} |
} elsif ($env{'form.phase'} eq 'username_validation') { |
|
(my $result,$output) = |
&print_header($r,$start_page); |
&username_validation($r,$env{'form.uname'},$domain,$domdesc, |
if ($env{'form.create_with_email'}) { |
$contact_name,$contact_email,$courseid, |
|
$lonhost); |
|
if ($result eq 'existingaccount') { |
|
$r->print($output); |
|
$r->print(&Apache::loncommon::end_page()); |
|
return OK; |
|
} else { |
|
&print_header($r,$start_page); |
|
} |
|
} elsif ($env{'form.create_with_email'}) { |
|
&print_header($r,$start_page); |
$output = &process_email_request($env{'form.useremail'},$domain,$domdesc, |
$output = &process_email_request($env{'form.useremail'},$domain,$domdesc, |
$contact_name,$contact_email,\@cancreate, |
$contact_name,$contact_email,\@cancreate, |
$lonhost,$domconfig{'usercreation'}, |
$lonhost,$domconfig{'usercreation'}, |
$courseid); |
$courseid); |
} elsif ($env{'form.phase'} eq 'username_validation') { |
|
$output = &username_validation($env{'form.uname'},$domain,$domdesc, |
|
$contact_name,$contact_email,$courseid, |
|
$lonhost); |
|
} elsif (!$token) { |
} elsif (!$token) { |
|
&print_header($r,$start_page); |
my $now=time; |
my $now=time; |
if (grep(/^login$/,@cancreate)) { |
if (grep(/^login$/,@cancreate)) { |
my $jsh=Apache::File->new($include."/londes.js"); |
my $jsh=Apache::File->new($include."/londes.js"); |
Line 524 sub process_mailtoken {
|
Line 520 sub process_mailtoken {
|
$data{'username'},$domdesc); |
$data{'username'},$domdesc); |
if ($result eq 'ok') { |
if ($result eq 'ok') { |
$msg = $output; |
$msg = $output; |
my $shownow = localtime($now); |
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'}, |
my $mailresult = &Apache::resetpw::send_mail($domdesc,$data{'email'}, |
$mailmsg,$contact_name, |
$mailmsg,$contact_name, |
Line 579 sub start_session {
|
Line 575 sub start_session {
|
if ($r->dir_config('lonBalancer') eq 'yes') { |
if ($r->dir_config('lonBalancer') eq 'yes') { |
&Apache::lonauth::success($r,$form{'uname'},$form{'udom'}, |
&Apache::lonauth::success($r,$form{'uname'},$form{'udom'}, |
$lonhost,'noredirect',undef,\%form); |
$lonhost,'noredirect',undef,\%form); |
my $delete = &Apache::lonnet::tmpdel($token); |
if ($token ne '') { |
|
my $delete = &Apache::lonnet::tmpdel($token); |
|
} |
$r->internal_redirect('/adm/switchserver'); |
$r->internal_redirect('/adm/switchserver'); |
} else { |
} else { |
&Apache::lonauth::success($r,$form{'uname'},$form{'udom'}, |
&Apache::lonauth::success($r,$form{'uname'},$form{'udom'}, |
Line 718 sub create_account {
|
Line 716 sub create_account {
|
} |
} |
|
|
sub username_validation { |
sub username_validation { |
my ($username,$domain,$domdesc,$contact_name,$contact_email,$courseid,$lonhost) = @_; |
my ($r,$username,$domain,$domdesc,$contact_name,$contact_email,$courseid, |
|
$lonhost) = @_; |
my ($retrieved,$output,$upass); |
my ($retrieved,$output,$upass); |
|
|
$username= &LONCAPA::clean_username($username); |
$username= &LONCAPA::clean_username($username); |
$domain = &LONCAPA::clean_domain($domain); |
$domain = &LONCAPA::clean_domain($domain); |
my $uhome = &Apache::lonnet::homeserver($username,$domain); |
my $uhome = &Apache::lonnet::homeserver($username,$domain); |
|
|
if ($uhome ne 'no_host') { |
|
$output = &invalid_state('existinguser',$domdesc, |
|
$contact_name,$contact_email); |
|
return $output; |
|
} |
|
($retrieved,$output,$upass) = &process_credentials($env{'form.logtoken'}, |
($retrieved,$output,$upass) = &process_credentials($env{'form.logtoken'}, |
$env{'form.serverid'}); |
$env{'form.serverid'}); |
if ($retrieved eq 'ok') { |
if ($retrieved ne 'ok') { |
|
return ('fail',$output); |
|
} |
|
if ($uhome ne 'no_host') { |
|
my $result = &Apache::lonnet::authenticate($username,$upass,$domain); |
|
if ($result ne 'no_host') { |
|
my %form = &start_session($r,$username,$domain,$lonhost,$courseid); |
|
$output = '<br /><br />'.&mt('A LON-CAPA account already exists for username [_1] at this institution ([_2]).','<tt>'.$username.'</tt>',$domdesc).'<br />'.&mt('The password entered was also correct so you have been logged in.'); |
|
return ('existingaccount',$output); |
|
} else { |
|
$output = '<div class="LC_warning">'. |
|
&mt('Username and/or password could not be authenticated.'). |
|
'</div>'. |
|
&mt('Please check the username and password.'); |
|
} |
|
} else { |
my $primlibserv = &Apache::lonnet::domain($domain,'primary'); |
my $primlibserv = &Apache::lonnet::domain($domain,'primary'); |
my $authok; |
my $authok; |
my %domdefaults = &Apache::lonnet::get_domain_defaults($domain); |
my %domdefaults = &Apache::lonnet::get_domain_defaults($domain); |
Line 744 sub username_validation {
|
Line 753 sub username_validation {
|
$authok = 'non_authorized'; |
$authok = 'non_authorized'; |
} |
} |
if ($authok eq 'authorized') { |
if ($authok eq 'authorized') { |
($output,undef) = &username_check($username,$domain,$domdesc, |
$output = &username_check($username,$domain,$domdesc,$courseid,$lonhost, |
$courseid,$lonhost,$contact_email); |
$contact_email,$contact_name); |
} else { |
} else { |
$output = '<div class="LC_warning">' |
$output = '<div class="LC_warning">'. |
.&mt('Username and/or password could not be authenticated.') |
&mt('Username and/or password could not be authenticated.'). |
.'</div>' |
'</div>'. |
.&mt('Please check the username and password.'); |
&mt('Please check the username and password.'); |
} |
} |
} |
} |
return $output; |
return ('ok',$output); |
} |
} |
|
|
sub username_check { |
sub username_check { |
my ($username,$domain,$domdesc,$courseid,$lonhost,$contact_email) = @_; |
my ($username,$domain,$domdesc,$courseid,$lonhost,$contact_email,$contact_name, |
my (%rulematch,%inst_results,$newuser,%alerts,%curr_rules,%got_rules); |
$sso_logout) = @_; |
|
my (%rulematch,%inst_results,$newuser,$checkfail,$rowcount,$editable,$output,$msg, |
|
%alerts,%curr_rules,%got_rules); |
$newuser = 1; |
$newuser = 1; |
my $checkhash; |
my $checkhash; |
my $checks = { 'username' => 1 }; |
my $checks = { 'username' => 1 }; |
Line 768 sub username_check {
|
Line 779 sub username_check {
|
if (ref($alerts{'username'}) eq 'HASH') { |
if (ref($alerts{'username'}) eq 'HASH') { |
if (ref($alerts{'username'}{$domain}) eq 'HASH') { |
if (ref($alerts{'username'}{$domain}) eq 'HASH') { |
if ($alerts{'username'}{$domain}{$username}) { |
if ($alerts{'username'}{$domain}{$username}) { |
my ($userchkmsg,$checkfail); |
|
if (ref($curr_rules{$domain}) eq 'HASH') { |
if (ref($curr_rules{$domain}) eq 'HASH') { |
$userchkmsg = |
$output = |
&Apache::loncommon::instrule_disallow_msg('username',$domdesc,1). |
&Apache::loncommon::instrule_disallow_msg('username',$domdesc,1, |
|
'selfcreate'). |
&Apache::loncommon::user_rule_formats($domain,$domdesc, |
&Apache::loncommon::user_rule_formats($domain,$domdesc, |
$curr_rules{$domain}{'username'},'username'); |
$curr_rules{$domain}{'username'},'username'); |
if ($userchkmsg) { |
|
$checkfail = 'username'; |
|
} |
|
} |
} |
return ($userchkmsg,$checkfail); |
$checkfail = 'username'; |
} |
} |
} |
} |
} |
} |
my $submit_text = &mt('Create LON-CAPA account'); |
if (!$checkfail) { |
my $output = '<form method="post" action="/adm/createaccount">'. |
$output = '<form method="post" action="/adm/createaccount">'; |
&Apache::loncreateuser::personal_data_display($username,$domain,1, |
(my $datatable,$rowcount,$editable) = |
undef,$inst_results{$username.':'.$domain}). |
&Apache::loncreateuser::personal_data_display($username,$domain,1,'selfcreate', |
'<br /><br /><input type="hidden" name="uname" value="'.$username.'" />'."\n". |
$inst_results{$username.':'.$domain}); |
'<input type="hidden" name="udom" value="'.$domain.'" />'."\n". |
if ($rowcount > 0) { |
'<input type="hidden" name="phase" value="username_activation" />'; |
$output .= $datatable; |
my $now = time; |
} |
my %info = ('ip' => $ENV{'REMOTE_ADDR'}, |
$output .= '<br /><br /><input type="hidden" name="uname" value="'.$username.'" />'."\n". |
'time' => $now, |
'<input type="hidden" name="udom" value="'.$domain.'" />'."\n". |
'domain' => $domain, |
'<input type="hidden" name="phase" value="username_activation" />'; |
'username' => $username); |
my $now = time; |
my $authtoken = &Apache::lonnet::tmpput(\%info,$lonhost); |
my %info = ('ip' => $ENV{'REMOTE_ADDR'}, |
if ($authtoken !~ /^error/ && $authtoken ne 'no_such_host') { |
'time' => $now, |
$output .= '<input type="hidden" name="authtoken" value="'.&HTML::Entities::encode($authtoken,'&<>"').'" />'; |
'domain' => $domain, |
} else { |
'username' => $username); |
$output = &mt('An error occurred when storing a token').'<br />'. |
my $authtoken = &Apache::lonnet::tmpput(\%info,$lonhost); |
&mt('You will not be able to proceed to the next stage of account creation'). |
if ($authtoken !~ /^error/ && $authtoken ne 'no_such_host') { |
&linkto_email_help($contact_email,$domdesc); |
$output .= '<input type="hidden" name="authtoken" value="'.&HTML::Entities::encode($authtoken,'&<>"').'" />'; |
return($output,'authtoken'); |
} else { |
} |
$output = &mt('An error occurred when storing a token').'<br />'. |
if ($courseid ne '') { |
&mt('You will not be able to proceed to the next stage of account creation'). |
$output .= '<input type="hidden" name="courseid" value="'.$courseid.'" />'; |
&linkto_email_help($contact_email,$domdesc); |
} |
$checkfail = 'authtoken'; |
$output .= '<input type="submit" name="newaccount" value="'. |
} |
$submit_text.'" /></form>'; |
} |
return ($output,''); |
if ($checkfail) { |
|
$msg = '<h4>'.&mt('Account creation unavailable').'</h4>'; |
|
if ($checkfail eq 'username') { |
|
$msg .= '<span class="LC_warning">'. |
|
&mt('A LON-CAPA account may not be created with the username you use.'). |
|
'</span><br /><br />'.$output; |
|
} elsif ($checkfail eq 'authtoken') { |
|
$msg .= '<span class="LC_error">'.&mt('Error creating token.').'</span>'. |
|
'<br />'.$output; |
|
} |
|
$msg .= &mt('Please contact the [_1] ([_2]) for assistance.', |
|
$contact_name,$contact_email).'<br /><hr />'. |
|
$sso_logout; |
|
&Apache::lonnet::logthis("ERROR: failure type of '$checkfail' when performing username check to create account for authenticated user: $username, in domain $domain"); |
|
} else { |
|
if ($courseid ne '') { |
|
$output .= '<input type="hidden" name="courseid" value="'.$courseid.'" />'; |
|
} |
|
$output .= '<input type="submit" name="newaccount" value="'. |
|
&mt('Create LON-CAPA account').'" /></form>'; |
|
if ($rowcount) { |
|
if ($editable) { |
|
$msg = &mt('To create one, use the table below to provide information about yourself, then click the [_1]Create LON-CAPA account[_2] button.','<span class="LC_cusr_emph">','</span>').'<br />'; |
|
} else { |
|
$msg = &mt('A user account will be created with information displayed in the table below, when you click the [_1]Create LON-CAPA account[_2] button.','<span class="LC_cusr_emph">','</span>').'<br />'; |
|
} |
|
} else { |
|
$msg = '<br />'.&mt('Confirm that you wish to create an account.'); |
|
} |
|
$msg .= $output; |
|
} |
|
return $msg; |
} |
} |
|
|
sub username_activation { |
sub username_activation { |
Line 934 sub linkto_email_help {
|
Line 973 sub linkto_email_help {
|
my $msg; |
my $msg; |
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); |
$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 />'; |
} else { |
} else { |
$msg .= '<br />'.&mt('You may wish to send an e-mail to the LON-CAPA server administrator: [_1] for [_2].',$Apache::lonnet::perlvar{'AdminEmail'},$domdesc); |
$msg .= '<br />'.&mt('You may wish to send an e-mail to the server administrator: [_1] for [_2].',$Apache::lonnet::perlvar{'AdminEmail'},$domdesc).'<br />'; |
} |
} |
return $msg; |
return $msg; |
} |
} |
Line 1050 sub guest_format_check {
|
Line 1089 sub guest_format_check {
|
return $format_msg; |
return $format_msg; |
} |
} |
|
|
|
sub sso_logout_frag { |
|
my ($r,$domain) = @_; |
|
my $endsessionmsg; |
|
if (defined($r->dir_config('lonSSOUserLogoutMessageFile_'.$domain))) { |
|
my $msgfile = $r->dir_config('lonSSOUserLogoutMessageFile_'.$domain); |
|
if (-e $msgfile) { |
|
open(my $fh,"<$msgfile"); |
|
$endsessionmsg = join('',<$fh>); |
|
close($fh); |
|
} |
|
} elsif (defined($r->dir_config('lonSSOUserLogoutMessageFile'))) { |
|
my $msgfile = $r->dir_config('lonSSOUserLogoutMessageFile'); |
|
if (-e $msgfile) { |
|
open(my $fh,"<$msgfile"); |
|
$endsessionmsg = join('',<$fh>); |
|
close($fh); |
|
} |
|
} |
|
return $endsessionmsg; |
|
} |
|
|
1; |
1; |