--- loncom/interface/lonpreferences.pm 2012/08/27 16:30:31 1.196.4.5
+++ loncom/interface/lonpreferences.pm 2014/06/09 22:39:01 1.196.4.15
@@ -1,7 +1,7 @@
# The LearningOnline Network
# Preferences
#
-# $Id: lonpreferences.pm,v 1.196.4.5 2012/08/27 16:30:31 raeburn Exp $
+# $Id: lonpreferences.pm,v 1.196.4.15 2014/06/09 22:39:01 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -36,8 +36,6 @@ use strict;
use LONCAPA;
use Apache::Constants qw(:common);
use Apache::File;
-use Crypt::DES;
-use DynaLoader; # for Crypt::DES version
use Apache::loncommon();
use Apache::lonhtmlcommon();
use Apache::lonlocal;
@@ -45,50 +43,6 @@ use Apache::lonnet;
use LONCAPA::lonauthcgi();
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 #
################################################################
@@ -152,32 +106,16 @@ sub languagechanger {
text => 'Change Language'});
$r->print(Apache::loncommon::start_page('Content Display Settings'));
$r->print(Apache::lonhtmlcommon::breadcrumbs('Change Language'));
- my $user = $env{'user.name'};
- my $domain = $env{'user.domain'};
- my %userenv = &Apache::lonnet::get
- ('environment',['languages']);
+ my %userenv = &Apache::lonnet::get('environment',['languages']);
my $language=$userenv{'languages'};
- my $pref=&mt('Preferred language');
- my %langchoices=('' => 'No language preference');
- foreach (&Apache::loncommon::languageids()) {
- if (&Apache::loncommon::supportedlanguagecode($_)) {
- $langchoices{&Apache::loncommon::supportedlanguagecode($_)}
- = &Apache::loncommon::plainlanguagedescription($_);
- }
- }
- %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').'" />');
+ $r->print(
+ '<form name="prefs" action="/adm/preferences" method="post">'."\n".
+ '<input type="hidden" name="action" value="verify_and_change_languages" />'.
+ '<br /><span class="LC_nobreak">'.&mt('Preferred language').': '.
+ &Apache::loncommon::select_language('language',$language,1).'</span>'."\n".
+ '<br /><input type="submit" value="'.&mt('Save').'" /></form>'
+ );
}
@@ -245,6 +183,7 @@ sub texenginechanger {
'change' => 'Save',
'exmpl' => 'Examples',
'mathjax' => 'MathJax:',
+ 'mathjaxinfo' => 'MathJax provides rendered equations whose source code can be extracted in TeX and MathML formats by right clicking the equation.',
'jsmath' => 'jsMath:',
'tth' => 'tth (TeX to HTML):',
'mimetex' => 'mimetex (Convert to Images):',
@@ -281,10 +220,10 @@ $lt{'exmpl'}
<h3>$lt{'mathjax'}</h3>
</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>
-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>
@@ -296,17 +235,17 @@ if (jsMath.nofonts == 1) {
}
</script>
-<iframe src="/res/adm/pages/math_example.tex?inhibitmenu=yes&texengine=jsMath" width="400" height="120"></iframe>
+<iframe src="/res/adm/pages/math_example.tex?inhibitmenu=yes&texengine=jsMath" width="400" height="150"></iframe>
</p>
<h3>$lt{'mimetex'}</h3>
<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>
<h3>$lt{'tth'}</h3>
<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>
ENDLSCREEN
if ($env{'environment.texengine'} ne 'jsMath') {
@@ -457,13 +396,13 @@ $options.'
$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 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>
'.$roles_check_list.'
</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.'));
+ &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" />
@@ -807,8 +746,8 @@ sub domcoordchanger {
if ($userenv{'domcoord.author'} eq 'blocked') {
$constchecked=' checked="checked"';
}
- my $text=&mt('By default, the Domain Coordinator can enter your construction space.');
- my $construction=&mt('Block access to construction space');
+ my $text=&mt('By default, the Domain Coordinator can enter your Authoring Space.');
+ my $construction=&mt('Block access to Authoring Space');
my $change=&mt('Save');
$r->print(<<ENDSCREEN);
<form name="prefs" action="/adm/preferences" method="post">
@@ -834,7 +773,7 @@ sub verify_and_change_domcoord {
} 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>'));
+ 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);
&print_main_menu($r,$message);
}
@@ -892,15 +831,15 @@ sub msgforwardchanger {
foad => 'Forward to account(s)',
fwdm => 'Forward messages to other account(s) in LON-CAPA',
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_exmpl => 'e.g. <tt>joe@doe.com</tt>',
chg => 'Save',
email => 'The e-mail address entered in row ',
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",
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(
{ href => '/adm/preferences?action=changemsgforward',
text => 'Messages & Notifications'});
@@ -1004,7 +943,7 @@ ENDMSG
'" onclick="javscript:delete_address('."'$num'".')" />'.
&mt('Delete').'</label></span></td>'.
'<td><input type="text" value="'.$item.'" name="address_'.
- $num.'" onFocus="javascript:address_changes('."'$num'".
+ $num.'" onfocus="javascript:address_changes('."'$num'".
')" /></td><td>';
my %chk;
if (defined($allnot{$item}{'crit'})) {
@@ -1053,7 +992,7 @@ ENDMSG
'<input type="checkbox" name="add_notify_'.$num.
'" value="1" />'.&mt('Add new address').'</label></span></td>'.
'<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') {
$output .= '<span class="LC_nobreak"><label>'.
'<input type="radio" name="notify_type_'.$num.
@@ -1227,41 +1166,25 @@ sub colorschanger {
foreach my $item (sort(keys(%colortypes))) {
my $curcol=&Apache::loncommon::designparm($function.'.'.$item,$domain);
$chtable.=&Apache::loncommon::start_data_table_row().
- '<td>'.$colortypes{$item}.'</td><td style="background: '.$curcol.
- '"> </td><td><input name="'.$item.
- '" size="10" value="'.$curcol.
-'" /></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";
+ '<td>'.$colortypes{$item}.'<td><input name="'.$item.
+ '" class="colorchooser" size="10" value="'.$curcol.
+ '" /></td>'.
+ &Apache::loncommon::end_data_table_row()."\n";
}
my $end_data_table = &Apache::loncommon::end_data_table();
my $pjump_def = &Apache::lonhtmlcommon::pjump_javascript_definition();
my $savebutton = &mt('Save');
my $resetbutton = &mt('Reset All');
my $resetbuttondesc = &mt('Reset All Colors to Default');
- $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='';
- }
- }
+ my $colorchooser=&Apache::lonhtmlcommon::color_picker();
+ $r->print('<script type="text/javascript" language="JavaScript">
+' . $colorchooser . '
+</script>
+');
+ $r->print(<<ENDCOL);
-</script>
-<form name="parmform">
+<form name="parmform" action="">
<input type="hidden" name="pres_marker" />
<input type="hidden" name="pres_type" />
<input type="hidden" name="pres_value" />
@@ -1299,6 +1222,9 @@ sub verify_and_change_colors {
my $message='';
foreach my $item (keys %colortypes) {
my $color=$env{'form.'.$item};
+ if (!($color =~ /^#/)) {
+ $color = '#' . $color;
+ }
my $entry='color.'.$function.'.'.$item;
if (($color=~/^\#[0-9A-Fa-f]{6}$/) && (!$env{'form.resetall'})) {
&Apache::lonnet::put('environment',{$entry => $color});
@@ -1346,8 +1272,11 @@ sub passwordchanger {
} elsif ($caller eq 'reset_by_email') {
my %data = &Apache::lonnet::tmpget($mailtoken);
if (keys(%data) == 0) {
- $r->print(&mt('Sorry, the URL you provided to complete the reset of your password was invalid. Either the token included in the URL has been deleted or the URL you provided was invalid. Please submit a [_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>')
+ .'</p>'
);
return;
}
@@ -1357,18 +1286,32 @@ sub passwordchanger {
$domain = $data{'domain'};
$currentpass = $data{'temppasswd'};
} 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;
}
} 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;
}
if (&Apache::lonnet::domain($domain) eq '') {
$domain = $r->dir_config('lonDefDomain');
}
} else {
- $r->print(&mt('Page requested in unexpected context').'<br />');
+ $r->print(
+ '<p class="LC_error">'
+ .&mt('Page requested in unexpected context')
+ .'</p>'
+ );
return;
}
my $currentauth=&Apache::lonnet::queryauthenticate($user,$domain);
@@ -1376,9 +1319,9 @@ sub passwordchanger {
return if ($currentauth !~ /^(unix|internal):/);
#
# Generate keys
- my ($lkey_cpass ,$ukey_cpass ) = &des_keys();
- my ($lkey_npass1,$ukey_npass1) = &des_keys();
- my ($lkey_npass2,$ukey_npass2) = &des_keys();
+ my ($lkey_cpass ,$ukey_cpass ) = &Apache::loncommon::des_keys();
+ my ($lkey_npass1,$ukey_npass1) = &Apache::loncommon::des_keys();
+ my ($lkey_npass2,$ukey_npass2) = &Apache::loncommon::des_keys();
# Store the keys in the log files
my $lonhost = $r->dir_config('lonHostID');
my $logtoken=Apache::lonnet::reply('tmpput:'
@@ -1471,7 +1414,7 @@ sub client_form {
'changepass' => 'Save',
);
- my $output = '<form name="client">'
+ my $output = '<form name="client" action="">'
.&Apache::lonhtmlcommon::start_pick_box();
if ($caller eq 'reset_by_email') {
$output .= &Apache::lonhtmlcommon::row_title(
@@ -1502,7 +1445,7 @@ sub client_form {
.'<input type="password" name="newpass_2" size="10" />'
.&Apache::lonhtmlcommon::row_closure(1)
.&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|
<input type="hidden" name="ukey_cpass" value="$hexkey->{'ukey_cpass'}" />
<input type="hidden" name="lkey_cpass" value="$hexkey->{'lkey_cpass'}" />
@@ -1617,9 +1560,9 @@ ENDERROR
}
my ($ckey,$n1key,$n2key)=split(/&/,$tmpinfo);
#
- $currentpass = &des_decrypt($ckey ,$currentpass);
- $newpass1 = &des_decrypt($n1key,$newpass1);
- $newpass2 = &des_decrypt($n2key,$newpass2);
+ $currentpass = &Apache::loncommon::des_decrypt($ckey ,$currentpass);
+ $newpass1 = &Apache::loncommon::des_decrypt($n1key,$newpass1);
+ $newpass2 = &Apache::loncommon::des_decrypt($n2key,$newpass2);
#
if ($caller eq 'reset_by_email') {
my %data = &Apache::lonnet::tmpget($mailtoken);
@@ -1640,14 +1583,14 @@ ENDERROR
}
if ($newpass1 ne $newpass2) {
&passwordchanger($r,
- '<span class="LC_error">'.
+ '<span class="LC_warning">'.
&mt('The new passwords you entered do not match.').' '.
&mt('Please try again.').'</span>',$caller,$mailtoken);
return 1;
}
if (length($newpass1) < 7) {
&passwordchanger($r,
- '<span class="LC_error">'.
+ '<span class="LC_warning">'.
&mt('Passwords must be a minimum of 7 characters long.').' '.
&mt('Please try again.').'</span>',$caller,$mailtoken);
return 1;
@@ -1660,7 +1603,7 @@ ENDERROR
}
if ($badpassword) {
# 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('Valid characters are').(<<"ENDERROR");
: space and <br />
@@ -1832,7 +1775,7 @@ sub verify_and_change_discussion {
if (defined($env{'form.discmark'}) ) {
my $newmark = $env{'form.newmark'};
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::appenv({'environment.discmarkread' => $newmark});
} else {