loncom/interface/lonpreferences.pm - diff

Return to lonpreferences.pm CVS log

Up to [LON-CAPA] / loncom / interface

Diff for /loncom/interface/lonpreferences.pm between versions 1.227 and 1.238

version 1.227, 2018/04/27 22:42:20	version 1.238, 2021/03/06 19:44:12
Line 27	Line 27
#	#
# This package uses the "londes.js" javascript code.	# This package uses the "londes.js" javascript code.
#	#
# TODOs that have to be completed:
# interface with lonnet to change the password

package Apache::lonpreferences;	package Apache::lonpreferences;

Line 365 $options.'	Line 363 $options.'
&Apache::lonhtmlcommon::row_closure(1).	&Apache::lonhtmlcommon::row_closure(1).
&Apache::lonhtmlcommon::end_pick_box().'	&Apache::lonhtmlcommon::end_pick_box().'
</div>');	</div>');
if ($roles_check_list) {	if ($roles_check_list) {
$r->print('<div class="LC_left_float">	$r->print('<div class="LC_left_float">
<h4>'.&mt('Freeze Roles').'</h4>	<h4>'.&mt('Freeze Roles').'</h4>
<p>'.&mt('The table below can be used to [_1]freeze[_2] '.$lc_role.'s in the Hotlist.','<q>','</q>').'<br />'.	<p>'.&mt('The table below can be used to [_1]freeze[_2] '.$lc_role.'s in the Hotlist.','<q>','</q>').'<br />'.
Line 629 sub icon_options {	Line 627 sub icon_options {
}	}

sub icon_previews {	sub icon_previews {
my %icon_text = (	my %icon_text = &Apache::lonlocal::texthash (
annotate => 'Notes',	annotate => 'Notes',
wishlist => 'Stored Links',	wishlist => 'Stored Links',
catalog => 'Info',	catalog => 'Info',
Line 638 sub icon_previews {	Line 636 sub icon_previews {
printout => 'Print',	printout => 'Print',
);	);
my %inlinetools = (	my %inlinetools = (
printout => "s&8&3&prt.png&$icon_text{'printout'}&printout[_1]&gopost('/adm/printout',currentURL)&Prepare a printable document",	printout => "s&8&3&prt.png&$icon_text{'printout'}&printout[_1]&gopost('/adm/printout',currentURL)&".&mt('Prepare a printable document'),
wishlist => "s&9&1&wishlist-link.png&$icon_text{'wishlist'}&wishlistlink[_2]&set_wishlistlink()&Save a link for this resource in your personal Stored Links repository",	wishlist => "s&9&1&wishlist-link.png&$icon_text{'wishlist'}&wishlistlink[_2]&set_wishlistlink()&".&mt('Save a link for this resource in your personal Stored Links repository'),
evaluate => "s&8&1&eval.png&$icon_text{'evaluate'}&this[_1]&gopost('/adm/evaluate',currentURL,1)&Provide my evaluation of this resource",	evaluate => "s&8&1&eval.png&$icon_text{'evaluate'}&this[_1]&gopost('/adm/evaluate',currentURL,1)&".&mt('Provide my evaluation of this resource'),
feedback => "s&8&2&fdbk.png&$icon_text{'feedback'}&discuss[_1]&gopost('/adm/feedback',currentURL,1)&Provide feedback messages or contribute to the course discussion about this resource",	feedback => "s&8&2&fdbk.png&$icon_text{'feedback'}&discuss[_1]&gopost('/adm/feedback',currentURL,1)&".&mt('Provide feedback messages or contribute to the course discussion about this resource'),
annotate => "s&9&3&anot.png&$icon_text{'annotate'}&tations[_1]&annotate()&Make notes and annotations about this resource",	annotate => "s&9&3&anot.png&$icon_text{'annotate'}&tations[_1]&annotate()&".&mt('Make notes and annotations about this resource'),
catalog => "s&6&3&catalog.png&$icon_text{'catalog'}&info[_1]&catalog_info()&Show Metadata",	catalog => "s&6&3&catalog.png&$icon_text{'catalog'}&info[_1]&catalog_info()&".&mt('Show Metadata'),
);	);
my @toolsorder = qw(annotate wishlist evaluate feedback printout catalog);	my @toolsorder = qw(annotate wishlist evaluate feedback printout catalog);
return (\%inlinetools,\@toolsorder);	return (\%inlinetools,\@toolsorder);
Line 1263 sub verify_and_change_colors {	Line 1261 sub verify_and_change_colors {
# password handler subroutines #	# password handler subroutines #
######################################################	######################################################
sub passwordchanger {	sub passwordchanger {
my ($r,$errormessage,$caller,$mailtoken) = @_;	my ($r,$errormessage,$caller,$mailtoken,$timelimit,$extrafields) = @_;
# 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)
$errormessage = ($errormessage \|\| '');	$errormessage = ($errormessage \|\| '');
Line 1275 sub passwordchanger {	Line 1273 sub passwordchanger {
$r->print(Apache::loncommon::start_page('Personal Data'));	$r->print(Apache::loncommon::start_page('Personal Data'));
$r->print(Apache::lonhtmlcommon::breadcrumbs('Change Password'));	$r->print(Apache::lonhtmlcommon::breadcrumbs('Change Password'));
}	}
my ($blocked,$blocktext) =
&Apache::loncommon::blocking_status('passwd');
if ($blocked) {
$r->print('<p class="LC_warning">'.$blocktext.'</p>');
return;
}
if ((!defined($caller)) \|\| ($caller eq 'preferences')) {	if ((!defined($caller)) \|\| ($caller eq 'preferences')) {
$user = $env{'user.name'};	$user = $env{'user.name'};
$domain = $env{'user.domain'};	$domain = $env{'user.domain'};
if (!defined($caller)) {	if (!defined($caller)) {
$caller = 'preferences';	$caller = 'preferences';
}	}
	my ($blocked,$blocktext) =
	&Apache::loncommon::blocking_status('passwd');
	if ($blocked) {
	$r->print('<p class="LC_warning">'.$blocktext.'</p>');
	return;
	}
} elsif ($caller eq 'reset_by_email') {	} elsif ($caller eq 'reset_by_email') {
my %data = &Apache::lonnet::tmpget($mailtoken);	my %data = &Apache::lonnet::tmpget($mailtoken);
if (keys(%data) == 0) {	if (keys(%data) == 0) {
$r->print(	$r->print(
'<p class="LC_warning">'	'<p class="LC_warning">'
.&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 [_1]new request[_2] 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.'	.&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 [_1]new request[_2] 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.'
,'<a href="/adm/resetpw">','</a>')	,'<a href="/adm/resetpw">','</a>')
.'</p>'	.'</p>'
);	);
return;	return;
}	}
if (defined($data{time})) {	if (defined($data{time})) {
if (time - $data{'time'} < 7200) {	if (time - $data{'time'} < $timelimit) {
$user = $data{'username'};	$user = $data{'username'};
$domain = $data{'domain'};	$domain = $data{'domain'};
$currentpass = $data{'temppasswd'};	$currentpass = $data{'temppasswd'};
} else {	my ($blocked,$blocktext) =
$r->print(	&Apache::loncommon::blocking_status('passwd',$user,$domain);
'<p class="LC_warning">'	if ($blocked) {
.&mt('Sorry, the token generated when you requested'	$r->print('<p class="LC_warning">'.$blocktext.'</p>');
.' a password reset has expired.')
.'</p>'
);
return;	return;
}	}
} else {	} else {
$r->print(	$r->print(
'<p class="LC_warning">'	'<p class="LC_warning">'
.&mt('Sorry, the URL generated when you requested reset of'	.&mt('Sorry, the token generated when you requested'
.' your password contained incomplete information.')	.' a password reset has expired.')
.'</p>'	.'</p>'
);	);
return;	return;
}	}
if (&Apache::lonnet::domain($domain) eq '') {	} else {
$domain = $r->dir_config('lonDefDomain');	$r->print(
}	'<p class="LC_warning">'
	.&mt('Sorry, the URL generated when you requested reset of'
	.' your password contained incomplete information.')
	.'</p>'
	);
	return;
	}
	if (&Apache::lonnet::domain($domain) eq '') {
	$domain = $r->dir_config('lonDefDomain');
	}
} else {	} else {
$r->print(	$r->print(
'<p class="LC_error">'	'<p class="LC_error">'
Line 1362 sub passwordchanger {	Line 1366 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(&jscript_send($caller,$domain,$currentauth,$extrafields));
$r->print(<<ENDFORM);	$r->print(<<ENDFORM);
$errormessage	$errormessage

Line 1371 $errormessage	Line 1375 $errormessage
ensure that unencrypted passwords will not be sent out by a	ensure that unencrypted passwords will not be sent out by a
crappy browser -->	crappy browser -->
ENDFORM	ENDFORM
$r->print(&server_form($logtoken,$caller,$mailtoken));	$r->print(&server_form($logtoken,$caller,$mailtoken,$extrafields));
$r->print(&client_form($caller,\%hexkey,$currentpass,$domain));	$r->print(&client_form($caller,\%hexkey,$currentpass,$domain,$extrafields));

#	#
return;	return;
}	}

sub jscript_send {	sub jscript_send {
my ($caller) = @_;	my ($caller,$domain,$currentauth,$extrafields) = @_;
	my ($min,$max,$rulestr,$numrules);
	$min = $Apache::lonnet::passwdmin;
	my %js_lt = &Apache::lonlocal::texthash(
	uc => 'New password needs at least one upper case letter',
	lc => 'New password needs at least one lower case letter',
	num => 'New password needs at least one number',
	spec => 'New password needs at least one non-alphanumeric',
	blank1 => 'Empty Password field',
	blank2 => 'Empty Confirm Password field',
	mismatch => 'Contents of Password and Confirm Password fields must match',
	fail => 'Please fix the following:',
	);
	&js_escape(\%js_lt);
	if ($currentauth eq 'internal:') {
	if ($domain ne '') {
	my %passwdconf = &Apache::lonnet::get_passwdconf($domain);
	if (keys(%passwdconf)) {
	if ($passwdconf{min}) {
	$min = $passwdconf{min};
	}
	if ($passwdconf{max}) {
	$max = $passwdconf{max};
	$js_lt{'long'} = &js_escape(&mt('Maximum password length: [_1]',$max));
	}
	if (ref($passwdconf{chars}) eq 'ARRAY') {
	if (@{$passwdconf{chars}}) {
	$rulestr = join('","',@{$passwdconf{chars}});
	$numrules = scalar(@{$passwdconf{chars}});
	}
	}
	}
	}
	}
	$js_lt{'short'} = &js_escape(&mt('Minimum password length: [_1]',$min));

	my $passwdcheck = <<"ENDJS";
	var errors = new Array();
	var min = parseInt("$min") \|\| 0;
	var currauth = "$currentauth";
	if (this.document.client.elements.newpass_1.value == '') {
	errors.push("$js_lt{'blank1'}");
	}
	if (this.document.client.elements.newpass_2.value == '') {
	errors.push("$js_lt{'blank2'}");
	}
	if (errors.length == 0) {
	if (this.document.client.elements.newpass_1.value != this.document.client.elements.newpass_2.value) {
	errors.push("$js_lt{'mismatch'}");
	}
	var posspass = this.document.client.elements.newpass_1.value;
	if (min > 0) {
	if (posspass.length < min) {
	errors.push("$js_lt{'short'}");
	}
	}
	if (currauth == 'internal:') {
	var max = parseInt("$max") \|\| 0;
	if (max > 0) {
	if (posspass.length > max) {
	errors.push("$js_lt{'long'}");
	}
	}
	var numrules = parseInt("$numrules") \|\| 0;
	if (numrules > 0) {
	var rules = new Array("$rulestr");
	for (var i=0; i<rules.length; i++) {
	if (rules[i] == 'uc') {
	if (!posspass.match(/[A-Z]/)) {
	errors.push("$js_lt{'uc'}");
	}
	} else if (rules[i] == 'lc') {
	if (!posspass.match(/[a-z]/)) {
	errors.push("$js_lt{'lc'}");
	}
	} else if (rules[i] == 'num') {
	if (!posspass.match(/\\d/)) {
	errors.push("$js_lt{'num'}");
	}
	} else if (rules[i] == 'spec') {
	var pattern = /^[!@#$%^&*()_+\\-=\\[\\]{};':"\\\\|,.<a>\\/?]/;
	if (!posspass.match(pattern)) {
	errors.push("$js_lt{'spec'}");
	}
	}
	}
	}
	}
	}
	if (errors.length > 0) {
	alert("$js_lt{'fail'}"+"\\n\\n"+errors.join("\\n"));
	return;
	}
	ENDJS
my $output = qq\|	my $output = qq\|
<script type="text/javascript" language="JavaScript">	<script type="text/javascript" language="JavaScript">

function send() {	function send() {
	$passwdcheck
uextkey=this.document.client.elements.ukey_cpass.value;	uextkey=this.document.client.elements.ukey_cpass.value;
lextkey=this.document.client.elements.lkey_cpass.value;	lextkey=this.document.client.elements.lkey_cpass.value;
initkeys();	initkeys();
Line 1401 sub jscript_send {	Line 1499 sub jscript_send {
=getCrypted(this.document.client.elements.newpass_2.value);	=getCrypted(this.document.client.elements.newpass_2.value);
\|;	\|;
if ($caller eq 'reset_by_email') {	if ($caller eq 'reset_by_email') {
$output .= qq\|	if ((ref($extrafields) eq 'HASH') && ($extrafields->{'username'})) {
	$output .= qq\|
this.document.pserver.elements.uname.value =	this.document.pserver.elements.uname.value =
this.document.client.elements.uname.value;	this.document.client.elements.uname.value;
this.document.pserver.elements.udom.value =	this.document.pserver.elements.udom.value =
this.document.client.elements.udom.options[this.document.client.elements.udom.selectedIndex].value;	this.document.client.elements.udom.options[this.document.client.elements.udom.selectedIndex].value;
	\|;
	}
	if ((ref($extrafields) eq 'HASH') && ($extrafields->{'email'})) {
	$output .= qq\|
this.document.pserver.elements.email.value =	this.document.pserver.elements.email.value =
this.document.client.elements.email.value;	this.document.client.elements.email.value;
\|;	\|;
	}
}	}
$ output .= qq\|	$ output .= qq\|
this.document.pserver.submit();	this.document.pserver.submit();
Line 1419 sub jscript_send {	Line 1523 sub jscript_send {
}	}

sub client_form {	sub client_form {
my ($caller,$hexkey,$currentpass,$defdom) = @_;	my ($caller,$hexkey,$currentpass,$defdom,$extrafields) = @_;
my %lt=&Apache::lonlocal::texthash(	my %lt=&Apache::lonlocal::texthash(
'email' => 'E-mail Address',	'email' => 'E-mail Address',
'username' => 'Username',	'username' => 'Username',
Line 1433 sub client_form {	Line 1537 sub client_form {
my $output = '<form name="client" action="">'	my $output = '<form name="client" action="">'
.&Apache::lonhtmlcommon::start_pick_box();	.&Apache::lonhtmlcommon::start_pick_box();
if ($caller eq 'reset_by_email') {	if ($caller eq 'reset_by_email') {
my $mobileargs;	if ((ref($extrafields) eq 'HASH') && ($extrafields->{'email'})) {
(undef,undef,undef,undef,undef,undef,my $clientmobile) =	$output .= &Apache::lonhtmlcommon::row_title(
&Apache::loncommon::decode_user_agent();
if ($clientmobile) {
$mobileargs = 'autocapitalize="off" autocorrect="off" ';
}
$output .= &Apache::lonhtmlcommon::row_title(
'<label for="email">'.$lt{'email'}.'</label>')	'<label for="email">'.$lt{'email'}.'</label>')
.'<input type="text" name="email" size="30" '.$mobileargs.'/>'	.'<input type="text" name="email" size="30" autocapitalize="off" autocorrect="off" />'
.&Apache::lonhtmlcommon::row_closure()	.&Apache::lonhtmlcommon::row_closure();
.&Apache::lonhtmlcommon::row_title(	}
	if ((ref($extrafields) eq 'HASH') && ($extrafields->{'username'})) {
	$output .= &Apache::lonhtmlcommon::row_title(
'<label for="uname">'.$lt{'username'}.'</label>')	'<label for="uname">'.$lt{'username'}.'</label>')
.'<input type="text" name="uname" size="20" '.$mobileargs.'/>'	.'<input type="text" name="uname" size="20" autocapitalize="off" autocorrect="off" />'
.'<input type="hidden" name="currentpass" value="'.$currentpass.'" />'	.&Apache::lonhtmlcommon::row_closure()
.&Apache::lonhtmlcommon::row_closure()	.&Apache::lonhtmlcommon::row_title(
.&Apache::lonhtmlcommon::row_title(
'<label for="udom">'.$lt{'domain'}.'</label>')	'<label for="udom">'.$lt{'domain'}.'</label>')
.&Apache::loncommon::select_dom_form($defdom,'udom')	.&Apache::loncommon::select_dom_form($defdom,'udom')
.&Apache::lonhtmlcommon::row_closure();	.&Apache::lonhtmlcommon::row_closure();
	}
} else {	} else {
$output .= &Apache::lonhtmlcommon::row_title(	$output .= &Apache::lonhtmlcommon::row_title(
'<label for="currentpass">'.$lt{'currentpass'}.'</label>')	'<label for="currentpass">'.$lt{'currentpass'}.'</label>')
Line 1467 sub client_form {	Line 1568 sub client_form {
.'<input type="password" name="newpass_2" size="20" />'	.'<input type="password" name="newpass_2" size="20" />'
.&Apache::lonhtmlcommon::row_closure(1)	.&Apache::lonhtmlcommon::row_closure(1)
.&Apache::lonhtmlcommon::end_pick_box();	.&Apache::lonhtmlcommon::end_pick_box();
	if ($caller eq 'reset_by_email') {
	$output .= '<input type="hidden" name="currentpass" value="'.$currentpass.'" />';
	}
$output .= '<p><input type="button" value="'.$lt{'changepass'}.'" onclick="send();" /></p>'	$output .= '<p><input type="button" value="'.$lt{'changepass'}.'" onclick="send();" /></p>'
.qq\|	.qq\|
<input type="hidden" name="ukey_cpass" value="$hexkey->{'ukey_cpass'}" />	<input type="hidden" name="ukey_cpass" value="$hexkey->{'ukey_cpass'}" />
Line 1482 sub client_form {	Line 1586 sub client_form {
}	}

sub server_form {	sub server_form {
my ($logtoken,$caller,$mailtoken) = @_;	my ($logtoken,$caller,$mailtoken,$extrafields) = @_;
my $action = '/adm/preferences';	my $action = '/adm/preferences';
if ($caller eq 'reset_by_email') {	if ($caller eq 'reset_by_email') {
$action = '/adm/resetpw';	$action = '/adm/resetpw';
Line 1493 sub server_form {	Line 1597 sub server_form {
<input type="hidden" name="currentpass" value="" />	<input type="hidden" name="currentpass" value="" />
<input type="hidden" name="newpass_1" value="" />	<input type="hidden" name="newpass_1" value="" />
<input type="hidden" name="newpass_2" value="" />	<input type="hidden" name="newpass_2" value="" />
\|;	\|;
if ($caller eq 'reset_by_email') {	if ($caller eq 'reset_by_email') {
$output .= qq\|	$output .= qq\|
<input type="hidden" name="token" value="$mailtoken" />	<input type="hidden" name="token" value="$mailtoken" />
	\|;
	if ((ref($extrafields) eq 'HASH') && ($extrafields->{'username'})) {
	$output .= qq\|
<input type="hidden" name="uname" value="" />	<input type="hidden" name="uname" value="" />
<input type="hidden" name="udom" value="" />	<input type="hidden" name="udom" value="" />
	\|;
	}
	if ((ref($extrafields) eq 'HASH') && ($extrafields->{'email'})) {
	$output .= qq\|
<input type="hidden" name="email" value="" />	<input type="hidden" name="email" value="" />

\|;	\|;
	}
}	}
$output .= qq\|	$output .= qq\|
<input type="hidden" name="action" value="verify_and_change_pass" />	<input type="hidden" name="action" value="verify_and_change_pass" />
Line 1511 sub server_form {	Line 1622 sub server_form {
}	}

sub verify_and_change_password {	sub verify_and_change_password {
my ($r,$caller,$mailtoken,$ended) = @_;	my ($r,$caller,$mailtoken,$timelimit,$extrafields,$ended) = @_;
my ($user,$domain,$homeserver);	my ($user,$domain,$homeserver);
my ($blocked,$blocktext) =
&Apache::loncommon::blocking_status('passwd');
if ($blocked) {
$r->print('<p class="LC_warning">'.$blocktext.'</p>');
return;
}
if ($caller eq 'reset_by_email') {	if ($caller eq 'reset_by_email') {
$user = $env{'form.uname'};	$user = $env{'form.uname'};
$domain = $env{'form.udom'};	$domain = $env{'form.udom'};
Line 1527 sub verify_and_change_password {	Line 1632 sub verify_and_change_password {
if ($homeserver eq 'no_host') {	if ($homeserver eq 'no_host') {
&passwordchanger($r,"<p>\n<span class='LC_error'>".	&passwordchanger($r,"<p>\n<span class='LC_error'>".
&mt("Invalid username and/or domain")."</span>\n</p>",	&mt("Invalid username and/or domain")."</span>\n</p>",
$caller,$mailtoken);	$caller,$mailtoken,$timelimit,$extrafields);
return 1;	return 'no_host';
}	}
} else {	} else {
&passwordchanger($r,"<p>\n<span class='LC_error'>".	&passwordchanger($r,"<p>\n<span class='LC_error'>".
&mt("Username and domain were blank")."</span>\n</p>",	&mt("Username and domain were blank")."</span>\n</p>",
$caller,$mailtoken);	$caller,$mailtoken,$timelimit,$extrafields);
return 1;	return 'missingdata';
}	}
} else {	} else {
$user = $env{'user.name'};	$user = $env{'user.name'};
$domain = $env{'user.domain'};	$domain = $env{'user.domain'};
$homeserver = $env{'user.home'};	$homeserver = $env{'user.home'};
}	}
	my ($blocked,$blocktext) =
	&Apache::loncommon::blocking_status('passwd',$user,$domain);
	if ($blocked) {
	$r->print('<p class="LC_warning">'.$blocktext.'</p>');
	if ($caller eq 'reset_by_email') {
	return 'blocked';
	} else {
	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.
if ($currentauth !~ /^(unix\|internal):/) {	if ($currentauth !~ /^(unix\|internal):/) {
Line 1548 sub verify_and_change_password {	Line 1663 sub verify_and_change_password {
&passwordchanger($r,"<p>\n<span class='LC_error'>".	&passwordchanger($r,"<p>\n<span class='LC_error'>".
&mt("Authentication type for this user can not be changed by this mechanism").	&mt("Authentication type for this user can not be changed by this mechanism").
"</span>\n</p>",	"</span>\n</p>",
$caller,$mailtoken);	$caller,$mailtoken,$timelimit,$extrafields);
return 1;	return 'otherauth';
} else {	} else {
return;	return;
}	}
Line 1565 sub verify_and_change_password {	Line 1680 sub verify_and_change_password {
defined($newpass2) ){	defined($newpass2) ){
&passwordchanger($r,"<p>\n<span class='LC_error'>".	&passwordchanger($r,"<p>\n<span class='LC_error'>".
&mt("One or more password fields were blank").	&mt("One or more password fields were blank").
"</span>\n</p>",$caller,$mailtoken);	"</span>\n</p>",$caller,$mailtoken,$timelimit,$extrafields);
return;	if ($caller eq 'reset_by_email') {
	return 'missingdata';
	} else {
	return;
	}
}	}
# Get the keys	# Get the keys
my $lonhost = $r->dir_config('lonHostID');	my $lonhost = $r->dir_config('lonHostID');
Line 1584 sub verify_and_change_password {	Line 1703 sub verify_and_change_password {
</p>	</p>
ENDERROR	ENDERROR
# Probably should log an error here	# Probably should log an error here
return 1;	if ($caller eq 'reset_by_email') {
	return 'internalerror';
	} else {
	return;
	}
}	}
my ($ckey,$n1key,$n2key)=split(/&/,$tmpinfo);	my ($ckey,$n1key,$n2key)=split(/&/,$tmpinfo);
#	#
Line 1598 ENDERROR	Line 1721 ENDERROR
&passwordchanger($r,	&passwordchanger($r,
'<span class="LC_error">'.	'<span class="LC_error">'.
&mt('Could not verify current authentication.').' '.	&mt('Could not verify current authentication.').' '.
&mt('Please try again.').'</span>',$caller,$mailtoken);	&mt('Please try again.').'</span>',$caller,$mailtoken,$timelimit,$extrafields);
return 1;	return 'emptydata';
}	}
if ($currentpass ne $data{'temppasswd'}) {	if ($currentpass ne $data{'temppasswd'}) {
&passwordchanger($r,	&passwordchanger($r,
'<span class="LC_error">'.	'<span class="LC_error">'.
&mt('Could not verify current authentication.').' '.	&mt('Could not verify current authentication.').' '.
&mt('Please try again.').'</span>',$caller,$mailtoken);	&mt('Please try again.').'</span>',$caller,$mailtoken,$timelimit,$extrafields);
return 1;	return 'missingtemp';
}	}
}	}
if ($newpass1 ne $newpass2) {	if ($newpass1 ne $newpass2) {
&passwordchanger($r,	&passwordchanger($r,
'<span class="LC_warning">'.	'<span class="LC_warning">'.
&mt('The new passwords you entered do not match.').' '.	&mt('The new passwords you entered do not match.').' '.
&mt('Please try again.').'</span>',$caller,$mailtoken);	&mt('Please try again.').'</span>',$caller,$mailtoken,$timelimit,$extrafields);
return 1;	if ($caller eq 'reset_by_email') {
	return 'mismatch';
	} else {
	return;
	}
}	}
if (length($newpass1) < 7) {	if ($currentauth eq 'unix:') {
&passwordchanger($r,	if (length($newpass1) < 7) {
'<span class="LC_warning">'.	&passwordchanger($r,
&mt('Passwords must be a minimum of 7 characters long.').' '.	'<span class="LC_warning">'.
&mt('Please try again.').'</span>',$caller,$mailtoken);	&mt('Passwords must be a minimum of 7 characters long.').' '.
return 1;	&mt('Please try again.').'</span>',$caller,$mailtoken,$timelimit,$extrafields);
	if ($caller eq 'reset_by_email') {
	return 'length';
	} else {
	return;
	}
	}
	} else {
	my $warning = &Apache::loncommon::check_passwd_rules($domain,$newpass1);
	if ($warning) {
	&passwordchanger($r,'<span class="LC_warning">'.
	$warning.
	&mt('Please try again.').'</span>',
	$caller,$mailtoken,$timelimit,$extrafields);
	if ($caller eq 'reset_by_email') {
	return 'rules';
	} else {
	return;
	}
	}
}	}
#	#
# Check for bad characters	# Check for bad characters
Line 1640 ENDERROR	Line 1786 ENDERROR
ABCDEFGHIJKLMNOPQRSTUVWXYZ[\]^_\`abcdefghijklmnopqrstuvwxyz{\|}~	ABCDEFGHIJKLMNOPQRSTUVWXYZ[\]^_\`abcdefghijklmnopqrstuvwxyz{\|}~
</pre></span>	</pre></span>
ENDERROR	ENDERROR
&passwordchanger($r,$errormessage,$caller,$mailtoken);	&passwordchanger($r,$errormessage,$caller,$mailtoken,$timelimit,$extrafields);
return 1;	if ($caller eq 'reset_by_email') {
	return 'badchars';
	} else {
	return;
	}
}	}
#	#
# Change the password (finally)	# Change the password (finally)
Line 1664 ENDERROR	Line 1814 ENDERROR
# error error: run in circles, scream and shout	# error error: run in circles, scream and shout
if ($caller eq 'reset_by_email') {	if ($caller eq 'reset_by_email') {
if (!$result) {	if (!$result) {
return 1;	return 'error';
} else {	} else {
return $result;	return $result;
}	}
} else {	} else {
	my $feedback;
	if ($result eq 'prioruse') {
	$feedback = &mt('Please enter a password that you have not used recently.');
	} else {
	$feedback = &mt('Please make sure your old password was entered correctly.');
	}
$message = &Apache::lonhtmlcommon::confirm_success(	$message = &Apache::lonhtmlcommon::confirm_success(
&mt("The password for user [_1] was not changed.",'<i>'.$user.'</i>').' '.&mt('Please make sure your old password was entered correctly.'),1);	&mt("The password for user [_1] was not changed.",'<i>'.$user.'</i>').' '.$feedback,1);
$message=&Apache::loncommon::confirmwrapper($message);	$message=&Apache::loncommon::confirmwrapper($message);
&print_main_menu($r, $message);	&print_main_menu($r, $message);
if (ref($ended)) {	if (ref($ended)) {
Line 2278 sub handler {	Line 2434 sub handler {
} else {	} else {
$brlink ='/adm/preferences';	$brlink ='/adm/preferences';
$brtxt = 'Set User Preferences';	$brtxt = 'Set User Preferences';
$brhelp = 'Prefs_About_Me,Prefs_Language,Prefs_Screen_Name_Nickname,Change_Colors,Change_Password,Prefs_Messages,Change_Discussion_Display';	$brhelp = 'Prefs_About_Me,Prefs_Language,Prefs_Screen_Name_Nickname,Change_Colors,Change_Password,Prefs_Messages,Change_Discussion_Display';
}	}
Apache::lonhtmlcommon::add_breadcrumb	Apache::lonhtmlcommon::add_breadcrumb
({href => $brlink,	({href => $brlink,
Line 2290 sub handler {	Line 2446 sub handler {
}elsif($env{'form.action'} eq 'changepass'){	}elsif($env{'form.action'} eq 'changepass'){
&passwordchanger($r);	&passwordchanger($r);
}elsif($env{'form.action'} eq 'verify_and_change_pass'){	}elsif($env{'form.action'} eq 'verify_and_change_pass'){
&verify_and_change_password($r,'preferences','',\$ended);	&verify_and_change_password($r,'preferences','','','',\$ended);
}elsif($env{'form.action'} eq 'changescreenname'){	}elsif($env{'form.action'} eq 'changescreenname'){
&screennamechanger($r);	&screennamechanger($r);
}elsif($env{'form.action'} eq 'verify_and_change_screenname'){	}elsif($env{'form.action'} eq 'verify_and_change_screenname'){

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>

Removed from v.1.227
changed lines
	Added in v.1.238