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.154 and 1.159

version 1.154, 2009/04/25 20:22:07	version 1.159, 2009/05/06 16:19:34
Line 135 sub verify_and_change_wysiwyg {	Line 135 sub verify_and_change_wysiwyg {
my $newsetting=$env{'form.wysiwyg'};	my $newsetting=$env{'form.wysiwyg'};
&Apache::lonnet::put('environment',{'wysiwygeditor' => $newsetting});	&Apache::lonnet::put('environment',{'wysiwygeditor' => $newsetting});
&Apache::lonnet::appenv({'environment.wysiwygeditor' => $newsetting});	&Apache::lonnet::appenv({'environment.wysiwygeditor' => $newsetting});
&print_main_menu($r,'<p>'.&Apache::lonhtmlcommon::confirm_success(&mt('Setting WYSIWYG editor to:').' '	my $message=&Apache::lonhtmlcommon::confirm_success(&mt('Set [_1] to [_2]','<i>'.&mt('WYSIWYG Editor').'</i>','<tt>'.&mt($newsetting).'</tt>'));
.&mt($newsetting)).'</p>');	$message=&Apache::loncommon::confirmwrapper($message);
	&print_main_menu($r,$message);
}	}

################################################################	################################################################
Line 186 sub verify_and_change_languages {	Line 187 sub verify_and_change_languages {
if ($newlanguage) {	if ($newlanguage) {
&Apache::lonnet::put('environment',{'languages' => $newlanguage});	&Apache::lonnet::put('environment',{'languages' => $newlanguage});
&Apache::lonnet::appenv({'environment.languages' => $newlanguage});	&Apache::lonnet::appenv({'environment.languages' => $newlanguage});
$message=&Apache::lonhtmlcommon::confirm_success(&mt('Set new preferred languages to ').'<tt>"'.$newlanguage.'"</tt>.');	$message=&Apache::lonhtmlcommon::confirm_success(&mt('Set [_1] to [_2]','<i>'.&mt('Preferred language').'</i>','<tt>"'.$newlanguage.'"</tt>.'));
} else {	} else {
&Apache::lonnet::del('environment',['languages']);	&Apache::lonnet::del('environment',['languages']);
&Apache::lonnet::delenv('environment.languages');	&Apache::lonnet::delenv('environment.languages');
$message=&Apache::lonhtmlcommon::confirm_success(&mt('Reset preferred language.'));	$message=&Apache::lonhtmlcommon::confirm_success(&mt('Reset [_1]','<i>'.&mt('Preferred language').'</i>'));
}	}
	$message=&Apache::loncommon::confirmwrapper($message);
&Apache::loncommon::flush_langs_cache($user,$domain);	&Apache::loncommon::flush_langs_cache($user,$domain);
&print_main_menu($r, $message);	&print_main_menu($r, $message);
}	}
Line 300 sub verify_and_change_texengine {	Line 302 sub verify_and_change_texengine {
if ($newtexengine) {	if ($newtexengine) {
&Apache::lonnet::put('environment',{'texengine' => $newtexengine});	&Apache::lonnet::put('environment',{'texengine' => $newtexengine});
&Apache::lonnet::appenv({'environment.texengine' => $newtexengine});	&Apache::lonnet::appenv({'environment.texengine' => $newtexengine});
$message=&Apache::lonhtmlcommon::confirm_success(&mt('Set new preferred math display to ').'<tt>"'.$newtexengine.'"</tt>.');	$message=&Apache::lonhtmlcommon::confirm_success(&mt('Set [_1] to [_2]','<i>'.&mt('Preferred method to display Math').'</i>','<tt>"'.$newtexengine.'"</tt>'));
} else {	} else {
&Apache::lonnet::del('environment',['texengine']);	&Apache::lonnet::del('environment',['texengine']);
&Apache::lonnet::delenv('environment.texengine');	&Apache::lonnet::delenv('environment.texengine');
$message=&Apache::lonhtmlcommon::confirm_success(&mt('Reset preferred math display.'));	$message=&Apache::lonhtmlcommon::confirm_success(&mt('Reset [_1]','<i>'.&mt('Preferred method to display Math').'</i>'));
}	}
	$message=&Apache::loncommon::confirmwrapper($message);
&print_main_menu($r, $message);	&print_main_menu($r, $message);
}	}

Line 364 sub rolesprefchanger {	Line 367 sub rolesprefchanger {
my $checked = "";	my $checked = "";
my $value = $recent_roles{$role_key};	my $value = $recent_roles{$role_key};
if ($frozen_roles{$role_key}) {	if ($frozen_roles{$role_key}) {
$checked = "checked=\"checked\"";	$checked = ' checked="checked"';
}	}
$count++;	$count++;
$roles_check_list .=	$roles_check_list .=
&Apache::loncommon::start_data_table_row().	&Apache::loncommon::start_data_table_row().
'<td class="LC_table_cell_checkbox">'.	'<td class="LC_table_cell_checkbox">'.
"<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\">".
"$role_text{$role_key}</label></td>".	"$role_text{$role_key}</label></td>".
Line 385 sub rolesprefchanger {	Line 388 sub rolesprefchanger {
<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>'.&mt('Enable Recent '.$role.'s 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 />'.&mt('Number of '.$role.'s in Hotlist:').'	<br />'.&mt('Number of '.$role.'s in Hotlist:').'
<select name="recentrolesn" size="1">	<select name="recentrolesn" size="1">
'.$options.'	'.$options.'
Line 473 sub verify_and_change_rolespref {	Line 476 sub verify_and_change_rolespref {
# 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 (($frozen_roles{$role_key}) && (!exists($freeze{$role_key}))) {	if (($frozen_roles{$role_key}) && (!exists($freeze{$role_key}))) {
$message .= "<br />".&Apache::lonhtmlcommon::confirm_success(&mt('Unfreezing '.$role.': [_1]',$role_text{$role_key}))."\n";	$message .= "<br />".&Apache::lonhtmlcommon::confirm_success(&mt('Unfreezing '.$role.': [_1]','<i>'.$role_text{$role_key}.'</i>'));
&Apache::lonhtmlcommon::store_recent('roles',$role_key,' ',0);	&Apache::lonhtmlcommon::store_recent('roles',$role_key,' ',0);
}	}
}	}
Line 482 sub verify_and_change_rolespref {	Line 485 sub verify_and_change_rolespref {
foreach my $role_key (@freeze_list) {	foreach my $role_key (@freeze_list) {
if (!$frozen_roles{$role_key}) {	if (!$frozen_roles{$role_key}) {
$message .= "<br />".	$message .= "<br />".
&Apache::lonhtmlcommon::confirm_success(&mt('Freezing '.$role.': [_1]',$role_text{$role_key}))."\n";	&Apache::lonhtmlcommon::confirm_success(&mt('Freezing '.$role.': [_1]','<i>'.$role_text{$role_key}.'</i>'));
&Apache::lonhtmlcommon::store_recent('roles',	&Apache::lonhtmlcommon::store_recent('roles',
$role_key,' ',1);	$role_key,' ',1);
}	}
}	}
$message .= "<hr /><br />\n";	$message=&Apache::loncommon::confirmwrapper($message);
&print_main_menu($r, $message);	&print_main_menu($r, $message);
}	}

Line 516 sub screennamechanger {	Line 519 sub screennamechanger {
$r->print('<form name="prefs" action="/adm/preferences" method="post">'	$r->print('<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" />'
.&Apache::lonhtmlcommon::start_pick_box()	.&Apache::lonhtmlcommon::start_pick_box()
.&Apache::lonhtmlcommon::row_title(&mt('New screenname (shown if you post anonymously)'))	.&Apache::lonhtmlcommon::row_title(&mt('Screenname').' '.&mt('(shown if you post anonymously)'))
.'<input type="text" size="20" value="'.$screenname.'" name="screenname" />'	.'<input type="text" size="20" value="'.$screenname.'" name="screenname" />'
.&Apache::lonhtmlcommon::row_closure()	.&Apache::lonhtmlcommon::row_closure()
.&Apache::lonhtmlcommon::row_title(&mt('New nickname (shown if you post non-anonymously)'))	.&Apache::lonhtmlcommon::row_title(&mt('Nickname').' '.&mt('(shown if you post non-anonymously)'))
.'<input type="text" size="20" value="'.$nickname.'" name="nickname" />'	.'<input type="text" size="20" value="'.$nickname.'" name="nickname" />'
.&Apache::lonhtmlcommon::row_closure()	.&Apache::lonhtmlcommon::row_closure()
.&Apache::lonhtmlcommon::row_title()	.&Apache::lonhtmlcommon::row_title()
Line 541 sub verify_and_change_screenname {	Line 544 sub verify_and_change_screenname {
if ($newscreen) {	if ($newscreen) {
&Apache::lonnet::put('environment',{'screenname' => $newscreen});	&Apache::lonnet::put('environment',{'screenname' => $newscreen});
&Apache::lonnet::appenv({'environment.screenname' => $newscreen});	&Apache::lonnet::appenv({'environment.screenname' => $newscreen});
$message=&Apache::lonhtmlcommon::confirm_success(&mt('Set new screenname to ').'<tt>"'.$newscreen.'."</tt>.');	$message=&Apache::lonhtmlcommon::confirm_success(&mt('Set [_1] to [_2]','<i>'.&mt('Screenname').'</i>','<tt>"'.$newscreen.'."</tt>'));
} else {	} else {
&Apache::lonnet::del('environment',['screenname']);	&Apache::lonnet::del('environment',['screenname']);
&Apache::lonnet::delenv('environment.screenname');	&Apache::lonnet::delenv('environment.screenname');
$message=&Apache::lonhtmlcommon::confirm_success(&mt('Reset screenname.'));	$message=&Apache::lonhtmlcommon::confirm_success(&mt('Reset [_1]','<i>'.&mt('Screenname').'</i>'));
}	}
# Nickname	# Nickname
$message.='<br />';	$message.='<br />';
Line 554 sub verify_and_change_screenname {	Line 557 sub verify_and_change_screenname {
if ($newscreen) {	if ($newscreen) {
&Apache::lonnet::put('environment',{'nickname' => $newscreen});	&Apache::lonnet::put('environment',{'nickname' => $newscreen});
&Apache::lonnet::appenv({'environment.nickname' => $newscreen});	&Apache::lonnet::appenv({'environment.nickname' => $newscreen});
$message.=&Apache::lonhtmlcommon::confirm_success(&mt('Set new nickname to ').'<tt>"'.$newscreen.'"</tt>.');	$message.=&Apache::lonhtmlcommon::confirm_success(&mt('Set [_1] to [_2]','<i>'.&mt('Nickname').'</i>','<tt>"'.$newscreen.'"</tt>.'));
} else {	} else {
&Apache::lonnet::del('environment',['nickname']);	&Apache::lonnet::del('environment',['nickname']);
&Apache::lonnet::delenv('environment.nickname');	&Apache::lonnet::delenv('environment.nickname');
$message.=&Apache::lonhtmlcommon::confirm_success(&mt('Reset nickname.'));	$message.=&Apache::lonhtmlcommon::confirm_success(&mt('Reset [_1]','<i>'.&mt('Nickname').'</i>'));
}	}
&Apache::lonnet::devalidate_cache_new('namescache',$user.':'.$domain);	&Apache::lonnet::devalidate_cache_new('namescache',$user.':'.$domain);
	$message=&Apache::loncommon::confirmwrapper($message);
&print_main_menu($r, $message);	&print_main_menu($r, $message);
}	}

Line 609 sub verify_and_change_icons {	Line 613 sub verify_and_change_icons {
my $r = shift;	my $r = shift;
my $user = $env{'user.name'};	my $user = $env{'user.name'};
my $domain = $env{'user.domain'};	my $domain = $env{'user.domain'};
my $newicons = $env{'form.menumode'};	my $newicons = $env{'form.menumode'};

&Apache::lonnet::put('environment',{'icons' => $newicons});	&Apache::lonnet::put('environment',{'icons' => $newicons});
&Apache::lonnet::appenv({'environment.icons' => $newicons});	&Apache::lonnet::appenv({'environment.icons' => $newicons});
&print_main_menu($r, &Apache::lonhtmlcommon::confirm_success(&mt('Set menu mode to [_1].',$newicons)));	my $message=&Apache::lonhtmlcommon::confirm_success(&mt('Set [_1] to [_2]','<i>'.&mt('Menu Display').'</i>','<tt>'.$newicons.'</tt>'));
	$message=&Apache::loncommon::confirmwrapper($message);
	&print_main_menu($r, $message);
}	}

################################################################	################################################################
Line 661 sub verify_and_change_clicker {	Line 667 sub verify_and_change_clicker {
$newclickers=~s/\,$//;	$newclickers=~s/\,$//;
&Apache::lonnet::put('environment',{'clickers' => $newclickers});	&Apache::lonnet::put('environment',{'clickers' => $newclickers});
&Apache::lonnet::appenv({'environment.clickers' => $newclickers});	&Apache::lonnet::appenv({'environment.clickers' => $newclickers});
&print_main_menu($r, &Apache::lonhtmlcommon::confirm_success(&mt('Registering clickers: [_1]',$newclickers)));	my $message=&Apache::lonhtmlcommon::confirm_success(&mt('Registering clickers: [_1]',$newclickers));
	$message=&Apache::loncommon::confirmwrapper($message);
	&print_main_menu($r, $message);
}	}

################################################################	################################################################
Line 681 sub domcoordchanger {	Line 689 sub domcoordchanger {
('environment',['domcoord.author']);	('environment',['domcoord.author']);
my $constchecked='';	my $constchecked='';
if ($userenv{'domcoord.author'} eq 'blocked') {	if ($userenv{'domcoord.author'} eq 'blocked') {
$constchecked='checked="checked"';	$constchecked=' checked="checked"';
}	}
my $text=&mt('By default, the Domain Coordinator can enter your construction space.');	my $text=&mt('By default, the Domain Coordinator can enter your construction space.');
my $construction=&mt('Block access to construction space');	my $construction=&mt('Block access to construction space');
Line 690 sub domcoordchanger {	Line 698 sub domcoordchanger {
<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_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 />
<input type="submit" value="$change" />	<input type="submit" value="$change" />
</form>	</form>
ENDSCREEN	ENDSCREEN
Line 704 sub verify_and_change_domcoord {	Line 712 sub verify_and_change_domcoord {
if ($env{'form.construction'}) { $domcoord{'domcoord.author'}='blocked'; }	if ($env{'form.construction'}) { $domcoord{'domcoord.author'}='blocked'; }
&Apache::lonnet::put('environment',\%domcoord);	&Apache::lonnet::put('environment',\%domcoord);
&Apache::lonnet::appenv({'environment.domcoord.author' => $domcoord{'domcoord.author'}});	&Apache::lonnet::appenv({'environment.domcoord.author' => $domcoord{'domcoord.author'}});
&print_main_menu($r,&Apache::lonhtmlcommon::confirm_success(&mt('Registering Domain Coordinator access restrictions.')));	my $status='';
	if ($domcoord{'domcoord.author'} eq 'blocked') {
	$status=&mt('on');
	} else {
	$status=&mt('off');
	}
	my $message=&Apache::lonhtmlcommon::confirm_success(&mt('Set [_1] to [_2]','<i>'.&mt('Block access to construction space').'</i>','<tt>'.$status.'</tt>'));
	$message=&Apache::loncommon::confirmwrapper($message);
	&print_main_menu($r,$message);
}	}

#################################################################	#################################################################
Line 1077 sub colorschanger {	Line 1093 sub colorschanger {
# figure out colors	# figure out colors
my $function=&Apache::loncommon::get_users_function();	my $function=&Apache::loncommon::get_users_function();
my $domain=&Apache::loncommon::determinedomain();	my $domain=&Apache::loncommon::determinedomain();
my %colortypes=('pgbg' => 'Page Background',	my %colortypes=&Apache::lonlocal::texthash(
'tabbg' => 'Header Background',	'pgbg' => 'Page Background Color',
'sidebg'=> 'Header Border',	'tabbg' => 'Header Background Color',
'font' => 'Font',	'sidebg' => 'Header Border Color',
'link' => 'Un-Visited Link',	'font' => 'Font Color',
'vlink' => 'Visited Link',	'fontmenu' => 'Font Menu Color',
'alink' => 'Active Link');	'link' => 'Un-Visited Link Color',
	'vlink' => 'Visited Link Color',
	'alink' => 'Active Link Color',
	);
my $start_data_table = &Apache::loncommon::start_data_table();	my $start_data_table = &Apache::loncommon::start_data_table();
my $chtable='';	my $chtable='';
foreach my $item (sort(keys(%colortypes))) {	foreach my $item (sort(keys(%colortypes))) {
Line 1094 sub colorschanger {	Line 1113 sub colorschanger {
'" size="10" value="'.$curcol.	'" size="10" value="'.$curcol.
'" /></td><td><a href="javascript:pjump('."'color_custom','".$colortypes{$item}.	'" /></td><td><a href="javascript:pjump('."'color_custom','".$colortypes{$item}.
"','".$curcol."','"	"','".$curcol."','"
.$item."','parmform.pres','psub'".');">Select</a></td>'.	.$item."','parmform.pres','psub'".');">'.&mt('Select').'</a></td>'.
&Apache::loncommon::end_data_table_row()."\n";	&Apache::loncommon::end_data_table_row()."\n";
}	}
my $end_data_table = &Apache::loncommon::end_data_table();	my $end_data_table = &Apache::loncommon::end_data_table();
my $pjump_def = &Apache::lonhtmlcommon::pjump_javascript_definition();	my $pjump_def = &Apache::lonhtmlcommon::pjump_javascript_definition();
my $save = &mt('Save');	my $savebutton = &mt('Save');
my $rstall = &mt('Reset All');	my $resetbutton = &mt('Reset All');
my $resetdefault = &mt('Reset All Colors to Default');	my $resetbuttondesc = &mt('Reset All Colors to Default');
$r->print(<<ENDCOL);	$r->print(<<ENDCOL);
<script type="text/javascript" language="JavaScript">	<script type="text/javascript" language="JavaScript">

Line 1140 $start_data_table	Line 1159 $start_data_table
$chtable	$chtable
$end_data_table	$end_data_table
</table>	</table>
<input type="submit" value="$save" />	<p>
<input type="submit" name="resetall" value="$rstall" title="$resetdefault" />	<input type="submit" value="$savebutton" />
	<input type="submit" name="resetall" value="$resetbutton" title="$resetbuttondesc" />
	</p>
</form>	</form>
ENDCOL	ENDCOL
}	}
Line 1151 sub verify_and_change_colors {	Line 1172 sub verify_and_change_colors {
# figure out colors	# figure out colors
my $function=&Apache::loncommon::get_users_function();	my $function=&Apache::loncommon::get_users_function();
my $domain=&Apache::loncommon::determinedomain();	my $domain=&Apache::loncommon::determinedomain();
my %colortypes=('pgbg' => 'Page Background',	my %colortypes=&Apache::lonlocal::texthash(
'tabbg' => 'Header Background',	'pgbg' => 'Page Background Color',
'sidebg'=> 'Header Border',	'tabbg' => 'Header Background Color',
'font' => 'Font',	'sidebg' => 'Header Border Color',
'link' => 'Un-Visited Link',	'font' => 'Font Color',
'vlink' => 'Visited Link',	'fontmenu' => 'Font Menu Color',
'alink' => 'Active Link');	'link' => 'Un-Visited Link Color',
	'vlink' => 'Visited Link Color',
	'alink' => 'Active Link Color',
	);

my $message='';	my $message='';
foreach my $item (keys %colortypes) {	foreach my $item (keys %colortypes) {
Line 1166 sub verify_and_change_colors {	Line 1190 sub verify_and_change_colors {
if (($color=~/^\#[0-9A-Fa-f]{6}$/) && (!$env{'form.resetall'})) {	if (($color=~/^\#[0-9A-Fa-f]{6}$/) && (!$env{'form.resetall'})) {
&Apache::lonnet::put('environment',{$entry => $color});	&Apache::lonnet::put('environment',{$entry => $color});
&Apache::lonnet::appenv({'environment.'.$entry => $color});	&Apache::lonnet::appenv({'environment.'.$entry => $color});
$message.=&Apache::lonhtmlcommon::confirm_success(&mt('Set '.$colortypes{$item}.' to ').'<tt>"'.$color.'"</tt>').'<br />';	$message.=&Apache::lonhtmlcommon::confirm_success(&mt('Set [_1] to [_2]','<i>'.$colortypes{$item}.'</i>','<tt>"'.$color.'"</tt>'))
	.'<br />';
} else {	} else {
&Apache::lonnet::del('environment',[$entry]);	&Apache::lonnet::del('environment',[$entry]);
&Apache::lonnet::delenv('environment.'.$entry);	&Apache::lonnet::delenv('environment.'.$entry);
$message.=&Apache::lonhtmlcommon::confirm_success(&mt('Reset '.$colortypes{$item}.'.')).'<br />';	$message.=&Apache::lonhtmlcommon::confirm_success(&mt('Reset [_1]','<i>'.$colortypes{$item}.'</i>'))
	.'<br />';
}	}
}	}
	$message=&Apache::loncommon::confirmwrapper($message);

my $now = time;	my $now = time;
&Apache::lonnet::put('environment',{'color.timestamp' => $now});	&Apache::lonnet::put('environment',{'color.timestamp' => $now});
&Apache::lonnet::appenv({'environment.color.timestamp' => $now});	&Apache::lonnet::appenv({'environment.color.timestamp' => $now});
Line 1206 sub passwordchanger {	Line 1234 sub passwordchanger {
$defdom = $r->dir_config('lonDefDomain');	$defdom = $r->dir_config('lonDefDomain');
my %data = &Apache::lonnet::tmpget($mailtoken);	my %data = &Apache::lonnet::tmpget($mailtoken);
if (keys(%data) == 0) {	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.'));	$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 [_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>')
	);
return;	return;
}	}
if (defined($data{time})) {	if (defined($data{time})) {
Line 1531 ENDERROR	Line 1561 ENDERROR
# Inform the user the password has (not?) been changed	# Inform the user the password has (not?) been changed
my $message;	my $message;
if ($result =~ /^ok$/) {	if ($result =~ /^ok$/) {
$message = &Apache::lonhtmlcommon::confirm_success(&mt('The password for [_1] was successfully changed.',$user));	$message = &Apache::lonhtmlcommon::confirm_success(&mt('The password for user [_1] was successfully changed.','<i>'.$user.'<i>'));
if ($caller eq 'reset_by_email') {	if ($caller eq 'reset_by_email') {
$r->print($message.'<br />');	$r->print($message.'<br />');
} else {	} else {
Line 1540 ENDERROR	Line 1570 ENDERROR
} else {	} else {
# error error: run in circles, scream and shout	# error error: run in circles, scream and shout
$message = &Apache::lonhtmlcommon::confirm_success(	$message = &Apache::lonhtmlcommon::confirm_success(
&mt("The password for [_1] was not changed.",$user).' '.&mt('Please make sure your old password was entered correctly.'),1);	&mt("The password for user [_1] was not changed.",'<i>'.$user.'</i>').' '.&mt('Please make sure your old password was entered correctly.'),1);
unless ($caller eq 'reset_by_email') {	unless ($caller eq 'reset_by_email') {
	$message=&Apache::loncommon::confirmwrapper($message);
&print_main_menu($r, $message);	&print_main_menu($r, $message);
}	}
return 1;	return 1;
Line 1622 sub discussionchanger {	Line 1653 sub discussionchanger {
<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 />
END	END

	$r->print('<p class="LC_info">'.$lt{'thde'}.'</p>');

$r->print(&Apache::loncommon::start_data_table());	$r->print(&Apache::loncommon::start_data_table());
$r->print(<<"END");	$r->print(<<"END");
<tr>	<tr>
Line 1650 END	Line 1682 END
$r->print(&Apache::loncommon::end_data_table_row().	$r->print(&Apache::loncommon::end_data_table_row().
&Apache::loncommon::end_data_table());	&Apache::loncommon::end_data_table());

$r->print('<br /><br /><input type="submit" name="sub" value="'.&mt('Save').'" /><br /><br />'.&mt('Note').': '.$lt{'thde'}.'</form>');	$r->print('<br />'
	.'<input type="submit" name="sub" value="'.&mt('Save').'" />'
	.'</form>'
	);
}	}

sub verify_and_change_discussion {	sub verify_and_change_discussion {
Line 1682 sub verify_and_change_discussion {	Line 1717 sub verify_and_change_discussion {
&Apache::lonnet::delenv('environment.discmarkread');	&Apache::lonnet::delenv('environment.discmarkread');
}	}
}	}
	$message=&Apache::loncommon::confirmwrapper($message);
&print_main_menu($r, $message);	&print_main_menu($r, $message);
}	}

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

Removed from v.1.154
changed lines
	Added in v.1.159