version 1.90, 2006/06/14 19:13:11
|
version 1.95, 2006/12/06 22:22:37
|
Line 42 use Apache::loncommon();
|
Line 42 use Apache::loncommon();
|
use Apache::lonhtmlcommon(); |
use Apache::lonhtmlcommon(); |
use Apache::lonlocal; |
use Apache::lonlocal; |
use Apache::lonnet; |
use Apache::lonnet; |
|
use LONCAPA(); |
|
|
# |
# |
# Write lonnet::passwd to do the call below. |
# Write lonnet::passwd to do the call below. |
Line 304 sub rolesprefchanger {
|
Line 305 sub rolesprefchanger {
|
if ($env{'environment.recentroles'}) { |
if ($env{'environment.recentroles'}) { |
my %recent_roles = |
my %recent_roles = |
&Apache::lonhtmlcommon::get_recent('roles',$env{'environment.recentrolesn'}); |
&Apache::lonhtmlcommon::get_recent('roles',$env{'environment.recentrolesn'}); |
|
my %frozen_roles = |
|
&Apache::lonhtmlcommon::get_recent_frozen('roles',$env{'environment.recentrolesn'}); |
|
|
|
my %role_text = &rolespref_get_role_text([keys(%recent_roles)]); |
|
my @sorted_roles = sort {$role_text{$a} cmp $role_text{$b}} keys(%role_text); |
|
|
$roles_check_list .= |
$roles_check_list .= |
&Apache::loncommon::start_data_table(). |
&Apache::loncommon::start_data_table(). |
&Apache::loncommon::start_data_table_header_row(). |
&Apache::loncommon::start_data_table_header_row(). |
Line 313 sub rolesprefchanger {
|
Line 319 sub rolesprefchanger {
|
&Apache::loncommon::end_data_table_header_row(). |
&Apache::loncommon::end_data_table_header_row(). |
"\n"; |
"\n"; |
my $count; |
my $count; |
foreach $role_key (sort(keys(%recent_roles))) { |
foreach $role_key (@sorted_roles) { |
my $checked = ""; |
my $checked = ""; |
my $value = $recent_roles{$role_key}; |
my $value = $recent_roles{$role_key}; |
if ($value eq 'role_frozen') { |
if ($frozen_roles{$role_key}) { |
$checked = "checked=\"checked\""; |
$checked = "checked=\"checked\""; |
} |
} |
# get course information |
|
my ($role,$rest) = split(/\./, $role_key); |
|
my $trole = &Apache::lonnet::plaintext($role); |
|
my ($tdomain,$other,$tsection)= |
|
split(/\//,Apache::lonnet::declutter($rest)); |
|
my $tother = '-'; |
|
if ($role =~ /cc|st|in|ta/ ) { |
|
my %newhash=&Apache::lonnet::coursedescription($tdomain."_".$other); |
|
$tother = " - ".$newhash{'description'}; |
|
} elsif ($role =~ /dc/) { |
|
$tother = ""; |
|
} else { |
|
$tother = " - $other"; |
|
} |
|
|
|
my $section=""; |
|
if ($tsection) { |
|
$section = " - Section/Group: $tsection"; |
|
} |
|
$count++; |
$count++; |
$roles_check_list .= |
$roles_check_list .= |
&Apache::loncommon::start_data_table_row(). |
&Apache::loncommon::start_data_table_row(). |
Line 345 sub rolesprefchanger {
|
Line 332 sub rolesprefchanger {
|
"<input type=\"checkbox\" $checked name=\"freezeroles\"". |
"<input type=\"checkbox\" $checked name=\"freezeroles\"". |
" id=\"freezeroles$count\" value=\"$role_key\" /></td>". |
" id=\"freezeroles$count\" value=\"$role_key\" /></td>". |
"<td><label for=\"freezeroles$count\">". |
"<td><label for=\"freezeroles$count\">". |
"$trole - $tdomain $tother $section</label></td>". |
"$role_text{$role_key}</label></td>". |
&Apache::loncommon::end_data_table_row(). "\n"; |
&Apache::loncommon::end_data_table_row(). "\n"; |
} |
} |
$roles_check_list .= "</table>\n"; |
$roles_check_list .= "</table>\n"; |
Line 370 sub rolesprefchanger {
|
Line 357 sub rolesprefchanger {
|
</form>'); |
</form>'); |
} |
} |
|
|
|
sub rolespref_get_role_text { |
|
# Get a line of text for each role |
|
my ($roles) = @_; |
|
my %roletext = (); |
|
|
|
foreach my $item (@$roles) { |
|
# get course information |
|
my ($role,$rest) = split(/\./, $item); |
|
my $trole = ""; |
|
$trole = &Apache::lonnet::plaintext($role); |
|
my ($tdomain,$other,$tsection)= split(/\//,Apache::lonnet::declutter($rest)); |
|
my $tother = '-'; |
|
if ($role =~ /^(cc|st|in|ta|ep|cr)/ ) { |
|
my %newhash=&Apache::lonnet::coursedescription($tdomain."_".$other); |
|
$tother = " - ".$newhash{'description'}; |
|
} elsif ($role =~ /dc/) { |
|
$tother = ""; |
|
} else { |
|
$tother = " - $other"; |
|
} |
|
|
|
my $section=""; |
|
if ($tsection) { |
|
$section = " - Section/Group: $tsection"; |
|
} |
|
$roletext{$item} = $tdomain." - ".$trole.$tother.$section; |
|
} |
|
return %roletext; |
|
} |
|
|
sub verify_and_change_rolespref { |
sub verify_and_change_rolespref { |
my $r = shift; |
my $r = shift; |
my $user = $env{'user.name'}; |
my $user = $env{'user.name'}; |
Line 399 sub verify_and_change_rolespref {
|
Line 416 sub verify_and_change_rolespref {
|
# Get list of froze roles and list of recent roles |
# Get list of froze roles and list of recent roles |
my @freeze_list = &Apache::loncommon::get_env_multiple('form.freezeroles'); |
my @freeze_list = &Apache::loncommon::get_env_multiple('form.freezeroles'); |
my %freeze = (); |
my %freeze = (); |
|
my %roletext = (); |
|
|
foreach my $key (@freeze_list) { |
foreach my $key (@freeze_list) { |
$freeze{$key}='role_frozen'; |
$freeze{$key}='1'; |
} |
} |
|
|
my %recent_roles = |
my %recent_roles = |
&Apache::lonhtmlcommon::get_recent('roles',$env{'environment.recentrolesn'}); |
&Apache::lonhtmlcommon::get_recent('roles',$env{'environment.recentrolesn'}); |
|
my %frozen_roles = |
|
&Apache::lonhtmlcommon::get_recent_frozen('roles',$env{'environment.recentrolesn'}); |
|
my %role_text = &rolespref_get_role_text([keys(%recent_roles)]); |
|
|
# Unset any roles that were previously frozen but aren't in list |
# Unset any roles that were previously frozen but aren't in list |
|
|
foreach my $role_key (sort(keys(%recent_roles))) { |
foreach my $role_key (sort(keys(%recent_roles))) { |
if (($recent_roles{$role_key} eq 'role_frozen') && |
if (($frozen_roles{$role_key}) && (!exists($freeze{$role_key}))) { |
(!exists($freeze{$role_key}))) { |
$message .= "<br />".&mt('Unfreezing Role: [_1]',$role_text{$role_key})."\n"; |
$message .= "<br />".&mt('Unfreezing Role: [_1]',$role_key)."\n"; |
&Apache::lonhtmlcommon::store_recent('roles',$role_key,' ',0); |
&Apache::lonhtmlcommon::store_recent('roles',$role_key,' '); |
|
} |
} |
} |
} |
|
|
# Freeze selected roles |
# Freeze selected roles |
foreach my $role_key (@freeze_list) { |
foreach my $role_key (@freeze_list) { |
$message .= "<br />".&mt('Freezing Role: [_1]',$role_key)."\n"; |
if (!$frozen_roles{$role_key}) { |
if ($recent_roles{$role_key} ne 'role_frozen') { |
$message .= "<br />".&mt('Freezing Role: [_1]',$role_text{$role_key})."\n"; |
&Apache::lonhtmlcommon::store_recent('roles', |
&Apache::lonhtmlcommon::store_recent('roles', |
$role_key,'role_frozen'); |
$role_key,' ',1); |
} |
} |
} |
} |
$message .= "<hr /><br />\n"; |
$message .= "<hr /><br />\n"; |
Line 534 sub verify_and_change_msgforward {
|
Line 554 sub verify_and_change_msgforward {
|
my $message=''; |
my $message=''; |
foreach (split(/\,/,$env{'form.msgforward'})) { |
foreach (split(/\,/,$env{'form.msgforward'})) { |
my ($msuser,$msdomain)=split(/[\@\:]/,$_); |
my ($msuser,$msdomain)=split(/[\@\:]/,$_); |
$msuser=~s/\W//g; |
$msuser = &LONCAPA::clean_username($msuser); |
$msdomain=~s/\W//g; |
$msdomain = &LONCAPA::clean_domain($msdomain); |
if (($msuser) && ($msdomain)) { |
if (($msuser) && ($msdomain)) { |
if (&Apache::lonnet::homeserver($msuser,$msdomain) ne 'no_host') { |
if (&Apache::lonnet::homeserver($msuser,$msdomain) ne 'no_host') { |
$newscreen.=$msuser.':'.$msdomain.','; |
$newscreen.=$msuser.':'.$msdomain.','; |
Line 699 ENDVCCOL
|
Line 719 ENDVCCOL
|
# password handler subroutines # |
# password handler subroutines # |
###################################################### |
###################################################### |
sub passwordchanger { |
sub passwordchanger { |
|
my ($r,$errormessage,$caller,$mailtoken) = @_; |
# This function is a bit of a mess.... |
# This function is a bit of a mess.... |
# Passwords are encrypted using londes.js (DES encryption) |
# Passwords are encrypted using londes.js (DES encryption) |
my $r = shift; |
|
my $errormessage = shift; |
|
$errormessage = ($errormessage || ''); |
$errormessage = ($errormessage || ''); |
my $user = $env{'user.name'}; |
my ($user,$domain,$currentpass,$defdom); |
my $domain = $env{'user.domain'}; |
if ((!defined($caller)) || ($caller eq 'preferences')) { |
my $homeserver = $env{'user.home'}; |
$user = $env{'user.name'}; |
|
$domain = $env{'user.domain'}; |
|
if (!defined($caller)) { |
|
$caller = 'preferences'; |
|
} |
|
} elsif ($caller eq 'reset_by_email') { |
|
$defdom = $r->dir_config('lonDefDomain'); |
|
my %data = &Apache::lonnet::tmpget($mailtoken); |
|
if (keys(%data) == 0) { |
|
$r->print(&mt('Sorry, the URL you provided to complete the reset of your password was invalid. Either the token included in the URL has been deleted or the URL you provided was invalid. Please submit a <a href="/adm/resetpw">new request</a> for a password reset, and follow the link to the new URL included in the e-mail that will be sent to you, to allow you to enter a new password.')); |
|
return; |
|
} |
|
if (defined($data{time})) { |
|
if (time - $data{'time'} < 7200) { |
|
$user = $data{'username'}; |
|
$domain = $data{'domain'}; |
|
$currentpass = $data{'temppasswd'}; |
|
} else { |
|
$r->print(&mt('Sorry, the token generated when you requested a password reset has expired.').'<br />'); |
|
return; |
|
} |
|
} else { |
|
$r->print(&mt('Sorry, the URL generated when you requested reset of your password contained incomplete information.').'<br />'); |
|
return; |
|
} |
|
} else { |
|
$r->print(&mt('Page requested in unexpected context').'<br />'); |
|
return; |
|
} |
my $currentauth=&Apache::lonnet::queryauthenticate($user,$domain); |
my $currentauth=&Apache::lonnet::queryauthenticate($user,$domain); |
# Check for authentication types that allow changing of the password. |
# Check for authentication types that allow changing of the password. |
return if ($currentauth !~ /^(unix|internal):/); |
return if ($currentauth !~ /^(unix|internal):/); |
Line 723 sub passwordchanger {
|
Line 770 sub passwordchanger {
|
.$ukey_npass2 . $lkey_npass2, |
.$ukey_npass2 . $lkey_npass2, |
$lonhost); |
$lonhost); |
# Hexify the keys for output as javascript variables |
# Hexify the keys for output as javascript variables |
$ukey_cpass = hex($ukey_cpass); |
my %hexkey; |
$lkey_cpass = hex($lkey_cpass); |
$hexkey{'ukey_cpass'} = hex($ukey_cpass); |
$ukey_npass1= hex($ukey_npass1); |
$hexkey{'lkey_cpass'} = hex($lkey_cpass); |
$lkey_npass1= hex($lkey_npass1); |
$hexkey{'ukey_npass1'} = hex($ukey_npass1); |
$ukey_npass2= hex($ukey_npass2); |
$hexkey{'lkey_npass1'} = hex($lkey_npass1); |
$lkey_npass2= hex($lkey_npass2); |
$hexkey{'ukey_npass2'} = hex($ukey_npass2); |
|
$hexkey{'lkey_npass2'} = hex($lkey_npass2); |
# Output javascript to deal with passwords |
# Output javascript to deal with passwords |
# Output DES javascript |
# Output DES javascript |
{ |
{ |
Line 736 sub passwordchanger {
|
Line 784 sub passwordchanger {
|
my $jsh=Apache::File->new($include."/londes.js"); |
my $jsh=Apache::File->new($include."/londes.js"); |
$r->print(<$jsh>); |
$r->print(<$jsh>); |
} |
} |
|
$r->print(&jscript_send($caller)); |
$r->print(<<ENDFORM); |
$r->print(<<ENDFORM); |
|
$errormessage |
|
|
|
<p> |
|
<!-- We separate the forms into 'server' and 'client' in order to |
|
ensure that unencrypted passwords will not be sent out by a |
|
crappy browser --> |
|
ENDFORM |
|
$r->print(&server_form($logtoken,$caller,$mailtoken)); |
|
$r->print(&client_form($caller,\%hexkey,$currentpass,$defdom)); |
|
|
|
# |
|
return; |
|
} |
|
|
|
sub jscript_send { |
|
my ($caller) = @_; |
|
my $output = qq| |
<script language="JavaScript"> |
<script language="JavaScript"> |
|
|
function send() { |
function send() { |
Line 758 sub passwordchanger {
|
Line 824 sub passwordchanger {
|
initkeys(); |
initkeys(); |
this.document.pserver.elements.newpass_2.value |
this.document.pserver.elements.newpass_2.value |
=crypted(this.document.client.elements.newpass_2.value); |
=crypted(this.document.client.elements.newpass_2.value); |
|
|; |
|
if ($caller eq 'reset_by_email') { |
|
$output .= qq| |
|
this.document.pserver.elements.uname.value = |
|
this.document.client.elements.uname.value; |
|
this.document.pserver.elements.udom.value = |
|
this.document.client.elements.udom.options[this.document.client.elements.udom.selectedIndex].value; |
|
|; |
|
} |
|
$ output .= qq| |
this.document.pserver.submit(); |
this.document.pserver.submit(); |
} |
} |
|
|
</script> |
</script> |
$errormessage |
|; |
|
} |
<p> |
|
<!-- We separate the forms into 'server' and 'client' in order to |
|
ensure that unencrypted passwords will not be sent out by a |
|
crappy browser --> |
|
|
|
<form name="pserver" action="/adm/preferences" method="post"> |
|
<input type="hidden" name="logtoken" value="$logtoken" /> |
|
<input type="hidden" name="action" value="verify_and_change_pass" /> |
|
<input type="hidden" name="currentpass" value="" /> |
|
<input type="hidden" name="newpass_1" value="" /> |
|
<input type="hidden" name="newpass_2" value="" /> |
|
</form> |
|
|
|
|
sub client_form { |
|
my ($caller,$hexkey,$currentpass,$defdom) = @_; |
|
my $output = qq| |
<form name="client" > |
<form name="client" > |
<table> |
<table> |
|
|; |
|
if ($caller eq 'reset_by_email') { |
|
$output .= qq| |
|
<tr><td align="right"> E-mail address: </td> |
|
<td><input type="text" name="email" size="15" /> </td></tr> |
|
<tr><td align="right"> Username: </td> |
|
<td> |
|
<input type="text" name="uname" size="10" /> |
|
<input type="hidden" name="currentpass" value="$currentpass" /> |
|
</td></tr> |
|
<tr><td align="right"> Domain: </td> |
|
<td> |
|
|; |
|
$output .= &Apache::loncommon::select_dom_form($defdom,'udom').' |
|
</td> |
|
</tr> |
|
'; |
|
} else { |
|
$output .= qq| |
<tr><td align="right"> Current password: </td> |
<tr><td align="right"> Current password: </td> |
<td><input type="password" name="currentpass" size="10"/> </td></tr> |
<td><input type="password" name="currentpass" size="10"/> </td></tr> |
|
|; |
|
} |
|
$output .= <<"ENDFORM"; |
<tr><td align="right"> New password: </td> |
<tr><td align="right"> New password: </td> |
<td><input type="password" name="newpass_1" size="10" /> </td></tr> |
<td><input type="password" name="newpass_1" size="10" /> </td></tr> |
<tr><td align="right"> Confirm password: </td> |
<tr><td align="right"> Confirm password: </td> |
Line 789 $errormessage
|
Line 876 $errormessage
|
<tr><td colspan="2" align="center"> |
<tr><td colspan="2" align="center"> |
<input type="button" value="Change Password" onClick="send();"> |
<input type="button" value="Change Password" onClick="send();"> |
</table> |
</table> |
<input type="hidden" name="ukey_cpass" value="$ukey_cpass" /> |
<input type="hidden" name="ukey_cpass" value="$hexkey->{'ukey_cpass'}" /> |
<input type="hidden" name="lkey_cpass" value="$lkey_cpass" /> |
<input type="hidden" name="lkey_cpass" value="$hexkey->{'lkey_cpass'}" /> |
<input type="hidden" name="ukey_npass1" value="$ukey_npass1" /> |
<input type="hidden" name="ukey_npass1" value="$hexkey->{'ukey_npass1'}" /> |
<input type="hidden" name="lkey_npass1" value="$lkey_npass1" /> |
<input type="hidden" name="lkey_npass1" value="$hexkey->{'lkey_npass1'}" /> |
<input type="hidden" name="ukey_npass2" value="$ukey_npass2" /> |
<input type="hidden" name="ukey_npass2" value="$hexkey->{'ukey_npass2'}" /> |
<input type="hidden" name="lkey_npass2" value="$lkey_npass2" /> |
<input type="hidden" name="lkey_npass2" value="$hexkey->{'lkey_npass2'}" /> |
</form> |
</form> |
</p> |
</p> |
ENDFORM |
ENDFORM |
# |
return $output; |
return; |
} |
|
|
|
sub server_form { |
|
my ($logtoken,$caller,$mailtoken) = @_; |
|
my $action = '/adm/preferences'; |
|
if ($caller eq 'reset_by_email') { |
|
$action = '/adm/resetpw'; |
|
} |
|
my $output = qq| |
|
<form name="pserver" action="$action" method="post"> |
|
<input type="hidden" name="logtoken" value="$logtoken" /> |
|
<input type="hidden" name="currentpass" value="" /> |
|
<input type="hidden" name="newpass_1" value="" /> |
|
<input type="hidden" name="newpass_2" value="" /> |
|
|; |
|
if ($caller eq 'reset_by_email') { |
|
$output .= qq| |
|
<input type="hidden" name="token" value="$mailtoken" /> |
|
<input type="hidden" name="uname" value="" /> |
|
<input type="hidden" name="udom" value="" /> |
|
|
|
|; |
|
} |
|
$output .= qq| |
|
<input type="hidden" name="action" value="verify_and_change_pass" /> |
|
</form> |
|
|; |
|
return $output; |
} |
} |
|
|
sub verify_and_change_password { |
sub verify_and_change_password { |
my $r = shift; |
my ($r,$caller,$mailtoken) = @_; |
my $user = $env{'user.name'}; |
my ($user,$domain,$homeserver); |
my $domain = $env{'user.domain'}; |
if ($caller eq 'reset_by_email') { |
my $homeserver = $env{'user.home'}; |
$user = $env{'form.uname'}; |
|
$domain = $env{'form.udom'}; |
|
if ($user ne '' && $domain ne '') { |
|
$homeserver = &Apache::lonnet::homeserver($user,$domain); |
|
if ($homeserver eq 'no_host') { |
|
&passwordchanger($r,"<p>\n<font color='#ff0000'>ERROR</font>". |
|
"Invalid username and/or domain .\n</p>", |
|
$caller,$mailtoken); |
|
return 1; |
|
} |
|
} else { |
|
&passwordchanger($r,"<p>\n<font color='#ff0000'>ERROR</font>". |
|
"Username and Domain were blank.\n</p>", |
|
$caller,$mailtoken); |
|
return 1; |
|
} |
|
} else { |
|
$user = $env{'user.name'}; |
|
$domain = $env{'user.domain'}; |
|
$homeserver = $env{'user.home'}; |
|
} |
my $currentauth=&Apache::lonnet::queryauthenticate($user,$domain); |
my $currentauth=&Apache::lonnet::queryauthenticate($user,$domain); |
# Check for authentication types that allow changing of the password. |
# Check for authentication types that allow changing of the password. |
return if ($currentauth !~ /^(unix|internal):/); |
if ($currentauth !~ /^(unix|internal):/) { |
|
if ($caller eq 'reset_by_email') { |
|
&passwordchanger($r,"<p>\n<font color='#ff0000'>ERROR</font>". |
|
"Authentication type for this user can not be changed by this mechanism..\n</p>", |
|
$caller,$mailtoken); |
|
return 1; |
|
} else { |
|
return; |
|
} |
|
} |
# |
# |
my $currentpass = $env{'form.currentpass'}; |
my $currentpass = $env{'form.currentpass'}; |
my $newpass1 = $env{'form.newpass_1'}; |
my $newpass1 = $env{'form.newpass_1'}; |
Line 820 sub verify_and_change_password {
|
Line 963 sub verify_and_change_password {
|
defined($newpass1) && |
defined($newpass1) && |
defined($newpass2) ){ |
defined($newpass2) ){ |
&passwordchanger($r,"<p>\n<font color='#ff0000'>ERROR</font>". |
&passwordchanger($r,"<p>\n<font color='#ff0000'>ERROR</font>". |
"Password data was blank.\n</p>"); |
"One or more password fields were blank.\n</p>",$caller,$mailtoken); |
return; |
return; |
} |
} |
# Get the keys |
# Get the keys |
Line 828 sub verify_and_change_password {
|
Line 971 sub verify_and_change_password {
|
my $tmpinfo = Apache::lonnet::reply('tmpget:'.$logtoken,$lonhost); |
my $tmpinfo = Apache::lonnet::reply('tmpget:'.$logtoken,$lonhost); |
if (($tmpinfo=~/^error/) || ($tmpinfo eq 'con_lost')) { |
if (($tmpinfo=~/^error/) || ($tmpinfo eq 'con_lost')) { |
# I do not a have a better idea about how to handle this |
# I do not a have a better idea about how to handle this |
|
my $tryagain_text = &mt('Please log out and try again.'); |
|
if ($caller eq 'reset_by_email') { |
|
$tryagain_text = &mt('Please try again later.'); |
|
} |
$r->print(<<ENDERROR); |
$r->print(<<ENDERROR); |
<p> |
<p> |
<font color="#ff0000">ERROR:</font> Unable to retrieve stored token for |
<font color="#ff0000">ERROR:</font> Unable to retrieve stored token for |
password decryption. Please log out and try again. |
password decryption. $tryagain_text |
</p> |
</p> |
ENDERROR |
ENDERROR |
# Probably should log an error here |
# Probably should log an error here |
Line 842 ENDERROR
|
Line 989 ENDERROR
|
$currentpass = &des_decrypt($ckey ,$currentpass); |
$currentpass = &des_decrypt($ckey ,$currentpass); |
$newpass1 = &des_decrypt($n1key,$newpass1); |
$newpass1 = &des_decrypt($n1key,$newpass1); |
$newpass2 = &des_decrypt($n2key,$newpass2); |
$newpass2 = &des_decrypt($n2key,$newpass2); |
# |
# |
|
if ($caller eq 'reset_by_email') { |
|
my %data = &Apache::lonnet::tmpget($mailtoken); |
|
if ($currentpass ne $data{'temppasswd'}) { |
|
&passwordchanger($r, |
|
'<font color="#ff0000">ERROR:</font>'. |
|
'Could not verify current authentication. '. |
|
'Please try again.',$caller,$mailtoken); |
|
return 1; |
|
} |
|
} |
if ($newpass1 ne $newpass2) { |
if ($newpass1 ne $newpass2) { |
&passwordchanger($r, |
&passwordchanger($r, |
'<font color="#ff0000">ERROR:</font>'. |
'<font color="#ff0000">ERROR:</font>'. |
'The new passwords you entered do not match. '. |
'The new passwords you entered do not match. '. |
'Please try again.'); |
'Please try again.',$caller,$mailtoken); |
return 1; |
return 1; |
} |
} |
if (length($newpass1) < 7) { |
if (length($newpass1) < 7) { |
&passwordchanger($r, |
&passwordchanger($r, |
'<font color="#ff0000">ERROR:</font>'. |
'<font color="#ff0000">ERROR:</font>'. |
'Passwords must be a minimum of 7 characters long. '. |
'Passwords must be a minimum of 7 characters long. '. |
'Please try again.'); |
'Please try again.',$caller,$mailtoken); |
return 1; |
return 1; |
} |
} |
# |
# |
Line 865 ENDERROR
|
Line 1022 ENDERROR
|
} |
} |
if ($badpassword) { |
if ($badpassword) { |
# I can't figure out how to enter bad characters on my browser. |
# I can't figure out how to enter bad characters on my browser. |
&passwordchanger($r,<<ENDERROR); |
my $errormessage = <<"ENDERROR"; |
<font color="#ff0000">ERROR:</font> |
<font color="#ff0000">ERROR:</font> |
The password you entered contained illegal characters.<br /> |
The password you entered contained illegal characters.<br /> |
Valid characters are: space and <br /> |
Valid characters are: space and <br /> |
Line 874 Valid characters are: space and <br />
|
Line 1031 Valid characters are: space and <br />
|
ABCDEFGHIJKLMNOPQRSTUVWXYZ[\]^_\`abcdefghijklmnopqrstuvwxyz{|}~ |
ABCDEFGHIJKLMNOPQRSTUVWXYZ[\]^_\`abcdefghijklmnopqrstuvwxyz{|}~ |
</pre> |
</pre> |
ENDERROR |
ENDERROR |
|
&passwordchanger($r,$errormessage,$caller,$mailtoken); |
|
return 1; |
} |
} |
# |
# |
# Change the password (finally) |
# Change the password (finally) |
my $result = &Apache::lonnet::changepass |
my $result = &Apache::lonnet::changepass |
($user,$domain,$currentpass,$newpass1,$homeserver); |
($user,$domain,$currentpass,$newpass1,$homeserver,$caller); |
# Inform the user the password has (not?) been changed |
# Inform the user the password has (not?) been changed |
if ($result =~ /^ok$/) { |
if ($result =~ /^ok$/) { |
$r->print(<<"ENDTEXT"); |
$r->print(<<"ENDTEXT"); |
<h2>The password for $user was successfully changed</h2> |
<h3>The password for $user was successfully changed</h3> |
ENDTEXT |
ENDTEXT |
} else { |
} else { |
# error error: run in circles, scream and shout |
# error error: run in circles, scream and shout |
$r->print(<<ENDERROR); |
$r->print(<<ENDERROR); |
<h2><font color="#ff0000">The password for $user was not changed</font></h2> |
<h3><font color="#ff0000">The password for $user was not changed</font></h3> |
Please make sure your old password was entered correctly. |
Please make sure your old password was entered correctly. |
ENDERROR |
ENDERROR |
return 1; |
return 1; |