--- loncom/interface/lonpreferences.pm	2009/05/27 17:14:56	1.164
+++ loncom/interface/lonpreferences.pm	2012/05/25 14:53:36	1.196.4.3
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Preferences
 #
-# $Id: lonpreferences.pm,v 1.164 2009/05/27 17:14:56 bisitz Exp $
+# $Id: lonpreferences.pm,v 1.196.4.3 2012/05/25 14:53:36 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -42,6 +42,7 @@ use Apache::loncommon();
 use Apache::lonhtmlcommon();
 use Apache::lonlocal;
 use Apache::lonnet;
+use LONCAPA::lonauthcgi();
 use LONCAPA();
 
 #
@@ -116,7 +117,7 @@ sub wysiwygchanger {
     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>";
+       $warning.='<p class="LC_warning">'.&mt("The WYSIWYG editor only supports simple HTML and is in many cases unsuited for advanced authoring. In a number of cases, it may destroy advanced authoring involving LaTeX and script function calls.")."</p>";
     }
     $r->print(<<ENDLSCREEN);
 <form name="prefs" action="/adm/preferences" method="post">
@@ -165,8 +166,12 @@ sub languagechanger {
 	               = &Apache::loncommon::plainlanguagedescription($_);
 	}
     }
-    my $selectionbox=&Apache::loncommon::select_form($language,'language',
-						     %langchoices);
+    %langchoices = &Apache::lonlocal::texthash(%langchoices);
+    my $selectionbox=
+           &Apache::loncommon::select_form(
+               $language,
+               'language',
+               \%langchoices);
     $r->print(<<ENDLSCREEN);
 <form name="prefs" action="/adm/preferences" method="post">
 <input type="hidden" name="action" value="verify_and_change_languages" />
@@ -187,7 +192,12 @@ sub verify_and_change_languages {
     if ($newlanguage) {
         &Apache::lonnet::put('environment',{'languages' => $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>.'));
+        $message=&Apache::lonhtmlcommon::confirm_success(
+            &mt('Set [_1] to [_2]',
+                '<i>'.&mt('Preferred language').'</i>',
+                '<tt>"'.$newlanguage.'"</tt>.'))
+           .'<br />'
+           .&mt('The change will become active on the next page.');
     } else {
         &Apache::lonnet::del('environment',['languages']);
         &Apache::lonnet::delenv('environment.languages');
@@ -205,9 +215,9 @@ sub texenginechanger {
     my $r = shift;
     Apache::lonhtmlcommon::add_breadcrumb(
 	    {	href => '/adm/preferences?action=changetexenginepref',
-                text => 'Change How Math Equations Are Displayed'});
+                text => 'Math display settings'});
     $r->print(Apache::loncommon::start_page('Content Display Settings'));
-    $r->print(Apache::lonhtmlcommon::breadcrumbs('Change How Math Equations Are Displayed'));
+    $r->print(Apache::lonhtmlcommon::breadcrumbs('Math display settings'));
     my $user       = $env{'user.name'};
     my $domain     = $env{'user.domain'};
     my %userenv = &Apache::lonnet::get('environment',['texengine']);
@@ -217,16 +227,24 @@ sub texenginechanger {
 		     'tth' => 'tth (TeX to HTML)',
 		     #'ttm' => 'TeX to MathML',
 		     'jsMath' => 'jsMath',
-		     'mimetex' => 'mimetex (Convert to Images)'
+                     'MathJax' => 'MathJax',
+		     'mimetex' => 'mimetex (Convert to Images)',
+                     'raw' => 'Raw (Screen Reader)'
                      );
-    my $selectionbox=&Apache::loncommon::select_form($texengine,'texengine',
-						     %mathchoices);
+    %mathchoices = &Apache::lonlocal::texthash(%mathchoices);
+    my $selectionbox=
+           &Apache::loncommon::select_form(
+               $texengine,
+               'texengine',
+               \%mathchoices);
+    my $MathJax_start=&Apache::lontexconvert::MathJax_header();
     my $jsMath_start=&Apache::lontexconvert::jsMath_header();
     my %lt=&Apache::lonlocal::texthash(
-      'headline' => 'Change Math Preferences',
-      'preftxt'  => 'Preferred method to display Math',
+      'headline' => 'Change how math is displayed',
+      'preftxt'  => 'Preferred method to display math',
       'change'   => 'Save',
       'exmpl'    => 'Examples',
+      'mathjax'  => 'MathJax:',
       'jsmath'   => 'jsMath:',
       'tth'      => 'tth (TeX to HTML):',
       'mimetex'  => 'mimetex (Convert to Images):',
@@ -261,6 +279,14 @@ $lt{'preftxt'}: $selectionbox
 <hr />
 $lt{'exmpl'}
 
+<h3>$lt{'mathjax'}</h3>
+</script>
+<iframe src="/res/adm/pages/math_example.tex?inhibitmenu=yes&texengine=MathJax" width="400" height="120"></iframe>
+</p>
+<p>
+MathJax provides rendered equations whose source code can be extracted in TeX and MathML formats by right clicking the equation.
+</p>
+
 <h3>$lt{'jsmath'}</h3> 
 <p>
 $jsMath_start
@@ -268,6 +294,7 @@ $jsMath_start
 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>
@@ -279,7 +306,7 @@ if (jsMath.nofonts == 1) {
 
 <h3>$lt{'tth'}</h3>
 <p>
-<iframe src="/res/adm/pages/math_example.tex?inhibitmenu=yes&texengine=tth" width="400" height="200"></iframe>
+<iframe src="/res/adm/pages/math_example.tex?inhibitmenu=yes&texengine=tth" width="400" height="220"></iframe>
 </p>
 ENDLSCREEN
     if ($env{'environment.texengine'} ne 'jsMath') {
@@ -391,13 +418,20 @@ sub rolesprefchanger {
 </p>
 <form name="prefs" action="/adm/preferences" method="post">
 <input type="hidden" name="action" value="verify_and_change_rolespref" />
-<br /><label>'.&mt('Enable Recent '.$role.'s Hotlist:').'
-<input type="checkbox"'.$checked.' name="recentroles" value="true" /></label>
-<br />'.&mt('Number of '.$role.'s in Hotlist:').'
-<select name="recentrolesn" size="1">
-'.$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.').'
+<br />'.
+'<h2>'.&mt('Recent '.$role.'s Hotlist').'</h2>'.
+&Apache::lonhtmlcommon::start_pick_box().
+&Apache::lonhtmlcommon::row_title('<label for="Hotlist">'.&mt('Enable Recent '.$role.'s Hotlist').'</label>').
+'<input id="Hotlist" type="checkbox"'.$checked.' name="recentroles" value="true" />'.
+&Apache::lonhtmlcommon::row_closure().
+&Apache::lonhtmlcommon::row_title('<label for="NumberOfRoles">'.&mt('Number of '.$role.'s in Hotlist').'</label>').
+'<select name="recentrolesn" size="1" id ="NumberOfRoles">'.
+$options.
+'</select>'.
+&Apache::lonhtmlcommon::row_closure(1).
+&Apache::lonhtmlcommon::end_pick_box().
+'<br/><h2>'.&mt('Freeze Roles').'</h2>'.
+'<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 />
@@ -447,19 +481,15 @@ sub verify_and_change_rolespref {
     if ($hotlist_flag) {
         &Apache::lonnet::put('environment',{'recentroles' => $hotlist_flag});
         &Apache::lonnet::appenv({'environment.recentroles' => $hotlist_flag});
-        $message=&mt('Recent '.$role.'s Hotlist is Enabled');
+        $message=&Apache::lonhtmlcommon::confirm_success(&mt('Recent '.$role.'s Hotlist is Enabled.')." ".&mt('Display [_1] Most Recent '.$role.'s.',$hotlist_n));
     } else {
         &Apache::lonnet::del('environment',['recentroles']);
         &Apache::lonnet::delenv('environment.recentroles');
-        $message=&mt('Recent '.$role.'s Hotlist is Disabled');
+        $message=&Apache::lonhtmlcommon::confirm_success(&mt('Recent '.$role.'s Hotlist is Disabled'));
     }
     if ($hotlist_n) {
         &Apache::lonnet::put('environment',{'recentrolesn' => $hotlist_n});
         &Apache::lonnet::appenv({'environment.recentrolesn' => $hotlist_n});
-        if ($hotlist_flag) {
-            $message.="<br />".
-		&mt('Display [_1] Most Recent '.$role.'s',$hotlist_n)."\n";
-        }
     }
 
 # Get list of froze roles and list of recent roles
@@ -578,36 +608,50 @@ sub verify_and_change_screenname {
 sub iconchanger {
     my $r = shift;
     &Apache::lonhtmlcommon::add_breadcrumb(
-	    {	href => '/adm/preferences?action=changeicons',
-                text => 'Change Main Menu'});
+            {   href => '/adm/preferences?action=changeicons',
+                text => 'Change Menu Display'});
     $r->print(Apache::loncommon::start_page('Page Display Settings'));
-    $r->print(Apache::lonhtmlcommon::breadcrumbs('Change Main Menu'));
+    $r->print(Apache::lonhtmlcommon::breadcrumbs('Change Menu Display'));
 
     my $user       = $env{'user.name'};
     my $domain     = $env{'user.domain'};
-    my %userenv = &Apache::lonnet::get
-        ('environment',['icons']);
+    my %userenv = &Apache::lonnet::get('environment',['icons']);
     my $iconic='checked="checked"';
-    my $classic='';
-    my $onlyicon='';
+    my ($classic,$onlyicon,$iconic_preview,$iconsonly_preview);
     if ($userenv{'icons'} eq 'classic') {
-       $classic='checked="checked"';
-       $iconic='';
+        $iconic='';
+        $classic='<div class="LC_info">'.
+                 &mt('Your current selection: "Use buttons and text" is deprecated - it is recommended that you change this to "Use icons and text".').'</div>';
     }
     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');
+    my %lt = &icon_options();
+    my ($inlinetools,$toolsorder) = &icon_previews();
+    if ((ref($inlinetools) eq 'HASH') && (ref($toolsorder) eq 'ARRAY')) {
+        foreach my $tool (@{$toolsorder}) {
+            my ($command,$row,$col,$img,$top,$bot,$act,$desc) = 
+                split(/\&/,$inlinetools->{$tool});
+            $iconic_preview .= '<li><a title="'.$desc.'" class="LC_menubuttons_link" href=""><img alt="'.$desc.'" src="/res/adm/pages/'.$img.'"  class="LC_icon" /><span class="LC_menubuttons_inline_text">'.$top.('&nbsp;' x 2).'</span></a></li>';
+            $iconsonly_preview .= '<li><a title="'.$desc.'" class="LC_menubuttons_link" href=""><img alt="'.$desc.'" src="/res/adm/pages/'.$img.'"  class="LC_icon" />&nbsp;</a></li>';
+        }
+    }
+    $iconsonly_preview = '<ul class="LC_breadcrumb_tools_outerlist"><li>'.
+                         '<ul>'.
+                         $iconsonly_preview.
+                         '</ul></li></ul>';
+    $iconic_preview = '<ul class="LC_breadcrumb_tools_outerlist"><li>'.
+                      '<ul>'.
+                      $iconic_preview.
+                      '</ul></li></ul>'; 
     $r->print(<<ENDSCREEN);
+$classic
 <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 />
+<label><input type="radio" name="menumode" value="iconic" $iconic /> $lt{'iconic'}</label>$iconic_preview<br />
+<label><input type="radio" name="menumode" value="iconsonly" $onlyicon /> $lt{'iconsonly'}</label>$iconsonly_preview<br />
 <input type="submit" value="$change" />
 </form>
 ENDSCREEN
@@ -618,14 +662,46 @@ sub verify_and_change_icons {
     my $user       = $env{'user.name'};
     my $domain     = $env{'user.domain'};
     my $newicons   = $env{'form.menumode'};
-
+    my %lt = &icon_options();
+    my $newchoice = $newicons;
+    if ($lt{$newicons}) {
+        $newchoice = $lt{$newicons};
+    }
     &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>'));
+    my $message=&Apache::lonhtmlcommon::confirm_success(&mt('Set [_1] to [_2]','<i>'.&mt('Menu Display').'</i>','<tt>'.$newchoice.'</tt>'));
     $message=&Apache::loncommon::confirmwrapper($message);
     &print_main_menu($r, $message);
 }
 
+sub icon_options {
+    return &Apache::lonlocal::texthash(
+                                        iconic    => 'Use icons and text',
+                                        iconsonly => 'Use icons only',
+                                      );
+}
+
+sub icon_previews {
+     my %icon_text = (
+                      annotate => 'Notes',
+                      wishlist => 'Wishlist',
+                      catalog  => 'Info',
+                      evaluate => 'Evaluate',
+                      feedback => 'Communicate',
+                      printout => 'Print',
+                     );
+    my %inlinetools = (
+        printout => "s&8&3&prt.png&$icon_text{'printout'}&printout[_1]&gopost('/adm/printout',currentURL)&Prepare a printable document",
+        wishlist => "s&9&1&wishlist-link.png&$icon_text{'wishlist'}&wishlistlink[_2]&set_wishlistlink()&Set a link for this resource to wishlist",
+        evaluate => "s&8&1&eval.png&$icon_text{'evaluate'}&this[_1]&gopost('/adm/evaluate',currentURL,1)&Provide my evaluation of this resource",
+        feedback => "s&8&2&fdbk.png&$icon_text{'feedback'}&discuss[_1]&gopost('/adm/feedback',currentURL,1)&Provide feedback messages or contribute to the course discussion about this resource",
+        annotate => "s&9&3&anot.png&$icon_text{'annotate'}&tations[_1]&annotate()&Make notes and annotations about this resource",
+        catalog  => "s&6&3&catalog.png&$icon_text{'catalog'}&info[_1]&catalog_info()&Show Metadata",
+    );
+    my @toolsorder = qw(annotate wishlist evaluate feedback printout catalog);
+    return (\%inlinetools,\@toolsorder);
+}
+
 ################################################################
 #                     Clicker Subroutines                      #
 ################################################################
@@ -777,11 +853,11 @@ sub msgforwardchanger {
                                           all   => 'All',
                                           crit  => 'Critical only',
                                           reg   => 'Non-critical only',
-                                          foad  => 'Forwarding Address(es)',
-                                          noti  => 'Notification E-mail Address(es)', 
+                                          foad  => 'Forward to account(s)',
+                                          fwdm  => 'Forward messages to other account(s) in LON-CAPA',
+                                          noti  => 'E-mail notification of LON-CAPA messages',
                                           foad_exmpl => 'e.g. <tt>userA:domain1,userB:domain2,...</tt>',
-                                          mnot  => 'E-mail Address(es) which should be notified about new LON-CAPA messages',
- # old: 'Message Notification Email Address(es)',
+                                          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 ',
@@ -791,9 +867,9 @@ sub msgforwardchanger {
                                         );
     Apache::lonhtmlcommon::add_breadcrumb(
 	    {	href => '/adm/preferences?action=changemsgforward',
-		text => 'Change Message Forwarding/Notification'});
-    $r->print(Apache::loncommon::start_page('Message Management'));
-    $r->print(Apache::lonhtmlcommon::breadcrumbs('Change Message Forwarding/Notification'));
+		text => 'Messages & Notifications'});
+    $r->print(Apache::loncommon::start_page('Messages &amp; Notifications'));
+    $r->print(Apache::lonhtmlcommon::breadcrumbs('Messages &amp; Notifications'));
     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");
@@ -859,11 +935,12 @@ $validatescript
     $r->print(<<ENDMSG);
 $jscript
 $message
-<h3>$lt{'foad'} $forwardingHelp</h3>
+<h3>$lt{'fwdm'} $forwardingHelp</h3>
 <form name="prefs" action="/adm/preferences" method="post">
 <input type="hidden" name="action" value="verify_and_change_msgforward" />
 $lt{'foad'} ($lt{'foad_exmpl'}):
-<input type="text" size="40" value="$msgforward" name="msgforward" /><br />
+<input type="text" size="40" value="$msgforward" name="msgforward" />
+<br /><br />
 <h3>$lt{'noti'} $notificationHelp</h3>
 $lt{'mnot'} ($lt{'mnot_exmpl'}):<br />
 ENDMSG
@@ -908,7 +985,7 @@ ENDMSG
                        '<input type="radio" name="notify_type_'.$num. 
                        '" value="'.$type.'" '.$chk{$type}.
                        ' onchange="javascript:address_changes('."'$num'".')" />'.
-                       $lt{$type}.'</label></span>&nbsp;';
+                       $lt{$type}.'</label></span>'.('&nbsp;' x4);
         }
         my $htmlon = '';
         my $htmloff = '';
@@ -920,7 +997,7 @@ ENDMSG
         $output .= '</td><td><label><input type="radio" name="html_'.$num.
                    '" value="1" '.$htmlon.
                    ' onchange="javascript:address_changes('."'$num'".')" />'.
-                   &mt('Yes').'</label>&nbsp;'.
+                   &mt('Yes').'</label>'.('&nbsp;' x3).
                    '<label><input type="radio" name="html_'.$num.'" value="0" '.
                    $htmloff. ' onchange="javascript:address_changes('."'$num'".
 ')" />'.
@@ -945,10 +1022,10 @@ ENDMSG
         $output .= '<span class="LC_nobreak"><label>'.
                    '<input type="radio" name="notify_type_'.$num.
                    '" value="'.$type.'" '.$defchk{$type}.'/>'.
-                   $lt{$type}.'</label></span>&nbsp;';
+                   $lt{$type}.'</label></span>'.('&nbsp;' x4);
     }
     $output .= '</td><td><label><input type="radio" name="html_'.$num.
-               '" value="1" />'.&mt('Yes').'</label>&nbsp;'.
+               '" value="1" />'.&mt('Yes').'</label>'.('&nbsp;' x3).
                '<label><input type="radio" name="html_'.$num.'" value="0" '.
                ' checked="checked" />'.
                &mt('No').'</label></td>'.
@@ -986,28 +1063,32 @@ sub verify_and_change_msgforward {
     my $domain     = $env{'user.domain'};
     my $newscreen  = '';
     my $message='';
-    foreach (split(/\,/,$env{'form.msgforward'})) {
-	my ($msuser,$msdomain)=split(/[\@\:]/,$_);
+    foreach my $recip (split(/\,/,$env{'form.msgforward'})) {
+        my ($msuser,$msdomain);
+        if ($recip =~ /:/) {
+            ($msuser,$msdomain)=split(':',$recip);
+        } else {
+            ($msuser,$msdomain)=split(/\@/,$recip);
+        }
         $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.= &mt('No such user: ').'<tt>'.$msuser.':'.$msdomain.'</tt><br />';
-           }
+                $newscreen.=$msuser.':'.$msdomain.',';
+	    } else {
+                $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 .= &mt('Set message forwarding to ').'<tt>"'.$newscreen.'"</tt>.'
-                    .'<br />';
+        $message .= &Apache::lonhtmlcommon::confirm_success(&mt('Set message forwarding to ').'<tt>"'.$newscreen.'"</tt>.<br />');
     } else {
         &Apache::lonnet::del('environment',['msgforward']);
         &Apache::lonnet::delenv('environment.msgforward');
-        $message.= &mt("Set message forwarding to 'off'.").'<br />';
+        $message.= &Apache::lonhtmlcommon::confirm_success(&mt("Set message forwarding to 'off'.").'<br />');
     }
     my $critnotification;
     my $notification;
@@ -1043,43 +1124,41 @@ sub verify_and_change_msgforward {
     if ($notification) {
         &Apache::lonnet::put('environment',{'notification' => $notification});
         &Apache::lonnet::appenv({'environment.notification' => $notification});
-        $message.=&mt('Set non-critical message notification address(es) to ').'<tt>"'.$notification.'"</tt>.<br />';
+        $message.=&Apache::lonhtmlcommon::confirm_success(&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.=&mt("Set non-critical message notification to 'off'.").'<br />';
+        $message.=&Apache::lonhtmlcommon::confirm_success(&mt("Set non-critical message notification to 'off'.").'<br />');
     }
     if ($critnotification) {
         &Apache::lonnet::put('environment',{'critnotification' => $critnotification});
         &Apache::lonnet::appenv({'environment.critnotification' => $critnotification});
-        $message.=&mt('Set critical message notification address(es) to ').'<tt>"'.$critnotification.'"</tt>.<br />';
+        $message.=&Apache::lonhtmlcommon::confirm_success(&mt('Set critical message notification address(es) to ').'<tt>"'.$critnotification.'"</tt>.<br />');
     } else {
         &Apache::lonnet::del('environment',['critnotification']);
         &Apache::lonnet::delenv('environment.critnotification');
-        $message.=&mt("Set critical message notification to 'off'.").'<br />';
+        $message.=&Apache::lonhtmlcommon::confirm_success(&mt("Set critical message notification to 'off'.").'<br />');
     }
     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>.';
+            $message.=&Apache::lonhtmlcommon::confirm_success(&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.");
+                $message.=&Apache::lonhtmlcommon::confirm_success(&mt("Set notification address to receive excerpts with html stripped."));
             } else {
-                $message.=&mt("Set all notification addresses to receive excerpts with html stripped.");
+                $message.=&Apache::lonhtmlcommon::confirm_success(&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);
+    $message=&Apache::loncommon::confirmwrapper($message);
     &msgforwardchanger($r,$message);
 }
 
@@ -1128,16 +1207,10 @@ sub colorschanger {
     $r->print(<<ENDCOL);
 <script type="text/javascript" language="JavaScript">
 
-    function pclose() {
-        parmwin=window.open("/adm/rat/empty.html","LONCAPAparms",
-                 "height=350,width=350,scrollbars=no,menubar=no");
-        parmwin.close();
-    }
-
     $pjump_def
 
     function psub() {
-        pclose();
+        modalWindow.close();
         if (document.parmform.pres_marker.value!='') {
             if (document.parmform.pres_type.value!='') {
                 eval('document.prefs.'+
@@ -1220,7 +1293,7 @@ sub passwordchanger {
     # This function is a bit of a mess....
     # Passwords are encrypted using londes.js (DES encryption)
     $errormessage = ($errormessage || '');
-    my ($user,$domain,$currentpass,$defdom);
+    my ($user,$domain,$currentpass);
     &Apache::lonhtmlcommon::add_breadcrumb(
 		{ href => '/adm/preferences?action=changepass',
                   text => 'Change Password'});
@@ -1235,7 +1308,6 @@ sub passwordchanger {
             $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.'
@@ -1256,7 +1328,10 @@ sub passwordchanger {
                 $r->print(&mt('Sorry, the URL generated when you requested reset of your password contained incomplete information.').'<br />');
                 return;
             }
-   } else {
+            if (&Apache::lonnet::domain($domain) eq '') {
+                $domain = $r->dir_config('lonDefDomain');
+            }
+    } else {
         $r->print(&mt('Page requested in unexpected context').'<br />');
         return;
     }
@@ -1300,7 +1375,7 @@ $errormessage
      crappy browser -->
 ENDFORM
     $r->print(&server_form($logtoken,$caller,$mailtoken));
-    $r->print(&client_form($caller,\%hexkey,$currentpass,$defdom));
+    $r->print(&client_form($caller,\%hexkey,$currentpass,$domain));
 
     #
     return;
@@ -1337,6 +1412,8 @@ sub jscript_send {
                    this.document.client.elements.uname.value;
         this.document.pserver.elements.udom.value =
                    this.document.client.elements.udom.options[this.document.client.elements.udom.selectedIndex].value;
+        this.document.pserver.elements.email.value =
+                   this.document.client.elements.email.value;
 |;
     }
     $ output .= qq|
@@ -1355,7 +1432,8 @@ sub client_form {
                 'currentpass' => 'Current Password',
                 'newpass' => 'New Password',
                 'confirmpass' => 'Confirm Password',
-                'changepass' => 'Save');
+                'changepass' => 'Save',
+    );
 
     my $output = '<form name="client">'
                 .&Apache::lonhtmlcommon::start_pick_box();
@@ -1420,6 +1498,7 @@ sub server_form {
 <input type="hidden" name="token"   value="$mailtoken" />
 <input type="hidden" name="uname"   value="" />
 <input type="hidden" name="udom"   value="" />
+<input type="hidden" name="email"   value="" />
 
 |;
     }
@@ -1564,7 +1643,8 @@ ENDERROR
     # Inform the user the password has (not?) been changed
     my $message;
     if ($result =~ /^ok$/) {
-        $message = &Apache::lonhtmlcommon::confirm_success(&mt('The password for user [_1] was successfully changed.','<i>'.$user.'<i>'));
+        $message = &Apache::lonhtmlcommon::confirm_success(&mt('The password for user [_1] was successfully changed.','<i>'.$user.'</i>'));
+        $message = &Apache::loncommon::confirmwrapper($message);
         if ($caller eq 'reset_by_email') {
             $r->print($message.'<br />');
         } else {
@@ -1572,13 +1652,18 @@ ENDERROR
         }
     } else {
 	# error error: run in circles, scream and shout
-        $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);
-        unless ($caller eq 'reset_by_email') {
+        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);
             $message=&Apache::loncommon::confirmwrapper($message);
             &print_main_menu($r, $message);
         }
-        return 1;
     }
     return;
 }
@@ -1591,7 +1676,7 @@ sub discussionchanger {
     Apache::lonhtmlcommon::add_breadcrumb(
 	    {	href => '/adm/preferences?action=changediscussions',
                 text => 'Change Discussion Preferences'});
-    $r->print(Apache::loncommon::start_page('Message Management'));
+    $r->print(Apache::loncommon::start_page('Change Discussion Preferences'));
     $r->print(Apache::lonhtmlcommon::breadcrumbs('Change Discussion Preferences'));
     my $user       = $env{'user.name'};
     my $domain     = $env{'user.domain'};
@@ -1606,7 +1691,7 @@ sub discussionchanger {
         }
     }
     if (defined($userenv{'discmarkread'})) {
-        unless ($userenv{'discdisplay'} eq '') { 
+        unless ($userenv{'discmarkread'} eq '') { 
             $discmark = $userenv{'discmarkread'};
         }
     }
@@ -1624,13 +1709,13 @@ sub discussionchanger {
         '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 discussion board or resource, and',
-        'unwh' => 'Under what circumstances posts are identfied as "New"',
+        'unwh' => 'Under what circumstances posts are identified as "NEW"',
         'allposts' => 'All posts',
         'unread' => 'New posts only',
         'ondisp' => 'Once displayed',
-        'onmark' => 'Once marked as read',
+        'onmark' => 'Once marked not NEW',
         'disa' => 'Posts displayed?',
-        'npmr' => 'New posts cease to be identified as "New"?',
+        '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 '
     );
@@ -1650,7 +1735,7 @@ sub discussionchanger {
         $currmark = $lt{'ondisp'};
         $newmark = 'onmark';
     }
-    
+
     $r->print(<<"END");
 <form name="prefs" action="/adm/preferences" method="post">
 <input type="hidden" name="action" value="verify_and_change_discussion" />
@@ -1699,11 +1784,11 @@ sub verify_and_change_discussion {
     if (defined($env{'form.discdisp'}) ) {
         my $newdisp  = $env{'form.newdisp'};
         if ($newdisp eq 'unread') {
-            $message .=&mt('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});
         } else {
-            $message .= &mt('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');
         }
@@ -1715,7 +1800,7 @@ sub verify_and_change_discussion {
             &Apache::lonnet::put('environment',{'discmarkread' => $newmark});
             &Apache::lonnet::appenv({'environment.discmarkread' => $newmark});
         } else {
-            $message.=&Apache::lonhtmlcommon::confirm_success(&mt('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 not "NEW".')).'<br />';
             &Apache::lonnet::del('environment',['discmarkread']);
             &Apache::lonnet::delenv('environment.discmarkread');
         }
@@ -1802,13 +1887,102 @@ sub verify_and_change_coursepage {
             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>';
+            $message .= '<br /><a href="'.$furl.'">'.$lt{'gtts'}.' <i>'.&mt('now').'</i></a>';
         } else {
-            $message .= '<br /><font size="+1"><a href="/adm/whatsnew?refpage='.
-                        $refpage.'">'.$lt{'dasp'}.'</a></font>';
+            $message .= '<br /><a href="/adm/whatsnew?refpage='.
+                        $refpage.'">'.$lt{'dasp'}.'</a>';
         }
     }
-    &print_main_menu($r, &Apache::lonhtmlcommon::confirm_success($message));
+    $message = &Apache::lonhtmlcommon::confirm_success($message);
+    $message = &Apache::loncommon::confirmwrapper($message);
+    &print_main_menu($r,$message);
+}
+
+sub lockednameschanger {
+    my $r = shift;
+    &Apache::lonhtmlcommon::add_breadcrumb(
+            {   href => '/adm/preferences?action=changelockednames',
+                text => 'Automatic name changes'});
+    $r->print(Apache::loncommon::start_page('Automatic name changes'));
+    $r->print(Apache::lonhtmlcommon::breadcrumbs('Allow/disallow name updates'));
+    my %userenv = &Apache::lonnet::get('environment',['lockedname']);
+    my $lockedname='';
+    if (&can_toggle_namelocking()) {
+        if ($userenv{'lockedname'}) {
+            $lockedname = ' checked="checked"';
+        }
+        my %updateable;
+        my %domconfig =
+            &Apache::lonnet::get_dom('configuration',['autoupdate'],$env{'user.domain'});
+        if (ref($domconfig{'autoupdate'}) eq 'HASH') {
+            if ($domconfig{'autoupdate'}{'run'}) {
+                my @inststatuses = split(':',$env{'environment.inststatus'});
+                unless (@inststatuses) {
+                    @inststatuses = ('default');
+                }
+                %updateable = &updateable_userinfo($domconfig{'autoupdate'},\@inststatuses);
+            }
+        }
+        if (keys(%updateable)) {
+            my %longnames = &Apache::lonlocal::texthash (
+                                firstname  => 'First Name',
+                                middlename => 'Middle Name',
+                                lastname   => 'Last Name',
+                            );
+            my $text=&mt('By default, based on your institutional affiliation, your LON-CAPA account can be automatically updated nightly based on directory information from your institution.').'<br />'.&mt('The following may be updated, unless you disallow updates:').
+                     '<ul>';
+           foreach my $item ('firstname','middlename','lastname') {
+               if ($updateable{$item}) {
+                   $text .= '<li>'.$longnames{$item}.'</li>';
+               }
+           }
+           $text .= '</ul>'; 
+           my $locking=&mt('Disallow automatic updates to name information for your LON-CAPA account');
+           my $change=&mt('Save');
+           $r->print(<<ENDSCREEN);
+<form name="prefs" action="/adm/preferences" method="post">
+<input type="hidden" name="action" value="verify_and_change_lockednames" />
+$text<br />
+<label><input type="checkbox" value="1" name="lockednames"$lockedname />$locking</label><br />
+<input type="submit" value="$change" />
+</form>
+ENDSCREEN
+        } else {
+            my $message = &mt('Based on your institutional affiliation no name information is automatically updated for your LON-CAPA account.');
+            &print_main_menu($r,$message);
+        }
+    } else {
+        my $message = &mt('You are not permitted to set a user preference for automatic name updates for your LON-CAPA account.');
+        &print_main_menu($r,$message);
+    }
+}
+
+sub verify_and_change_lockednames {
+    my $r = shift;
+    my $message;
+    if (&can_toggle_namelocking()) {
+        my $newlockedname = $env{'form.lockednames'};
+        $newlockedname =~ s/\D//g;
+        my $currlockedname = $env{'environment.lockedname'};
+        if ($newlockedname ne $currlockedname) {
+            if ($newlockedname) {
+                if (&Apache::lonnet::put('environment',{lockedname => $newlockedname}) eq 'ok') {
+                    &Apache::lonnet::appenv({'environment.lockedname' => $newlockedname});
+                }
+            } elsif (&Apache::lonnet::del('environment',['lockedname']) eq 'ok') {
+                &Apache::lonnet::delenv('environment.lockedname');
+            }
+        }
+        my $status='';
+        if ($newlockedname) {
+            $status=&mt('disallowed');
+        } else {
+            $status=&mt('allowed');
+        }
+        $message=&Apache::lonhtmlcommon::confirm_success(&mt('[_1] set to [_2]','<i>'.&mt('Automatic update of first, middle and last names if institutional directory information indicates changes').'</i>','<tt>'.$status.'</tt>'));
+        $message=&Apache::loncommon::confirmwrapper($message);
+    }
+    &print_main_menu($r,$message);
 }
 
 sub print_main_menu {
@@ -1844,25 +2018,6 @@ my @menu=
 	    },
 		]
     },
-    {	categorytitle=>'Page Display Settings',
-	items =>[
-	    {	linktext => 'Color Scheme',
-		url => '/adm/preferences?action=changecolors',
-		permission => 'F',
-		#help => 'Change_Colors',
-		icon => 'preferences-desktop-theme.png',
-		linktitle => 'Change LON-CAPA default colors.'
-	    },
-	    {	linktext => 'Menu Display',
-		url => '/adm/preferences?action=changeicons',
-		permission => 'F',
-		#help => '',
-		icon => 'preferences-system-windows.png',
-		linktitle => 'Change whether the menus are displayed with buttons, icons or icons and text.'
-	    }
-
-		]
-    },
     {	categorytitle=>'Content Display Settings',
 	items =>[
 	    {	linktext => 'Language',
@@ -1872,30 +2027,41 @@ my @menu=
 		icon => 'preferences-desktop-locale.png',
 		linktitle => 'Choose the default language for this user.'
 	    },
-	    {	linktext => 'WYSIWYG Editor',
-		url => '/adm/preferences?action=changewysiwyg',
-		permission => 'F',
-		#help => '',
-		icon => 'edit-select-all.png',
-		linktitle => 'Enable or disable the WYSIWYG-Editor.'
-	    },
 	    {	linktext => $role.' Page',
 		url => '/adm/preferences?action=changerolespref',
 		permission => 'F',
 		#help => '',
-		icon => 'sctr.png',
+		icon => 'role_hotlist.png',
 		linktitle => 'Configure the roles hotlist.'
 	    },
-	    {	linktext => 'Display of Scientific Equations',
+	    {	linktext => 'Math display settings',
 		url => '/adm/preferences?action=changetexenginepref',
 		permission => 'F',
 		#help => '',
-		icon => 'stat.png',
-		linktitle => 'Change how Scientific Equations are displayed.'
+		icon => 'dismath.png',
+		linktitle => 'Change how math is displayed.'
+	    },
+		]
+    },
+    {	categorytitle=>'Page Display Settings',
+	items =>[
+	    {	linktext => 'Color Scheme',
+		url => '/adm/preferences?action=changecolors',
+		permission => 'F',
+		#help => 'Change_Colors',
+		icon => 'preferences-desktop-theme.png',
+		linktitle => 'Change LON-CAPA default colors.'
 	    },
+            {   linktext => 'Menu Display',
+                url => '/adm/preferences?action=changeicons',
+                permission => 'F',
+                #help => '',
+                icon => 'preferences-system-windows.png',
+                linktitle => 'Change whether the menus are displayed with icons or icons and text.'
+            }
 		]
     },
-    {	categorytitle=>'Message Management',
+    {	categorytitle=>'Messages &amp; Notifications',
 	items =>[
 	    {	linktext => 'Messages &amp; Notifications',
 		url => '/adm/preferences?action=changemsgforward',
@@ -1908,7 +2074,7 @@ my @menu=
 		url => '/adm/preferences?action=changediscussions',
 		permission => 'F',
 		#help => 'Change_Discussion_Display',
-		icon => 'mail-message-new.png',
+		icon => 'chat.png',
 		linktitle => 'Set display preferences for discussion posts for both discussion boards and individual resources in all your courses.'
 	    },
 		]
@@ -1938,23 +2104,35 @@ push(@{ $menu[0]->{items} }, {
     }
     if ($env{'environment.remote'} eq 'off') {
 push(@{ $menu[1]->{items} }, {
-	linktext => 'Launch Remote Control',
-	url => '/adm/remote?url=/adm/preferences?action=launch',
-	permission => 'F',
-	#help => '',
-	icon => 'network-wireless.png',
-	linktitle => 'Launch the remote control for LON-CAPA.',
-	});
+        linktext => 'Launch Remote Control',
+        url => '/adm/remote?url=/adm/preferences&amp;action=launch',
+        permission => 'F',
+        #help => '',
+        icon => 'remotecontrol.png',
+        linktitle => 'Launch the remote control for LON-CAPA.',
+        });
     }else{
 push(@{ $menu[1]->{items} }, {
-	linktext => 'Collapse Remote Control',
-	url => '/adm/remote?url=/adm/preferences?action=collapse',
-	permission => 'F',
-	#help => '',
-	icon => 'network-wireless.png',
-	linktitle => 'Collapse the remote control for LON-CAPA.',
-	});
+        linktext => 'Collapse Remote Control',
+        url => '/adm/remote?url=/adm/preferences&amp;action=collapse',
+        permission => 'F',
+        #help => '',
+        icon => 'remotecontrol.png',
+        linktitle => 'Collapse the remote control for LON-CAPA.',
+        });
+    }
+
+    if (&can_toggle_namelocking()) {
+        push(@{ $menu[0]->{items} }, {
+        linktext => 'Automatic name changes',
+        url => '/adm/preferences?action=changelockednames',
+        permission => 'F',
+        #help => '',
+        icon => 'system-lock-screen.png',
+        linktitle => 'Allow/disallow propagation of name changes from institutional directory service',
+        });
     }
+
     my %author_roles = &Apache::lonnet::get_my_roles($user,$domain,'userroles','',['au']);
     if (keys(%author_roles) > 0) {
 push(@{ $menu[4]->{items} }, {
@@ -1975,21 +2153,21 @@ push(@{ $menu[4]->{items} }, {
 	url => '/adm/preferences?action=changecourseinit',
 	permission => 'F',
 	#help => '',
-	icon => 'edit-copy.png',
+	icon => 'course_ini.png',
 	linktitle => 'Set the default page to be displayed when you select a course role.',
 	});
 
     }
-    if ($env{'user.name'} =~ /^(albertel|fox|foxr|kortemey|korte|raeburn)$/) {
+    if (&can_toggle_debug()) {
 push(@{ $menu[4]->{items} }, {
-	linktext => 'Toggle Debug Messages (Current:'.$env{'user.debug'}.')',
+	linktext => 'Toggle Debug Messages (Currently '.($env{'user.debug'} ? 'on)' : 'off)'),
 	url => '/adm/preferences?action=debugtoggle',
 	permission => 'F',
 	#help => '',
 	icon => 'blog.png',
 	linktitle => 'Toggle Debug Messages.',
 	});
-    }   
+    }
 
     $r->print(&Apache::loncommon::start_page('My Space'));
     $r->print(Apache::lonhtmlcommon::breadcrumbs('Change Preferences'));
@@ -2081,374 +2259,91 @@ sub handler {
     }elsif($env{'form.action'} eq 'verify_and_change_coursepage'){
         &verify_and_change_coursepage($r);
     }elsif($env{'form.action'} eq 'debugtoggle'){
-        &toggle_debug();
+        if (&can_toggle_debug()) {
+            &toggle_debug();
+        }
 	&print_main_menu($r);
+    } elsif ($env{'form.action'} eq 'changelockednames') {
+        &lockednameschanger($r);
+    } elsif ($env{'form.action'} eq 'verify_and_change_lockednames') {
+        &verify_and_change_lockednames($r);
     }
 
-    return OK;
-
+    # Properly end the HTML page of all preference pages
+    # started in each sub routine
+    # Exception: print_main_menu has its own end_page call
+    unless (!exists $env{'form.action'} ||
+            $env{'form.action'} eq 'debugtoggle') {
+        $r->print(&Apache::loncommon::end_page());
+    }
 
+    return OK;
 }
-#remove when done
-#old handler routine
-sub handler2 {
-    my $r = shift;
-    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);
-    $r->send_http_header;
-    return OK if $r->header_only;
-    #
-    &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
-                                   ['action','wysiwyg','returnurl','refpage']);
-    #
-    &Apache::lonhtmlcommon::clear_breadcrumbs();
-    &Apache::lonhtmlcommon::add_breadcrumb
-        ({href => '/adm/preferences',
-          text => 'Set User Preferences'});
 
-    my @Options;
-    # Determine current authentication method
-    my $currentauth=&Apache::lonnet::queryauthenticate($user,$domain);
-    if ($currentauth =~ /^(unix|internal):/) {
-        push (@Options,({ action   => 'changepass',
-                          linktext => 'Change Password',
-                          href     => '/adm/preferences',
-                          help     => 'Change_Password',
-                          subroutine => \&passwordchanger,
-                          breadcrumb => 
-                              { href => '/adm/preferences?action=changepass',
-                                text => 'Change Password'},
-                          },
-                        { action => 'verify_and_change_pass',
-                          subroutine => \&verify_and_change_password,
-                          breadcrumb => 
-                              { href =>'/adm/preferences?action=changepass',
-                                text => 'Change Password'},
-                          printmenu => 'not_on_error',
-                          }));
-    }
-    push (@Options,({ action   => 'changescreenname',
-                      linktext => 'Change Screen Name',
-                      href     => '/adm/preferences',
-                      help     => 'Prefs_Screen_Name_Nickname',
-                      subroutine => \&screennamechanger,
-                      breadcrumb => 
-                          { href => '/adm/preferences?action=changescreenname',
-                            text => 'Change Screen Name'},
-                      },
-                    { action   => 'verify_and_change_screenname',
-                      subroutine => \&verify_and_change_screenname,
-                      breadcrumb => 
-                          { href => '/adm/preferences?action=changescreenname',
-                            text => 'Change Screen Name'},
-                      printmenu => 'yes',
-                      }));
-
-    push (@Options,({ action   => 'changemsgforward',
-                      linktext => 'Change Message Forwarding and Notification E-mail Addresses',
-                      href     => '/adm/preferences',
-                      help     => 'Prefs_Messages',
-                      breadcrumb => 
-                          { href => '/adm/preferences?action=changemsgforward',
-                            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/Notification'},
-                      printmenu => 'yes',
-                      subroutine => \&verify_and_change_msgforward }));
-    my $aboutmeaction=
-        '/adm/'.$env{'user.domain'}.'/'.$env{'user.name'}.'/aboutme';
-    push (@Options,{ action => 'none', 
-                     linktext =>
-                         q{Edit the Personal Information Page},
-		     help => 'Prefs_About_Me',
-                     href => $aboutmeaction});
-    push (@Options,({ action => 'changecolors',
-                      linktext => 'Change Color Scheme',
-                      href => '/adm/preferences',
-                      help => 'Change_Colors',
-                      breadcrumb => 
-                          { href => '/adm/preferences?action=changecolors',
-                            text => 'Change Colors'},
-                      subroutine => \&colorschanger,
-                  },
-                    { action => 'verify_and_change_colors',
-                      breadcrumb => 
-                          { href => '/adm/preferences?action=changecolors',
-                            text => 'Change Colors'},
-                      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, }
-                    ));
-    push (@Options,({ action => 'changewysiwyg',
-                      linktext => 'Change WYSIWYG Editor Preferences',
-                      href => '/adm/preferences',
-                      breadcrumb => 
-                            { href => '/adm/preferences?action=changewysiwyg',
-                              text => 'Change WYSIWYG Preferences'},
-                      subroutine => \&wysiwygchanger,
-                  },
-                    { action => 'set_wysiwyg',
-                      breadcrumb =>
-                          { href => '/adm/preferences?action=changewysiwyg',
-                            text => 'Change WYSIWYG Preferences'},
-                      printmenu => 'yes',
-                      subroutine => \&verify_and_change_wysiwyg, }
-                    ));
-    push (@Options,({ action => 'changediscussions',
-                      linktext => 'Change Discussion Display Preferences',
-                      href => '/adm/preferences',
-                      help => 'Change_Discussion_Display',
-                      breadcrumb => 
-                            { href => '/adm/preferences?action=changediscussions',
-                              text => 'Change Discussion Preferences'},
-                      subroutine => \&discussionchanger,
-                  },
-                    { action => 'verify_and_change_discussion',
-                      breadcrumb =>
-                          { href => '/adm/preferences?action=changediscussions',
-                            text => 'Change Discussion Preferences'},
-                      printmenu => 'yes',
-                      subroutine => \&verify_and_change_discussion, }
-                    ));
-
-    my $role = ($env{'user.adv'} ? 'Roles' : 'Course');
-    push (@Options,({ action   => 'changerolespref',
-                      linktext => 'Change '.$role.' Page Preferences',
-                      href     => '/adm/preferences',
-                      subroutine => \&rolesprefchanger,
-                      breadcrumb =>
-                          { href => '/adm/preferences?action=changerolespref',
-                            text => 'Change '.$role.' Page Pref'},
-                      },
-                    { action   => 'verify_and_change_rolespref',
-                      subroutine => \&verify_and_change_rolespref,
-                      breadcrumb =>
-                          { href => '/adm/preferences?action=changerolespref',
-                            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',
-		      }));
+sub toggle_debug {
+    if ($env{'user.debug'}) {
+        &Apache::lonnet::delenv('user.debug');
     } 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',
-                      }));
-
-    push (@Options,({ action   => 'changeclicker',
-                      linktext => 'Register Response Devices ("Clickers")',
-                      href     => '/adm/preferences',
-                      subroutine => \&clickerchanger,
-                      breadcrumb =>
-                          { href => '/adm/preferences?action=changeclicker',
-                            text => 'Register Clicker'},
-                      },
-                    { action   => 'verify_and_change_clicker',
-                      subroutine => \&verify_and_change_clicker,
-                      breadcrumb =>
-                          { href => '/adm/preferences?action=changeclicker',
-                            text => 'Register Clicker'},
-                      printmenu => 'yes',
-                      }));
-    my %author_roles = &Apache::lonnet::get_my_roles($user,$domain,'userroles','',['au']);
-    if (keys(%author_roles) > 0) {
-      push (@Options,({ action   => 'changedomcoord',
-                        linktext => 'Restrict Domain Coordinator Access',
-                        href     => '/adm/preferences',
-                        subroutine => \&domcoordchanger,
-                        breadcrumb =>
-                            { href => '/adm/preferences?action=changedomcoord',
-                              text => 'Restrict Domain Coordinator Access'},
-                      },
-                      { action   => 'verify_and_change_domcoord',
-                        subroutine => \&verify_and_change_domcoord,
-                        breadcrumb =>
-                            { href => '/adm/preferences?action=changedomcoord',
-                              text => 'Restrict Domain Coordinator Access'},
-                        printmenu => 'yes',
-                      }));
-    }
-
-    push (@Options,({ action   => 'lockwarning',
-                      subroutine => \&lockwarning,
-                      breadcrumb =>
-                          { href => '/adm/preferences?action=lockwarning',
-                            text => 'Lock Warnings'},
-                      },
-                    { action   => 'verify_and_change_locks',
-                      subroutine => \&verify_and_change_lockwarning,
-                      breadcrumb =>
-                          { href => '/adm/preferences?action=lockwarning',
-                            text => 'Lockwarnings'},
-                      printmenu => 'yes',
-                      }));
-
-
-    if (&Apache::lonnet::allowed('whn',$env{'request.course.id'})
-	|| &Apache::lonnet::allowed('whn',$env{'request.course.id'}.'/'
-				    .$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)$/)
-     && ($env{'user.domain'} =~/^(msu|gerd)$/)){
-        push (@Options,({ action => 'debugtoggle',
-                          printmenu => 'yes',
-                          subroutine => \&toggle_debug,
-                          }));
-    }
-
-    $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'}) {
-            $call = $option->{'subroutine'};
-            $printmenu = $option->{'printmenu'};
-            if (exists($option->{'breadcrumb'})) {
-                &Apache::lonhtmlcommon::add_breadcrumb
-                    ($option->{'breadcrumb'});
-            }
-	    $help=$option->{'help'};
-        }
+        &Apache::lonnet::appenv({'user.debug' => 1});
     }
-    $r->print(&Apache::lonhtmlcommon::breadcrumbs('Change Preferences',$help));
-    my $error;
-    if (defined($call)) {
-        $error = $call->($r);
-    }
-    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|raeburn)$/
-            ) {
-            push (@Options,({ action => 'debugtoggle',
-                              linktext => 'Toggle Debug Messages',
-                              text => 'Current Debug status is -'.
-                                  $env{'user.debug'}.'-.',
-                              href => '/adm/preferences',
-                              printmenu => 'yes',
-                              subroutine => \&toggle_debug,
-                              }));
-        }
-        foreach my $option(@Options) {
-            my $optiontext = '';
-            if (exists($option->{'href'})) {
-		$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'})) {
-                $optiontext .= ' '.&mt($option->{'text'});
+}
+
+sub can_toggle_debug {
+    my $can_toggle = 0;
+    my $page = 'toggledebug';
+    if (&LONCAPA::lonauthcgi::can_view($page)) {
+        $can_toggle = 1;
+    } elsif (&LONCAPA::lonauthcgi::check_ipbased_access($page)) {
+        $can_toggle = 1;
+    }
+    return $can_toggle;
+}
+
+sub can_toggle_namelocking {
+    my $lockablenames;
+    my %domconfig =
+        &Apache::lonnet::get_dom('configuration',['autoupdate'],$env{'user.domain'});
+    if (ref($domconfig{'autoupdate'}) eq 'HASH') {
+        if ($domconfig{'autoupdate'}{'run'}) {
+            my @inststatuses = split(':',$env{'environment.inststatus'});
+            unless (@inststatuses) {
+                @inststatuses = ('default');
             }
-            if ($optiontext ne '') {
-                $optiontext = '<font size="+1">'.$optiontext.'</font>'; 
-                my $helplink = '&nbsp;';
-                if (exists($option->{'help'})) {
-                    $helplink = &Apache::loncommon::help_open_topic
-                                                    ($option->{'help'});
+            my %updateable = &updateable_userinfo($domconfig{'autoupdate'},\@inststatuses);
+            if ($updateable{'lastname'} || $updateable{'firstname'} ||
+                $updateable{'middlename'}) { 
+                if (ref($domconfig{'autoupdate'}{'lockablenames'}) eq 'ARRAY') {
+                    unless (@inststatuses) {
+                        @inststatuses = ('default');
+                    }
+                    foreach my $status (@inststatuses) {
+                        if (grep(/^\Q$status\E$/,@{$domconfig{'autoupdate'}{'lockablenames'}})) {
+                            $lockablenames = 1;
+                            last;
+                        }
+                    }
                 }
-                $optionlist .= '<tr>'.
-                    '<td>'.$helplink.'</td>'.
-                    '<td>'.$optiontext.'</td>'.
-                    '</tr>';
             }
         }
-        $optionlist .= '</table>';
-        $r->print($optionlist);
-    } elsif ($env{'form.returnurl'}) {
-	$r->print('<br /><a href="'.$env{'form.returnurl'}.'"><font size="+1">'.
-		  &mt('Return').'</font></a>');
     }
-    $r->print(&Apache::loncommon::end_page());
-    return OK;
+    return $lockablenames;
 }
 
-sub toggle_debug {
-    if ($env{'user.debug'}) {
-        &Apache::lonnet::delenv('user.debug');
-    } else {
-        &Apache::lonnet::appenv({'user.debug' => 1});
+sub updateable_userinfo {
+    my ($autoupdate,$inststatuses) = @_;
+    my %updateable;
+    return %updateable unless ((ref($autoupdate) eq 'HASH') && 
+                               (ref($inststatuses) eq 'ARRAY'));
+    if (ref($autoupdate->{'fields'}) eq 'HASH') {
+        foreach my $status (@{$inststatuses}) {
+            if (ref($autoupdate->{'fields'}{$status}) eq 'ARRAY') {
+                foreach my $field (@{$autoupdate->{'fields'}{$status}}) {
+                    $updateable{$field} = 1;
+                }
+            }
+        }
     }
+    return %updateable;
 }
 
 1;