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.196.4.19 and 1.196.4.25

version 1.196.4.19, 2016/08/10 23:50:07	version 1.196.4.25, 2019/08/22 00:00:03
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 477 sub verify_and_change_rolespref {	Line 475 sub verify_and_change_rolespref {
}	}



################################################################	################################################################
# Anonymous Discussion Name Change Subroutines #	# Anonymous Discussion Name Change Subroutines #
################################################################	################################################################
Line 722 sub domcoordchanger {	Line 719 sub domcoordchanger {
my $text=&mt('By default, the Domain Coordinator can enter your Authoring Space.');	my $text=&mt('By default, the Domain Coordinator can enter your Authoring Space.');
my $construction=&mt('Block access to Authoring Space');	my $construction=&mt('Block access to Authoring Space');
my $change=&mt('Save');	my $change=&mt('Save');
	my $returnurl = &HTML::Entities::encode($env{'form.returnurl'},'"<>&\'');
$r->print(<<ENDSCREEN);	$r->print(<<ENDSCREEN);
<form name="prefs" action="/adm/preferences" method="post">	<form name="prefs" action="/adm/preferences" method="post">
	<input type="hidden" name="returnurl" value="$returnurl" />
<input type="hidden" name="action" value="verify_and_change_domcoord" />	<input type="hidden" name="action" value="verify_and_change_domcoord" />
$text<br />	$text<br />
<label><input type="checkbox" name="construction"$constchecked />$construction</label><br />	<label><input type="checkbox" name="construction"$constchecked />$construction</label><br />
Line 748 sub verify_and_change_domcoord {	Line 747 sub verify_and_change_domcoord {
}	}
my $message=&Apache::lonhtmlcommon::confirm_success(&mt('Set [_1] to [_2]','<i>'.&mt('Block access to Authoring Space').'</i>','<tt>'.$status.'</tt>'));	my $message=&Apache::lonhtmlcommon::confirm_success(&mt('Set [_1] to [_2]','<i>'.&mt('Block access to Authoring Space').'</i>','<tt>'.$status.'</tt>'));
$message=&Apache::loncommon::confirmwrapper($message);	$message=&Apache::loncommon::confirmwrapper($message);
&print_main_menu($r,$message);	if ($env{'form.returnurl'}) {
	&do_redirect($r,$env{'form.returnurl'},$message);
	} else {
	&print_main_menu($r,$message);
	}
}	}

#################################################################	#################################################################
Line 1154 sub colorschanger {	Line 1157 sub colorschanger {
' . $colorchooser . '	' . $colorchooser . '
</script>	</script>
');	');

$r->print(<<ENDCOL);	$r->print(<<ENDCOL);

<form name="parmform" action="">	<form name="parmform" action="">
Line 1224 sub verify_and_change_colors {	Line 1226 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 1249 sub passwordchanger {	Line 1251 sub passwordchanger {
$caller = 'preferences';	$caller = 'preferences';
}	}
} 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 {
$r->print(
'<p class="LC_warning">'
.&mt('Sorry, the token generated when you requested'
.' a password reset has expired.')
.'</p>'
);
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 1323 sub passwordchanger {	Line 1325 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,$extrafields));
$r->print(<<ENDFORM);	$r->print(<<ENDFORM);
$errormessage	$errormessage

Line 1332 $errormessage	Line 1334 $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,$extrafields) = @_;
my $output = qq\|	my $output = qq\|
<script type="text/javascript" language="JavaScript">	<script type="text/javascript" language="JavaScript">

Line 1362 sub jscript_send {	Line 1364 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 1380 sub jscript_send {	Line 1388 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 1394 sub client_form {	Line 1402 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') {
$output .= &Apache::lonhtmlcommon::row_title(	if ((ref($extrafields) eq 'HASH') && ($extrafields->{'email'})) {
	$output .= &Apache::lonhtmlcommon::row_title(
'<label for="email">'.$lt{'email'}.'</label>')	'<label for="email">'.$lt{'email'}.'</label>')
.'<input type="text" name="email" size="30" />'	.'<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" />'	.'<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 1422 sub client_form {	Line 1433 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 1437 sub client_form {	Line 1451 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 1448 sub server_form {	Line 1462 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 1466 sub server_form {	Line 1487 sub server_form {
}	}

sub verify_and_change_password {	sub verify_and_change_password {
my ($r,$caller,$mailtoken) = @_;	my ($r,$caller,$mailtoken,$ended) = @_;
my ($user,$domain,$homeserver);	my ($user,$domain,$homeserver);
my ($blocked,$blocktext) =	my ($blocked,$blocktext) =
&Apache::loncommon::blocking_status('passwd');	&Apache::loncommon::blocking_status('passwd');
Line 1542 ENDERROR	Line 1563 ENDERROR
return 1;	return 1;
}	}
my ($ckey,$n1key,$n2key)=split(/&/,$tmpinfo);	my ($ckey,$n1key,$n2key)=split(/&/,$tmpinfo);
#	#
$currentpass = &Apache::loncommon::des_decrypt($ckey ,$currentpass);	$currentpass = &Apache::loncommon::des_decrypt($ckey ,$currentpass);
$newpass1 = &Apache::loncommon::des_decrypt($n1key,$newpass1);	$newpass1 = &Apache::loncommon::des_decrypt($n1key,$newpass1);
$newpass2 = &Apache::loncommon::des_decrypt($n2key,$newpass2);	$newpass2 = &Apache::loncommon::des_decrypt($n2key,$newpass2);
Line 1563 ENDERROR	Line 1584 ENDERROR
&mt('Please try again.').'</span>',$caller,$mailtoken);	&mt('Please try again.').'</span>',$caller,$mailtoken);
return 1;	return 1;
}	}
}	}
if ($newpass1 ne $newpass2) {	if ($newpass1 ne $newpass2) {
&passwordchanger($r,	&passwordchanger($r,
'<span class="LC_warning">'.	'<span class="LC_warning">'.
Line 1571 ENDERROR	Line 1592 ENDERROR
&mt('Please try again.').'</span>',$caller,$mailtoken);	&mt('Please try again.').'</span>',$caller,$mailtoken);
return 1;	return 1;
}	}
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);
	return 1;
	}
	} 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);
	return 1;
	}
}	}
#	#
# Check for bad characters	# Check for bad characters
Line 1611 ENDERROR	Line 1643 ENDERROR
$r->print($message.'<br />');	$r->print($message.'<br />');
} else {	} else {
&print_main_menu($r, $message);	&print_main_menu($r, $message);
	if (ref($ended)) {
	$$ended = 1;
	}
}	}
} else {	} else {
# error error: run in circles, scream and shout	# error error: run in circles, scream and shout
Line 1621 ENDERROR	Line 1656 ENDERROR
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)) {
	$$ended = 1;
	}
}	}
}	}
return;	return;
Line 1860 sub verify_and_change_coursepage {	Line 1904 sub verify_and_change_coursepage {
&print_main_menu($r,$message);	&print_main_menu($r,$message);
}	}

	sub author_space_settings {
	my $r = shift;
	&Apache::lonhtmlcommon::add_breadcrumb(
	{ href => '/adm/preferences?action=authorsettings',
	text => 'Authoring Space Settings'});
	my $user = $env{'user.name'};
	my $domain = $env{'user.domain'};
	my %author_roles = &Apache::lonnet::get_my_roles($user,$domain,'userroles','',['au','ca','aa']);
	if (keys(%author_roles) > 0) {
	$r->print(Apache::loncommon::start_page('Authoring Space Settings'));
	$r->print(Apache::lonhtmlcommon::breadcrumbs('Authoring Space Settings'));
	my %userenv = &Apache::lonnet::get('environment',['nocodemirror']);
	my $constchecked='';
	if ($env{'environment.nocodemirror'}) {
	$constchecked=' checked="checked"';
	}
	my $text=&mt('By default, CodeMirror an editor with advanced functionality for editing code is activated for authors.');
	my $cmoff=&mt('Deactivate CodeMirror. This can improve performance on slow computers and accessibility.');
	my $change=&mt('Save');
	my $returnurl = &HTML::Entities::encode($env{'form.returnurl'},'"<>&\'');
	$r->print(<<ENDSCREEN);
	<form name="prefs" action="/adm/preferences" method="post">
	<input type="hidden" name="returnurl" value="$returnurl" />
	<input type="hidden" name="action" value="change_authoring_settings" />
	$text<br />
	<label><input type="checkbox" name="cmoff"$constchecked />$cmoff</label><br />
	<input type="submit" value="$change" />
	</form>
	ENDSCREEN
	}
	}

	sub change_authoring_settings {
	my $r = shift;
	my $user = $env{'user.name'};
	my $domain = $env{'user.domain'};
	my %author_roles = &Apache::lonnet::get_my_roles($user,$domain,'userroles','',['au','ca','aa']);
	if (keys(%author_roles) > 0) {
	my %ausettings=('environment.nocodemirror' => '');
	if ($env{'form.cmoff'}) { $ausettings{'environment.nocodemirror'}='yes'; }
	&Apache::lonnet::put('environment',\%ausettings);
	&Apache::lonnet::appenv({'environment.nocodemirror' => $ausettings{'environment.nocodemirror'}});
	my $status='';
	if ($ausettings{'environment.nocodemirror'} eq 'yes') {
	$status=&mt('on');
	} else {
	$status=&mt('off');
	}
	my $message=&Apache::lonhtmlcommon::confirm_success(&mt('Set [_1] to [_2]','<i>'.&mt('Deactivate CodeMirror in Authoring Space').'</i>','<tt>'.$status.'</tt>'));
	$message=&Apache::loncommon::confirmwrapper($message);
	if ($env{'form.returnurl'}) {
	&do_redirect($r,$env{'form.returnurl'},$message);
	} else {
	&print_main_menu($r,$message);
	}
	}
	}

sub lockednameschanger {	sub lockednameschanger {
my $r = shift;	my $r = shift;
&Apache::lonhtmlcommon::add_breadcrumb(	&Apache::lonhtmlcommon::add_breadcrumb(
Line 2120 push(@{ $menu[4]->{items} }, {	Line 2222 push(@{ $menu[4]->{items} }, {
});	});

}	}

	my %author_coauthor_roles = &Apache::lonnet::get_my_roles($user,$domain,'userroles','',['au','ca','aa']);
	if (keys(%author_coauthor_roles) > 0) {
	push(@{ $menu[4]->{items} }, {
	linktext => 'Authoring Space Configuration',
	url => '/adm/preferences?action=authorsettings',
	permission => 'F',
	icon => 'codemirror.png',
	linktitle => 'Settings for your authoring space.',
	});
	}

if (&can_toggle_debug()) {	if (&can_toggle_debug()) {
push(@{ $menu[4]->{items} }, {	push(@{ $menu[4]->{items} }, {
linktext => 'Toggle Debug Messages (Currently '.($env{'user.debug'} ? 'on)' : 'off)'),	linktext => 'Toggle Debug Messages (Currently '.($env{'user.debug'} ? 'on)' : 'off)'),
Line 2157 sub handler {	Line 2271 sub handler {
['action','wysiwyg','returnurl','refpage']);	['action','wysiwyg','returnurl','refpage']);
#	#
Apache::lonhtmlcommon::clear_breadcrumbs();	Apache::lonhtmlcommon::clear_breadcrumbs();
my ($brlink,$brtxt,$brhelp);	my ($brlink,$brtxt,$brhelp,$ended);
if (($env{'form.action'} eq 'changerolespref') && ($env{'form.returnurl'} eq '/adm/roles')) {	if (($env{'form.action'} eq 'changerolespref') && ($env{'form.returnurl'} eq '/adm/roles')) {
$brlink ='/adm/roles';	$brlink ='/adm/roles';
$brtxt = 'User Roles';	$brtxt = 'User Roles';
	} elsif ((($env{'form.action'} eq 'changedomcoord') \|\|
	($env{'form.action'} eq 'authorsettings')) &&
	(($env{'form.returnurl'} =~ m{^/(priv/\|res($\|/))}) \|\|
	($env{'form.returnurl'} eq '/adm/createuser'))) {
	$brlink = $env{'form.returnurl'};
	if ($env{'form.returnurl'} eq '/adm/createuser') {
	$brtxt = 'User Management';
	} elsif ($env{'form.returnurl'} =~ m{^/res($\/)}) {
	$brtxt = 'Browse published resources';
	} else {
	$brtxt = 'Authoring Space';
	}
} else {	} else {
$brlink ='/adm/preferences';	$brlink ='/adm/preferences';
$brtxt = 'Set User Preferences';	$brtxt = 'Set User Preferences';
Line 2172 sub handler {	Line 2298 sub handler {
help => $brhelp,});	help => $brhelp,});
if(!exists $env{'form.action'}) {	if(!exists $env{'form.action'}) {
&print_main_menu($r);	&print_main_menu($r);
	$ended = 1;
}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');	&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'){
&verify_and_change_screenname($r);	&verify_and_change_screenname($r);
	$ended = 1;
}elsif($env{'form.action'} eq 'changemsgforward'){	}elsif($env{'form.action'} eq 'changemsgforward'){
&msgforwardchanger($r);	&msgforwardchanger($r);
}elsif($env{'form.action'} eq 'verify_and_change_msgforward'){	}elsif($env{'form.action'} eq 'verify_and_change_msgforward'){
Line 2188 sub handler {	Line 2316 sub handler {
&colorschanger($r);	&colorschanger($r);
}elsif($env{'form.action'} eq 'verify_and_change_colors'){	}elsif($env{'form.action'} eq 'verify_and_change_colors'){
&verify_and_change_colors($r);	&verify_and_change_colors($r);
	$ended = 1;
}elsif($env{'form.action'} eq 'changelanguages'){	}elsif($env{'form.action'} eq 'changelanguages'){
&languagechanger($r);	&languagechanger($r);
}elsif($env{'form.action'} eq 'verify_and_change_languages'){	}elsif($env{'form.action'} eq 'verify_and_change_languages'){
&verify_and_change_languages($r);	&verify_and_change_languages($r);
	$ended = 1;
}elsif($env{'form.action'} eq 'changewysiwyg'){	}elsif($env{'form.action'} eq 'changewysiwyg'){
&wysiwygchanger($r);	&wysiwygchanger($r);
}elsif($env{'form.action'} eq 'set_wysiwyg'){	}elsif($env{'form.action'} eq 'set_wysiwyg'){
&verify_and_change_wysiwyg($r);	&verify_and_change_wysiwyg($r);
	$ended = 1;
}elsif($env{'form.action'} eq 'changediscussions'){	}elsif($env{'form.action'} eq 'changediscussions'){
&discussionchanger($r);	&discussionchanger($r);
}elsif($env{'form.action'} eq 'verify_and_change_discussion'){	}elsif($env{'form.action'} eq 'verify_and_change_discussion'){
&verify_and_change_discussion($r);	&verify_and_change_discussion($r);
	$ended = 1;
}elsif($env{'form.action'} eq 'changerolespref'){	}elsif($env{'form.action'} eq 'changerolespref'){
&rolesprefchanger($r);	&rolesprefchanger($r);
}elsif($env{'form.action'} eq 'verify_and_change_rolespref'){	}elsif($env{'form.action'} eq 'verify_and_change_rolespref'){
&verify_and_change_rolespref($r);	&verify_and_change_rolespref($r);
	$ended = 1;
}elsif($env{'form.action'} eq 'changetexenginepref'){	}elsif($env{'form.action'} eq 'changetexenginepref'){
&texenginechanger($r);	&texenginechanger($r);
}elsif($env{'form.action'} eq 'verify_and_change_texengine'){	}elsif($env{'form.action'} eq 'verify_and_change_texengine'){
&verify_and_change_texengine($r);	&verify_and_change_texengine($r);
	$ended = 1;
}elsif($env{'form.action'} eq 'changeicons'){	}elsif($env{'form.action'} eq 'changeicons'){
&iconchanger($r);	&iconchanger($r);
}elsif($env{'form.action'} eq 'verify_and_change_icons'){	}elsif($env{'form.action'} eq 'verify_and_change_icons'){
&verify_and_change_icons($r);	&verify_and_change_icons($r);
	$ended = 1;
}elsif($env{'form.action'} eq 'changeclicker'){	}elsif($env{'form.action'} eq 'changeclicker'){
&clickerchanger($r);	&clickerchanger($r);
}elsif($env{'form.action'} eq 'verify_and_change_clicker'){	}elsif($env{'form.action'} eq 'verify_and_change_clicker'){
&verify_and_change_clicker($r);	&verify_and_change_clicker($r);
	$ended = 1;
}elsif($env{'form.action'} eq 'changedomcoord'){	}elsif($env{'form.action'} eq 'changedomcoord'){
&domcoordchanger($r);	&domcoordchanger($r);
}elsif($env{'form.action'} eq 'verify_and_change_domcoord'){	}elsif($env{'form.action'} eq 'verify_and_change_domcoord'){
&verify_and_change_domcoord($r);	&verify_and_change_domcoord($r);
	$ended = 1;
}elsif($env{'form.action'} eq 'lockwarning'){	}elsif($env{'form.action'} eq 'lockwarning'){
&lockwarning($r);	&lockwarning($r);
}elsif($env{'form.action'} eq 'verify_and_change_locks'){	}elsif($env{'form.action'} eq 'verify_and_change_locks'){
Line 2228 sub handler {	Line 2365 sub handler {
&coursedisplaychanger($r);	&coursedisplaychanger($r);
}elsif($env{'form.action'} eq 'verify_and_change_coursepage'){	}elsif($env{'form.action'} eq 'verify_and_change_coursepage'){
&verify_and_change_coursepage($r);	&verify_and_change_coursepage($r);
	$ended = 1;
	}elsif($env{'form.action'} eq 'authorsettings'){
	&author_space_settings($r);
	}elsif($env{'form.action'} eq 'change_authoring_settings'){
	&change_authoring_settings($r);
	$ended = 1;
}elsif($env{'form.action'} eq 'debugtoggle'){	}elsif($env{'form.action'} eq 'debugtoggle'){
if (&can_toggle_debug()) {	if (&can_toggle_debug()) {
&toggle_debug();	&toggle_debug();
}	}
&print_main_menu($r);	&print_main_menu($r);
	$ended = 1;
} elsif ($env{'form.action'} eq 'changelockednames') {	} elsif ($env{'form.action'} eq 'changelockednames') {
&lockednameschanger($r);	&lockednameschanger($r);
} elsif ($env{'form.action'} eq 'verify_and_change_lockednames') {	} elsif ($env{'form.action'} eq 'verify_and_change_lockednames') {
&verify_and_change_lockednames($r);	&verify_and_change_lockednames($r);
	$ended = 1;
}	}

# Properly end the HTML page of all preference pages	# Properly end the HTML page of all preference pages
# started in each sub routine	# started in each sub routine
# Exception: print_main_menu has its own end_page call	# Exception: print_main_menu has its own end_page call
unless (!exists $env{'form.action'} \|\|	unless ($ended) {
$env{'form.action'} eq 'debugtoggle') {
$r->print(&Apache::loncommon::end_page());	$r->print(&Apache::loncommon::end_page());
}	}

Line 2316 sub updateable_userinfo {	Line 2460 sub updateable_userinfo {
return %updateable;	return %updateable;
}	}

	sub do_redirect {
	my ($r,$url,$msg) = @_;
	$r->print(
	&Apache::loncommon::start_page('Switching Server ...',undef,
	{'redirect' => [0.5,$url]}).
	'<div style="padding:0;clear:both;margin:0;border:0"></div>'."\n".
	"$msg\n".
	&Apache::loncommon::end_page());
	return;
	}

1;	1;
__END__	__END__

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

Removed from v.1.196.4.19
changed lines
	Added in v.1.196.4.25