--- loncom/interface/lonpreferences.pm	2005/01/20 21:32:55	1.52
+++ 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.52 2005/01/20 21:32:55 raeburn Exp $
+# $Id: lonpreferences.pm,v 1.125.8.3 2009/11/19 15:41:59 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -33,6 +33,7 @@
 package Apache::lonpreferences;
 
 use strict;
+use LONCAPA;
 use Apache::Constants qw(:common);
 use Apache::File;
 use Crypt::DES;
@@ -40,6 +41,8 @@ use DynaLoader; # for Crypt::DES version
 use Apache::loncommon();
 use Apache::lonhtmlcommon();
 use Apache::lonlocal;
+use Apache::lonnet;
+use LONCAPA();
 
 #
 # Write lonnet::passwd to do the call below.
@@ -97,31 +100,40 @@ sub wysiwygchanger {
     my $r = shift;
     my %userenv = &Apache::lonnet::get
         ('environment',['wysiwygeditor']);
+    my $onselect='checked="checked"';
     my $offselect='';
-    my $onselect='checked="1"';
-    if ($userenv{'wysiwygeditor'}) {
+    if ($userenv{'wysiwygeditor'} eq 'on') {
 	$onselect='';
-	$offselect='checked="1"';
+	$offselect='checked="checked"';
     }
     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="server" action="/adm/preferences" method="post">
+<form name="prefs" action="/adm/preferences" method="post">
 <input type="hidden" name="action" value="set_wysiwyg" />
+$warning
 <br />
-<input type="radio" name="wysiwyg" value="off" $onselect /> $switchoff<br />
-<input type="radio" name="wysiwyg" value="on" $offselect /> $switchon
+<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').'" />');
 }
 
 
 sub verify_and_change_wysiwyg {
     my $r = shift;
-    my $newsetting=$ENV{'form.wysiwyg'};
+    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
 }
 
 ################################################################
@@ -129,8 +141,8 @@ sub verify_and_change_wysiwyg {
 ################################################################
 sub languagechanger {
     my $r = shift;
-    my $user       = $ENV{'user.name'};
-    my $domain     = $ENV{'user.domain'};
+    my $user       = $env{'user.name'};
+    my $domain     = $env{'user.domain'};
     my %userenv = &Apache::lonnet::get
         ('environment',['languages']);
     my $language=$userenv{'languages'};
@@ -146,33 +158,150 @@ sub languagechanger {
     my $selectionbox=&Apache::loncommon::select_form($language,'language',
 						     %langchoices);
     $r->print(<<ENDLSCREEN);
-<form name="server" action="/adm/preferences" method="post">
+<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('Change').'" />');
+    $r->print('<br /><input type="submit" value="'.&mt('Save').'" />');
 }
 
 
 sub verify_and_change_languages {
     my $r = shift;
-    my $user       = $ENV{'user.name'};
-    my $domain     = $ENV{'user.domain'};
+    my $user       = $env{'user.name'};
+    my $domain     = $env{'user.domain'};
 # Screenname
-    my $newlanguage  = $ENV{'form.language'};
+    my $newlanguage  = $env{'form.language'};
     $newlanguage=~s/[^\-\w]//g;
     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
+}
+
+################################################################
+#         Tex Engine Change Subroutines                        #
+################################################################
+sub texenginechanger {
+    my $r = shift;
+    my $user       = $env{'user.name'};
+    my $domain     = $env{'user.domain'};
+    my %userenv = &Apache::lonnet::get('environment',['texengine']);
+    my $texengine=$userenv{'texengine'};
+
+    my %mathchoices=('' => 'Default',
+		     'tth' => 'tth (TeX to HTML)',
+		     #'ttm' => 'TeX to MathML',
+		     'jsMath' => 'jsMath',
+		     '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 %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>
+$lt{'preftxt'}: $selectionbox
+<br />
+<input type="submit" value="$lt{'change'}" />
 </p>
+</form>
+<br />
+<hr />
+$lt{'exmpl'}
+
+<h3>$lt{'jsmath'}</h3> 
+<p>
+$jsMath_start
+<script type="text/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>
+
+<h3>$lt{'mimetex'}</h3>
+<p>
+<iframe src="/res/adm/pages/math_example.tex?inhibitmenu=yes&texengine=mimetex" width="400" height="100"></iframe>
+</p>
+
+<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') {
+	$r->print('<script type="text/javascript">jsMath.Process()</script>');
+    }
+}
+
+
+sub verify_and_change_texengine {
+    my $r = shift;
+    my $user       = $env{'user.name'};
+    my $domain     = $env{'user.domain'};
+# Screenname
+    my $newtexengine  = $env{'form.texengine'};
+    $newtexengine=~s/[^\-\w]//g;
+    if ($newtexengine eq 'ttm') {
+	&Apache::lonnet::appenv({'browser.mathml' => 1});
+    } else {
+	if ($env{'environment.texengine'} eq 'ttm') {
+	    &Apache::lonnet::appenv({'browser.mathml' => 0});
+	}
+    }
+    my $message='';
+    if ($newtexengine) {
+        &Apache::lonnet::put('environment',{'texengine' => $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=&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
 }
@@ -182,15 +311,17 @@ ENDVCSCREEN
 ################################################################
 sub rolesprefchanger {
     my $r = shift;
-    my $user       = $ENV{'user.name'};
-    my $domain     = $ENV{'user.domain'};
+    my $role    = ($env{'user.adv'} ? 'Role' : 'Course');
+    my $lc_role = ($env{'user.adv'} ? 'role' : 'course');
+    my $user       = $env{'user.name'};
+    my $domain     = $env{'user.domain'};
     my %userenv = &Apache::lonnet::get
         ('environment',['recentroles','recentrolesn']);
     my $hotlist_flag=$userenv{'recentroles'};
     my $hotlist_n=$userenv{'recentrolesn'};
     my $checked;
     if ($hotlist_flag) {
-	$checked = 'checked="checked"';
+	$checked = ' checked="checked"';
     }
     
     if (!$hotlist_n) { $hotlist_n=3; }
@@ -201,54 +332,155 @@ sub rolesprefchanger {
 	$options .= "<option $select>$i</option>\n";
     }
 
-    $r->print(<<ENDSCREEN);
-<p>Some LON-CAPA users have a long list of roles. The Recent Roles Hotlist
-feature keeps track of the last N roles which have been
-visited and places a table of these at the top of the roles page.
-People with very few roles should leave this feature disabled.
-</p>
+# Get list of recent roles and display with checkbox in front
+    my $roles_check_list = '';
+    my $role_key='';
+    if ($env{'environment.recentroles'}) {
+        my %recent_roles =
+               &Apache::lonhtmlcommon::get_recent('roles',$env{'environment.recentrolesn'});
+        my %frozen_roles =
+               &Apache::lonhtmlcommon::get_recent_frozen('roles',$env{'environment.recentrolesn'});
+        
+        my %role_text = &rolespref_get_role_text([keys(%recent_roles)]);
+        my @sorted_roles = sort {$role_text{$a} cmp $role_text{$b}} keys(%role_text);
+
+        $roles_check_list .=
+	    &Apache::loncommon::start_data_table().
+	    &Apache::loncommon::start_data_table_header_row().
+	    "<th>".&mt('Freeze '.$role)."</th>".
+	    "<th>".&mt($role)."</td>".
+	    &Apache::loncommon::end_data_table_header_row().
+	    "\n";
+	my $count;
+        foreach $role_key (@sorted_roles) {
+            my $checked = "";
+            my $value = $recent_roles{$role_key};
+            if ($frozen_roles{$role_key}) {
+                $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\"".
+		" id=\"freezeroles$count\" value=\"$role_key\" /></td>".
+		"<td><label for=\"freezeroles$count\">".
+		"$role_text{$role_key}</label></td>".
+		&Apache::loncommon::end_data_table_row(). "\n";
+        }
+        $roles_check_list .= "</table>\n";
+    }
 
-<form name="server" action="/adm/preferences" method="post">
+    $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">
 <input type="hidden" name="action" value="verify_and_change_rolespref" />
-<br />Enable Recent Roles Hotlist:
-<input type="checkbox" $checked name="recentroles" value="true" />
-<br />Number of roles in Hotlist:
+<br /><label>'.&mt('Enable Recent '.$role.'s Hotlist:').'
+<input type="checkbox"'.$checked.' name="recentroles" value="true" /></label>
+<br />'.&mt('Number of '.$role.'s in Hotlist:').'
 <select name="recentrolesn" size="1">
-$options
+'.$options.'
 </select>
+<p>'.&mt('This list below can be used to <q>freeze</q> '.$lc_role.'s on your screen. Those marked as frozen will not be removed from the list, even if they have not been used recently.').'
+</p>
+'.$roles_check_list.'
 <br />
-<input type="submit" value="Change" />
-</form>
-ENDSCREEN
+<input type="submit" value="'.&mt('Save').'" />
+</form>');
+}
+
+sub rolespref_get_role_text {
+# Get a line of text for each role
+    my ($roles) = @_;
+    my %roletext = ();
+
+    foreach my $item (@$roles) {
+# get course information
+        my ($role,$rest) = split(/\./, $item);
+        my $trole = "";
+        $trole = &Apache::lonnet::plaintext($role);
+        my ($tdomain,$other,$tsection)= split(/\//,Apache::lonnet::declutter($rest));
+        my $tother = '-';
+        if ($role =~ /^(cc|st|in|ta|ep|cr)/ ) {
+            my %newhash=&Apache::lonnet::coursedescription($tdomain."_".$other);
+            $tother = " - ".$newhash{'description'};
+        } elsif ($role =~ /dc/) {
+            $tother = "";
+        } else {
+            $tother = " - $other";
+        }
+ 
+        my $section="";
+        if ($tsection) {
+            $section = " - Section/Group: $tsection";
+        }
+        $roletext{$item} = $tdomain." - ".$trole.$tother.$section;
+    }
+    return %roletext;
 }
 
 sub verify_and_change_rolespref {
     my $r = shift;
-    my $user       = $ENV{'user.name'};
-    my $domain     = $ENV{'user.domain'};
+    my $role = ($env{'user.adv'} ? 'Role' : 'Course');
+    my $user       = $env{'user.name'};
+    my $domain     = $env{'user.domain'};
 # Recent Roles Hotlist Flag
-    my $hotlist_flag  = $ENV{'form.recentroles'};
-    my $hotlist_n  = $ENV{'form.recentrolesn'};
-    my $message='';
+    my $hotlist_flag  = $env{'form.recentroles'};
+    my $hotlist_n  = $env{'form.recentrolesn'};
+    my $message='<hr />';
     if ($hotlist_flag) {
         &Apache::lonnet::put('environment',{'recentroles' => $hotlist_flag});
-        &Apache::lonnet::appenv('environment.recentroles' => $hotlist_flag);
-        $message='Recent Roles Hotlist is Enabled';
+        &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');
-        $message='Recent Roles Hotlist is Disabled';
+        &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 />Display $hotlist_n Most Recent Roles\n";
+            $message.="<br />".
+		&mt('Display [_1] Most Recent '.$role.'s',$hotlist_n)."\n";
+        }
+    }
+
+# Get list of froze roles and list of recent roles
+    my @freeze_list = &Apache::loncommon::get_env_multiple('form.freezeroles');
+    my %freeze = ();
+    my %roletext = ();
+
+    foreach my $key (@freeze_list) {
+        $freeze{$key}='1';
+    }
+
+    my %recent_roles =
+        &Apache::lonhtmlcommon::get_recent('roles',$env{'environment.recentrolesn'});
+    my %frozen_roles =
+        &Apache::lonhtmlcommon::get_recent_frozen('roles',$env{'environment.recentrolesn'});
+    my %role_text = &rolespref_get_role_text([keys(%recent_roles)]);
+
+# 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 />".&Apache::lonhtmlcommon::confirm_success(&mt('Unfreezing '.$role.': [_1]','<i>'.$role_text{$role_key}.'</i>'));
+	    &Apache::lonhtmlcommon::store_recent('roles',$role_key,' ',0);
         }
     }
 
+# Freeze selected roles
+    foreach my $role_key (@freeze_list) {
+        if (!$frozen_roles{$role_key}) {
+             $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=&Apache::loncommon::confirmwrapper($message);
     $r->print(<<ENDRPSCREEN);
-</p>
 $message
 ENDRPSCREEN
 }
@@ -260,149 +492,563 @@ ENDRPSCREEN
 ################################################################
 sub screennamechanger {
     my $r = shift;
-    my $user       = $ENV{'user.name'};
-    my $domain     = $ENV{'user.domain'};
+    my $user       = $env{'user.name'};
+    my $domain     = $env{'user.domain'};
     my %userenv = &Apache::lonnet::get
         ('environment',['screenname','nickname']);
     my $screenname=$userenv{'screenname'};
     my $nickname=$userenv{'nickname'};
-    $r->print(<<ENDSCREEN);
-<form name="server" 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 {
     my $r = shift;
-    my $user       = $ENV{'user.name'};
-    my $domain     = $ENV{'user.domain'};
+    my $user       = $env{'user.name'};
+    my $domain     = $env{'user.domain'};
 # Screenname
-    my $newscreen  = $ENV{'form.screenname'};
+    my $newscreen  = $env{'form.screenname'};
     $newscreen=~s/[^ \w]//g;
     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 />';
-    $newscreen  = $ENV{'form.nickname'};
+    $newscreen  = $env{'form.nickname'};
     $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
+}
+
+################################################################
+#                     Icon Subroutines                         #
+################################################################
+sub iconchanger {
+    my $r = shift;
+    my $user       = $env{'user.name'};
+    my $domain     = $env{'user.domain'};
+    my %userenv = &Apache::lonnet::get
+        ('environment',['icons']);
+    my $iconic='checked="checked"';
+    my $classic='';
+    my $onlyicon='';
+    if ($userenv{'icons'} eq 'classic') {
+       $classic='checked="checked"';
+       $iconic='';
+    }
+    if ($userenv{'icons'} eq 'iconsonly') {
+       $onlyicon='checked="checked"';
+       $iconic='';
+    }
+    my $useicons=&mt('Use icons and text');
+    my $usebuttons=&mt('Use buttons and text');
+    my $useicononly=&mt('Use icons only');
+    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" />
+<label><input type="radio" name="menumode" value="iconic" $iconic /> $useicons</label><br />
+<label><input type="radio" name="menumode" value="classic" $classic /> $usebuttons</label><br />
+<label><input type="radio" name="menumode" value="iconsonly" $onlyicon /> $useicononly</label><br />
+<input type="submit" value="$change" />
+</form>
+ENDSCREEN
+}
 
+sub verify_and_change_icons {
+    my $r = shift;
+    my $user       = $env{'user.name'};
+    my $domain     = $env{'user.domain'};
+    my $newicons  = $env{'form.menumode'};
+
+    &Apache::lonnet::put('environment',{'icons' => $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);
-</p>
 $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 $user       = $ENV{'user.name'};
-    my $domain     = $ENV{'user.domain'};
-    my %userenv = &Apache::lonnet::get('environment',['msgforward','notification','critnotification']);
+    my ($r,$message) = @_;
+    my $user       = $env{'user.name'};
+    my $domain     = $env{'user.domain'};
+    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 />
-<form name="server" action="/adm/preferences" method="post">
+$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>&nbsp;</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>&nbsp;&nbsp; '.
+                   '<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>&nbsp;';
+        }
+        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>&nbsp;'.
+                   '<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>&nbsp;';
+    }
+    $output .= '</td><td><label><input type="radio" name="html_'.$num.
+               '" value="1" />'.&mt('Yes').'</label>&nbsp;'.
+               '<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 {
     my $r = shift;
-    my $user       = $ENV{'user.name'};
-    my $domain     = $ENV{'user.domain'};
+    my $user       = $env{'user.name'};
+    my $domain     = $env{'user.domain'};
     my $newscreen  = '';
     my $message='';
-    foreach (split(/\,/,$ENV{'form.msgforward'})) {
+    foreach (split(/\,/,$env{'form.msgforward'})) {
 	my ($msuser,$msdomain)=split(/[\@\:]/,$_);
-        $msuser=~s/\W//g;
-        $msdomain=~s/\W//g;
+        $msuser = &LONCAPA::clean_username($msuser);
+        $msdomain = &LONCAPA::clean_domain($msdomain);
         if (($msuser) && ($msdomain)) {
 	    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 $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 ++;
+            }
+        }
     }
-    my $notification=$ENV{'form.notification'};
+    $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);
-</p>
-$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);
 }
 
 ################################################################
@@ -412,38 +1058,35 @@ ENDVCMSG
 sub colorschanger {
     my $r = shift;
 # figure out colors
-    my $function='student';
-    if ($ENV{'request.role'}=~/^(cc|in|ta|ep)/) {
-	$function='coordinator';
-    }
-    if ($ENV{'request.role'}=~/^(su|dc|ad|li)/) {
-	$function='admin';
-    }
-    if (($ENV{'request.role'}=~/^(au|ca)/) ||
-	($ENV{'REQUEST_URI'}=~/^(\/priv|\~)/)) {
-	$function='author';
-    }
+    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))) {
        my $curcol=&Apache::loncommon::designparm($function.'.'.$item,$domain);
-       $chtable.='<tr><td>'.$colortypes{$item}.'</td><td bgcolor="'.$curcol.
+       $chtable.=&Apache::loncommon::start_data_table_row().
+	   '<td>'.$colortypes{$item}.'</td><td style="background: '.$curcol.
         '">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td><td><input name="'.$item.
         '" size="10" value="'.$curcol.
 '" /></td><td><a href="javascript:pjump('."'color_custom','".$colortypes{$item}.
 "','".$curcol."','"
-	    .$item."','parmform.pres','psub'".');">Select</a></td></tr>';
+	    .$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>
+<script type="text/javascript">
 
     function pclose() {
         parmwin=window.open("/adm/rat/empty.html","LONCAPAparms",
@@ -457,7 +1100,7 @@ sub colorschanger {
         pclose();
         if (document.parmform.pres_marker.value!='') {
             if (document.parmform.pres_type.value!='') {
-                eval('document.server.'+
+                eval('document.prefs.'+
                      document.parmform.pres_marker.value+
 		     '.value=document.parmform.pres_value.value;');
 	    }
@@ -474,13 +1117,14 @@ sub colorschanger {
 <input type="hidden" name="pres_type" />
 <input type="hidden" name="pres_value" />
 </form>
-<form name="server" action="/adm/preferences" method="post">
+<form name="prefs" action="/adm/preferences" method="post">
 <input type="hidden" name="action" value="verify_and_change_colors" />
-<table border="2">
+$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
 }
@@ -488,42 +1132,39 @@ ENDCOL
 sub verify_and_change_colors {
     my $r = shift;
 # figure out colors
-    my $function='student';
-    if ($ENV{'request.role'}=~/^(cc|in|ta|ep)/) {
-	$function='coordinator';
-    }
-    if ($ENV{'request.role'}=~/^(su|dc|ad|li)/) {
-	$function='admin';
-    }
-    if (($ENV{'request.role'}=~/^(au|ca)/) ||
-	($ENV{'REQUEST_URI'}=~/^(\/priv|\~)/)) {
-	$function='author';
-    }
+    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) {
-        my $color=$ENV{'form.'.$item};
+        my $color=$env{'form.'.$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::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});
+
     $r->print(<<ENDVCCOL);
-</p>
 $message
 <form name="client" action="/adm/preferences" method="post">
 <input type="hidden" name="action" value="changecolors" />
@@ -535,14 +1176,43 @@ ENDVCCOL
 #            password handler subroutines            #
 ######################################################
 sub passwordchanger {
+    my ($r,$errormessage,$caller,$mailtoken) = @_;
     # This function is a bit of a mess....
     # Passwords are encrypted using londes.js (DES encryption)
-    my $r = shift;
-    my $errormessage = shift;
     $errormessage = ($errormessage || '');
-    my $user       = $ENV{'user.name'};
-    my $domain     = $ENV{'user.domain'};
-    my $homeserver = $ENV{'user.home'};
+    my ($user,$domain,$currentpass,$defdom);
+    if ((!defined($caller)) || ($caller eq 'preferences')) {
+        $user = $env{'user.name'};
+        $domain = $env{'user.domain'};
+        if (!defined($caller)) {
+            $caller = 'preferences';
+        }
+    } elsif ($caller eq 'reset_by_email') {
+            $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 [_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})) {
+                if (time - $data{'time'} < 7200) {
+                    $user = $data{'username'};
+                    $domain = $data{'domain'};
+                    $currentpass = $data{'temppasswd'};
+                } else {
+                    $r->print(&mt('Sorry, the token generated when you requested a password reset has expired.').'<br />');
+                    return;
+                }
+            } else {
+                $r->print(&mt('Sorry, the URL generated when you requested reset of your password contained incomplete information.').'<br />');
+                return;
+            }
+   } else {
+        $r->print(&mt('Page requested in unexpected context').'<br />');
+        return;
+    }
     my $currentauth=&Apache::lonnet::queryauthenticate($user,$domain);
     # Check for authentication types that allow changing of the password.
     return if ($currentauth !~ /^(unix|internal):/);
@@ -559,21 +1229,39 @@ sub passwordchanger {
 				       .$ukey_npass2 . $lkey_npass2,
 				       $lonhost);
     # Hexify the keys for output as javascript variables
-    $ukey_cpass = hex($ukey_cpass);
-    $lkey_cpass = hex($lkey_cpass);
-    $ukey_npass1= hex($ukey_npass1);
-    $lkey_npass1= hex($lkey_npass1);
-    $ukey_npass2= hex($ukey_npass2);
-    $lkey_npass2= hex($lkey_npass2);
+    my %hexkey;
+    $hexkey{'ukey_cpass'}  = hex($ukey_cpass);
+    $hexkey{'lkey_cpass'}  = hex($lkey_cpass);
+    $hexkey{'ukey_npass1'} = hex($ukey_npass1);
+    $hexkey{'lkey_npass1'} = hex($lkey_npass1);
+    $hexkey{'ukey_npass2'} = hex($ukey_npass2);
+    $hexkey{'lkey_npass2'} = hex($lkey_npass2);
     # Output javascript to deal with passwords
     # Output DES javascript
-    $r->print("<html><head>");
     {
 	my $include = $r->dir_config('lonIncludes');
 	my $jsh=Apache::File->new($include."/londes.js");
 	$r->print(<$jsh>);
     }
+    $r->print(&jscript_send($caller));
     $r->print(<<ENDFORM);
+$errormessage
+
+<p>
+<!-- We separate the forms into 'server' and 'client' in order to
+     ensure that unencrypted passwords will not be sent out by a
+     crappy browser -->
+ENDFORM
+    $r->print(&server_form($logtoken,$caller,$mailtoken));
+    $r->print(&client_form($caller,\%hexkey,$currentpass,$defdom));
+
+    #
+    return;
+}
+
+sub jscript_send {
+    my ($caller) = @_;
+    my $output = qq|
 <script language="JavaScript">
 
     function send() {
@@ -595,76 +1283,158 @@ sub passwordchanger {
         initkeys();
         this.document.pserver.elements.newpass_2.value
             =crypted(this.document.client.elements.newpass_2.value);
-
+|;
+    if ($caller eq 'reset_by_email') {
+        $output .= qq|
+        this.document.pserver.elements.uname.value =
+                   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|
         this.document.pserver.submit();
     }
-
 </script>
-$errormessage
+|;
+}
 
-<p>
-<!-- We separate the forms into 'server' and 'client' in order to
-     ensure that unencrypted passwords will not be sent out by a
-     crappy browser -->
+sub client_form {
+    my ($caller,$hexkey,$currentpass,$defdom) = @_;
+    my %lt=&Apache::lonlocal::texthash(
+                'email' => 'E-mail Address',
+                'username' => 'Username',
+                'domain' => 'Domain',
+                'currentpass' => 'Current Password',
+                'newpass' => 'New Password',
+                'confirmpass' => 'Confirm Password',
+                'changepass' => 'Save');
+    my $output = '<form name="client">'
+                .&Apache::lonhtmlcommon::start_pick_box();
+    if ($caller eq 'reset_by_email') {
+        $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 .= &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'}" />
+<input type="hidden" name="lkey_npass1" value="$hexkey->{'lkey_npass1'}" />
+<input type="hidden" name="ukey_npass2" value="$hexkey->{'ukey_npass2'}" />
+<input type="hidden" name="lkey_npass2" value="$hexkey->{'lkey_npass2'}" />
+</form>
+</p>
+|;
+    return $output;
+}
 
-<form name="pserver" action="/adm/preferences" method="post">
+sub server_form {
+    my ($logtoken,$caller,$mailtoken) = @_;
+    my $action = '/adm/preferences';
+    if ($caller eq 'reset_by_email') {
+        $action = '/adm/resetpw';
+    }
+    my $output = qq|
+<form name="pserver" action="$action" method="post">
 <input type="hidden" name="logtoken"    value="$logtoken" />
-<input type="hidden" name="action"      value="verify_and_change_pass" />
 <input type="hidden" name="currentpass" value="" />
 <input type="hidden" name="newpass_1"   value="" />
 <input type="hidden" name="newpass_2"   value="" />
-</form>
+    |;
+    if ($caller eq 'reset_by_email') {
+        $output .=  qq|
+<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="" />
 
-<form name="client" >
-<table>
-<tr><td align="right"> Current password:                      </td>
-    <td><input type="password" name="currentpass" size="10"/> </td></tr>
-<tr><td align="right"> New password:                          </td>
-    <td><input type="password" name="newpass_1" size="10"  /> </td></tr>
-<tr><td align="right"> Confirm password:                      </td>
-    <td><input type="password" name="newpass_2" size="10"  /> </td></tr>
-<tr><td colspan="2" align="center">
-    <input type="button" value="Change Password" onClick="send();">
-</table>
-<input type="hidden" name="ukey_cpass"  value="$ukey_cpass" />
-<input type="hidden" name="lkey_cpass"  value="$lkey_cpass" />
-<input type="hidden" name="ukey_npass1" value="$ukey_npass1" />
-<input type="hidden" name="lkey_npass1" value="$lkey_npass1" />
-<input type="hidden" name="ukey_npass2" value="$ukey_npass2" />
-<input type="hidden" name="lkey_npass2" value="$lkey_npass2" />
+|;
+    }
+    $output .= qq|
+<input type="hidden" name="action" value="verify_and_change_pass" />
 </form>
-</p>
-ENDFORM
-    #
-    return;
+|;
+    return $output;
 }
 
 sub verify_and_change_password {
-    my $r = shift;
-    my $user       = $ENV{'user.name'};
-    my $domain     = $ENV{'user.domain'};
-    my $homeserver = $ENV{'user.home'};
+    my ($r,$caller,$mailtoken) = @_;
+    my ($user,$domain,$homeserver);
+    if ($caller eq 'reset_by_email') {
+        $user       = $env{'form.uname'};
+        $domain     = $env{'form.udom'};
+        if ($user ne '' && $domain ne '') {
+            $homeserver = &Apache::lonnet::homeserver($user,$domain);
+            if ($homeserver eq 'no_host') {
+        &passwordchanger($r,"<p>\n<span class='LC_error'>".
+                         &mt("Invalid username and/or domain")."</span>\n</p>",
+                         $caller,$mailtoken);
+                return 1;
+            }
+        } else {
+            &passwordchanger($r,"<p>\n<span class='LC_error'>".
+                             &mt("Username and domain were blank")."</span>\n</p>",
+                             $caller,$mailtoken);
+            return 1;
+        }
+    } else {
+        $user       = $env{'user.name'};
+        $domain     = $env{'user.domain'};
+        $homeserver = $env{'user.home'};
+    }
     my $currentauth=&Apache::lonnet::queryauthenticate($user,$domain);
     # Check for authentication types that allow changing of the password.
-    return if ($currentauth !~ /^(unix|internal):/);
-    #
-    $r->print(<<ENDHEADER);
-<html>
-<head>
-<title>LON-CAPA Preferences:  Change password for $user</title>
-</head>
-ENDHEADER
+    if ($currentauth !~ /^(unix|internal):/) {
+        if ($caller eq 'reset_by_email') {
+            &passwordchanger($r,"<p>\n<span class='LC_error'>".
+                             &mt("Authentication type for this user can not be changed by this mechanism").
+                             "</span>\n</p>",
+                              $caller,$mailtoken);
+            return 1;
+        } else {
+            return;
+        }
+    }
     #
-    my $currentpass = $ENV{'form.currentpass'}; 
-    my $newpass1    = $ENV{'form.newpass_1'}; 
-    my $newpass2    = $ENV{'form.newpass_2'};
-    my $logtoken    = $ENV{'form.logtoken'};
+    my $currentpass = $env{'form.currentpass'}; 
+    my $newpass1    = $env{'form.newpass_1'}; 
+    my $newpass2    = $env{'form.newpass_2'};
+    my $logtoken    = $env{'form.logtoken'};
     # Check for empty data 
     unless (defined($currentpass) && 
 	    defined($newpass1)    && 
 	    defined($newpass2)    ){
-	&passwordchanger($r,"<p>\n<font color='#ff0000'>ERROR</font>".
-			 "Password data was blank.\n</p>");
+	&passwordchanger($r,"<p>\n<span class='LC_error'>".
+			 &mt("One or more password fields were blank").
+                         "</span>\n</p>",$caller,$mailtoken);
 	return;
     }
     # Get the keys
@@ -672,34 +1442,55 @@ ENDHEADER
     my $tmpinfo = Apache::lonnet::reply('tmpget:'.$logtoken,$lonhost);
     if (($tmpinfo=~/^error/) || ($tmpinfo eq 'con_lost')) {
         # I do not a have a better idea about how to handle this
+        my $tryagain_text = &mt('Please log out and try again.');
+        if ($caller eq 'reset_by_email') {
+            $tryagain_text = &mt('Please try again later.');
+        }
+        my $unable=&mt("Unable to retrieve saved token for password decryption");
 	$r->print(<<ENDERROR);
 <p>
-<font color="#ff0000">ERROR:</font> Unable to retrieve stored token for
-password decryption.  Please log out and try again.
+<span class="LC_error">$unable.  $tryagain_text</span>
 </p>
 ENDERROR
         # Probably should log an error here
-        return;
+        return 1;
     }
     my ($ckey,$n1key,$n2key)=split(/&/,$tmpinfo);
     # 
     $currentpass = &des_decrypt($ckey ,$currentpass);
     $newpass1    = &des_decrypt($n1key,$newpass1);
     $newpass2    = &des_decrypt($n2key,$newpass2);
-    # 
+    #
+    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);
+            return 1;
+        }
+    } 
     if ($newpass1 ne $newpass2) {
 	&passwordchanger($r,
-			 '<font color="#ff0000">ERROR:</font>'.
-			 'The new passwords you entered do not match.  '.
-			 'Please try again.');
-	return;
+			 '<span class="LC_error">'.
+			 &mt('The new passwords you entered do not match.').'  '.
+			 &mt('Please try again.').'</span>',$caller,$mailtoken);
+	return 1;
     }
     if (length($newpass1) < 7) {
 	&passwordchanger($r,
-			 '<font color="#ff0000">ERROR:</font>'.
-			 'Passwords must be a minimum of 7 characters long.  '.
-			 'Please try again.');
-	return;
+			 '<span class="LC_error">'.
+			 &mt('Passwords must be a minimum of 7 characters long.').'  '.
+			 &mt('Please try again.').'</span>',$caller,$mailtoken);
+	return 1;
     }
     #
     # Check for bad characters
@@ -709,31 +1500,44 @@ ENDERROR
     }
     if ($badpassword) {
 	# I can't figure out how to enter bad characters on my browser.
-	&passwordchanger($r,<<ENDERROR);
-<font color="#ff0000">ERROR:</font>
-The password you entered contained illegal characters.<br />
-Valid characters are: space and <br />
+	my $errormessage ='<span class="LC_error">'.
+           &mt('The password you entered contained illegal characters.').'<br />'.
+           &mt('Valid characters are').(<<"ENDERROR");
+: space and <br />
 <pre>
 !&quot;\#$%&amp;\'()*+,-./0123456789:;&lt;=&gt;?\@
 ABCDEFGHIJKLMNOPQRSTUVWXYZ[\]^_\`abcdefghijklmnopqrstuvwxyz{|}~
-</pre>
+</pre></span>
 ENDERROR
+        &passwordchanger($r,$errormessage,$caller,$mailtoken);
+        return 1;
     }
     # 
     # Change the password (finally)
     my $result = &Apache::lonnet::changepass
-	($user,$domain,$currentpass,$newpass1,$homeserver);
+	($user,$domain,$currentpass,$newpass1,$homeserver,$caller);
     # Inform the user the password has (not?) been changed
+    my $message;
     if ($result =~ /^ok$/) {
-	$r->print(<<"ENDTEXT");
-<h2>The password for $user was successfully changed</h2>
-ENDTEXT
+        $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(<<ENDERROR);
-<h2><font color="#ff0000">The password for $user was not changed</font></h2>
-Please make sure your old password was entered correctly.
-ENDERROR
+        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;
 }
@@ -743,8 +1547,8 @@ ENDERROR
 ################################################################
 sub discussionchanger {
     my $r = shift;
-    my $user       = $ENV{'user.name'};
-    my $domain     = $ENV{'user.domain'};
+    my $user       = $env{'user.name'};
+    my $domain     = $env{'user.domain'};
     my %userenv = &Apache::lonnet::get
         ('environment',['discdisplay','discmarkread']);
     my $discdisp = 'allposts';
@@ -756,7 +1560,7 @@ sub discussionchanger {
         }
     }
     if (defined($userenv{'discmarkread'})) {
-        unless ($userenv{'discdisplay'} eq '') { 
+        unless ($userenv{'discmarkread'} eq '') { 
             $discmark = $userenv{'discmarkread'};
         }
     }
@@ -766,14 +1570,14 @@ sub discussionchanger {
 
     my $function = &Apache::loncommon::get_users_function();
     my $color = &Apache::loncommon::designparm($function.'.tabbg',
-                                                    $ENV{'user.domain'});
+                                                    $env{'user.domain'});
     my %lt = &Apache::lonlocal::texthash(
         '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',
@@ -782,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'};
@@ -802,85 +1606,161 @@ sub discussionchanger {
     }
     
     $r->print(<<"END");
-<form name="server" action="/adm/preferences" method="post">
+<form name="prefs" action="/adm/preferences" method="post">
 <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 />
-<table border="0" cellpadding="0" cellspacing="0">
- <tr>
-  <td width="100%" bgcolor="#000000">
-   <table width="100%" border="0" cellpadding="1" cellspacing="0">
-    <tr>
-     <td width="100%" bgcolor="#000000">
-      <table border="0" cellpadding="3" cellspacing="3" bgcolor="#FFFFFF">
-       <tr bgcolor="$color">
-        <td><b>$lt{'pref'}</b></td>
-        <td><b>$lt{'curr'}</b></td>
-        <td><b>$lt{'actn'}?</b></td>
+$lt{'sdpf'}<br /> $lt{'prca'}  <ol><li>$lt{'whpo'}</li><li>$lt{'unwh'}</li></ol> 
+END
+    $r->print('<p class="LC_info">'.$lt{'thde'}.'</p>');
+
+    $r->print(&Apache::loncommon::start_data_table());
+    $r->print(<<"END");
+       <tr>
+        <th>$lt{'pref'}</th>
+        <th>$lt{'curr'}</th>
+        <th>$lt{'actn'}?</th>
        </tr>
-       <tr bgcolor="#dddddd">
+END
+    $r->print(&Apache::loncommon::start_data_table_row());
+    $r->print(<<"END");
        <td>$lt{'disa'}</td>
        <td>$lt{$discdisp}</td>
-       <td><input type="checkbox" name="discdisp" /><input type="hidden" name="newdisp" value="$newdisp" />&nbsp;$lt{'chgt'} "$dispchange"</td>
-      </tr><tr bgcolor="#eeeeee">
+       <td><label><input type="checkbox" name="discdisp" /><input type="hidden" name="newdisp" value="$newdisp" />&nbsp;$lt{'chgt'} "$dispchange"</label></td>
+END
+    $r->print(&Apache::loncommon::end_data_table_row().
+	      &Apache::loncommon::start_data_table_row());
+    $r->print(<<"END");
        <td>$lt{'npmr'}</td>
        <td>$lt{$discmark}</td>
-       <td><input type="checkbox" name="discmark" /><input type="hidden" name="newmark" value="$newmark" />&nbsp;$lt{'chgt'} "$markchange"</td>
+       <td><label><input type="checkbox" name="discmark" /><input type="hidden" name="newmark" value="$newmark" />&nbsp;$lt{'chgt'} "$markchange"</label></td>
       </tr>
-     </table>
-    </td>
-   </tr>
-  </table>
- </td>
-</tr>
-</table>
-<br />
-<br />
-<input type="submit" name="sub" value="Store Changes" />
-<br />
-<br />
-Note: $lt{'thde'}
-</form>
 END
+    $r->print(&Apache::loncommon::end_data_table_row().
+	      &Apache::loncommon::end_data_table());
+    $r->print('<br />'.
+              '<input type="submit" name="sub" value="'.&mt('Save').'" />'.
+              '</form>');
 }
                                                                                                                 
 sub verify_and_change_discussion {
     my $r = shift;
-    my $user     = $ENV{'user.name'};
-    my $domain   = $ENV{'user.domain'};
+    my $user     = $env{'user.name'};
+    my $domain   = $env{'user.domain'};
     my $message='';
-    if (defined($ENV{'form.discdisp'}) ) {
-        my $newdisp  = $ENV{'form.newdisp'};
+    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 (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);
-</p>
 $message
 ENDVCSCREEN
 }
 
+################################################################
+# Subroutines for page display on course access (Course Coordinators)
+################################################################
+sub coursedisplaychanger {
+    my $r = shift;
+    my $user       = $env{'user.name'};
+    my $domain     = $env{'user.domain'};
+    my %userenv = &Apache::lonnet::get('environment',['course_init_display']);
+    my $currvalue = 'whatsnew';
+    my $firstselect = '';
+    my $whatsnewselect = 'checked="checked"';
+    if (exists($userenv{'course_init_display'})) {
+        if ($userenv{'course_init_display'} eq 'firstres') {
+            $currvalue = 'firstres';
+            $firstselect = 'checked="checked"';
+	    $whatsnewselect = '';
+        }
+    }
+    my %pagenames = (
+                       firstres => 'First resource',
+                       whatsnew => "What's New Page",
+                    );
+    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>&nbsp;'.
+              &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" />
+<br />
+<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('Save').'" />
+</form>');
+}
+
+sub verify_and_change_coursepage {
+    my $r = shift;
+    my $message='';
+    my %lt = &Apache::lonlocal::texthash(
+        'defs' => 'Default now set',
+        'when' => 'when you select a course role from the roles screen',
+        '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", 
+    );
+    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});
+    } else {
+        $message .= $lt{'apwb'}.'<br />';
+        &Apache::lonnet::del('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'})) {
+        if ($newdisp eq 'firstres') {
+            my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
+            my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'}; 
+            my ($furl,$ferr)=
+                &Apache::lonuserstate::readmap($cdom.'/'.$cnum);
+            $message .= '<br /><font size="+1"><a href="'.$furl.'">'.$lt{'gtts'}.' <i>'.&mt('now').'</i></a></font>';
+        } else {
+            $message .= '<br /><font size="+1"><a href="/adm/whatsnew?refpage='.
+                        $refpage.'">'.$lt{'dasp'}.'</a></font>';
+        }
+    }
+    $message = &Apache::lonhtmlcommon::confirm_success($message);
+    $r->print(<<ENDVCSCREEN);
+$message
+ENDVCSCREEN
+}
+
+
 ######################################################
 #            other handler subroutines               #
 ######################################################
@@ -890,8 +1770,8 @@ ENDVCSCREEN
 ################################################################
 sub handler {
     my $r = shift;
-    my $user = $ENV{'user.name'};
-    my $domain = $ENV{'user.domain'};
+    my $user = $env{'user.name'};
+    my $domain = $env{'user.domain'};
     &Apache::loncommon::content_type($r,'text/html');
     # Some pages contain DES keys and should not be cached.
     &Apache::loncommon::no_cache($r);
@@ -899,7 +1779,7 @@ sub handler {
     return OK if $r->header_only;
     #
     &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
-                                            ['action','wysiwyg','returnurl']);
+                                   ['action','wysiwyg','returnurl','refpage']);
     #
     &Apache::lonhtmlcommon::clear_breadcrumbs();
     &Apache::lonhtmlcommon::add_breadcrumb
@@ -924,7 +1804,7 @@ sub handler {
                           breadcrumb => 
                               { href =>'/adm/preferences?action=changepass',
                                 text => 'Change Password'},
-                          printmenu => 'yes',
+                          printmenu => 'not_on_error',
                           }));
     }
     push (@Options,({ action   => 'changescreenname',
@@ -945,27 +1825,28 @@ sub handler {
                       }));
 
     push (@Options,({ action   => 'changemsgforward',
-                      linktext => 'Change Message Forwarding and Notification Addresses',
+                      linktext => 'Messages &amp; 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',
@@ -982,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',
@@ -1029,41 +1912,151 @@ sub handler {
                       printmenu => 'yes',
                       subroutine => \&verify_and_change_discussion, }
                     ));
-                       
+
+    my $role = ($env{'user.adv'} ? 'Roles' : 'Course');
     push (@Options,({ action   => 'changerolespref',
-                      linktext => 'Change Roles Page Preferences',
+                      linktext => 'Change '.$role.' Page Preferences',
                       href     => '/adm/preferences',
                       subroutine => \&rolesprefchanger,
                       breadcrumb =>
                           { href => '/adm/preferences?action=changerolespref',
-                            text => 'Change Roles Pref'},
+                            text => 'Change '.$role.' Page Pref'},
                       },
                     { action   => 'verify_and_change_rolespref',
                       subroutine => \&verify_and_change_rolespref,
                       breadcrumb =>
                           { href => '/adm/preferences?action=changerolespref',
-                            text => 'Change Roles Preferences'},
+                            text => 'Change '.$role.' Page Preferences'},
+                      printmenu => 'yes',
+                      }));
+
+    push (@Options,({ action   => 'changetexenginepref',
+                      linktext => 'Change How Math Equations Are Displayed',
+                      href     => '/adm/preferences',
+                      subroutine => \&texenginechanger,
+                      breadcrumb =>
+                          { href => '/adm/preferences?action=changetexenginepref',
+                            text => 'Change Math Pref'},
+                      },
+                    { action   => 'verify_and_change_texengine',
+                      subroutine => \&verify_and_change_texengine,
+                      breadcrumb =>
+                          { href => '/adm/preferences?action=changetexenginepref',
+                            text => 'Change Math Preferences'},
+                      printmenu => 'yes',
+                      }));
+
+    if ($env{'environment.remote'} eq 'off') {
+	push (@Options,({ action => 'launch',
+			  linktext => 'Launch Remote Control',
+			  href => '/adm/remote?url=/adm/preferences',
+		      }));
+    } else {
+	push (@Options,({ action => 'collapse',
+			  linktext => 'Collapse Remote Control',
+			  href => '/adm/remote?url=/adm/preferences',
+		      }));
+    }
+
+    push (@Options,({ action   => 'changeicons',
+                      linktext => 'Change How Menus are Displayed',
+                      href     => '/adm/preferences',
+                      subroutine => \&iconchanger,
+                      breadcrumb =>
+                          { href => '/adm/preferences?action=changeicons',
+                            text => 'Change Main Menu'},
+                      },
+                    { action   => 'verify_and_change_icons',
+                      subroutine => \&verify_and_change_icons,
+                      breadcrumb =>
+                          { href => '/adm/preferences?action=changeicons',
+                            text => 'Change Main Menu'},
+                      printmenu => 'yes',
+                      }));
+    if ($env{'user.adv'}) {
+        push (@Options,({ action   => 'changeclicker',
+                          linktext => 'Register Response Devices (&quot;Clickers&quot;)',
+                          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 ($ENV{'user.name'} =~ /^(albertel|fox|foxr|koretemey|korte|hallmat3|turtle)$/) {
+    if (&Apache::lonnet::allowed('whn',$env{'request.course.id'})
+	|| &Apache::lonnet::allowed('whn',$env{'request.course.id'}.'/'
+				    .$env{'request.course.sec'})) {
+        push (@Options,({ action => 'changecourseinit',
+                          linktext => 'Change Course Initialization Preference',
+                          href => '/adm/preferences',
+                          subroutine => \&coursedisplaychanger,
+                          breadcrumb =>
+                              { href => '/adm/preferences?action=changecourseinit',
+                                text => 'Change Course Init. Pref.'},
+                          },
+                        { action => 'verify_and_change_coursepage',
+                          breadcrumb =>
+                          { href => '/adm/preferences?action=changecourseinit',                               text => 'Change Course Initialization Preference'},
+                        printmenu => 'yes',
+                        subroutine => \&verify_and_change_coursepage,
+                       }));
+    }
+
+    if ($env{'user.name'} =~ /^(albertel|fox|foxr|kortemey|korte|raeburn)$/) {
         push (@Options,({ action => 'debugtoggle',
                           printmenu => 'yes',
                           subroutine => \&toggle_debug,
                           }));
     }
-    $r->print(<<ENDHEADER);
-<html>
-<head>
-<title>LON-CAPA Preferences</title>
-</head>
-ENDHEADER
+
+    $r->print(&Apache::loncommon::start_page('Change Preferences'));
+
     my $call = undef;
     my $help = undef;
     my $printmenu = 'yes';
     foreach my $option (@Options) {
-        if ($option->{'action'} eq $ENV{'form.action'}) {
+        if ($option->{'action'} eq $env{'form.action'}) {
             $call = $option->{'subroutine'};
             $printmenu = $option->{'printmenu'};
             if (exists($option->{'breadcrumb'})) {
@@ -1073,21 +2066,22 @@ ENDHEADER
 	    $help=$option->{'help'};
         }
     }
-    $r->print(&Apache::loncommon::bodytag('Change Preferences'));
-    $r->print(&Apache::lonhtmlcommon::breadcrumbs
-              (undef,'Change Preferences',$help));
+    $r->print(&Apache::lonhtmlcommon::breadcrumbs('Change Preferences',$help));
+    my $error;
     if (defined($call)) {
-        $call->($r);
+        $error = $call->($r);
     }
-    if (($printmenu eq 'yes') && (!$ENV{'form.returnurl'})) {
+    if ( ( ($printmenu eq 'yes')
+	   || ($printmenu eq 'not_on_error' && !$error) )
+	 && (!$env{'form.returnurl'})) {
         my $optionlist = '<table cellpadding="5">';
-        if ($ENV{'user.name'} =~ 
-                         /^(albertel|kortemey|fox|foxr|korte|hallmat3|turtle)$/
+        if ($env{'user.name'} =~ 
+                         /^(albertel|kortemey|fox|foxr|korte|hallmat3|turtle|raeburn)$/
             ) {
             push (@Options,({ action => 'debugtoggle',
                               linktext => 'Toggle Debug Messages',
                               text => 'Current Debug status is -'.
-                                  $ENV{'user.debug'}.'-.',
+                                  $env{'user.debug'}.'-.',
                               href => '/adm/preferences',
                               printmenu => 'yes',
                               subroutine => \&toggle_debug,
@@ -1096,9 +2090,10 @@ ENDHEADER
         foreach my $option(@Options) {
             my $optiontext = '';
             if (exists($option->{'href'})) {
-                $optiontext .= 
-                    '<a href="'.$option->{'href'}.
-                    '?action='.$option->{'action'}.'">'.
+		$option->{'href_args'}{'action'}=$option->{'action'};
+		$optiontext .= 
+                    '<a href="'.&add_get_param($option->{'href'},
+					       $option->{'href_args'}).'">'.
                     &mt($option->{'linktext'}).'</a>';
             }
             if (exists($option->{'text'})) {
@@ -1119,22 +2114,19 @@ ENDHEADER
         }
         $optionlist .= '</table>';
         $r->print($optionlist);
-    } elsif ($ENV{'form.returnurl'}) {
-	$r->print('<br /><a href="'.$ENV{'form.returnurl'}.'"><font size="+1">'.
+    } elsif ($env{'form.returnurl'}) {
+	$r->print('<br /><a href="'.$env{'form.returnurl'}.'"><font size="+1">'.
 		  &mt('Return').'</font></a>');
     }
-    $r->print(<<ENDFOOTER);
-</body>
-</html>
-ENDFOOTER
+    $r->print(&Apache::loncommon::end_page());
     return OK;
 }
 
 sub toggle_debug {
-    if ($ENV{'user.debug'}) {
-        &Apache::lonnet::delenv('user\.debug');
+    if ($env{'user.debug'}) {
+        &Apache::lonnet::delenv('user.debug');
     } else {
-        &Apache::lonnet::appenv('user.debug' => 1);
+        &Apache::lonnet::appenv({'user.debug' => 1});
     }
 }