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 and 1.196.4.19

version 1.196, 2011/12/08 21:52:32	version 1.196.4.19, 2016/08/10 23:50:07
Line 36 use strict;	Line 36 use strict;
use LONCAPA;	use LONCAPA;
use Apache::Constants qw(:common);	use Apache::Constants qw(:common);
use Apache::File;	use Apache::File;
use Crypt::DES;
use DynaLoader; # for Crypt::DES version
use Apache::loncommon();	use Apache::loncommon();
use Apache::lonhtmlcommon();	use Apache::lonhtmlcommon();
use Apache::lonlocal;	use Apache::lonlocal;
Line 45 use Apache::lonnet;	Line 43 use Apache::lonnet;
use LONCAPA::lonauthcgi();	use LONCAPA::lonauthcgi();
use LONCAPA();	use LONCAPA();

#
# Write lonnet::passwd to do the call below.
# Use:
# my $answer=reply("encrypt:passwd:$udom:$uname:$upass",$tryserver);
#
##################################################
# password associated functions #
##################################################
sub des_keys {
# Make a new key for DES encryption.
# Each key has two parts which are returned separately.
# Please note: Each key must be passed through the &hex function
# before it is output to the web browser. The hex versions cannot
# be used to decrypt.
my @hexstr=('0','1','2','3','4','5','6','7',
'8','9','a','b','c','d','e','f');
my $lkey='';
for (0..7) {
$lkey.=$hexstr[rand(15)];
}
my $ukey='';
for (0..7) {
$ukey.=$hexstr[rand(15)];
}
return ($lkey,$ukey);
}

sub des_decrypt {
my ($key,$cyphertext) = @_;
my $keybin=pack("H16",$key);
my $cypher;
if ($Crypt::DES::VERSION>=2.03) {
$cypher=new Crypt::DES $keybin;
} else {
$cypher=new DES $keybin;
}
my $plaintext=
$cypher->decrypt(unpack("a8",pack("H16",substr($cyphertext,0,16))));
$plaintext.=
$cypher->decrypt(unpack("a8",pack("H16",substr($cyphertext,16,16))));
$plaintext=substr($plaintext,1,ord(substr($plaintext,0,1)) );
return $plaintext;
}

################################################################	################################################################
# Handler subroutines #	# Handler subroutines #
################################################################	################################################################
Line 152 sub languagechanger {	Line 106 sub languagechanger {
text => 'Change Language'});	text => 'Change Language'});
$r->print(Apache::loncommon::start_page('Content Display Settings'));	$r->print(Apache::loncommon::start_page('Content Display Settings'));
$r->print(Apache::lonhtmlcommon::breadcrumbs('Change Language'));	$r->print(Apache::lonhtmlcommon::breadcrumbs('Change Language'));
my $user = $env{'user.name'};	my %userenv = &Apache::lonnet::get('environment',['languages']);
my $domain = $env{'user.domain'};
my %userenv = &Apache::lonnet::get
('environment',['languages']);
my $language=$userenv{'languages'};	my $language=$userenv{'languages'};

my $pref=&mt('Preferred language');	$r->print(
my %langchoices=('' => 'No language preference');	'<form name="prefs" action="/adm/preferences" method="post">'."\n".
foreach (&Apache::loncommon::languageids()) {	'<input type="hidden" name="action" value="verify_and_change_languages" />'.
if (&Apache::loncommon::supportedlanguagecode($_)) {	'<br /><span class="LC_nobreak">'.&mt('Preferred language').': '.
$langchoices{&Apache::loncommon::supportedlanguagecode($_)}	&Apache::loncommon::select_language('language',$language,1).'</span>'."\n".
= &Apache::loncommon::plainlanguagedescription($_);	'<br /><input type="submit" value="'.&mt('Save').'" /></form>'
}	);
}
%langchoices = &Apache::lonlocal::texthash(%langchoices);
my $selectionbox=
&Apache::loncommon::select_form(
$language,
'language',
\%langchoices);
$r->print(<<ENDLSCREEN);
<form name="prefs" action="/adm/preferences" method="post">
<input type="hidden" name="action" value="verify_and_change_languages" />
<br />$pref: $selectionbox
ENDLSCREEN
$r->print('<br /><input type="submit" value="'.&mt('Save').'" />');
}	}


Line 222 sub texenginechanger {	Line 160 sub texenginechanger {
my $domain = $env{'user.domain'};	my $domain = $env{'user.domain'};
my %userenv = &Apache::lonnet::get('environment',['texengine']);	my %userenv = &Apache::lonnet::get('environment',['texengine']);
my $texengine=$userenv{'texengine'};	my $texengine=$userenv{'texengine'};
	if (lc($texengine) eq 'jsmath') {
	$texengine = 'MathJax';
	}

my %mathchoices=('' => 'Default',	my %mathchoices=('' => 'Default',
'tth' => 'tth (TeX to HTML)',	'tth' => 'tth (TeX to HTML)',
#'ttm' => 'TeX to MathML',	#'ttm' => 'TeX to MathML',
'jsMath' => 'jsMath',	'MathJax' => 'MathJax',
'MathJax' => 'MathJax',
'mimetex' => 'mimetex (Convert to Images)',	'mimetex' => 'mimetex (Convert to Images)',
'raw' => 'Raw (Screen Reader)'	'raw' => 'Raw (Screen Reader)'
);	);
Line 238 sub texenginechanger {	Line 178 sub texenginechanger {
'texengine',	'texengine',
\%mathchoices);	\%mathchoices);
my $MathJax_start=&Apache::lontexconvert::MathJax_header();	my $MathJax_start=&Apache::lontexconvert::MathJax_header();
my $jsMath_start=&Apache::lontexconvert::jsMath_header();
my %lt=&Apache::lonlocal::texthash(	my %lt=&Apache::lonlocal::texthash(
'headline' => 'Change how math is displayed',	'headline' => 'Change how math is displayed',
'preftxt' => 'Preferred method to display math',	'preftxt' => 'Preferred method to display math',
'change' => 'Save',	'change' => 'Save',
'exmpl' => 'Examples',	'exmpl' => 'Examples',
'mathjax' => 'MathJax:',	'mathjax' => 'MathJax:',
'jsmath' => 'jsMath:',	'mathjaxinfo' => 'MathJax provides rendered equations whose source code can be extracted in TeX and MathML formats by right clicking the equation.',
'tth' => 'tth (TeX to HTML):',	'tth' => 'tth (TeX to HTML):',
'mimetex' => 'mimetex (Convert to Images):',	'mimetex' => 'mimetex (Convert to Images):',
);	);

my $jsMathWarning='<p>'
.'<div class="LC_warning">'
.&mt("It looks like you don't have the TeX math fonts installed.")
.'</div>'
.'<div>'
.&mt('The jsMath example on this page may not look right without them. '
.'The [_1]jsMath Home Page[_2] has information on how to download the '
.'needed fonts. In the meantime, jsMath will do the best it can '
.'with the fonts you have, but it may not be pretty and some equations '
.'may not be rendered correctly.'
,'<a href="http://www.math.union.edu/locate/jsMath/" target="_blank">'
,'</a>')
.'</div>'
.'</p>';

$r->print(<<ENDLSCREEN);	$r->print(<<ENDLSCREEN);
<h2>$lt{'headline'}</h2>	<h2>$lt{'headline'}</h2>
<form name="prefs" action="/adm/preferences" method="post">	<form name="prefs" action="/adm/preferences" method="post">
Line 281 $lt{'exmpl'}	Line 205 $lt{'exmpl'}

<h3>$lt{'mathjax'}</h3>	<h3>$lt{'mathjax'}</h3>
</script>	</script>
<iframe src="/res/adm/pages/math_example.tex?inhibitmenu=yes&texengine=MathJax" width="400" height="120"></iframe>	<iframe src="/res/adm/pages/math_example.tex?inhibitmenu=yes&texengine=MathJax" width="400" height="150"></iframe>
</p>	</p>
<p>	<p>
MathJax provides rendered equations whose source code can be extracted in TeX and MathML formats by right clicking the equation.	$lt{'mathjaxinfo'}
</p>

<h3>$lt{'jsmath'}</h3>
<p>
$jsMath_start
<script type="text/javascript" language="JavaScript">
if (jsMath.nofonts == 1) {
document.writeln($jsMathWarning);
}

</script>
<iframe src="/res/adm/pages/math_example.tex?inhibitmenu=yes&texengine=jsMath" width="400" height="120"></iframe>
</p>	</p>

<h3>$lt{'mimetex'}</h3>	<h3>$lt{'mimetex'}</h3>
<p>	<p>
<iframe src="/res/adm/pages/math_example.tex?inhibitmenu=yes&texengine=mimetex" width="400" height="100"></iframe>	<iframe src="/res/adm/pages/math_example.tex?inhibitmenu=yes&texengine=mimetex" width="400" height="150"></iframe>
</p>	</p>

<h3>$lt{'tth'}</h3>	<h3>$lt{'tth'}</h3>
<p>	<p>
<iframe src="/res/adm/pages/math_example.tex?inhibitmenu=yes&texengine=tth" width="400" height="220"></iframe>	<iframe src="/res/adm/pages/math_example.tex?inhibitmenu=yes&texengine=tth" width="400" height="150"></iframe>
</p>	</p>
ENDLSCREEN	ENDLSCREEN
if ($env{'environment.texengine'} ne 'jsMath') {
$r->print('<script type="text/javascript" language="JavaScript">jsMath.Process()</script>');
}
}	}


Line 322 sub verify_and_change_texengine {	Line 231 sub verify_and_change_texengine {
# Screenname	# Screenname
my $newtexengine = $env{'form.texengine'};	my $newtexengine = $env{'form.texengine'};
$newtexengine=~s/[^\-\w]//g;	$newtexengine=~s/[^\-\w]//g;
	if (lc($newtexengine) eq 'jsmath') {
	$newtexengine = 'MathJax';
	}
if ($newtexengine eq 'ttm') {	if ($newtexengine eq 'ttm') {
&Apache::lonnet::appenv({'browser.mathml' => 1});	&Apache::lonnet::appenv({'browser.mathml' => 1});
} else {	} else {
Line 354 sub rolesprefchanger {	Line 266 sub rolesprefchanger {
my $domain = $env{'user.domain'};	my $domain = $env{'user.domain'};
my %userenv = &Apache::lonnet::get	my %userenv = &Apache::lonnet::get
('environment',['recentroles','recentrolesn']);	('environment',['recentroles','recentrolesn']);
	my $brtext = 'Change '.$role.' Page Pref';
	my $brtitle;
	if ($env{'form.returnurl'} eq '/adm/roles') {
	$brtext = 'Configure Hotlist';
	} else {
	$brtitle = $brtext;
	}
Apache::lonhtmlcommon::add_breadcrumb(	Apache::lonhtmlcommon::add_breadcrumb(
{ href => '/adm/preferences?action=changerolespref',	{ href => '/adm/preferences?action=changerolespref',
text => 'Change '.$role.' Page Pref'});	text => $brtext});
$r->print(Apache::loncommon::start_page('Content Display Settings'));	$r->print(Apache::loncommon::start_page('Content Display Settings'));
$r->print(Apache::lonhtmlcommon::breadcrumbs('Change '.$role.' Page Pref'));	$r->print(Apache::lonhtmlcommon::breadcrumbs($brtitle));
my $hotlist_flag=$userenv{'recentroles'};	my $hotlist_flag=$userenv{'recentroles'};
my $hotlist_n=$userenv{'recentrolesn'};	my $hotlist_n=$userenv{'recentrolesn'};
my $checked;	my ($checkedon,$checkedoff);
if ($hotlist_flag) {	if ($hotlist_flag) {
$checked = 'checked="checked"';	$checkedon = 'checked="checked"';
	} else {
	$checkedoff = 'checked="checked"';
}	}

if (!$hotlist_n) { $hotlist_n=3; }	if (!$hotlist_n) { $hotlist_n=3; }
Line 390 sub rolesprefchanger {	Line 311 sub rolesprefchanger {
&Apache::loncommon::start_data_table().	&Apache::loncommon::start_data_table().
&Apache::loncommon::start_data_table_header_row().	&Apache::loncommon::start_data_table_header_row().
"<th>".&mt('Freeze '.$role)."</th>".	"<th>".&mt('Freeze '.$role)."</th>".
"<th>".&mt($role)."</td>".	"<th>".&mt($role)."</th>".
&Apache::loncommon::end_data_table_header_row().	&Apache::loncommon::end_data_table_header_row().
"\n";	"\n";
my $count;	my $count;
Line 413 sub rolesprefchanger {	Line 334 sub rolesprefchanger {
$roles_check_list .= "</table>\n";	$roles_check_list .= "</table>\n";
}	}

	my $actionurl = '/adm/preferences';
	if ($env{'form.returnurl'} eq '/adm/roles') {
	$actionurl = '/adm/roles';
	}
	$r->print('<h3>'.&mt('Recent Roles Hotlist').'</h3>');
	unless ($checkedon) {
	$r->print(&mt('LON-CAPA users with several '.$lc_role.'s may wish to enable the Hotlist.').'<br />');
	}
$r->print('	$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.').'	<form name="prefs" action="'.$actionurl.'" method="post">
</p>
<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 />'.	<input type="hidden" name="returnurl" value="'.$env{'form.returnurl'}.'" />
'<h2>'.&mt('Recent '.$role.'s Hotlist').'</h2>'.	<div class="LC_left_float"><h4>'.&mt('Hotlist options').'</h4>
	<p>'.
	&mt('When enabled, the Hotlist keeps track of the last N '.$lc_role.'s visited.').'<br />'.
	&mt('Those N '.$lc_role.'s are then shown in a table at the top of the '.$lc_role.'s page.').'</p>'.
&Apache::lonhtmlcommon::start_pick_box().	&Apache::lonhtmlcommon::start_pick_box().
&Apache::lonhtmlcommon::row_title('<label for="Hotlist">'.&mt('Enable Recent '.$role.'s Hotlist').'</label>').	&Apache::lonhtmlcommon::row_title(&mt('Use Recent '.$role.'s Hotlist')).
'<input id="Hotlist" type="checkbox"'.$checked.' name="recentroles" value="true" />'.	'<span class="LC_nobreak">
	<label><input id="Hotliston" type="radio" '.$checkedon.' name="recentroles" value="1" />'.&mt('Yes').'</label>'.
	(' 'x2).
	'<label><input id="Hotlistoff" type="radio" '.$checkedoff.' name="recentroles" value="0" />'.&mt('No').'</label>
	</span>'.
&Apache::lonhtmlcommon::row_closure().	&Apache::lonhtmlcommon::row_closure().
&Apache::lonhtmlcommon::row_title('<label for="NumberOfRoles">'.&mt('Number of '.$role.'s in Hotlist').'</label>').	&Apache::lonhtmlcommon::row_title('<label for="NumberOfRoles">'.&mt('Number of '.$role.'s in Hotlist').'</label>').
'<select name="recentrolesn" size="1" id ="NumberOfRoles">'.	'<select name="recentrolesn" size="1" id ="NumberOfRoles">'.
$options.	$options.'
'</select>'.	</select>'.
&Apache::lonhtmlcommon::row_closure(1).	&Apache::lonhtmlcommon::row_closure(1).
&Apache::lonhtmlcommon::end_pick_box().	&Apache::lonhtmlcommon::end_pick_box().'
'<br/><h2>'.&mt('Freeze Roles').'</h2>'.	</div>');
'<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.').'	if ($roles_check_list) {
	$r->print('<div class="LC_left_float">
	<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 />'.
	&mt('Those '.$lc_role.'s marked frozen will not be removed from the list, even if not recently used.').'
</p>	</p>
'.$roles_check_list.'	'.$roles_check_list.'
<br />	</div>');
	} else {
	$r->print('<br clear="all" />'.
	&mt('Once the Hotlist contains recently visited '.$lc_role.'s you can return to this page to also set frozen roles.'));
	}
	$r->print('
	<br clear="all" />
<input type="submit" value="'.&mt('Save').'" />	<input type="submit" value="'.&mt('Save').'" />
</form>');	</form>');
}	}
Line 525 sub verify_and_change_rolespref {	Line 469 sub verify_and_change_rolespref {
}	}
}	}
$message=&Apache::loncommon::confirmwrapper($message);	$message=&Apache::loncommon::confirmwrapper($message);
&print_main_menu($r, $message);	if ($env{'form.returnurl'} eq '/adm/roles') {
	return $message;
	} else {
	&print_main_menu($r, $message);
	}
}	}


Line 684 sub icon_options {	Line 632 sub icon_options {
sub icon_previews {	sub icon_previews {
my %icon_text = (	my %icon_text = (
annotate => 'Notes',	annotate => 'Notes',
wishlist => 'Wishlist',	wishlist => 'Stored Links',
catalog => 'Info',	catalog => 'Info',
evaluate => 'Evaluate',	evaluate => 'Evaluate',
feedback => 'Communicate',	feedback => 'Communicate',
Line 692 sub icon_previews {	Line 640 sub icon_previews {
);	);
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)&Prepare a printable document",
wishlist => "s&9&1&wishlist-link.png&$icon_text{'wishlist'}&wishlistlink[_2]&set_wishlistlink()&Set a link for this resource to wishlist",	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",
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)&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)&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()&Make notes and annotations about this resource",
Line 771 sub domcoordchanger {	Line 719 sub domcoordchanger {
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 Authoring Space.');
my $construction=&mt('Block access to construction space');	my $construction=&mt('Block access to Authoring Space');
my $change=&mt('Save');	my $change=&mt('Save');
$r->print(<<ENDSCREEN);	$r->print(<<ENDSCREEN);
<form name="prefs" action="/adm/preferences" method="post">	<form name="prefs" action="/adm/preferences" method="post">
Line 798 sub verify_and_change_domcoord {	Line 746 sub verify_and_change_domcoord {
} else {	} else {
$status=&mt('off');	$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>'));	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);	&print_main_menu($r,$message);
}	}
Line 814 sub lockwarning {	Line 762 sub lockwarning {
my $textbottom=&mt('Changing roles or logging out may result in data corruption.');	my $textbottom=&mt('Changing roles or logging out may result in data corruption.');
my ($num,%which)=&Apache::lonnet::get_locks();	my ($num,%which)=&Apache::lonnet::get_locks();
my $which='';	my $which='';
foreach my $id (keys %which) {	foreach my $id (keys(%which)) {
$which.='<li>'.$which{$id}.'</li>';	$which.='<li>'.$which{$id}.'</li>';
}	}
my $change=&mt('Override');	my $change=&mt('Override');
Line 856 sub msgforwardchanger {	Line 804 sub msgforwardchanger {
foad => 'Forward to account(s)',	foad => 'Forward to account(s)',
fwdm => 'Forward messages to other account(s) in LON-CAPA',	fwdm => 'Forward messages to other account(s) in LON-CAPA',
noti => 'E-mail notification of LON-CAPA messages',	noti => 'E-mail notification of LON-CAPA messages',
foad_exmpl => 'e.g. <tt>userA:domain1,userB:domain2,...</tt>',
mnot => 'E-mail address(es) which should be notified about new LON-CAPA messages',	mnot => 'E-mail address(es) which should be notified about new LON-CAPA messages',
mnot_exmpl => 'e.g. <tt>joe@doe.com</tt>',
chg => 'Save',	chg => 'Save',
email => 'The e-mail address entered in row ',	email => 'The e-mail address entered in row ',
notv => 'is not a valid e-mail address',	notv => 'is not a valid e-mail address',
toen => "To enter multiple addresses, enter one address at a time, click 'Change' and then add the next one",	toen => "To enter multiple addresses, enter one address at a time, click 'Change' and then add the next one",
prme => 'Back',	prme => 'Back',
);	);
	$lt{'foad_exmpl'} = &mt('e.g. [_1]userA:domain1,userB:domain2,...[_2]','<tt>','</tt>');
	$lt{'mnot_exmpl'} = &mt('e.g. [_1]joe@doe.com[_2]','<tt>','</tt>');
Apache::lonhtmlcommon::add_breadcrumb(	Apache::lonhtmlcommon::add_breadcrumb(
{ href => '/adm/preferences?action=changemsgforward',	{ href => '/adm/preferences?action=changemsgforward',
text => 'Messages & Notifications'});	text => 'Messages & Notifications'});
Line 968 ENDMSG	Line 916 ENDMSG
'" onclick="javscript:delete_address('."'$num'".')" />'.	'" onclick="javscript:delete_address('."'$num'".')" />'.
&mt('Delete').'</label></span></td>'.	&mt('Delete').'</label></span></td>'.
'<td><input type="text" value="'.$item.'" name="address_'.	'<td><input type="text" value="'.$item.'" name="address_'.
$num.'" onFocus="javascript:address_changes('."'$num'".	$num.'" onfocus="javascript:address_changes('."'$num'".
')" /></td><td>';	')" /></td><td>';
my %chk;	my %chk;
if (defined($allnot{$item}{'crit'})) {	if (defined($allnot{$item}{'crit'})) {
Line 1017 ENDMSG	Line 965 ENDMSG
'<input type="checkbox" name="add_notify_'.$num.	'<input type="checkbox" name="add_notify_'.$num.
'" value="1" />'.&mt('Add new address').'</label></span></td>'.	'" value="1" />'.&mt('Add new address').'</label></span></td>'.
'<td><input type="text" value="" name="address_'.$num.	'<td><input type="text" value="" name="address_'.$num.
'" onFocus="javascript:new_address('."'$num'".')" /></td><td>';	'" onfocus="javascript:new_address('."'$num'".')" /></td><td>';
foreach my $type ('all','crit','reg') {	foreach my $type ('all','crit','reg') {
$output .= '<span class="LC_nobreak"><label>'.	$output .= '<span class="LC_nobreak"><label>'.
'<input type="radio" name="notify_type_'.$num.	'<input type="radio" name="notify_type_'.$num.
Line 1191 sub colorschanger {	Line 1139 sub colorschanger {
foreach my $item (sort(keys(%colortypes))) {	foreach my $item (sort(keys(%colortypes))) {
my $curcol=&Apache::loncommon::designparm($function.'.'.$item,$domain);	my $curcol=&Apache::loncommon::designparm($function.'.'.$item,$domain);
$chtable.=&Apache::loncommon::start_data_table_row().	$chtable.=&Apache::loncommon::start_data_table_row().
'<td>'.$colortypes{$item}.'</td><td style="background: '.$curcol.	'<td>'.$colortypes{$item}.'<td><input name="'.$item.
'">      </td><td><input name="'.$item.	'" class="colorchooser" size="10" value="'.$curcol.
'" size="10" value="'.$curcol.	'" /></td>'.
'" /></td><td><a href="javascript:pjump('."'color_custom','".$colortypes{$item}.	&Apache::loncommon::end_data_table_row()."\n";
"','".$curcol."','"
.$item."','parmform.pres','psub'".');">'.&mt('Select').'</a></td>'.
&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 $savebutton = &mt('Save');	my $savebutton = &mt('Save');
my $resetbutton = &mt('Reset All');	my $resetbutton = &mt('Reset All');
my $resetbuttondesc = &mt('Reset All Colors to Default');	my $resetbuttondesc = &mt('Reset All Colors to Default');
$r->print(<<ENDCOL);	my $colorchooser=&Apache::lonhtmlcommon::color_picker();
<script type="text/javascript" language="JavaScript">	$r->print('<script type="text/javascript" language="JavaScript">
	' . $colorchooser . '
$pjump_def	</script>
	');
function psub() {
modalWindow.close();
if (document.parmform.pres_marker.value!='') {
if (document.parmform.pres_type.value!='') {
eval('document.prefs.'+
document.parmform.pres_marker.value+
'.value=document.parmform.pres_value.value;');
}
} else {
document.parmform.pres_value.value='';
document.parmform.pres_marker.value='';
}
}

	$r->print(<<ENDCOL);

</script>	<form name="parmform" action="">
<form name="parmform">
<input type="hidden" name="pres_marker" />	<input type="hidden" name="pres_marker" />
<input type="hidden" name="pres_type" />	<input type="hidden" name="pres_type" />
<input type="hidden" name="pres_value" />	<input type="hidden" name="pres_value" />
Line 1261 sub verify_and_change_colors {	Line 1193 sub verify_and_change_colors {
);	);

my $message='';	my $message='';
foreach my $item (keys %colortypes) {	foreach my $item (keys(%colortypes)) {
my $color=$env{'form.'.$item};	my $color=$env{'form.'.$item};
	if (!($color =~ /^#/)) {
	$color = '#' . $color;
	}
my $entry='color.'.$function.'.'.$item;	my $entry='color.'.$function.'.'.$item;
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});
Line 1301 sub passwordchanger {	Line 1236 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'};
Line 1310 sub passwordchanger {	Line 1251 sub passwordchanger {
} 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(&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.'	$r->print(
	'<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.'
,'<a href="/adm/resetpw">','</a>')	,'<a href="/adm/resetpw">','</a>')
	.'</p>'
);	);
return;	return;
}	}
Line 1321 sub passwordchanger {	Line 1265 sub passwordchanger {
$domain = $data{'domain'};	$domain = $data{'domain'};
$currentpass = $data{'temppasswd'};	$currentpass = $data{'temppasswd'};
} else {	} else {
$r->print(&mt('Sorry, the token generated when you requested a password reset has expired.').'<br />');	$r->print(
	'<p class="LC_warning">'
	.&mt('Sorry, the token generated when you requested'
	.' a password reset has expired.')
	.'</p>'
	);
return;	return;
}	}
} else {	} else {
$r->print(&mt('Sorry, the URL generated when you requested reset of your password contained incomplete information.').'<br />');	$r->print(
	'<p class="LC_warning">'
	.&mt('Sorry, the URL generated when you requested reset of'
	.' your password contained incomplete information.')
	.'</p>'
	);
return;	return;
}	}
if (&Apache::lonnet::domain($domain) eq '') {	if (&Apache::lonnet::domain($domain) eq '') {
$domain = $r->dir_config('lonDefDomain');	$domain = $r->dir_config('lonDefDomain');
}	}
} else {	} else {
$r->print(&mt('Page requested in unexpected context').'<br />');	$r->print(
	'<p class="LC_error">'
	.&mt('Page requested in unexpected context')
	.'</p>'
	);
return;	return;
}	}
my $currentauth=&Apache::lonnet::queryauthenticate($user,$domain);	my $currentauth=&Apache::lonnet::queryauthenticate($user,$domain);
Line 1340 sub passwordchanger {	Line 1298 sub passwordchanger {
return if ($currentauth !~ /^(unix\|internal):/);	return if ($currentauth !~ /^(unix\|internal):/);
#	#
# Generate keys	# Generate keys
my ($lkey_cpass ,$ukey_cpass ) = &des_keys();	my ($lkey_cpass ,$ukey_cpass ) = &Apache::loncommon::des_keys();
my ($lkey_npass1,$ukey_npass1) = &des_keys();	my ($lkey_npass1,$ukey_npass1) = &Apache::loncommon::des_keys();
my ($lkey_npass2,$ukey_npass2) = &des_keys();	my ($lkey_npass2,$ukey_npass2) = &Apache::loncommon::des_keys();
# Store the keys in the log files	# Store the keys in the log files
my $lonhost = $r->dir_config('lonHostID');	my $lonhost = $r->dir_config('lonHostID');
my $logtoken=Apache::lonnet::reply('tmpput:'	my $logtoken=Apache::lonnet::reply('tmpput:'
Line 1390 sub jscript_send {	Line 1348 sub jscript_send {
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();
	this.document.pserver.elements.currentpass.value =
this.document.pserver.elements.currentpass.value	getCrypted(this.document.client.elements.currentpass.value);
=crypted(this.document.client.elements.currentpass.value);

uextkey=this.document.client.elements.ukey_npass1.value;	uextkey=this.document.client.elements.ukey_npass1.value;
lextkey=this.document.client.elements.lkey_npass1.value;	lextkey=this.document.client.elements.lkey_npass1.value;
initkeys();	initkeys();
this.document.pserver.elements.newpass_1.value	this.document.pserver.elements.newpass_1.value
=crypted(this.document.client.elements.newpass_1.value);	=getCrypted(this.document.client.elements.newpass_1.value);

uextkey=this.document.client.elements.ukey_npass2.value;	uextkey=this.document.client.elements.ukey_npass2.value;
lextkey=this.document.client.elements.lkey_npass2.value;	lextkey=this.document.client.elements.lkey_npass2.value;
initkeys();	initkeys();
this.document.pserver.elements.newpass_2.value	this.document.pserver.elements.newpass_2.value
=crypted(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\|	$output .= qq\|
Line 1419 sub jscript_send {	Line 1374 sub jscript_send {
$ output .= qq\|	$ output .= qq\|
this.document.pserver.submit();	this.document.pserver.submit();
}	}

</script>	</script>
\|;	\|;
}	}
Line 1435 sub client_form {	Line 1391 sub client_form {
'changepass' => 'Save',	'changepass' => 'Save',
);	);

my $output = '<form name="client">'	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(	$output .= &Apache::lonhtmlcommon::row_title(
Line 1444 sub client_form {	Line 1400 sub client_form {
.&Apache::lonhtmlcommon::row_closure()	.&Apache::lonhtmlcommon::row_closure()
.&Apache::lonhtmlcommon::row_title(	.&Apache::lonhtmlcommon::row_title(
'<label for="uname">'.$lt{'username'}.'</label>')	'<label for="uname">'.$lt{'username'}.'</label>')
.'<input type="text" name="uname" size="15" />'	.'<input type="text" name="uname" size="20" />'
.'<input type="hidden" name="currentpass" value="'.$currentpass.'" />'	.'<input type="hidden" name="currentpass" value="'.$currentpass.'" />'
.&Apache::lonhtmlcommon::row_closure()	.&Apache::lonhtmlcommon::row_closure()
.&Apache::lonhtmlcommon::row_title(	.&Apache::lonhtmlcommon::row_title(
Line 1454 sub client_form {	Line 1410 sub client_form {
} else {	} else {
$output .= &Apache::lonhtmlcommon::row_title(	$output .= &Apache::lonhtmlcommon::row_title(
'<label for="currentpass">'.$lt{'currentpass'}.'</label>')	'<label for="currentpass">'.$lt{'currentpass'}.'</label>')
.'<input type="password" name="currentpass" size="10"/>'	.'<input type="password" name="currentpass" size="20"/>'
.&Apache::lonhtmlcommon::row_closure();	.&Apache::lonhtmlcommon::row_closure();
}	}
$output .= &Apache::lonhtmlcommon::row_title(	$output .= &Apache::lonhtmlcommon::row_title(
'<label for="newpass_1">'.$lt{'newpass'}.'</label>')	'<label for="newpass_1">'.$lt{'newpass'}.'</label>')
.'<input type="password" name="newpass_1" size="10" />'	.'<input type="password" name="newpass_1" size="20" />'
.&Apache::lonhtmlcommon::row_closure()	.&Apache::lonhtmlcommon::row_closure()
.&Apache::lonhtmlcommon::row_title(	.&Apache::lonhtmlcommon::row_title(
'<label for="newpass_2">'.$lt{'confirmpass'}.'</label>')	'<label for="newpass_2">'.$lt{'confirmpass'}.'</label>')
.'<input type="password" name="newpass_2" size="10" />'	.'<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();
$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'}" />
<input type="hidden" name="lkey_cpass" value="$hexkey->{'lkey_cpass'}" />	<input type="hidden" name="lkey_cpass" value="$hexkey->{'lkey_cpass'}" />
Line 1512 sub server_form {	Line 1468 sub server_form {
sub verify_and_change_password {	sub verify_and_change_password {
my ($r,$caller,$mailtoken) = @_;	my ($r,$caller,$mailtoken) = @_;
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 1581 ENDERROR	Line 1543 ENDERROR
}	}
my ($ckey,$n1key,$n2key)=split(/&/,$tmpinfo);	my ($ckey,$n1key,$n2key)=split(/&/,$tmpinfo);
#	#
$currentpass = &des_decrypt($ckey ,$currentpass);	$currentpass = &Apache::loncommon::des_decrypt($ckey ,$currentpass);
$newpass1 = &des_decrypt($n1key,$newpass1);	$newpass1 = &Apache::loncommon::des_decrypt($n1key,$newpass1);
$newpass2 = &des_decrypt($n2key,$newpass2);	$newpass2 = &Apache::loncommon::des_decrypt($n2key,$newpass2);
#	#
if ($caller eq 'reset_by_email') {	if ($caller eq 'reset_by_email') {
my %data = &Apache::lonnet::tmpget($mailtoken);	my %data = &Apache::lonnet::tmpget($mailtoken);
Line 1604 ENDERROR	Line 1566 ENDERROR
}	}
if ($newpass1 ne $newpass2) {	if ($newpass1 ne $newpass2) {
&passwordchanger($r,	&passwordchanger($r,
'<span class="LC_error">'.	'<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);
return 1;	return 1;
}	}
if (length($newpass1) < 7) {	if (length($newpass1) < 7) {
&passwordchanger($r,	&passwordchanger($r,
'<span class="LC_error">'.	'<span class="LC_warning">'.
&mt('Passwords must be a minimum of 7 characters long.').' '.	&mt('Passwords must be a minimum of 7 characters long.').' '.
&mt('Please try again.').'</span>',$caller,$mailtoken);	&mt('Please try again.').'</span>',$caller,$mailtoken);
return 1;	return 1;
Line 1624 ENDERROR	Line 1586 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.
my $errormessage ='<span class="LC_error">'.	my $errormessage ='<span class="LC_warning">'.
&mt('The password you entered contained illegal characters.').'<br />'.	&mt('The password you entered contained illegal characters.').'<br />'.
&mt('Valid characters are').(<<"ENDERROR");	&mt('Valid characters are').(<<"ENDERROR");
: space and <br />	: space and <br />
Line 1796 sub verify_and_change_discussion {	Line 1758 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.=&Apache::lonhtmlcommon::confirm_success(&mt('In discussions: new posts will be cease to be identified as "NEW" after display.')).'<br />';	$message.=&Apache::lonhtmlcommon::confirm_success(&mt('In discussions: new posts will 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 {
Line 2102 push(@{ $menu[0]->{items} }, {	Line 2064 push(@{ $menu[0]->{items} }, {
linktitle => 'Change your password.',	linktitle => 'Change your password.',
});	});
}	}
	if ($env{'environment.remote'} eq 'off') {
	push(@{ $menu[1]->{items} }, {
	linktext => 'Launch Remote Control',
	url => '/adm/remote?url=/adm/preferences&action=launch',
	permission => 'F',
	#help => '',
	icon => 'remotecontrol.png',
	linktitle => 'Launch the remote control for LON-CAPA.',
	});
	}else{
	push(@{ $menu[1]->{items} }, {
	linktext => 'Collapse Remote Control',
	url => '/adm/remote?url=/adm/preferences&action=collapse',
	permission => 'F',
	#help => '',
	icon => 'remotecontrol.png',
	linktitle => 'Collapse the remote control for LON-CAPA.',
	});
	}

if (&can_toggle_namelocking()) {	if (&can_toggle_namelocking()) {
push(@{ $menu[0]->{items} }, {	push(@{ $menu[0]->{items} }, {
Line 2176 sub handler {	Line 2157 sub handler {
['action','wysiwyg','returnurl','refpage']);	['action','wysiwyg','returnurl','refpage']);
#	#
Apache::lonhtmlcommon::clear_breadcrumbs();	Apache::lonhtmlcommon::clear_breadcrumbs();
	my ($brlink,$brtxt,$brhelp);
	if (($env{'form.action'} eq 'changerolespref') && ($env{'form.returnurl'} eq '/adm/roles')) {
	$brlink ='/adm/roles';
	$brtxt = 'User Roles';
	} else {
	$brlink ='/adm/preferences';
	$brtxt = 'Set User Preferences';
	$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 => '/adm/preferences',	({href => $brlink,
text => 'Set User Preferences',	text => $brtxt,
help =>	help => $brhelp,});
'Prefs_About_Me,Prefs_Language,Prefs_Screen_Name_Nickname,Change_Colors,Change_Password,Prefs_Messages,Change_Discussion_Display'});
if(!exists $env{'form.action'}) {	if(!exists $env{'form.action'}) {
&print_main_menu($r);	&print_main_menu($r);
}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);	&verify_and_change_password($r,'preferences');
}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.196
changed lines
	Added in v.1.196.4.19