--- loncom/interface/lonpreferences.pm 2007/04/28 23:13:56 1.100
+++ loncom/interface/lonpreferences.pm 2009/11/19 15:41:59 1.125.8.3
@@ -1,7 +1,7 @@
# The LearningOnline Network
# Preferences
#
-# $Id: lonpreferences.pm,v 1.100 2007/04/28 23:13:56 www Exp $
+# $Id: lonpreferences.pm,v 1.125.8.3 2009/11/19 15:41:59 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -108,14 +108,19 @@ sub wysiwygchanger {
}
my $switchoff=&mt('Disable WYSIWYG editor');
my $switchon=&mt('Enable WYSIWYG editor');
+ my $warning='';
+ if ($env{'user.adv'}) {
+ $warning.="<p>".&mt("The WYSIWYG editor only supports simple HTML and is in many cases unsuited for advanced authoring. In a number of cases, it may destroy advanced authoring involving LaTeX and script function calls.")."</p>";
+ }
$r->print(<<ENDLSCREEN);
<form name="prefs" action="/adm/preferences" method="post">
<input type="hidden" name="action" value="set_wysiwyg" />
+$warning
<br />
<label><input type="radio" name="wysiwyg" value="off" $onselect /> $switchoff</label><br />
<label><input type="radio" name="wysiwyg" value="on" $offselect /> $switchon</label>
ENDLSCREEN
- $r->print('<br /><input type="submit" value="'.&mt('Change').'" />');
+ $r->print('<br /><input type="submit" value="'.&mt('Save').'" />');
}
@@ -123,8 +128,12 @@ sub verify_and_change_wysiwyg {
my $r = shift;
my $newsetting=$env{'form.wysiwyg'};
&Apache::lonnet::put('environment',{'wysiwygeditor' => $newsetting});
- &Apache::lonnet::appenv('environment.wysiwygeditor' => $newsetting);
- $r->print('<p>'.&mt('Setting WYSIWYG editor to:').' '.&mt($newsetting).'</p>');
+ &Apache::lonnet::appenv({'environment.wysiwygeditor' => $newsetting});
+ my $message=&Apache::lonhtmlcommon::confirm_success(&mt('Set [_1] to [_2]','<i>'.&mt('WYSIWYG Editor').'</i>','<tt>'.&mt($newsetting).'</tt>'));
+ $message=&Apache::loncommon::confirmwrapper($message);
+ $r->print(<<ENDVCSCREEN);
+$message
+ENDVCSCREEN
}
################################################################
@@ -153,7 +162,7 @@ sub languagechanger {
<input type="hidden" name="action" value="verify_and_change_languages" />
<br />$pref: $selectionbox
ENDLSCREEN
- $r->print('<br /><input type="submit" value="'.&mt('Change').'" />');
+ $r->print('<br /><input type="submit" value="'.&mt('Save').'" />');
}
@@ -167,13 +176,15 @@ sub verify_and_change_languages {
my $message='';
if ($newlanguage) {
&Apache::lonnet::put('environment',{'languages' => $newlanguage});
- &Apache::lonnet::appenv('environment.languages' => $newlanguage);
- $message='Set new preferred languages to '.$newlanguage;
+ &Apache::lonnet::appenv({'environment.languages' => $newlanguage});
+ $message=&Apache::lonhtmlcommon::confirm_success(&mt('Set [_1] to [_2]','<i>'.&mt('Preferred language').'</i>','<tt>"'.$newlanguage.'"</tt>.'));
} else {
&Apache::lonnet::del('environment',['languages']);
- &Apache::lonnet::delenv('environment\.languages');
- $message='Reset preferred language';
+ &Apache::lonnet::delenv('environment.languages');
+ $message=&Apache::lonhtmlcommon::confirm_success(&mt('Reset [_1]','<i>'.&mt('Preferred language').'</i>'));
}
+ $message=&Apache::loncommon::confirmwrapper($message);
+ &Apache::loncommon::flush_langs_cache($user,$domain);
$r->print(<<ENDVCSCREEN);
$message
ENDVCSCREEN
@@ -189,53 +200,74 @@ sub texenginechanger {
my %userenv = &Apache::lonnet::get('environment',['texengine']);
my $texengine=$userenv{'texengine'};
- my $pref=&mt('Preferred method to display Math');
my %mathchoices=('' => 'Default',
- 'tth' => 'TeX to HTML',
+ 'tth' => 'tth (TeX to HTML)',
#'ttm' => 'TeX to MathML',
'jsMath' => 'jsMath',
- 'mimetex' => 'Convert to Images'
+ 'mimetex' => 'mimetex (Convert to Images)',
+ 'raw' => 'Raw (Screen Reader)'
);
my $selectionbox=&Apache::loncommon::select_form($texengine,'texengine',
%mathchoices);
my $jsMath_start=&Apache::lontexconvert::jsMath_header();
- my $change=&mt('Change');
- $r->print(<<ENDLSCREEN);
-<br />
+ my %lt=&Apache::lonlocal::texthash(
+ 'headline' => 'Change Math Preferences',
+ 'preftxt' => 'Preferred method to display Math',
+ 'change' => 'Save',
+ 'exmpl' => 'Examples',
+ 'jsmath' => 'jsMath:',
+ 'tth' => 'tth (TeX to HTML):',
+ '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);
+<h2>$lt{'headline'}</h2>
<form name="prefs" action="/adm/preferences" method="post">
<input type="hidden" name="action" value="verify_and_change_texengine" />
-<p>$pref: $selectionbox</p>
-<p><input type="submit" value="$change" /></p>
-</form>
-Examples:
-<p> TeX to HTML <br />
-<iframe src="/res/adm/pages/math_example.tex?inhibitmenu=yes&texengine=tth" width="400" hieght="200"></iframe>
+<p>
+$lt{'preftxt'}: $selectionbox
+<br />
+<input type="submit" value="$lt{'change'}" />
</p>
-<p>jsMath <br />
+</form>
+<br />
+<hr />
+$lt{'exmpl'}
+
+<h3>$lt{'jsmath'}</h3>
+<p>
$jsMath_start
<script type="text/javascript">
if (jsMath.nofonts == 1) {
- document.writeln
- ('<center><div style="padding: 10; border-style: solid; border-width:3;'
- +' border-color: #DD0000; background-color: #FFF8F8; width: 75%; text-align: left">'
- +'<small><font color="#AA0000"><b>Warning:</b> '
- +'It looks like you don\\\'t have the TeX math fonts installed. '
- +'The jsMath example on this page may not look right without them. '
- +'The <a href="http://www.math.union.edu/locate/jsMath/" target="_blank"> '
- +'jsMath Home Page</a> 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. '
- +'</font></small></div></center>');
+ document.writeln($jsMathWarning);
}
</script>
-<iframe src="/res/adm/pages/math_example.tex?inhibitmenu=yes&texengine=jsMath" width="400" hieght="200"></iframe>
+<iframe src="/res/adm/pages/math_example.tex?inhibitmenu=yes&texengine=jsMath" width="400" height="120"></iframe>
+</p>
+<h3>$lt{'mimetex'}</h3>
+<p>
+<iframe src="/res/adm/pages/math_example.tex?inhibitmenu=yes&texengine=mimetex" width="400" height="100"></iframe>
</p>
-<p> Convert to Images <br />
-<br />
-<iframe src="/res/adm/pages/math_example.tex?inhibitmenu=yes&texengine=mimetex" width="400" hieght="200"></iframe>
+
+<h3>$lt{'tth'}</h3>
+<p>
+<iframe src="/res/adm/pages/math_example.tex?inhibitmenu=yes&texengine=tth" width="400" height="200"></iframe>
</p>
ENDLSCREEN
if ($env{'environment.texengine'} ne 'jsMath') {
@@ -252,24 +284,23 @@ sub verify_and_change_texengine {
my $newtexengine = $env{'form.texengine'};
$newtexengine=~s/[^\-\w]//g;
if ($newtexengine eq 'ttm') {
- &Apache::lonnet::appenv('browser.mathml' => 1);
+ &Apache::lonnet::appenv({'browser.mathml' => 1});
} else {
if ($env{'environment.texengine'} eq 'ttm') {
- &Apache::lonnet::appenv('browser.mathml' => 0);
+ &Apache::lonnet::appenv({'browser.mathml' => 0});
}
}
my $message='';
if ($newtexengine) {
&Apache::lonnet::put('environment',{'texengine' => $newtexengine});
- &Apache::lonnet::appenv('environment.texengine' => $newtexengine);
- $message='Set new preferred math display to '.$newtexengine;
+ &Apache::lonnet::appenv({'environment.texengine' => $newtexengine});
+ $message=&Apache::lonhtmlcommon::confirm_success(&mt('Set [_1] to [_2]','<i>'.&mt('Preferred method to display Math').'</i>','<tt>"'.$newtexengine.'"</tt>'));
} else {
&Apache::lonnet::del('environment',['texengine']);
- &Apache::lonnet::delenv('environment\.texengine');
- $message='Reset preferred math display.';
+ &Apache::lonnet::delenv('environment.texengine');
+ $message=&Apache::lonhtmlcommon::confirm_success(&mt('Reset [_1]','<i>'.&mt('Preferred method to display Math').'</i>'));
}
-
-
+ $message=&Apache::loncommon::confirmwrapper($message);
$r->print(<<ENDVCSCREEN);
$message
ENDVCSCREEN
@@ -290,7 +321,7 @@ sub rolesprefchanger {
my $hotlist_n=$userenv{'recentrolesn'};
my $checked;
if ($hotlist_flag) {
- $checked = 'checked="checked"';
+ $checked = ' checked="checked"';
}
if (!$hotlist_n) { $hotlist_n=3; }
@@ -325,13 +356,13 @@ sub rolesprefchanger {
my $checked = "";
my $value = $recent_roles{$role_key};
if ($frozen_roles{$role_key}) {
- $checked = "checked=\"checked\"";
+ $checked = ' checked="checked"';
}
$count++;
$roles_check_list .=
&Apache::loncommon::start_data_table_row().
'<td class="LC_table_cell_checkbox">'.
- "<input type=\"checkbox\" $checked name=\"freezeroles\"".
+ "<input type=\"checkbox\"$checked name=\"freezeroles\"".
" id=\"freezeroles$count\" value=\"$role_key\" /></td>".
"<td><label for=\"freezeroles$count\">".
"$role_text{$role_key}</label></td>".
@@ -343,10 +374,10 @@ sub rolesprefchanger {
$r->print('
<p>'.&mt('Some LON-CAPA users have a long list of '.$lc_role.'s. The Recent '.$role.'s Hotlist feature keeps track of the last N '.$lc_role.'s which have been visited and places a table of these at the top of the '.$lc_role.'s page. People with very few '.$lc_role.'s should leave this feature disabled.').'
</p>
-<form name="prefs" action="/adm/preferences" method="POST">
+<form name="prefs" action="/adm/preferences" method="post">
<input type="hidden" name="action" value="verify_and_change_rolespref" />
<br /><label>'.&mt('Enable Recent '.$role.'s Hotlist:').'
-<input type="checkbox" '.$checked.' name="recentroles" value="true" /></label>
+<input type="checkbox"'.$checked.' name="recentroles" value="true" /></label>
<br />'.&mt('Number of '.$role.'s in Hotlist:').'
<select name="recentrolesn" size="1">
'.$options.'
@@ -355,7 +386,7 @@ sub rolesprefchanger {
</p>
'.$roles_check_list.'
<br />
-<input type="submit" value="'.&mt('Change').'" />
+<input type="submit" value="'.&mt('Save').'" />
</form>');
}
@@ -400,16 +431,16 @@ sub verify_and_change_rolespref {
my $message='<hr />';
if ($hotlist_flag) {
&Apache::lonnet::put('environment',{'recentroles' => $hotlist_flag});
- &Apache::lonnet::appenv('environment.recentroles' => $hotlist_flag);
+ &Apache::lonnet::appenv({'environment.recentroles' => $hotlist_flag});
$message=&mt('Recent '.$role.'s Hotlist is Enabled');
} else {
&Apache::lonnet::del('environment',['recentroles']);
- &Apache::lonnet::delenv('environment\.recentroles');
+ &Apache::lonnet::delenv('environment.recentroles');
$message=&mt('Recent '.$role.'s Hotlist is Disabled');
}
if ($hotlist_n) {
&Apache::lonnet::put('environment',{'recentrolesn' => $hotlist_n});
- &Apache::lonnet::appenv('environment.recentrolesn' => $hotlist_n);
+ &Apache::lonnet::appenv({'environment.recentrolesn' => $hotlist_n});
if ($hotlist_flag) {
$message.="<br />".
&mt('Display [_1] Most Recent '.$role.'s',$hotlist_n)."\n";
@@ -434,7 +465,7 @@ sub verify_and_change_rolespref {
# Unset any roles that were previously frozen but aren't in list
foreach my $role_key (sort(keys(%recent_roles))) {
if (($frozen_roles{$role_key}) && (!exists($freeze{$role_key}))) {
- $message .= "<br />".&mt('Unfreezing '.$role.': [_1]',$role_text{$role_key})."\n";
+ $message .= "<br />".&Apache::lonhtmlcommon::confirm_success(&mt('Unfreezing '.$role.': [_1]','<i>'.$role_text{$role_key}.'</i>'));
&Apache::lonhtmlcommon::store_recent('roles',$role_key,' ',0);
}
}
@@ -442,13 +473,13 @@ sub verify_and_change_rolespref {
# Freeze selected roles
foreach my $role_key (@freeze_list) {
if (!$frozen_roles{$role_key}) {
- $message .= "<br />".&mt('Freezing '.$role.': [_1]',$role_text{$role_key})."\n";
+ $message .= "<br />".
+ &Apache::lonhtmlcommon::confirm_success(&mt('Freezing '.$role.': [_1]','<i>'.$role_text{$role_key}.'</i>'));
&Apache::lonhtmlcommon::store_recent('roles',
$role_key,' ',1);
}
}
- $message .= "<hr /><br />\n";
-
+ $message=&Apache::loncommon::confirmwrapper($message);
$r->print(<<ENDRPSCREEN);
$message
ENDRPSCREEN
@@ -467,16 +498,25 @@ sub screennamechanger {
('environment',['screenname','nickname']);
my $screenname=$userenv{'screenname'};
my $nickname=$userenv{'nickname'};
- $r->print(<<ENDSCREEN);
-<form name="prefs" action="/adm/preferences" method="post">
-<input type="hidden" name="action" value="verify_and_change_screenname" />
-<br />New screenname (shown if you post anonymously):
-<input type="text" size="20" value="$screenname" name="screenname" />
-<br />New nickname (shown if you post non-anonymously):
-<input type="text" size="20" value="$nickname" name="nickname" />
-<input type="submit" value="Change" />
-</form>
-ENDSCREEN
+ $r->print('<p>'
+ .&mt('Change the name that is displayed in your posts.')
+ .'</p>'
+ );
+ $r->print('<form name="prefs" action="/adm/preferences" method="post">'
+ .'<input type="hidden" name="action" value="verify_and_change_screenname" />'
+ .&Apache::lonhtmlcommon::start_pick_box()
+ .&Apache::lonhtmlcommon::row_title(&mt('New screenname (shown if you post anonymously)'))
+ .'<input type="text" size="20" value="'.$screenname.'" name="screenname" />'
+ .&Apache::lonhtmlcommon::row_closure()
+ .&Apache::lonhtmlcommon::row_title(&mt('New nickname (shown if you post non-anonymously)'))
+ .'<input type="text" size="20" value="'.$nickname.'" name="nickname" />'
+ .&Apache::lonhtmlcommon::row_closure()
+ .&Apache::lonhtmlcommon::row_title()
+ .'<input type="submit" value="'.&mt('Save').'" />'
+ .&Apache::lonhtmlcommon::row_closure(1)
+ .&Apache::lonhtmlcommon::end_pick_box()
+ .'</form>'
+ );
}
sub verify_and_change_screenname {
@@ -489,12 +529,12 @@ sub verify_and_change_screenname {
my $message='';
if ($newscreen) {
&Apache::lonnet::put('environment',{'screenname' => $newscreen});
- &Apache::lonnet::appenv('environment.screenname' => $newscreen);
- $message='Set new screenname to '.$newscreen;
+ &Apache::lonnet::appenv({'environment.screenname' => $newscreen});
+ $message=&Apache::lonhtmlcommon::confirm_success(&mt('Set [_1] to [_2]','<i>'.&mt('Screenname').'</i>','<tt>"'.$newscreen.'"</tt>'));
} else {
&Apache::lonnet::del('environment',['screenname']);
- &Apache::lonnet::delenv('environment\.screenname');
- $message='Reset screenname';
+ &Apache::lonnet::delenv('environment.screenname');
+ $message=&Apache::lonhtmlcommon::confirm_success(&mt('Reset [_1]','<i>'.&mt('Screenname').'</i>'));
}
# Nickname
$message.='<br />';
@@ -502,14 +542,15 @@ sub verify_and_change_screenname {
$newscreen=~s/[^ \w]//g;
if ($newscreen) {
&Apache::lonnet::put('environment',{'nickname' => $newscreen});
- &Apache::lonnet::appenv('environment.nickname' => $newscreen);
- $message.='Set new nickname to '.$newscreen;
+ &Apache::lonnet::appenv({'environment.nickname' => $newscreen});
+ $message.=&Apache::lonhtmlcommon::confirm_success(&mt('Set [_1] to [_2]','<i>'.&mt('Nickname').'</i>','<tt>"'.$newscreen.'"</tt>'));
} else {
&Apache::lonnet::del('environment',['nickname']);
- &Apache::lonnet::delenv('environment\.nickname');
- $message.='Reset nickname';
+ &Apache::lonnet::delenv('environment.nickname');
+ $message.=&Apache::lonhtmlcommon::confirm_success(&mt('Reset [_1]','<i>'.&mt('Nickname').'</i>'));
}
&Apache::lonnet::devalidate_cache_new('namescache',$user.':'.$domain);
+ $message=&Apache::loncommon::confirmwrapper($message);
$r->print(<<ENDVCSCREEN);
$message
ENDVCSCREEN
@@ -538,7 +579,7 @@ sub iconchanger {
my $useicons=&mt('Use icons and text');
my $usebuttons=&mt('Use buttons and text');
my $useicononly=&mt('Use icons only');
- my $change=&mt('Change');
+ my $change=&mt('Save');
$r->print(<<ENDSCREEN);
<form name="prefs" action="/adm/preferences" method="post">
<input type="hidden" name="action" value="verify_and_change_icons" />
@@ -557,42 +598,354 @@ sub verify_and_change_icons {
my $newicons = $env{'form.menumode'};
&Apache::lonnet::put('environment',{'icons' => $newicons});
- &Apache::lonnet::appenv('environment.icons' => $newicons);
- $r->print(&mt('Set menu mode to [_1].',$newicons));
+ &Apache::lonnet::appenv({'environment.icons' => $newicons});
+ my $message=&Apache::lonhtmlcommon::confirm_success(&mt('Set [_1] to [_2]','<i>'.&mt('Menu Display').'</i>','<tt>'.$newicons.'</tt>'));
+ $message=&Apache::loncommon::confirmwrapper($message);
+ $r->print(<<ENDVCSCREEN);
+$message
+ENDVCSCREEN
}
################################################################
+# Clicker Subroutines #
+################################################################
+
+sub clickerchanger {
+ my $r = shift;
+ my $user = $env{'user.name'};
+ my $domain = $env{'user.domain'};
+ my %userenv = &Apache::lonnet::get
+ ('environment',['clickers']);
+ my $clickers=$userenv{'clickers'};
+ $clickers=~s/\,/\n/gs;
+ my $text=&mt('Enter response device ("clicker") numbers');
+ my $change=&mt('Register');
+ my $helplink=&Apache::loncommon::help_open_topic('Clicker_Registration',&mt('Locating your clicker ID'));
+ $r->print(<<ENDSCREEN);
+<form name="prefs" action="/adm/preferences" method="post">
+<input type="hidden" name="action" value="verify_and_change_clicker" />
+<label>$helplink<br /><br />$text<br />
+<textarea name="clickers" rows="5" cols="20">$clickers</textarea>
+</label>
+<br />
+<input type="submit" value="$change" />
+</form>
+ENDSCREEN
+}
+
+sub verify_and_change_clicker {
+ my $r = shift;
+ my $user = $env{'user.name'};
+ my $domain = $env{'user.domain'};
+ my $newclickers = $env{'form.clickers'};
+ $newclickers=~s/[^\w\:\-]+/\,/gs;
+ $newclickers=~tr/a-z/A-Z/;
+ $newclickers=~s/[\:\-]+/\-/g;
+ $newclickers=~s/\,+/\,/g;
+ $newclickers=~s/^\,//;
+ $newclickers=~s/\,$//;
+ &Apache::lonnet::put('environment',{'clickers' => $newclickers});
+ &Apache::lonnet::appenv({'environment.clickers' => $newclickers});
+ my $message=&Apache::lonhtmlcommon::confirm_success(&mt('Registering clickers: [_1]',$newclickers));
+ $message=&Apache::loncommon::confirmwrapper($message);
+ $r->print(<<ENDVCSCREEN);
+$message
+ENDVCSCREEN
+}
+
+################################################################
+# Domcoord Access Subroutines #
+################################################################
+
+sub domcoordchanger {
+ my $r = shift;
+ my $user = $env{'user.name'};
+ my $domain = $env{'user.domain'};
+ my %userenv = &Apache::lonnet::get
+ ('environment',['domcoord.author']);
+ my $constchecked='';
+ 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 $change=&mt('Save');
+ $r->print(<<ENDSCREEN);
+<form name="prefs" action="/adm/preferences" method="post">
+<input type="hidden" name="action" value="verify_and_change_domcoord" />
+$text<br />
+<label><input type="checkbox" name="construction"$constchecked />$construction</label><br />
+<input type="submit" value="$change" />
+</form>
+ENDSCREEN
+}
+
+sub verify_and_change_domcoord {
+ my $r = shift;
+ my $user = $env{'user.name'};
+ my $domain = $env{'user.domain'};
+ my %domcoord=('domcoord.author' => '');
+ if ($env{'form.construction'}) { $domcoord{'domcoord.author'}='blocked'; }
+ &Apache::lonnet::put('environment',\%domcoord);
+ &Apache::lonnet::appenv({'environment.domcoord.author' => $domcoord{'domcoord.author'}});
+ my $status='';
+ if ($domcoord{'domcoord.author'} eq 'blocked') {
+ $status=&mt('on');
+ } else {
+ $status=&mt('off');
+ }
+ my $message=&Apache::lonhtmlcommon::confirm_success(&mt('Set [_1] to [_2]','<i>'.&mt('Block access to construction space').'</i>','<tt>'.$status.'</tt>'));
+ $message=&Apache::loncommon::confirmwrapper($message);
+ $r->print(<<ENDVCSCREEN);
+$message
+ENDVCSCREEN
+}
+
+#################################################################
+## Lock Subroutines #
+#################################################################
+
+sub lockwarning {
+ my $r = shift;
+ my $title=&mt('Action locked');
+ my $texttop=&mt('LON-CAPA is currently performing the following actions:');
+ my $textbottom=&mt('Changing roles or logging out may result in data corruption.');
+ my ($num,%which)=&Apache::lonnet::get_locks();
+ my $which='';
+ foreach my $id (keys %which) {
+ $which.='<li>'.$which{$id}.'</li>';
+ }
+ my $change=&mt('Override');
+ $r->print(<<ENDSCREEN);
+<form name="prefs" action="/adm/preferences" method="post">
+<input type="hidden" name="action" value="verify_and_change_locks" />
+<h1>$title</h1>
+$texttop
+<ul>
+$which
+</ul>
+$textbottom
+<input type="submit" value="$change" />
+</form>
+ENDSCREEN
+}
+
+sub verify_and_change_lockwarning {
+ my $r = shift;
+ &Apache::lonnet::remove_all_locks();
+ $r->print(&mt('Cleared locks.'));
+}
+
+
+################################################################
# Message Forward #
################################################################
sub msgforwardchanger {
- my $r = shift;
+ my ($r,$message) = @_;
my $user = $env{'user.name'};
my $domain = $env{'user.domain'};
- my %userenv = &Apache::lonnet::get('environment',['msgforward','notification','critnotification']);
+ my %userenv = &Apache::lonnet::get('environment',['msgforward','notification','critnotification','notifywithhtml']);
my $msgforward=$userenv{'msgforward'};
- my $notification=$userenv{'notification'};
- my $critnotification=$userenv{'critnotification'};
- my $forwardingHelp = Apache::loncommon::help_open_topic("Prefs_Forwarding",
- "What are forwarding ".
- "and notification ".
- "addresses");
- my $criticalMessageHelp = Apache::loncommon::help_open_topic("Course_Critical_Message",
- "What are critical messages");
+ my %lt = &Apache::lonlocal::texthash(
+ all => 'All',
+ crit => 'Critical only',
+ reg => 'Non-critical only',
+ foad => 'Forwarding Address(es)',
+ noti => 'Notification E-mail Address(es)',
+ 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 'Save' and then add the next one",
+ prme => 'Back',
+ );
+ my $forwardingHelp = &Apache::loncommon::help_open_topic("Prefs_Forwarding");
+ my $notificationHelp = &Apache::loncommon::help_open_topic("Prefs_Notification");
+ my $criticalMessageHelp = &Apache::loncommon::help_open_topic("Course_Critical_Message");
+ my @allow_html = split(/,/,$userenv{'notifywithhtml'});
+ my %allnot = &get_notifications(\%userenv);
+ my $validatescript = &Apache::lonhtmlcommon::javascript_valid_email();
+ my $jscript = qq|
+<script type="text/javascript">
+function validate() {
+ for (var i=0; i<document.prefs.numnotify.value; i++) {
+ var checkaddress = 0;
+ var addr = document.prefs.elements['address_'+i].value;
+ var rownum = i+1;
+ if (i < document.prefs.numnotify.value-1) {
+ if (document.prefs.elements['modify_notify_'+i].checked) {
+ checkaddress = 1;
+ }
+ } else {
+ if (document.prefs.elements['add_notify_'+i].checked == true) {
+ checkaddress = 1;
+ }
+ }
+ if (checkaddress == 1) {
+ var addr = document.prefs.elements['address_'+i].value;
+ if (validmail(document.prefs.elements['address_'+i]) == false) {
+ var multimsg = '';
+ if (addr.indexOf(",") >= 0) {
+ multimsg = "\\n($lt{'toen'}).";
+ }
+ alert("$lt{'email'} "+rownum+" ('"+addr+"') $lt{'notv'}."+multimsg);
+ return;
+ }
+ }
+ }
+ document.prefs.submit();
+}
+
+function address_changes (adnum) {
+ if (!document.prefs.elements['del_notify_'+adnum].checked) {
+ document.prefs.elements['modify_notify_'+adnum].checked = true;
+ }
+}
+
+function new_address(adnum) {
+ document.prefs.elements['add_notify_'+adnum].checked = true;
+}
+
+function delete_address(adnum) {
+ if (document.prefs.elements['del_notify_'+adnum].checked) {
+ document.prefs.elements['modify_notify_'+adnum].checked = false;
+ }
+}
+
+function modify_address(adnum) {
+ if (document.prefs.elements['modify_notify_'+adnum].checked) {
+ document.prefs.elements['del_notify_'+adnum].checked = false;
+ }
+}
+$validatescript
+</script>
+|;
$r->print(<<ENDMSG);
-$forwardingHelp <br />
+$jscript
+$message
+<h3>$lt{'foad'} $forwardingHelp</h3>
<form name="prefs" action="/adm/preferences" method="post">
<input type="hidden" name="action" value="verify_and_change_msgforward" />
-New Forwarding Address(es) (<tt>user:domain,user:domain,...</tt>):
-<input type="text" size="40" value="$msgforward" name="msgforward" /><hr />
-New Message Notification Email Address(es) (<tt>joe\@doe.com,jane\@doe.edu,...</tt>):
-<input type="text" size="40" value="$notification" name="notification" /><hr />
-New Critical Message Notification Email Address(es) (<tt>joe\@doe.com,jane\@doe.edu,...</tt>):
-<input type="text" size="40" value="$critnotification" name="critnotification" />$criticalMessageHelp<hr />
-<input type="submit" value="Change" />
-</form>
+$lt{'foad'} ($lt{'foad_exmpl'}):
+<input type="text" size="40" value="$msgforward" name="msgforward" /><br />
+<h3>$lt{'noti'} $notificationHelp</h3>
+$lt{'mnot'} ($lt{'mnot_exmpl'}):<br />
ENDMSG
+ my @sortforwards = sort (keys(%allnot));
+ my $output = &Apache::loncommon::start_data_table().
+ &Apache::loncommon::start_data_table_header_row().
+ '<th> </th>'.
+ '<th>'.&mt('Action').'</th>'.
+ '<th>'.&mt('Notification address').'</th><th>'.
+ &mt('Types of message for which notification is sent').
+ $criticalMessageHelp.'</th><th>'.
+ &mt('Excerpt retains HTML tags in message').'</th>'.
+ &Apache::loncommon::end_data_table_header_row();
+ my $num = 0;
+ my $counter = 1;
+ foreach my $item (@sortforwards) {
+ $output .= &Apache::loncommon::start_data_table_row().
+ '<td><b>'.$counter.'</b></td>'.
+ '<td><span class="LC_nobreak"><label>'.
+ '<input type="checkbox" name="modify_notify_'.
+ $num.'" onclick="javscript:modify_address('."'$num'".')" />'.
+ &mt('Modify').'</label></span> '.
+ '<span class="LC_nobreak"><label>'.
+ '<input type="checkbox" name="del_notify_'.$num.
+ '" onclick="javscript:delete_address('."'$num'".')" />'.
+ &mt('Delete').'</label></span></td>'.
+ '<td><input type="text" value="'.$item.'" name="address_'.
+ $num.'" onFocus="javascript:address_changes('."'$num'".
+ ')" /></td><td>';
+ my %chk;
+ if (defined($allnot{$item}{'crit'})) {
+ if (defined($allnot{$item}{'reg'})) {
+ $chk{'all'} = 'checked="checked" ';
+ } else {
+ $chk{'crit'} = 'checked="checked" ';
+ }
+ } else {
+ $chk{'reg'} = 'checked="checked" ';
+ }
+ foreach my $type ('all','crit','reg') {
+ $output .= '<span class="LC_nobreak"><label>'.
+ '<input type="radio" name="notify_type_'.$num.
+ '" value="'.$type.'" '.$chk{$type}.
+ ' onchange="javascript:address_changes('."'$num'".')" />'.
+ $lt{$type}.'</label></span> ';
+ }
+ my $htmlon = '';
+ my $htmloff = '';
+ if (grep/^\Q$item\E/,@allow_html) {
+ $htmlon = 'checked="checked" ';
+ } else {
+ $htmloff = 'checked="checked" ';
+ }
+ $output .= '</td><td><label><input type="radio" name="html_'.$num.
+ '" value="1" '.$htmlon.
+ ' onchange="javascript:address_changes('."'$num'".')" />'.
+ &mt('Yes').'</label> '.
+ '<label><input type="radio" name="html_'.$num.'" value="0" '.
+ $htmloff. ' onchange="javascript:address_changes('."'$num'".
+')" />'.
+ &mt('No').'</label></td>'.
+ &Apache::loncommon::end_data_table_row();
+ $num ++;
+ $counter ++;
+ }
+ my %defchk = (
+ all => 'checked="checked" ',
+ crit => '',
+ reg => '',
+ );
+ $output .= &Apache::loncommon::start_data_table_row().
+ '<td><b>'.$counter.'</b></td>'.
+ '<td><span class="LC_nobreak"><label>'.
+ '<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>';
+ foreach my $type ('all','crit','reg') {
+ $output .= '<span class="LC_nobreak"><label>'.
+ '<input type="radio" name="notify_type_'.$num.
+ '" value="'.$type.'" '.$defchk{$type}.'/>'.
+ $lt{$type}.'</label></span> ';
+ }
+ $output .= '</td><td><label><input type="radio" name="html_'.$num.
+ '" value="1" />'.&mt('Yes').'</label> '.
+ '<label><input type="radio" name="html_'.$num.'" value="0" '.
+ ' checked="checked" />'.
+ &mt('No').'</label></td>'.
+ &Apache::loncommon::end_data_table_row().
+ &Apache::loncommon::end_data_table();
+ $num ++;
+ $r->print($output);
+ $r->print(qq|
+<br /><hr />
+<input type="hidden" name="numnotify" value="$num" />
+<input type="button" value="$lt{'prme'}" onclick="location.href='/adm/preferences'" />
+<input type="button" value="$lt{'chg'}" onclick="javascript:validate()" />
+</form>
+|);
+
+}
+
+sub get_notifications {
+ my ($userenv) = @_;
+ my %allnot;
+ my @critnot = split(/,/,$userenv->{'critnotification'});
+ my @regnot = split(/,/,$userenv->{'notification'});
+ foreach my $item (@critnot) {
+ $allnot{$item}{crit} = 1;
+ }
+ foreach my $item (@regnot) {
+ $allnot{$item}{reg} = 1;
+ }
+ return %allnot;
}
sub verify_and_change_msgforward {
@@ -609,45 +962,93 @@ sub verify_and_change_msgforward {
if (&Apache::lonnet::homeserver($msuser,$msdomain) ne 'no_host') {
$newscreen.=$msuser.':'.$msdomain.',';
} else {
- $message.='No such user: '.$msuser.':'.$msdomain.'<br>';
+ $message.= &mt('No such user: ').'<tt>'.$msuser.':'.$msdomain.'</tt><br />';
}
}
}
$newscreen=~s/\,$//;
if ($newscreen) {
&Apache::lonnet::put('environment',{'msgforward' => $newscreen});
- &Apache::lonnet::appenv('environment.msgforward' => $newscreen);
- $message.='Set new message forwarding to '.$newscreen.'<br />';
+ &Apache::lonnet::appenv({'environment.msgforward' => $newscreen});
+ $message .= &mt('Set message forwarding to ').'<tt>"'.$newscreen.'"</tt>.'
+ .'<br />';
} else {
&Apache::lonnet::del('environment',['msgforward']);
- &Apache::lonnet::delenv('environment\.msgforward');
- $message.='Reset message forwarding<br />';
+ &Apache::lonnet::delenv('environment.msgforward');
+ $message.= &mt("Set message forwarding to 'off'.").'<br />';
}
- my $notification=$env{'form.notification'};
+ my $critnotification;
+ my $notification;
+ my $notify_with_html;
+ my $lastnotify = $env{'form.numnotify'}-1;
+ my $totaladdresses = 0;
+ for (my $i=0; $i<$env{'form.numnotify'}; $i++) {
+ if ((!defined($env{'form.del_notify_'.$i})) &&
+ ((($i==$lastnotify) && ($env{'form.add_notify_'.$lastnotify} == 1)) ||
+ ($i<$lastnotify))) {
+ if (defined($env{'form.address_'.$i})) {
+ if ($env{'form.notify_type_'.$i} eq 'all') {
+ $critnotification .= $env{'form.address_'.$i}.',';
+ $notification .= $env{'form.address_'.$i}.',';
+ } elsif ($env{'form.notify_type_'.$i} eq 'crit') {
+ $critnotification .= $env{'form.address_'.$i}.',';
+ } elsif ($env{'form.notify_type_'.$i} eq 'reg') {
+ $notification .= $env{'form.address_'.$i}.',';
+ }
+ if ($env{'form.html_'.$i} eq '1') {
+ $notify_with_html .= $env{'form.address_'.$i}.',';
+ }
+ $totaladdresses ++;
+ }
+ }
+ }
+ $critnotification =~ s/,$//;
+ $critnotification=~s/\s//gs;
+ $notification =~ s/,$//;
$notification=~s/\s//gs;
+ $notify_with_html =~ s/,$//;
+ $notify_with_html =~ s/\s//gs;
if ($notification) {
&Apache::lonnet::put('environment',{'notification' => $notification});
- &Apache::lonnet::appenv('environment.notification' => $notification);
- $message.='Set message notification address to '.$notification.'<br />';
+ &Apache::lonnet::appenv({'environment.notification' => $notification});
+ $message.=&mt('Set non-critical message notification address(es) to ').'<tt>"'.$notification.'"</tt>.<br />';
} else {
&Apache::lonnet::del('environment',['notification']);
- &Apache::lonnet::delenv('environment\.notification');
- $message.='Reset message notification<br />';
+ &Apache::lonnet::delenv('environment.notification');
+ $message.=&mt("Set non-critical message notification to 'off'.").'<br />';
}
- my $critnotification=$env{'form.critnotification'};
- $critnotification=~s/\s//gs;
if ($critnotification) {
&Apache::lonnet::put('environment',{'critnotification' => $critnotification});
- &Apache::lonnet::appenv('environment.critnotification' => $critnotification);
- $message.='Set critical message notification address to '.$critnotification;
+ &Apache::lonnet::appenv({'environment.critnotification' => $critnotification});
+ $message.=&mt('Set critical message notification address(es) to ').'<tt>"'.$critnotification.'"</tt>.<br />';
} else {
&Apache::lonnet::del('environment',['critnotification']);
- &Apache::lonnet::delenv('environment\.critnotification');
- $message.='Reset critical message notification<br />';
+ &Apache::lonnet::delenv('environment.critnotification');
+ $message.=&mt("Set critical message notification to 'off'.").'<br />';
}
- $r->print(<<ENDVCMSG);
-$message
-ENDVCMSG
+ if ($critnotification || $notification) {
+ if ($notify_with_html) {
+ &Apache::lonnet::put('environment',{'notifywithhtml' => $notify_with_html});
+ &Apache::lonnet::appenv({'environment.notifywithhtml' => $notify_with_html});
+ $message.=&mt('Set address(es) to receive excerpts with html retained ').'<tt>"'.$notify_with_html.'"</tt>.';
+ } else {
+ &Apache::lonnet::del('environment',['notifywithhtml']);
+ &Apache::lonnet::delenv('environment.notifywithhtml');
+ if ($totaladdresses == 1) {
+ $message.=&mt("Set notification address to receive excerpts with html stripped.");
+ } else {
+ $message.=&mt("Set all notification addresses to receive excerpts with html stripped.");
+ }
+ }
+ } else {
+ &Apache::lonnet::del('environment',['notifywithhtml']);
+ &Apache::lonnet::delenv('environment.notifywithhtml');
+ }
+ if ($message) {
+ $message .= '<br /><hr />';
+ }
+ &Apache::loncommon::flush_email_cache($user,$domain);
+ &msgforwardchanger($r,$message);
}
################################################################
@@ -659,13 +1060,13 @@ sub colorschanger {
# figure out colors
my $function=&Apache::loncommon::get_users_function();
my $domain=&Apache::loncommon::determinedomain();
- my %colortypes=('pgbg' => 'Page Background',
- 'tabbg' => 'Header Background',
- 'sidebg'=> 'Header Border',
- 'font' => 'Font',
- 'link' => 'Un-Visited Link',
- 'vlink' => 'Visited Link',
- 'alink' => 'Active Link');
+ my %colortypes=('pgbg' => 'Page Background Color',
+ 'tabbg' => 'Header Background Color',
+ 'sidebg'=> 'Header Border Color',
+ 'font' => 'Font Color',
+ 'link' => 'Un-Visited Link Color',
+ 'vlink' => 'Visited Link Color',
+ 'alink' => 'Active Link Color');
my $start_data_table = &Apache::loncommon::start_data_table();
my $chtable='';
foreach my $item (sort(keys(%colortypes))) {
@@ -676,11 +1077,14 @@ sub colorschanger {
'" size="10" value="'.$curcol.
'" /></td><td><a href="javascript:pjump('."'color_custom','".$colortypes{$item}.
"','".$curcol."','"
- .$item."','parmform.pres','psub'".');">Select</a></td>'.
+ .$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 $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">
@@ -719,8 +1123,8 @@ $start_data_table
$chtable
$end_data_table
</table>
-<input type="submit" value="Change Custom Colors" />
-<input type="submit" name="resetall" value="Reset All Colors to Default" />
+<input type="submit" value="$savebutton" />
+<input type="submit" name="resetall" value="$resetbutton" title="$resetbuttondesc" />
</form>
ENDCOL
}
@@ -730,13 +1134,13 @@ sub verify_and_change_colors {
# figure out colors
my $function=&Apache::loncommon::get_users_function();
my $domain=&Apache::loncommon::determinedomain();
- my %colortypes=('pgbg' => 'Page Background',
- 'tabbg' => 'Header Background',
- 'sidebg'=> 'Header Border',
- 'font' => 'Font',
- 'link' => 'Un-Visited Link',
- 'vlink' => 'Visited Link',
- 'alink' => 'Active Link');
+ my %colortypes=('pgbg' => 'Page Background Color',
+ 'tabbg' => 'Header Background Color',
+ 'sidebg'=> 'Header Border Color',
+ 'font' => 'Font Color',
+ 'link' => 'Un-Visited Link Color',
+ 'vlink' => 'Visited Link Color',
+ 'alink' => 'Active Link Color');
my $message='';
foreach my $item (keys %colortypes) {
@@ -744,17 +1148,21 @@ sub verify_and_change_colors {
my $entry='color.'.$function.'.'.$item;
if (($color=~/^\#[0-9A-Fa-f]{6}$/) && (!$env{'form.resetall'})) {
&Apache::lonnet::put('environment',{$entry => $color});
- &Apache::lonnet::appenv('environment.'.$entry => $color);
- $message.='Set '.$colortypes{$item}.' to '.$color.'<br />';
+ &Apache::lonnet::appenv({'environment.'.$entry => $color});
+ $message.=&Apache::lonhtmlcommon::confirm_success(&mt('Set [_1] to [_2]','<i>'.$colortypes{$item}.'</i>','<tt>"'.$color.'"</tt>'))
+ .'<br />';
} else {
&Apache::lonnet::del('environment',[$entry]);
- &Apache::lonnet::delenv('environment\.'.$entry);
- $message.='Reset '.$colortypes{$item}.'<br />';
+ &Apache::lonnet::delenv('environment.'.$entry);
+ $message.=&Apache::lonhtmlcommon::confirm_success(&mt('Reset [_1]','<i>'.$colortypes{$item}.'</i>'))
+ .'<br />';
}
}
+ $message=&Apache::loncommon::confirmwrapper($message);
+
my $now = time;
&Apache::lonnet::put('environment',{'color.timestamp' => $now});
- &Apache::lonnet::appenv('environment.color.timestamp' => $now);
+ &Apache::lonnet::appenv({'environment.color.timestamp' => $now});
$r->print(<<ENDVCCOL);
$message
@@ -783,7 +1191,9 @@ sub passwordchanger {
$defdom = $r->dir_config('lonDefDomain');
my %data = &Apache::lonnet::tmpget($mailtoken);
if (keys(%data) == 0) {
- $r->print(&mt('Sorry, the URL you provided to complete the reset of your password was invalid. Either the token included in the URL has been deleted or the URL you provided was invalid. Please submit a <a href="/adm/resetpw">new request</a> for a password reset, and follow the link to the new URL included in the e-mail that will be sent to you, to allow you to enter a new password.'));
+ $r->print(&mt('Sorry, the URL you provided to complete the reset of your password was invalid. Either the token included in the URL has been deleted or the URL you provided was invalid. Please submit a [_1]new request[_2] for a password reset, and follow the link to the new URL included in the e-mail that will be sent to you, to allow you to enter a new password.',
+ '<a href="/adm/resetpw">','</a>')
+ );
return;
}
if (defined($data{time})) {
@@ -880,6 +1290,8 @@ sub jscript_send {
this.document.client.elements.uname.value;
this.document.pserver.elements.udom.value =
this.document.client.elements.udom.options[this.document.client.elements.udom.selectedIndex].value;
+ this.document.pserver.elements.email.value =
+ this.document.client.elements.email.value;
|;
}
$ output .= qq|
@@ -892,48 +1304,46 @@ sub jscript_send {
sub client_form {
my ($caller,$hexkey,$currentpass,$defdom) = @_;
my %lt=&Apache::lonlocal::texthash(
- 'email' => 'EMail Address',
+ 'email' => 'E-mail Address',
'username' => 'Username',
'domain' => 'Domain',
'currentpass' => 'Current Password',
'newpass' => 'New Password',
'confirmpass' => 'Confirm Password',
- 'changepass' => 'Change Password');
-
- my $output = qq|
-<form name="client" >
-<table>
-|;
+ 'changepass' => 'Save');
+ my $output = '<form name="client">'
+ .&Apache::lonhtmlcommon::start_pick_box();
if ($caller eq 'reset_by_email') {
- $output .= qq|
-<tr><td class="LC_preferences_labeltext"><label for="email">$lt{'email'}</label>:</td>
- <td><input type="text" name="email" size="30" /> </td></tr>
-<tr><td class="LC_preferences_labeltext"><label for="uname">$lt{'username'}</label>:</td>
- <td>
- <input type="text" name="uname" size="15" />
- <input type="hidden" name="currentpass" value="$currentpass" />
- </td></tr>
-<tr><td class="LC_preferences_labeltext"><label for="udom">$lt{'udom'}</label>:</td>
- <td>
-|;
- $output .= &Apache::loncommon::select_dom_form($defdom,'udom').'
- </td>
-</tr>
-';
+ $output .= &Apache::lonhtmlcommon::row_title(
+ '<label for="email">'.$lt{'email'}.'</label>')
+ .'<input type="text" name="email" size="30" />'
+ .&Apache::lonhtmlcommon::row_closure()
+ .&Apache::lonhtmlcommon::row_title(
+ '<label for="uname">'.$lt{'username'}.'</label>')
+ .'<input type="text" name="uname" size="15" />'
+ .'<input type="hidden" name="currentpass" value="'.$currentpass.'" />'
+ .&Apache::lonhtmlcommon::row_closure()
+ .&Apache::lonhtmlcommon::row_title(
+ '<label for="udom">'.$lt{'domain'}.'</label>')
+ .&Apache::loncommon::select_dom_form($defdom,'udom')
+ .&Apache::lonhtmlcommon::row_closure();
} else {
- $output .= qq|
-<tr><td class="LC_preferences_labeltext"><label for="currentpass">$lt{'currentpass'}</label></td>
- <td><input type="password" name="currentpass" size="10"/> </td></tr>
-|;
- }
- $output .= <<"ENDFORM";
-<tr><td class="LC_preferences_labeltext"><label for="newpass_1">$lt{'newpass'}</label></td>
- <td><input type="password" name="newpass_1" size="10" /> </td></tr>
-<tr><td class="LC_preferences_labeltext"><label for="newpass_2">$lt{'confirmpass'}</label></td>
- <td><input type="password" name="newpass_2" size="10" /> </td></tr>
-<tr><td colspan="2" align="center">
- <input type="button" value="$lt{'changepass'}" onClick="send();">
-</table>
+ $output .= &Apache::lonhtmlcommon::row_title(
+ '<label for="currentpass">'.$lt{'currentpass'}.'</label>')
+ .'<input type="password" name="currentpass" size="10"/>'
+ .&Apache::lonhtmlcommon::row_closure();
+ }
+ $output .= &Apache::lonhtmlcommon::row_title(
+ '<label for="newpass_1">'.$lt{'newpass'}.'</label>')
+ .'<input type="password" name="newpass_1" size="10" />'
+ .&Apache::lonhtmlcommon::row_closure()
+ .&Apache::lonhtmlcommon::row_title(
+ '<label for="newpass_2">'.$lt{'confirmpass'}.'</label>')
+ .'<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>'
+ .qq|
<input type="hidden" name="ukey_cpass" value="$hexkey->{'ukey_cpass'}" />
<input type="hidden" name="lkey_cpass" value="$hexkey->{'lkey_cpass'}" />
<input type="hidden" name="ukey_npass1" value="$hexkey->{'ukey_npass1'}" />
@@ -942,7 +1352,7 @@ sub client_form {
<input type="hidden" name="lkey_npass2" value="$hexkey->{'lkey_npass2'}" />
</form>
</p>
-ENDFORM
+|;
return $output;
}
@@ -964,6 +1374,7 @@ sub server_form {
<input type="hidden" name="token" value="$mailtoken" />
<input type="hidden" name="uname" value="" />
<input type="hidden" name="udom" value="" />
+<input type="hidden" name="email" value="" />
|;
}
@@ -1035,7 +1446,7 @@ sub verify_and_change_password {
if ($caller eq 'reset_by_email') {
$tryagain_text = &mt('Please try again later.');
}
- my $unable=&mt("Unable to retrieve stored token for password decryption");
+ my $unable=&mt("Unable to retrieve saved token for password decryption");
$r->print(<<ENDERROR);
<p>
<span class="LC_error">$unable. $tryagain_text</span>
@@ -1052,26 +1463,33 @@ ENDERROR
#
if ($caller eq 'reset_by_email') {
my %data = &Apache::lonnet::tmpget($mailtoken);
+ if (keys(%data) == 0) {
+ &passwordchanger($r,
+ '<span class="LC_error">'.
+ &mt('Could not verify current authentication.').' '.
+ &mt('Please try again.').'</span>',$caller,$mailtoken);
+ return 1;
+ }
if ($currentpass ne $data{'temppasswd'}) {
&passwordchanger($r,
'<span class="LC_error">'.
- &mt('Could not verify current authentication').'. '.
- &mt('Please try again').'.</span>',$caller,$mailtoken);
+ &mt('Could not verify current authentication.').' '.
+ &mt('Please try again.').'</span>',$caller,$mailtoken);
return 1;
}
}
if ($newpass1 ne $newpass2) {
&passwordchanger($r,
'<span class="LC_error">'.
- &mt('The new passwords you entered do not match').'. '.
- &mt('Please try again').'.</span>',$caller,$mailtoken);
+ &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">'.
- &mt('Passwords must be a minimum of 7 characters long').'. '.
- &mt('Please try again').'</span>.',$caller,$mailtoken);
+ &mt('Passwords must be a minimum of 7 characters long.').' '.
+ &mt('Please try again.').'</span>',$caller,$mailtoken);
return 1;
}
#
@@ -1083,7 +1501,7 @@ ENDERROR
if ($badpassword) {
# I can't figure out how to enter bad characters on my browser.
my $errormessage ='<span class="LC_error">'.
- &mt('The password you entered contained illegal characters').'.<br />'.
+ &mt('The password you entered contained illegal characters.').'<br />'.
&mt('Valid characters are').(<<"ENDERROR");
: space and <br />
<pre>
@@ -1099,13 +1517,27 @@ ENDERROR
my $result = &Apache::lonnet::changepass
($user,$domain,$currentpass,$newpass1,$homeserver,$caller);
# Inform the user the password has (not?) been changed
+ my $message;
if ($result =~ /^ok$/) {
- $r->print("<h3>".&mt('The password for [_1] was successfully changed',$user)."</h3>");
+ $message = &Apache::lonhtmlcommon::confirm_success(&mt('The password for user [_1] was successfully changed.','<i>'.$user.'</i>'));
+ if ($caller eq 'reset_by_email') {
+ $r->print($message.'<br />');
+ } else {
+ $r->print(&Apache::loncommon::confirmwrapper($message));
+ }
} else {
# error error: run in circles, scream and shout
- $r->print("<h3><span class='LC_error'>".&mt("The password for [_1] was not changed",$user)."</span></h3>".
- &mt('Please make sure your old password was entered correctly').'.');
- return 1;
+ if ($caller eq 'reset_by_email') {
+ if (!$result) {
+ return 1;
+ } else {
+ return $result;
+ }
+ } else {
+ $message = &Apache::lonhtmlcommon::confirm_success(
+ &mt("The password for user [_1] was not changed.",'<i>'.$user.'</i>').' '.&mt('Please make sure your old password was entered correctly.'),1);
+ $r->print(&Apache::loncommon::confirmwrapper($message));
+ }
}
return;
}
@@ -1128,7 +1560,7 @@ sub discussionchanger {
}
}
if (defined($userenv{'discmarkread'})) {
- unless ($userenv{'discdisplay'} eq '') {
+ unless ($userenv{'discmarkread'} eq '') {
$discmark = $userenv{'discmarkread'};
}
}
@@ -1143,9 +1575,9 @@ sub discussionchanger {
'pref' => 'Display Preference',
'curr' => 'Current setting ',
'actn' => 'Action',
- 'sdpf' => 'Set display preferences for discussion posts for both bulletin boards and individual resources in all your courses.',
+ 'sdpf' => 'Set display preferences for discussion posts for both discussion boards and individual resources in all your courses.',
'prca' => 'Preferences can be set that determine',
- 'whpo' => 'Which posts are displayed when you display a bulletin board or resource, and',
+ 'whpo' => 'Which posts are displayed when you display a discussion board or resource, and',
'unwh' => 'Under what circumstances posts are identfied as "New"',
'allposts' => 'All posts',
'unread' => 'New posts only',
@@ -1154,7 +1586,7 @@ sub discussionchanger {
'disa' => 'Posts displayed?',
'npmr' => 'New posts cease to be identified as "New"?',
'thde' => 'The preferences you set here can be overridden within each individual discussion.',
- 'chgt' => 'Change to '
+ 'chgt' => 'Change to ',
);
my $dispchange = $lt{'unread'};
my $markchange = $lt{'ondisp'};
@@ -1178,9 +1610,9 @@ sub discussionchanger {
<input type="hidden" name="action" value="verify_and_change_discussion" />
<br />
$lt{'sdpf'}<br /> $lt{'prca'} <ol><li>$lt{'whpo'}</li><li>$lt{'unwh'}</li></ol>
-<br />
-<br />
END
+ $r->print('<p class="LC_info">'.$lt{'thde'}.'</p>');
+
$r->print(&Apache::loncommon::start_data_table());
$r->print(<<"END");
<tr>
@@ -1205,15 +1637,9 @@ END
END
$r->print(&Apache::loncommon::end_data_table_row().
&Apache::loncommon::end_data_table());
- $r->print(<<"END");
-<br />
-<br />
-<input type="submit" name="sub" value="Store Changes" />
-<br />
-<br />
-Note: $lt{'thde'}
-</form>
-END
+ $r->print('<br />'.
+ '<input type="submit" name="sub" value="'.&mt('Save').'" />'.
+ '</form>');
}
sub verify_and_change_discussion {
@@ -1224,27 +1650,28 @@ sub verify_and_change_discussion {
if (defined($env{'form.discdisp'}) ) {
my $newdisp = $env{'form.newdisp'};
if ($newdisp eq 'unread') {
- $message .='In discussions: only new posts will be displayed.<br />';
+ $message .= &Apache::lonhtmlcommon::confirm_success(&mt('In discussions: only new posts will be displayed.')).'<br />';
&Apache::lonnet::put('environment',{'discdisplay' => $newdisp});
- &Apache::lonnet::appenv('environment.discdisplay' => $newdisp);
+ &Apache::lonnet::appenv({'environment.discdisplay' => $newdisp});
} else {
- $message .= 'In discussions: all posts will be displayed.<br />';
+ $message .= &Apache::lonhtmlcommon::confirm_success(&mt('In discussions: all posts will be displayed.')).'<br />';
&Apache::lonnet::del('environment',['discdisplay']);
- &Apache::lonnet::delenv('environment\.discdisplay');
+ &Apache::lonnet::delenv('environment.discdisplay');
}
}
if (defined($env{'form.discmark'}) ) {
my $newmark = $env{'form.newmark'};
if ($newmark eq 'ondisp') {
- $message.='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 be cease to be identified as "NEW" after display.')).'<br />';
&Apache::lonnet::put('environment',{'discmarkread' => $newmark});
- &Apache::lonnet::appenv('environment.discmarkread' => $newmark);
+ &Apache::lonnet::appenv({'environment.discmarkread' => $newmark});
} else {
- $message.='In discussions: posts will be identified as "new" until marked as read by the reader.<br />';
+ $message.=&Apache::lonhtmlcommon::confirm_success(&mt('In discussions: posts will be identified as "NEW" until marked as read by the reader.')).'<br />';
&Apache::lonnet::del('environment',['discmarkread']);
- &Apache::lonnet::delenv('environment\.discmarkread');
+ &Apache::lonnet::delenv('environment.discmarkread');
}
}
+ $message=&Apache::loncommon::confirmwrapper($message);
$r->print(<<ENDVCSCREEN);
$message
ENDVCSCREEN
@@ -1270,12 +1697,17 @@ sub coursedisplaychanger {
}
my %pagenames = (
firstres => 'First resource',
- whatsnew => "What's new page",
+ whatsnew => "What's New Page",
);
- my $whatsnew_off=&mt('Display the [_1] in the course.','<b>first resource</b>');
- my $whatsnew_on=&mt('Display the "[_1]" page - a summary of items in the course which require attention.',"<b>What's New</b>");
+ my $whatsnew_off=&mt('Display the [_1]first resource[_2] in the course.','<b>','</b>');
+ my $whatsnew_on=&mt("Display the [_1]What's New Page[_2] - a summary of items in the course which require attention.",'<b>','</b>');
- $r->print('<br /><b>'.&mt('Set the default page to be displayed when you select a course role').'</b> '.&mt('(Currently: [_1])',$pagenames{$currvalue}).'<br />'.&mt('The global user preference you set for your courses can be overridden in an individual course by setting a course specific setting via the "[_1]" page in the course',"<i>What's New</i>").'<br /><br />');
+ $r->print('<br /><b>'.
+ &mt('Set the default page to be displayed when you select a course role').
+ '</b> '.
+ &mt('(Currently: [_1])',$pagenames{$currvalue}).'<br />'.
+ &mt("The global user preference you set for your courses can be overridden in an individual course by setting a course specific setting via the [_1]What's New Page[_2] page in the course.",'<i>','</i>').
+ '<br /><br />');
$r->print(<<ENDLSCREEN);
<form name="prefs" action="/adm/preferences" method="post">
<input type="hidden" name="action" value="verify_and_change_coursepage" />
@@ -1283,7 +1715,7 @@ sub coursedisplaychanger {
<label><input type="radio" name="newdisp" value="firstres" $firstselect /> $whatsnew_off</label><br />
<label><input type="radio" name="newdisp" value="whatsnew" $whatsnewselect /> $whatsnew_on</label><input type="hidden" name="refpage" value="$env{'form.refpage'}" />
ENDLSCREEN
- $r->print('<br /><br /><input type="submit" value="'.&mt('Change').'" />
+ $r->print('<br /><br /><input type="submit" value="'.&mt('Save').'" />
</form>');
}
@@ -1296,18 +1728,18 @@ sub verify_and_change_coursepage {
'ywbt' => 'you will be taken to the start of the course.',
'apwb' => 'a page will be displayed that lists items in the course that may require action from you.',
'gtts' => 'Go to the start of the course',
- 'dasp' => "Display the What's New page listing course action items",
+ 'dasp' => "Display the What's New Page",
);
my $newdisp = $env{'form.newdisp'};
$message = '<b>'.$lt{'defs'}.'</b>: '.$lt{'when'}.', ';
if ($newdisp eq 'firstres') {
$message .= $lt{'ywbt'}.'<br />';
&Apache::lonnet::put('environment',{'course_init_display' => $newdisp});
- &Apache::lonnet::appenv('environment.course_init_display' => $newdisp);
+ &Apache::lonnet::appenv({'environment.course_init_display' => $newdisp});
} else {
$message .= $lt{'apwb'}.'<br />';
&Apache::lonnet::del('environment',['course_init_display']);
- &Apache::lonnet::delenv('environment\.course_init_display');
+ &Apache::lonnet::delenv('environment.course_init_display');
}
my $refpage = $env{'form.refpage'};
if (($env{'request.course.fn'}) && ($env{'request.course.id'})) {
@@ -1322,9 +1754,9 @@ sub verify_and_change_coursepage {
$refpage.'">'.$lt{'dasp'}.'</a></font>';
}
}
+ $message = &Apache::lonhtmlcommon::confirm_success($message);
$r->print(<<ENDVCSCREEN);
$message
-<br /><br />
ENDVCSCREEN
}
@@ -1393,27 +1825,28 @@ sub handler {
}));
push (@Options,({ action => 'changemsgforward',
- linktext => 'Change Message Forwarding and Notification Email Addresses',
+ linktext => 'Messages & Notifications',
href => '/adm/preferences',
- help => 'Prefs_Forwarding',
+ help => 'Prefs_Messages',
breadcrumb =>
{ href => '/adm/preferences?action=changemsgforward',
- text => 'Change Message Forwarding'},
+ text => 'Change Message Forwarding/Notification'},
subroutine => \&msgforwardchanger,
},
{ action => 'verify_and_change_msgforward',
+ help => 'Prefs_Messages',
breadcrumb =>
{ href => '/adm/preferences?action=changemsgforward',
- text => 'Change Message Forwarding'},
- printmenu => 'yes',
+ text => 'Change Message Forwarding/Notification'},
+ printmenu => 'no',
subroutine => \&verify_and_change_msgforward }));
- my $aboutmeaction=
- '/adm/'.$env{'user.domain'}.'/'.$env{'user.name'}.'/aboutme';
- push (@Options,{ action => 'none',
- linktext =>
- q{Edit the 'About Me' Personal Information Screen},
- help => 'Prefs_About_Me',
- href => $aboutmeaction});
+ if (&Apache::lonnet::usertools_access($user,$domain,'aboutme')) {
+ my $aboutmeaction = '/adm/'.$domain.'/'.$user.'/aboutme';
+ push (@Options,{ action => 'none',
+ linktext =>"Edit the Personal Information Page",
+ help => 'Prefs_About_Me',
+ href => $aboutmeaction});
+ }
push (@Options,({ action => 'changecolors',
linktext => 'Change Color Scheme',
href => '/adm/preferences',
@@ -1430,22 +1863,24 @@ sub handler {
printmenu => 'yes',
subroutine => \&verify_and_change_colors,
}));
- push (@Options,({ action => 'changelanguages',
- linktext => 'Change Language Preferences',
- href => '/adm/preferences',
- help => 'Prefs_Language',
- breadcrumb=>
- { href => '/adm/preferences?action=changelanguages',
- text => 'Change Language'},
- subroutine => \&languagechanger,
- },
- { action => 'verify_and_change_languages',
- breadcrumb=>
- {href => '/adm/preferences?action=changelanguages',
- text => 'Change Language'},
- printmenu => 'yes',
- subroutine=>\&verify_and_change_languages, }
+ if ($env{'user.adv'}) {
+ push (@Options,({ action => 'changelanguages',
+ linktext => 'Change Language Preferences',
+ href => '/adm/preferences',
+ help => 'Prefs_Language',
+ breadcrumb=>
+ { href => '/adm/preferences?action=changelanguages',
+ text => 'Change Language'},
+ subroutine => \&languagechanger,
+ },
+ { action => 'verify_and_change_languages',
+ breadcrumb=>
+ {href => '/adm/preferences?action=changelanguages',
+ text => 'Change Language'},
+ printmenu => 'yes',
+ subroutine=>\&verify_and_change_languages, }
));
+ }
push (@Options,({ action => 'changewysiwyg',
linktext => 'Change WYSIWYG Editor Preferences',
href => '/adm/preferences',
@@ -1538,6 +1973,56 @@ sub handler {
text => 'Change Main Menu'},
printmenu => 'yes',
}));
+ if ($env{'user.adv'}) {
+ push (@Options,({ action => 'changeclicker',
+ linktext => 'Register Response Devices ("Clickers")',
+ href => '/adm/preferences',
+ subroutine => \&clickerchanger,
+ breadcrumb =>
+ { href => '/adm/preferences?action=changeclicker',
+ text => 'Register Clicker'},
+ },
+ { action => 'verify_and_change_clicker',
+ subroutine => \&verify_and_change_clicker,
+ breadcrumb =>
+ { href => '/adm/preferences?action=changeclicker',
+ text => 'Register Clicker'},
+ printmenu => 'yes',
+ }));
+ }
+ my %author_roles = &Apache::lonnet::get_my_roles($user,$domain,'userroles','',['au']);
+ if (keys(%author_roles) > 0) {
+ push (@Options,({ action => 'changedomcoord',
+ linktext => 'Restrict Domain Coordinator Access',
+ href => '/adm/preferences',
+ subroutine => \&domcoordchanger,
+ breadcrumb =>
+ { href => '/adm/preferences?action=changedomcoord',
+ text => 'Restrict Domain Coordinator Access'},
+ },
+ { action => 'verify_and_change_domcoord',
+ subroutine => \&verify_and_change_domcoord,
+ breadcrumb =>
+ { href => '/adm/preferences?action=changedomcoord',
+ text => 'Restrict Domain Coordinator Access'},
+ printmenu => 'yes',
+ }));
+ }
+
+ push (@Options,({ action => 'lockwarning',
+ subroutine => \&lockwarning,
+ breadcrumb =>
+ { href => '/adm/preferences?action=lockwarning',
+ text => 'Lock Warnings'},
+ },
+ { action => 'verify_and_change_locks',
+ subroutine => \&verify_and_change_lockwarning,
+ breadcrumb =>
+ { href => '/adm/preferences?action=lockwarning',
+ text => 'Lockwarnings'},
+ printmenu => 'yes',
+ }));
+
if (&Apache::lonnet::allowed('whn',$env{'request.course.id'})
|| &Apache::lonnet::allowed('whn',$env{'request.course.id'}.'/'
@@ -1558,7 +2043,7 @@ sub handler {
}));
}
- if ($env{'user.name'} =~ /^(albertel|fox|foxr|koretemey|korte|hallmat3|turtle|raeburn)$/) {
+ if ($env{'user.name'} =~ /^(albertel|fox|foxr|kortemey|korte|raeburn)$/) {
push (@Options,({ action => 'debugtoggle',
printmenu => 'yes',
subroutine => \&toggle_debug,
@@ -1639,9 +2124,9 @@ sub handler {
sub toggle_debug {
if ($env{'user.debug'}) {
- &Apache::lonnet::delenv('user\.debug');
+ &Apache::lonnet::delenv('user.debug');
} else {
- &Apache::lonnet::appenv('user.debug' => 1);
+ &Apache::lonnet::appenv({'user.debug' => 1});
}
}