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.86 and 1.97

version 1.86, 2006/05/08 22:25:17	version 1.97, 2007/03/07 16:24:08
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 108 sub wysiwygchanger {	Line 109 sub wysiwygchanger {
my $switchoff=&mt('Disable WYSIWYG editor');	my $switchoff=&mt('Disable WYSIWYG editor');
my $switchon=&mt('Enable WYSIWYG editor');	my $switchon=&mt('Enable WYSIWYG editor');
$r->print(<<ENDLSCREEN);	$r->print(<<ENDLSCREEN);
<form name="prefs" action="/adm/preferences" method="POST">	<form name="prefs" action="/adm/preferences" method="post">
<input type="hidden" name="action" value="set_wysiwyg" />	<input type="hidden" name="action" value="set_wysiwyg" />
<br />	<br />
<label><input type="radio" name="wysiwyg" value="off" $onselect /> $switchoff</label><br />	<label><input type="radio" name="wysiwyg" value="off" $onselect /> $switchoff</label><br />
Line 148 sub languagechanger {	Line 149 sub languagechanger {
my $selectionbox=&Apache::loncommon::select_form($language,'language',	my $selectionbox=&Apache::loncommon::select_form($language,'language',
%langchoices);	%langchoices);
$r->print(<<ENDLSCREEN);	$r->print(<<ENDLSCREEN);
<form name="prefs" action="/adm/preferences" method="POST">	<form name="prefs" action="/adm/preferences" method="post">
<input type="hidden" name="action" value="verify_and_change_languages" />	<input type="hidden" name="action" value="verify_and_change_languages" />
<br />$pref: $selectionbox	<br />$pref: $selectionbox
ENDLSCREEN	ENDLSCREEN
Line 202 sub texenginechanger {	Line 203 sub texenginechanger {
$r->print(<<ENDLSCREEN);	$r->print(<<ENDLSCREEN);
<br />	<br />

<form name="prefs" action="/adm/preferences" method="POST">	<form name="prefs" action="/adm/preferences" method="post">
<input type="hidden" name="action" value="verify_and_change_texengine" />	<input type="hidden" name="action" value="verify_and_change_texengine" />
<p>$pref: $selectionbox</p>	<p>$pref: $selectionbox</p>
<p><input type="submit" value="$change" /></p>	<p><input type="submit" value="$change" /></p>
Line 279 ENDVCSCREEN	Line 280 ENDVCSCREEN
################################################################	################################################################
sub rolesprefchanger {	sub rolesprefchanger {
my $r = shift;	my $r = shift;
	my $role = ($env{'user.adv'} ? 'Role' : 'Course');
	my $lc_role = ($env{'user.adv'} ? 'role' : 'course');
my $user = $env{'user.name'};	my $user = $env{'user.name'};
my $domain = $env{'user.domain'};	my $domain = $env{'user.domain'};
my %userenv = &Apache::lonnet::get	my %userenv = &Apache::lonnet::get
Line 298 sub rolesprefchanger {	Line 301 sub rolesprefchanger {
$options .= "<option $select>$i</option>\n";	$options .= "<option $select>$i</option>\n";
}	}

$r->print(<<ENDSCREEN);	# Get list of recent roles and display with checkbox in front
<p>Some LON-CAPA users have a long list of roles. The Recent Roles Hotlist	my $roles_check_list = '';
feature keeps track of the last N roles which have been	my $role_key='';
visited and places a table of these at the top of the roles page.	if ($env{'environment.recentroles'}) {
People with very few roles should leave this feature disabled.	my %recent_roles =
</p>	&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 .=
	&Apache::loncommon::start_data_table().
	&Apache::loncommon::start_data_table_header_row().
	"<th>".&mt('Freeze '.$role)."</th>".
	"<th>".&mt($role)."</td>".
	&Apache::loncommon::end_data_table_header_row().
	"\n";
	my $count;
	foreach $role_key (@sorted_roles) {
	my $checked = "";
	my $value = $recent_roles{$role_key};
	if ($frozen_roles{$role_key}) {
	$checked = "checked=\"checked\"";
	}
	$count++;
	$roles_check_list .=
	&Apache::loncommon::start_data_table_row().
	'<td class="LC_table_cell_checkbox">'.
	"<input type=\"checkbox\" $checked name=\"freezeroles\"".
	" id=\"freezeroles$count\" value=\"$role_key\" /></td>".
	"<td><label for=\"freezeroles$count\">".
	"$role_text{$role_key}</label></td>".
	&Apache::loncommon::end_data_table_row(). "\n";
	}
	$roles_check_list .= "</table>\n";
	}

	$r->print('
	<p>'.&mt('Some LON-CAPA users have a long list of '.$lc_role.'s. The Recent '.$role.'s Hotlist feature keeps track of the last N '.$lc_role.'s which have been visited and places a table of these at the top of the '.$lc_role.'s page. People with very few '.$lc_role.'s should leave this feature disabled.').'
	</p>
<form name="prefs" action="/adm/preferences" method="POST">	<form name="prefs" action="/adm/preferences" method="POST">
<input type="hidden" name="action" value="verify_and_change_rolespref" />	<input type="hidden" name="action" value="verify_and_change_rolespref" />
<br /><label>Enable Recent Roles Hotlist:	<br /><label>'.&mt('Enable Recent '.$role.'s Hotlist:').'
<input type="checkbox" $checked name="recentroles" value="true" /></label>	<input type="checkbox" '.$checked.' name="recentroles" value="true" /></label>
<br />Number of roles in Hotlist:	<br />'.&mt('Number of '.$role.'s in Hotlist:').'
<select name="recentrolesn" size="1">	<select name="recentrolesn" size="1">
$options	'.$options.'
</select>	</select>
	<p>'.&mt('This list below can be used to <q>freeze</q> '.$lc_role.'s on your screen. Those marked as frozen will not be removed from the list, even if they have not been used recently.').'
	</p>
	'.$roles_check_list.'
<br />	<br />
<input type="submit" value="Change" />	<input type="submit" value="'.&mt('Change').'" />
</form>	</form>');
ENDSCREEN	}

	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 $role = ($env{'user.adv'} ? 'Role' : 'Course');
my $user = $env{'user.name'};	my $user = $env{'user.name'};
my $domain = $env{'user.domain'};	my $domain = $env{'user.domain'};
# Recent Roles Hotlist Flag	# Recent Roles Hotlist Flag
my $hotlist_flag = $env{'form.recentroles'};	my $hotlist_flag = $env{'form.recentroles'};
my $hotlist_n = $env{'form.recentrolesn'};	my $hotlist_n = $env{'form.recentrolesn'};
my $message='';	my $message='<hr />';
if ($hotlist_flag) {	if ($hotlist_flag) {
&Apache::lonnet::put('environment',{'recentroles' => $hotlist_flag});	&Apache::lonnet::put('environment',{'recentroles' => $hotlist_flag});
&Apache::lonnet::appenv('environment.recentroles' => $hotlist_flag);	&Apache::lonnet::appenv('environment.recentroles' => $hotlist_flag);
$message='Recent Roles Hotlist is Enabled';	$message=&mt('Recent '.$role.'s Hotlist is Enabled');
} else {	} else {
&Apache::lonnet::del('environment',['recentroles']);	&Apache::lonnet::del('environment',['recentroles']);
&Apache::lonnet::delenv('environment\.recentroles');	&Apache::lonnet::delenv('environment\.recentroles');
$message='Recent Roles Hotlist is Disabled';	$message=&mt('Recent '.$role.'s Hotlist is Disabled');
}	}
if ($hotlist_n) {	if ($hotlist_n) {
&Apache::lonnet::put('environment',{'recentrolesn' => $hotlist_n});	&Apache::lonnet::put('environment',{'recentrolesn' => $hotlist_n});
&Apache::lonnet::appenv('environment.recentrolesn' => $hotlist_n);	&Apache::lonnet::appenv('environment.recentrolesn' => $hotlist_n);
if ($hotlist_flag) {	if ($hotlist_flag) {
$message.="<br />Display $hotlist_n Most Recent Roles\n";	$message.="<br />".
	&mt('Display [_1] Most Recent '.$role.'s',$hotlist_n)."\n";
	}
	}

	# Get list of froze roles and list of recent roles
	my @freeze_list = &Apache::loncommon::get_env_multiple('form.freezeroles');
	my %freeze = ();
	my %roletext = ();

	foreach my $key (@freeze_list) {
	$freeze{$key}='1';
	}

	my %recent_roles =
	&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
	foreach my $role_key (sort(keys(%recent_roles))) {
	if (($frozen_roles{$role_key}) && (!exists($freeze{$role_key}))) {
	$message .= "<br />".&mt('Unfreezing '.$role.': [_1]',$role_text{$role_key})."\n";
	&Apache::lonhtmlcommon::store_recent('roles',$role_key,' ',0);
	}
	}

	# Freeze selected roles
	foreach my $role_key (@freeze_list) {
	if (!$frozen_roles{$role_key}) {
	$message .= "<br />".&mt('Freezing '.$role.': [_1]',$role_text{$role_key})."\n";
	&Apache::lonhtmlcommon::store_recent('roles',
	$role_key,' ',1);
}	}
}	}
	$message .= "<hr /><br />\n";

$r->print(<<ENDRPSCREEN);	$r->print(<<ENDRPSCREEN);
$message	$message
Line 363 sub screennamechanger {	Line 468 sub screennamechanger {
my $screenname=$userenv{'screenname'};	my $screenname=$userenv{'screenname'};
my $nickname=$userenv{'nickname'};	my $nickname=$userenv{'nickname'};
$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="action" value="verify_and_change_screenname" />	<input type="hidden" name="action" value="verify_and_change_screenname" />
<br />New screenname (shown if you post anonymously):	<br />New screenname (shown if you post anonymously):
<input type="text" size="20" value="$screenname" name="screenname" />	<input type="text" size="20" value="$screenname" name="screenname" />
Line 431 sub msgforwardchanger {	Line 536 sub msgforwardchanger {

$r->print(<<ENDMSG);	$r->print(<<ENDMSG);
$forwardingHelp <br />	$forwardingHelp <br />
<form name="prefs" action="/adm/preferences" method="POST">	<form name="prefs" action="/adm/preferences" method="post">
<input type="hidden" name="action" value="verify_and_change_msgforward" />	<input type="hidden" name="action" value="verify_and_change_msgforward" />
New Forwarding Address(es) (<tt>user:domain,user:domain,...</tt>):	New Forwarding Address(es) (<tt>user:domain,user:domain,...</tt>):
<input type="text" size="40" value="$msgforward" name="msgforward" /><hr />	<input type="text" size="40" value="$msgforward" name="msgforward" /><hr />
Line 452 sub verify_and_change_msgforward {	Line 557 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 562 sub colorschanger {	Line 667 sub colorschanger {
<input type="hidden" name="pres_type" />	<input type="hidden" name="pres_type" />
<input type="hidden" name="pres_value" />	<input type="hidden" name="pres_value" />
</form>	</form>
<form name="prefs" action="/adm/preferences" method="POST">	<form name="prefs" action="/adm/preferences" method="post">
<input type="hidden" name="action" value="verify_and_change_colors" />	<input type="hidden" name="action" value="verify_and_change_colors" />
$start_data_table	$start_data_table
$chtable	$chtable
Line 607 sub verify_and_change_colors {	Line 712 sub verify_and_change_colors {

$r->print(<<ENDVCCOL);	$r->print(<<ENDVCCOL);
$message	$message
<form name="client" action="/adm/preferences" method="POST">	<form name="client" action="/adm/preferences" method="post">
<input type="hidden" name="action" value="changecolors" />	<input type="hidden" name="action" value="changecolors" />
</form>	</form>
ENDVCCOL	ENDVCCOL
Line 617 ENDVCCOL	Line 722 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 641 sub passwordchanger {	Line 773 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 654 sub passwordchanger {	Line 787 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 676 sub passwordchanger {	Line 827 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="30" /> </td></tr>
	<tr><td align="right"> Username: </td>
	<td>
	<input type="text" name="uname" size="15" />
	<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 707 $errormessage	Line 879 $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 738 sub verify_and_change_password {	Line 966 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 746 sub verify_and_change_password {	Line 974 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 760 ENDERROR	Line 992 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 783 ENDERROR	Line 1025 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 792 Valid characters are: space and <br />	Line 1034 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;
Line 877 sub discussionchanger {	Line 1121 sub discussionchanger {
}	}

$r->print(<<"END");	$r->print(<<"END");
<form name="prefs" action="/adm/preferences" method="POST">	<form name="prefs" action="/adm/preferences" method="post">
<input type="hidden" name="action" value="verify_and_change_discussion" />	<input type="hidden" name="action" value="verify_and_change_discussion" />
<br />	<br />
$lt{'sdpf'}<br/> $lt{'prca'} <ol><li>$lt{'whpo'}</li><li>$lt{'unwh'}</li></ol>	$lt{'sdpf'}<br /> $lt{'prca'} <ol><li>$lt{'whpo'}</li><li>$lt{'unwh'}</li></ol>
<br />	<br />
<br />	<br />
END	END
Line 927 sub verify_and_change_discussion {	Line 1171 sub verify_and_change_discussion {
if (defined($env{'form.discdisp'}) ) {	if (defined($env{'form.discdisp'}) ) {
my $newdisp = $env{'form.newdisp'};	my $newdisp = $env{'form.newdisp'};
if ($newdisp eq 'unread') {	if ($newdisp eq 'unread') {
$message .='In discussions: only new posts will be displayed.<br/>';	$message .='In discussions: only new posts will be displayed.<br />';
&Apache::lonnet::put('environment',{'discdisplay' => $newdisp});	&Apache::lonnet::put('environment',{'discdisplay' => $newdisp});
&Apache::lonnet::appenv('environment.discdisplay' => $newdisp);	&Apache::lonnet::appenv('environment.discdisplay' => $newdisp);
} else {	} else {
$message .= 'In discussions: all posts will be displayed.<br/>';	$message .= 'In discussions: all posts will be displayed.<br />';
&Apache::lonnet::del('environment',['discdisplay']);	&Apache::lonnet::del('environment',['discdisplay']);
&Apache::lonnet::delenv('environment\.discdisplay');	&Apache::lonnet::delenv('environment\.discdisplay');
}	}
Line 939 sub verify_and_change_discussion {	Line 1183 sub verify_and_change_discussion {
if (defined($env{'form.discmark'}) ) {	if (defined($env{'form.discmark'}) ) {
my $newmark = $env{'form.newmark'};	my $newmark = $env{'form.newmark'};
if ($newmark eq 'ondisp') {	if ($newmark eq 'ondisp') {
$message.='In discussions: new posts will be cease to be identified as "new" after display.<br/>';	$message.='In discussions: new posts will be cease to be identified as "new" after display.<br />';
&Apache::lonnet::put('environment',{'discmarkread' => $newmark});	&Apache::lonnet::put('environment',{'discmarkread' => $newmark});
&Apache::lonnet::appenv('environment.discmarkread' => $newmark);	&Apache::lonnet::appenv('environment.discmarkread' => $newmark);
} else {	} else {
$message.='In discussions: posts will be identified as "new" until marked as read by the reader.<br/>';	$message.='In discussions: posts will be identified as "new" until marked as read by the reader.<br />';
&Apache::lonnet::del('environment',['discmarkread']);	&Apache::lonnet::del('environment',['discmarkread']);
&Apache::lonnet::delenv('environment\.discmarkread');	&Apache::lonnet::delenv('environment\.discmarkread');
}	}
Line 980 sub coursedisplaychanger {	Line 1224 sub coursedisplaychanger {

$r->print('<br /><b>'.&mt('Set the default page to be displayed when you select a course role').'</b> '.&mt('(Currently: [_1])',$pagenames{$currvalue}).'<br />'.&mt('The global user preference you set for your courses can be overridden in an individual course by setting a course specific setting via the "[_1]" page in the course',"<i>What's New</i>").'<br /><br />');	$r->print('<br /><b>'.&mt('Set the default page to be displayed when you select a course role').'</b> '.&mt('(Currently: [_1])',$pagenames{$currvalue}).'<br />'.&mt('The global user preference you set for your courses can be overridden in an individual course by setting a course specific setting via the "[_1]" page in the course',"<i>What's New</i>").'<br /><br />');
$r->print(<<ENDLSCREEN);	$r->print(<<ENDLSCREEN);
<form name="prefs" action="/adm/preferences" method="POST">	<form name="prefs" action="/adm/preferences" method="post">
<input type="hidden" name="action" value="verify_and_change_coursepage" />	<input type="hidden" name="action" value="verify_and_change_coursepage" />
<br />	<br />
<label><input type="radio" name="newdisp" value="firstres" $firstselect /> $whatsnew_off</label><br />	<label><input type="radio" name="newdisp" value="firstres" $firstselect /> $whatsnew_off</label><br />
Line 1004 sub verify_and_change_coursepage {	Line 1248 sub verify_and_change_coursepage {
my $newdisp = $env{'form.newdisp'};	my $newdisp = $env{'form.newdisp'};
$message = '<b>'.$lt{'defs'}.'</b>: '.$lt{'when'}.', ';	$message = '<b>'.$lt{'defs'}.'</b>: '.$lt{'when'}.', ';
if ($newdisp eq 'firstres') {	if ($newdisp eq 'firstres') {
$message .= $lt{'ywbt'}.'<br/>';	$message .= $lt{'ywbt'}.'<br />';
&Apache::lonnet::put('environment',{'course_init_display' => $newdisp});	&Apache::lonnet::put('environment',{'course_init_display' => $newdisp});
&Apache::lonnet::appenv('environment.course_init_display' => $newdisp);	&Apache::lonnet::appenv('environment.course_init_display' => $newdisp);
} else {	} else {
$message .= $lt{'apwb'}.'<br/>';	$message .= $lt{'apwb'}.'<br />';
&Apache::lonnet::del('environment',['course_init_display']);	&Apache::lonnet::del('environment',['course_init_display']);
&Apache::lonnet::delenv('environment\.course_init_display');	&Apache::lonnet::delenv('environment\.course_init_display');
}	}
Line 1096 sub handler {	Line 1340 sub handler {
}));	}));

push (@Options,({ action => 'changemsgforward',	push (@Options,({ action => 'changemsgforward',
linktext => 'Change Message Forwarding and Notification Addresses',	linktext => 'Change Message Forwarding and Notification Email Addresses',
href => '/adm/preferences',	href => '/adm/preferences',
help => 'Prefs_Forwarding',	help => 'Prefs_Forwarding',
breadcrumb =>	breadcrumb =>
Line 1180 sub handler {	Line 1424 sub handler {
printmenu => 'yes',	printmenu => 'yes',
subroutine => \&verify_and_change_discussion, }	subroutine => \&verify_and_change_discussion, }
));	));

	my $role = ($env{'user.adv'} ? 'Roles' : 'Course');
push (@Options,({ action => 'changerolespref',	push (@Options,({ action => 'changerolespref',
linktext => 'Change Roles Page Preferences',	linktext => 'Change '.$role.' Page Preferences',
href => '/adm/preferences',	href => '/adm/preferences',
subroutine => \&rolesprefchanger,	subroutine => \&rolesprefchanger,
breadcrumb =>	breadcrumb =>
{ href => '/adm/preferences?action=changerolespref',	{ href => '/adm/preferences?action=changerolespref',
text => 'Change Roles Pref'},	text => 'Change '.$role.' Page Pref'},
},	},
{ action => 'verify_and_change_rolespref',	{ action => 'verify_and_change_rolespref',
subroutine => \&verify_and_change_rolespref,	subroutine => \&verify_and_change_rolespref,
breadcrumb =>	breadcrumb =>
{ href => '/adm/preferences?action=changerolespref',	{ href => '/adm/preferences?action=changerolespref',
text => 'Change Roles Preferences'},	text => 'Change '.$role.' Page Preferences'},
printmenu => 'yes',	printmenu => 'yes',
}));	}));

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

Removed from v.1.86
changed lines
	Added in v.1.97