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.198 and 1.224

version 1.198, 2012/08/16 17:02:55	version 1.224, 2016/09/19 03:19:12
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 457 $options.'	Line 369 $options.'
$r->print('<div class="LC_left_float">	$r->print('<div class="LC_left_float">
<h4>'.&mt('Freeze Roles').'</h4>	<h4>'.&mt('Freeze Roles').'</h4>
<p>'.&mt('The table below can be used to [_1]freeze[_2] '.$lc_role.'s in the Hotlist.','<q>','</q>').'<br />'.	<p>'.&mt('The table below can be used to [_1]freeze[_2] '.$lc_role.'s in the Hotlist.','<q>','</q>').'<br />'.
&mt('Those marked frozen will not be removed from the list, even if not recently used.').'	&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.'
</div>');	</div>');
} else {	} else {
$r->print('<br clear="all" />'.	$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.'));	&mt('Once the Hotlist contains recently visited '.$lc_role.'s you can return to this page to also set frozen roles.'));
}	}
$r->print('	$r->print('
<br clear="all" />	<br clear="all" />
Line 774 sub verify_and_change_clicker {	Line 686 sub verify_and_change_clicker {
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 $uhome = $env{'user.home'};
my $newclickers = $env{'form.clickers'};	my $newclickers = $env{'form.clickers'};
	my $message;
$newclickers=~s/[^\w\:\-]+/\,/gs;	$newclickers=~s/[^\w\:\-]+/\,/gs;
$newclickers=~tr/a-z/A-Z/;	$newclickers=~tr/a-z/A-Z/;
$newclickers=~s/[\:\-]+/\-/g;	$newclickers=~s/[\:\-]+/\-/g;
$newclickers=~s/\,+/\,/g;	$newclickers=~s/\,+/\,/g;
$newclickers=~s/^\,//;	$newclickers=~s/^\,//;
$newclickers=~s/\,$//;	$newclickers=~s/\,$//;
&Apache::lonnet::put('environment',{'clickers' => $newclickers});	my @oldclickers = split(/,/,$env{'environment.clickers'});
&Apache::lonnet::appenv({'environment.clickers' => $newclickers});	my @newclickers = split(/,/,$newclickers);
my $message=&Apache::lonhtmlcommon::confirm_success(&mt('Registering clickers: [_1]',$newclickers));	my %newuniq;
	map { $newuniq{$_} = 1; } @newclickers;
	@newclickers = sort(keys(%newuniq));
	my @differences = &Apache::loncommon::compare_arrays(\@oldclickers,\@newclickers);
	if (@differences) {
	my $putres = &Apache::lonnet::put('environment',{'clickers' => $newclickers});
	if ($putres eq 'ok') {
	my @adds = ();
	my @dels = ();
	foreach my $item (@differences) {
	if (grep(/^\Q$item\E$/,@newclickers)) {
	push(@adds,$item);
	} else {
	push(@dels,$item);
	}
	}
	if (@dels) {
	my %delclicker;
	map { $delclicker{$_} = $user; } @dels;
	my $putresult = &Apache::lonnet::iddel($domain,\%delclicker,$uhome,'clickers');
	}
	if (@adds) {
	my %addclicker;
	map { $addclicker{$_} = $user; } @adds;
	my $putresult = &Apache::lonnet::updateclickers($domain,'add',\%addclicker,$uhome,1);
	}
	&Apache::lonnet::appenv({'environment.clickers' => $newclickers});
	$message=&Apache::lonhtmlcommon::confirm_success(&mt('Registering clickers: [_1]',$newclickers));
	} else {
	$message=&Apache::lonhtmlcommon::confirm_success(&mt('Error saving clicker ID').1);
	}
	} else {
	$message='<span class="LC_info">'.&mt('Clicker information unchanged').'</span>';
	}
$message=&Apache::loncommon::confirmwrapper($message);	$message=&Apache::loncommon::confirmwrapper($message);
&print_main_menu($r, $message);	&print_main_menu($r, $message);
}	}
Line 807 sub domcoordchanger {	Line 754 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 834 sub verify_and_change_domcoord {	Line 781 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 850 sub lockwarning {	Line 797 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 892 sub msgforwardchanger {	Line 839 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 1004 ENDMSG	Line 951 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 1053 ENDMSG	Line 1000 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 1227 sub colorschanger {	Line 1174 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}.
"','".$curcol."','"
.$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();
Line 1240 sub colorschanger {	Line 1184 sub colorschanger {
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');
	my $colorchooser=&Apache::lonhtmlcommon::color_picker();
	$r->print('<script type="text/javascript" language="JavaScript">
	' . $colorchooser . '
	</script>
	');
$r->print(<<ENDCOL);	$r->print(<<ENDCOL);
<script type="text/javascript" language="JavaScript">

$pjump_def

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='';
}
}

	<form name="parmform" action="">
</script>
<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 1297 sub verify_and_change_colors {	Line 1227 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 1337 sub passwordchanger {	Line 1270 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 1346 sub passwordchanger {	Line 1285 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(
,'<a href="/adm/resetpw">','</a>')	'<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>')
	.'</p>'
);	);
return;	return;
}	}
Line 1357 sub passwordchanger {	Line 1299 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 1376 sub passwordchanger {	Line 1332 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 1426 sub jscript_send {	Line 1382 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 1455 sub jscript_send {	Line 1408 sub jscript_send {
$ output .= qq\|	$ output .= qq\|
this.document.pserver.submit();	this.document.pserver.submit();
}	}

</script>	</script>
\|;	\|;
}	}
Line 1471 sub client_form {	Line 1425 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') {
	my $mobileargs;
	(undef,undef,undef,undef,undef,undef,my $clientmobile) =
	&Apache::loncommon::decode_user_agent();
	if ($clientmobile) {
	$mobileargs = 'autocapitalize="off" autocorrect="off" ';
	}
$output .= &Apache::lonhtmlcommon::row_title(	$output .= &Apache::lonhtmlcommon::row_title(
'<label for="email">'.$lt{'email'}.'</label>')	'<label for="email">'.$lt{'email'}.'</label>')
.'<input type="text" name="email" size="30" />'	.'<input type="text" name="email" size="30" '.$mobileargs.'/>'
.&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" '.$mobileargs.'/>'
.'<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 1490 sub client_form {	Line 1450 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 1548 sub server_form {	Line 1508 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 1616 ENDERROR	Line 1582 ENDERROR
return 1;	return 1;
}	}
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 1640 ENDERROR	Line 1606 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 1660 ENDERROR	Line 1626 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 1832 sub verify_and_change_discussion {	Line 1798 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 1934 sub verify_and_change_coursepage {	Line 1900 sub verify_and_change_coursepage {
&print_main_menu($r,$message);	&print_main_menu($r,$message);
}	}

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

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

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

}	}

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

if (&can_toggle_debug()) {	if (&can_toggle_debug()) {
push(@{ $menu[4]->{items} }, {	push(@{ $menu[4]->{items} }, {
linktext => 'Toggle Debug Messages (Currently '.($env{'user.debug'} ? 'on)' : 'off)'),	linktext => 'Toggle Debug Messages (Currently '.($env{'user.debug'} ? 'on)' : 'off)'),
Line 2230 sub handler {	Line 2260 sub handler {
}elsif($env{'form.action'} eq 'changepass'){	}elsif($env{'form.action'} eq 'changepass'){
&passwordchanger($r);	&passwordchanger($r);
}elsif($env{'form.action'} eq 'verify_and_change_pass'){	}elsif($env{'form.action'} eq 'verify_and_change_pass'){
&verify_and_change_password($r);	&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'){
Line 2283 sub handler {	Line 2313 sub handler {
&coursedisplaychanger($r);	&coursedisplaychanger($r);
}elsif($env{'form.action'} eq 'verify_and_change_coursepage'){	}elsif($env{'form.action'} eq 'verify_and_change_coursepage'){
&verify_and_change_coursepage($r);	&verify_and_change_coursepage($r);
	}elsif($env{'form.action'} eq 'authorsettings'){
	&author_space_settings($r);
	}elsif($env{'form.action'} eq 'change_authoring_settings'){
	&change_authoring_settings($r);
}elsif($env{'form.action'} eq 'debugtoggle'){	}elsif($env{'form.action'} eq 'debugtoggle'){
if (&can_toggle_debug()) {	if (&can_toggle_debug()) {
&toggle_debug();	&toggle_debug();

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

Removed from v.1.198
changed lines
	Added in v.1.224