--- loncom/interface/lonpreferences.pm	2024/02/28 06:28:07	1.196.4.28.2.2
+++ loncom/interface/lonpreferences.pm	2019/04/24 21:12:44	1.230
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Preferences
 #
-# $Id: lonpreferences.pm,v 1.196.4.28.2.2 2024/02/28 06:28:07 raeburn Exp $
+# $Id: lonpreferences.pm,v 1.230 2019/04/24 21:12:44 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -31,6 +31,7 @@
 package Apache::lonpreferences;
 
 use strict;
+use LONCAPA;
 use Apache::Constants qw(:common);
 use Apache::File;
 use Apache::loncommon();
@@ -39,7 +40,6 @@ use Apache::lonlocal;
 use Apache::lonnet;
 use LONCAPA::lonauthcgi();
 use LONCAPA();
-use DateTime::TimeZone();
 
 ################################################################
 #                       Handler subroutines                    #
@@ -165,7 +165,7 @@ sub texenginechanger {
     my %mathchoices=('' => 'Default',
 		     'tth' => 'tth (TeX to HTML)',
 		     #'ttm' => 'TeX to MathML',
-                     'MathJax' => 'MathJax',
+		     'MathJax' => 'MathJax',
 		     'mimetex' => 'mimetex (Convert to Images)',
                      'raw' => 'Raw (Screen Reader)'
                      );
@@ -182,7 +182,7 @@ sub texenginechanger {
       'change'   => 'Save',
       'exmpl'    => 'Examples',
       'mathjax'  => 'MathJax:',
-      'mathjaxinfo' =>  'MathJax provides rendered equations whose source code can be extracted in TeX and MathML formats by right clicking the equation.',
+      'mathjaxinfo' => 'MathJax provides rendered equations whose source code can be extracted in TeX and MathML formats by right clicking the equation.',
       'tth'      => 'tth (TeX to HTML):',
       'mimetex'  => 'mimetex (Convert to Images):',
     );
@@ -280,7 +280,7 @@ sub rolesprefchanger {
     my $hotlist_n=$userenv{'recentrolesn'};
     my ($checkedon,$checkedoff);
     if ($hotlist_flag) {
-        $checkedon = 'checked="checked"'; 
+	$checkedon = 'checked="checked"';
     } else {
         $checkedoff = 'checked="checked"';
     }
@@ -363,7 +363,7 @@ $options.'
 &Apache::lonhtmlcommon::row_closure(1).
 &Apache::lonhtmlcommon::end_pick_box().'
 </div>');
-    if ($roles_check_list) {
+    if ($roles_check_list) { 
         $r->print('<div class="LC_left_float">
 <h4>'.&mt('Freeze Roles').'</h4>
 <p>'.&mt('The table below can be used to [_1]freeze[_2] '.$lc_role.'s in the Hotlist.','<q>','</q>').'<br />'.
@@ -627,7 +627,7 @@ sub icon_options {
 }
 
 sub icon_previews {
-     my %icon_text = &Apache::lonlocal::texthash (
+     my %icon_text = (
                       annotate => 'Notes',
                       wishlist => 'Stored Links',
                       catalog  => 'Info',
@@ -636,12 +636,12 @@ sub icon_previews {
                       printout => 'Print',
                      );
     my %inlinetools = (
-        printout => "s&8&3&prt.png&$icon_text{'printout'}&printout[_1]&gopost('/adm/printout',currentURL)&".&mt('Prepare a printable document'),
-        wishlist => "s&9&1&wishlist-link.png&$icon_text{'wishlist'}&wishlistlink[_2]&set_wishlistlink()&".&mt('Save a link for this resource in your personal Stored Links repository'),
-        evaluate => "s&8&1&eval.png&$icon_text{'evaluate'}&this[_1]&gopost('/adm/evaluate',currentURL,1)&".&mt('Provide my evaluation of this resource'),
-        feedback => "s&8&2&fdbk.png&$icon_text{'feedback'}&discuss[_1]&gopost('/adm/feedback',currentURL,1)&".&mt('Provide feedback messages or contribute to the course discussion about this resource'),
-        annotate => "s&9&3&anot.png&$icon_text{'annotate'}&tations[_1]&annotate()&".&mt('Make notes and annotations about this resource'),
-        catalog  => "s&6&3&catalog.png&$icon_text{'catalog'}&info[_1]&catalog_info()&".&mt('Show Metadata'),
+        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()&Save a link for this resource in your personal Stored Links repository",
+        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);
@@ -683,16 +683,51 @@ sub verify_and_change_clicker {
     my $r = shift;
     my $user       = $env{'user.name'};
     my $domain     = $env{'user.domain'};
+    my $uhome      = $env{'user.home'};
     my $newclickers  = $env{'form.clickers'};
+    my $message;
     $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));
+    my @oldclickers = split(/,/,$env{'environment.clickers'});
+    my @newclickers = split(/,/,$newclickers);
+    my %newuniq;
+    map { $newuniq{$_} = 1; }  @newclickers;
+    @newclickers = sort(keys(%newuniq));
+    my @differences = &Apache::loncommon::compare_arrays(\@oldclickers,\@newclickers);
+    if (@differences) {
+        my $putres = &Apache::lonnet::put('environment',{'clickers' => $newclickers});
+        if ($putres eq 'ok') {
+            my @adds = ();
+            my @dels = ();
+            foreach my $item (@differences) {
+                if (grep(/^\Q$item\E$/,@newclickers)) {
+                    push(@adds,$item);
+                } else {
+                    push(@dels,$item);
+                }
+            }
+            if (@dels) {
+                 my %delclicker;
+                 map { $delclicker{$_} = $user; } @dels;
+                 my $putresult = &Apache::lonnet::iddel($domain,\%delclicker,$uhome,'clickers');
+            }
+            if (@adds) {
+                 my %addclicker;
+                 map { $addclicker{$_} = $user; } @adds;
+                 my $putresult = &Apache::lonnet::updateclickers($domain,'add',\%addclicker,$uhome,1);
+            }
+            &Apache::lonnet::appenv({'environment.clickers' => $newclickers});
+            $message=&Apache::lonhtmlcommon::confirm_success(&mt('Registering clickers: [_1]',$newclickers));
+        } else {
+            $message=&Apache::lonhtmlcommon::confirm_success(&mt('Error saving clicker ID').1);
+        }
+    } else {
+        $message='<span class="LC_info">'.&mt('Clicker information unchanged').'</span>';
+    }
     $message=&Apache::loncommon::confirmwrapper($message);
     &print_main_menu($r, $message);
 }
@@ -1142,10 +1177,10 @@ sub colorschanger {
     foreach my $item (sort(keys(%colortypes))) {
        my $curcol=&Apache::loncommon::designparm($function.'.'.$item,$domain);
        $chtable.=&Apache::loncommon::start_data_table_row().
-                 '<td>'.$colortypes{$item}.'<td><input name="'.$item.
-                 '" class="colorchooser"  size="10" value="'.$curcol.
-                 '" /></td>'.
-	         &Apache::loncommon::end_data_table_row()."\n";
+	   '<td>'.$colortypes{$item}.'<td><input name="'.$item.
+        '" class="colorchooser"  size="10" value="'.$curcol.
+'" /></td>'.
+	    &Apache::loncommon::end_data_table_row()."\n";
     }
     my $end_data_table = &Apache::loncommon::end_data_table();
     my $pjump_def = &Apache::lonhtmlcommon::pjump_javascript_definition();
@@ -1197,9 +1232,9 @@ sub verify_and_change_colors {
     my $message='';
     foreach my $item (keys(%colortypes)) {
         my $color=$env{'form.'.$item};
-        if (!($color =~ /^#/)) {
-            $color = '#' . $color;
-        }
+	if (!($color =~ /^#/)) {
+	    $color = '#' . $color;
+	}
         my $entry='color.'.$function.'.'.$item;
 	if (($color=~/^\#[0-9A-Fa-f]{6}$/) && (!$env{'form.resetall'})) {
 	    &Apache::lonnet::put('environment',{$entry => $color});
@@ -1230,8 +1265,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,$clientip);
-    $clientip = &Apache::lonnet::get_requestor_ip($r);
+    my ($user,$domain,$currentpass);
     &Apache::lonhtmlcommon::add_breadcrumb(
 		{ href => '/adm/preferences?action=changepass',
                   text => 'Change Password'});
@@ -1239,18 +1273,18 @@ sub passwordchanger {
         $r->print(Apache::loncommon::start_page('Personal Data'));
         $r->print(Apache::lonhtmlcommon::breadcrumbs('Change Password'));
     }
+    my ($blocked,$blocktext) =
+        &Apache::loncommon::blocking_status('passwd');
+    if ($blocked) {
+        $r->print('<p class="LC_warning">'.$blocktext.'</p>');
+        return;
+    }
     if ((!defined($caller)) || ($caller eq 'preferences')) {
         $user = $env{'user.name'};
         $domain = $env{'user.domain'};
         if (!defined($caller)) {
             $caller = 'preferences';
         }
-        my ($blocked,$blocktext) =
-            &Apache::loncommon::blocking_status('passwd',$clientip);
-        if ($blocked) {
-            $r->print('<p class="LC_warning">'.$blocktext.'</p>');
-            return;
-        }
     } elsif ($caller eq 'reset_by_email') {
         my %data = &Apache::lonnet::tmpget($mailtoken);
         if (keys(%data) == 0) {
@@ -1267,12 +1301,6 @@ sub passwordchanger {
                 $user = $data{'username'};
                 $domain = $data{'domain'};
                 $currentpass = $data{'temppasswd'};
-                my ($blocked,$blocktext) =
-                    &Apache::loncommon::blocking_status('passwd',$clientip,$user,$domain);
-                if ($blocked) {
-                    $r->print('<p class="LC_warning">'.$blocktext.'</p>');
-                    return;
-                }
             } else {
                 $r->print(
                     '<p class="LC_warning">'
@@ -1282,12 +1310,12 @@ sub passwordchanger {
                 );
                 return;
             }
-        } else {
+         } else {
             $r->print(
                 '<p class="LC_warning">'
-                .&mt('Sorry, the URL generated when you requested reset of'
-                    .' your password contained incomplete information.')
-                .'</p>'
+               .&mt('Sorry, the URL generated when you requested reset of'
+                   .' your password contained incomplete information.')
+               .'</p>'
             );
             return;
         }
@@ -1332,7 +1360,7 @@ sub passwordchanger {
 	my $jsh=Apache::File->new($include."/londes.js");
 	$r->print(<$jsh>);
     }
-    $r->print(&jscript_send($caller,$domain,$currentauth,$extrafields));
+    $r->print(&jscript_send($caller,$extrafields));
     $r->print(<<ENDFORM);
 $errormessage
 
@@ -1349,105 +1377,11 @@ ENDFORM
 }
 
 sub jscript_send {
-    my ($caller,$domain,$currentauth,$extrafields) = @_;
-    my ($min,$max,$rulestr,$numrules);
-    $min = $Apache::lonnet::passwdmin;
-    my %js_lt = &Apache::lonlocal::texthash(
-              uc => 'New password needs at least one upper case letter',
-              lc => 'New password needs at least one lower case letter',
-              num => 'New password needs at least one number',
-              spec => 'New password needs at least one non-alphanumeric',
-              blank1 => 'Empty Password field',
-              blank2 => 'Empty Confirm Password field',
-              mismatch => 'Contents of Password and Confirm Password fields must match',
-              fail => 'Please fix the following:',
-    );
-    &js_escape(\%js_lt);
-    if ($currentauth eq 'internal:') {
-        if ($domain ne '') {
-            my %passwdconf = &Apache::lonnet::get_passwdconf($domain);
-            if (keys(%passwdconf)) {
-                if ($passwdconf{min}) {
-                    $min = $passwdconf{min};
-                }
-                if ($passwdconf{max}) {
-                    $max = $passwdconf{max};
-                    $js_lt{'long'} = &js_escape(&mt('Maximum password length: [_1]',$max));
-                }
-                if (ref($passwdconf{chars}) eq 'ARRAY') {
-                    if (@{$passwdconf{chars}}) {
-                        $rulestr =  join('","',@{$passwdconf{chars}});
-                        $numrules = scalar(@{$passwdconf{chars}});
-                    }
-                }
-            }
-        }
-    }
-    $js_lt{'short'} = &js_escape(&mt('Minimum password length: [_1]',$min));
-
-    my $passwdcheck = <<"ENDJS";
-        var errors = new Array();
-        var min = parseInt("$min") || 0;
-        var currauth = "$currentauth";
-        if (this.document.client.elements.newpass_1.value == '') {
-            errors.push("$js_lt{'blank1'}");
-        }
-        if (this.document.client.elements.newpass_2.value == '') {
-            errors.push("$js_lt{'blank2'}");
-        }
-        if (errors.length == 0) {
-            if (this.document.client.elements.newpass_1.value !=  this.document.client.elements.newpass_2.value) {
-                errors.push("$js_lt{'mismatch'}");
-            }
-            var posspass = this.document.client.elements.newpass_1.value;
-            if (min > 0) {
-                if (posspass.length < min) {
-                    errors.push("$js_lt{'short'}"); 
-                }
-            }
-            if (currauth == 'internal:') {
-                var max = parseInt("$max") || 0;
-                if (max > 0) {
-                    if (posspass.length > max) {
-                        errors.push("$js_lt{'long'}");
-                    }
-                }
-                var numrules = parseInt("$numrules") || 0;
-                if (numrules > 0) {
-                    var rules = new Array("$rulestr");
-                    for (var i=0; i<rules.length; i++) {
-                        if (rules[i] == 'uc') {
-                            if (!posspass.match(/[A-Z]/)) {
-                                errors.push("$js_lt{'uc'}");
-                            }
-                        } else if (rules[i] == 'lc') {
-                            if (!posspass.match(/[a-z]/)) {
-                                errors.push("$js_lt{'lc'}");
-                            }
-                        } else if (rules[i] == 'num') {
-                            if (!posspass.match(/\\d/)) {
-                                errors.push("$js_lt{'num'}");
-                            }
-                        } else if (rules[i] == 'spec') {
-                            var pattern = /^[!@#$%^&*()_+\\-=\\[\\]{};':"\\\|,.<a>\\/?]/;
-                            if (!posspass.match(pattern)) {
-                                errors.push("$js_lt{'spec'}"); 
-                            }
-                        }
-                    }
-                }
-            }
-        }
-        if (errors.length > 0) {
-            alert("$js_lt{'fail'}"+"\\n\\n"+errors.join("\\n"));
-            return;
-        }
-ENDJS
+    my ($caller,$extrafields) = @_;
     my $output = qq|
 <script type="text/javascript" language="JavaScript">
 
     function send() {
-$passwdcheck
         uextkey=this.document.client.elements.ukey_cpass.value;
         lextkey=this.document.client.elements.lkey_cpass.value;
         initkeys();
@@ -1474,7 +1408,7 @@ $passwdcheck
 |;
         }
         if ((ref($extrafields) eq 'HASH') && ($extrafields->{'email'})) {
-            $output .= qq|
+            $output .= qq| 
         this.document.pserver.elements.email.value =
                    this.document.client.elements.email.value;
 |;
@@ -1510,7 +1444,7 @@ sub client_form {
                       .&Apache::lonhtmlcommon::row_closure();
         }
         if ((ref($extrafields) eq 'HASH') && ($extrafields->{'username'})) {
-            $output .= &Apache::lonhtmlcommon::row_title(
+            $output .= &Apache::lonhtmlcommon::row_title(  
                        '<label for="uname">'.$lt{'username'}.'</label>')
                       .'<input type="text" name="uname" size="20" autocapitalize="off" autocorrect="off" />'
                       .&Apache::lonhtmlcommon::row_closure()
@@ -1588,8 +1522,14 @@ sub server_form {
 }
 
 sub verify_and_change_password {
-    my ($r,$caller,$mailtoken,$timelimit,$extrafields,$ended) = @_;
-    my ($user,$domain,$homeserver,$clientip);
+    my ($r,$caller,$mailtoken,$ended) = @_;
+    my ($user,$domain,$homeserver);
+    my ($blocked,$blocktext) =
+        &Apache::loncommon::blocking_status('passwd');
+    if ($blocked) {
+        $r->print('<p class="LC_warning">'.$blocktext.'</p>');
+        return;
+    }
     if ($caller eq 'reset_by_email') {
         $user       = $env{'form.uname'};
         $domain     = $env{'form.udom'};
@@ -1598,31 +1538,20 @@ sub verify_and_change_password {
             if ($homeserver eq 'no_host') {
         &passwordchanger($r,"<p>\n<span class='LC_error'>".
                          &mt("Invalid username and/or domain")."</span>\n</p>",
-                         $caller,$mailtoken,$timelimit,$extrafields);
-                return 'no_host';
+                         $caller,$mailtoken);
+                return 1;
             }
         } else {
             &passwordchanger($r,"<p>\n<span class='LC_error'>".
                              &mt("Username and domain were blank")."</span>\n</p>",
-                             $caller,$mailtoken,$timelimit,$extrafields);
-            return 'missingdata';
+                             $caller,$mailtoken);
+            return 1;
         }
     } else {
         $user       = $env{'user.name'};
         $domain     = $env{'user.domain'};
         $homeserver = $env{'user.home'};
     }
-    $clientip = &Apache::lonnet::get_requestor_ip($r);
-    my ($blocked,$blocktext) =
-        &Apache::loncommon::blocking_status('passwd',$clientip,$user,$domain);
-    if ($blocked) {
-        $r->print('<p class="LC_warning">'.$blocktext.'</p>');
-        if ($caller eq 'reset_by_email') {
-            return 'blocked';
-        } else {
-            return;
-        }
-    }
     my $currentauth=&Apache::lonnet::queryauthenticate($user,$domain);
     # Check for authentication types that allow changing of the password.
     if ($currentauth !~ /^(unix|internal):/) {
@@ -1630,8 +1559,8 @@ sub verify_and_change_password {
             &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,$timelimit,$extrafields);
-            return 'otherauth';
+                              $caller,$mailtoken);
+            return 1;
         } else {
             return;
         }
@@ -1647,12 +1576,8 @@ sub verify_and_change_password {
 	    defined($newpass2)    ){
 	&passwordchanger($r,"<p>\n<span class='LC_error'>".
 			 &mt("One or more password fields were blank").
-                         "</span>\n</p>",$caller,$mailtoken,$timelimit,$extrafields);
-        if ($caller eq 'reset_by_email') {
-            return 'missingdata';
-        } else {
-            return;
-        }
+                         "</span>\n</p>",$caller,$mailtoken);
+	return;
     }
     # Get the keys
     my $lonhost = $r->dir_config('lonHostID');
@@ -1670,11 +1595,7 @@ sub verify_and_change_password {
 </p>
 ENDERROR
         # Probably should log an error here
-        if ($caller eq 'reset_by_email') {
-            return 'internalerror';
-        } else {
-            return;
-        }
+        return 1;
     }
     my ($ckey,$n1key,$n2key)=split(/&/,$tmpinfo);
     #
@@ -1688,53 +1609,30 @@ ENDERROR
             &passwordchanger($r,
                          '<span class="LC_error">'.
                          &mt('Could not verify current authentication.').'  '.
-                         &mt('Please try again.').'</span>',$caller,$mailtoken,$timelimit,$extrafields);
-            return 'emptydata';
+                         &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,$timelimit,$extrafields);
-            return 'missingtemp';
+                         &mt('Please try again.').'</span>',$caller,$mailtoken);
+            return 1;
         }
-    }
+    } 
     if ($newpass1 ne $newpass2) {
 	&passwordchanger($r,
 			 '<span class="LC_warning">'.
 			 &mt('The new passwords you entered do not match.').'  '.
-			 &mt('Please try again.').'</span>',$caller,$mailtoken,$timelimit,$extrafields);
-        if ($caller eq 'reset_by_email') {
-            return 'mismatch';
-        } else {
-            return;
-        }
+			 &mt('Please try again.').'</span>',$caller,$mailtoken);
+	return 1;
     }
-    if ($currentauth eq 'unix:') {
-        if (length($newpass1) < 7) {
-            &passwordchanger($r,
-                             '<span class="LC_warning">'.
-                             &mt('Passwords must be a minimum of 7 characters long.').'  '.
-                             &mt('Please try again.').'</span>',$caller,$mailtoken,$timelimit,$extrafields);
-            if ($caller eq 'reset_by_email') {
-                return 'length';
-            } else {
-                return;
-            }
-        }
-    } else {
-        my $warning = &Apache::loncommon::check_passwd_rules($domain,$newpass1);
-        if ($warning) {
-	    &passwordchanger($r,'<span class="LC_warning">'.
-                             $warning.
-			     &mt('Please try again.').'</span>',
-                             $caller,$mailtoken,$timelimit,$extrafields);
-            if ($caller eq 'reset_by_email') {
-                return 'rules';
-            } else {
-                return;
-            }
-        }
+    if (length($newpass1) < 7) {
+	&passwordchanger($r,
+			 '<span class="LC_warning">'.
+			 &mt('Passwords must be a minimum of 7 characters long.').'  '.
+			 &mt('Please try again.').'</span>',$caller,$mailtoken);
+	return 1;
     }
     #
     # Check for bad characters
@@ -1753,12 +1651,8 @@ ENDERROR
 ABCDEFGHIJKLMNOPQRSTUVWXYZ[\]^_\`abcdefghijklmnopqrstuvwxyz{|}~
 </pre></span>
 ENDERROR
-        &passwordchanger($r,$errormessage,$caller,$mailtoken,$timelimit,$extrafields);
-        if ($caller eq 'reset_by_email') {
-            return 'badchars';
-        } else {
-            return;
-        }
+        &passwordchanger($r,$errormessage,$caller,$mailtoken);
+        return 1;
     }
     # 
     # Change the password (finally)
@@ -1781,19 +1675,13 @@ ENDERROR
 	# error error: run in circles, scream and shout
         if ($caller eq 'reset_by_email') {
             if (!$result) {
-                return 'error';
+                return 1;
             } else {
                 return $result;
             }
         } else {
-            my $feedback;
-            if ($result eq 'prioruse') {
-                $feedback = &mt('Please enter a password that you have not used recently.');
-            } else {
-                $feedback = &mt('Please make sure your old password was entered correctly.');
-            }
             $message = &Apache::lonhtmlcommon::confirm_success(
-                &mt("The password for user [_1] was not changed.",'<i>'.$user.'</i>').' '.$feedback,1);
+                &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);
             if (ref($ended)) {
@@ -2043,98 +1931,9 @@ sub author_space_settings {
     my $domain     = $env{'user.domain'};
     my %author_roles = &Apache::lonnet::get_my_roles($user,$domain,'userroles','',['au','ca','aa']);
     if (keys(%author_roles) > 0) {
-        my ($showdomdefs,$js,$args,@items);
-        my $returnurl = &HTML::Entities::encode($env{'form.returnurl'},'"<>&\'');
-        my $reqdmajor = 2;
-        my $reqdminor = 12;
-        my $loncaparev = &Apache::lonnet::get_server_loncaparev($env{'user.domain'},$env{'user.home'});
-        my ($major,$minor) = ($loncaparev =~ /^\'?(\d+)\.(\d+)\.[\w.\-]+\'?$/);
-        unless (($major eq '' && $minor eq '') ||
-                ($reqdmajor > $major) || (($reqdmajor == $major) && ($reqdminor > $minor))) {
-            @items = ('nocodemirror','copyright','sourceavail');
-            $showdomdefs = 1;
-            $js = &toggle_options_js();
-            my $onload;
-            foreach my $item (@items) {
-                $onload .= "javascript:toggleOptions(document.prefs,'$item','user_$item');"
-            }
-            $args = { 'add_entries' => { 'onload' => $onload } };
-        }
-        $r->print(Apache::loncommon::start_page('Authoring Space Settings',$js,$args));
-        $r->print(Apache::lonhtmlcommon::breadcrumbs('Authoring Space Settings'));
-        if ($showdomdefs) {
-            my %userenv = &Apache::lonnet::get('environment',\@items);
-            my %domdefs = &Apache::lonnet::get_domain_defaults($domain);
-            my %staticdefaults = (
-                            'nocodemirror'  => '0',
-                            'copyright'     => 'default',
-                            'sourceavail'   => 'closed',
-            );
-            my %lt = &authoring_settings_text();
-            my %titles = &authoring_settings_titles();
-            $r->print("<h3>$lt{'auss'}</h3><br /><hr />\n".
-                      '<form name="prefs" action="/adm/preferences" method="post">'."\n".
-                      '<input type="hidden" name="returnurl" value="'.$returnurl.'" />'."\n".
-                      '<input type="hidden" name="action" value="change_authoring_settings" />'."\n");
-            foreach my $item (@items) {
-                my ($domdef,$checkeddom,$checkeduser,$domdefdisplay,$divsty,$userelem);
-                $checkeddom = ' checked="checked"';
-                $divsty = 'display:none';
-                if (exists($domdefs{$item})) {
-                    $domdef = $domdefs{$item};
-                } else {
-                    $domdef = $staticdefaults{$item};
-                }
-                if ($item eq 'copyright') {
-                    $domdefdisplay = &Apache::loncommon::copyrightdescription($domdef);
-                    $userelem = &selectbox('userchoice_'.$item,$userenv{$item},'',
-                                           \&Apache::loncommon::copyrightdescription,
-                                           (grep !/^priv|custom$/,(&Apache::loncommon::copyrightids)));
-                } elsif ($item eq 'sourceavail') {
-                    $domdefdisplay = &Apache::loncommon::source_copyrightdescription($domdef);
-                    $userelem = &selectbox('userchoice_'.$item,$userenv{$item},'',
-                                           \&Apache::loncommon::source_copyrightdescription,
-                                           (&Apache::loncommon::source_copyrightids));
-                } elsif ($item eq 'nocodemirror') {
-                    if ($domdef) {
-                        $domdefdisplay = $lt{'yes'};
-                    } else {
-                        $domdefdisplay = $lt{'no'};
-                    }
-                    my %checked;
-                    $checked{'no'} = ' checked="checked"';
-                    if ($userenv{$item} eq 'yes') {
-                        $checked{'yes'} = $checked{'no'};
-                        $checked{'no'} = '';
-                    }
-                    $userelem = '<span class="LC_nobreak">';
-                    foreach my $choice ('yes','no') {
-                        $userelem .= '<label><input type="radio" name="userchoice_'.$item.'" value="'.$choice.'"'.
-                                     $checked{$choice}.' />'.$lt{$choice}.'</label>&nbsp;&nbsp;&nbsp;';
-                    }
-                    $userelem .= '</span>';
-                }
-                if ($userenv{$item} ne '') {
-                    $checkeduser = $checkeddom;
-                    $checkeddom = '';
-                    $divsty = 'display:inline-block';
-                }
-                $r->print(<<"END");
-<h4><span class="LC_nobreak">$titles{$item}</span></h4>
-<p class="LC_nobreak">$lt{'curd'}: <span style="font-style:italic">$domdefdisplay</span></p>
-<p class="LC_nobreak">
-<label><input type="radio" name="$item" value="dom" onclick="toggleOptions(this.form,'$item','user_$item');"$checkeddom />$lt{'used'}</label>&nbsp;&nbsp;&nbsp;
-<label><input type="radio" name="$item" value="user" onclick="toggleOptions(this.form,'$item','user_$item');"$checkeduser />$lt{'usyo'}</label></p>
-<fieldset id="user_$item" style="$divsty">
-<legend style="font-weight:normal;font-style:italic;">$lt{'ousv'}</legend>
-$userelem
-</fieldset><br /><hr />
-END
-            }
-            $r->print('<br />'.
-                      '<input type="submit" value="'.$lt{'save'}.'" />'.
-                      '</form>'."\n");
-        } else {
+            $r->print(Apache::loncommon::start_page('Authoring Space Settings'));
+            $r->print(Apache::lonhtmlcommon::breadcrumbs('Authoring Space Settings'));
+            my %userenv = &Apache::lonnet::get('environment',['nocodemirror']);
             my $constchecked='';
             if ($env{'environment.nocodemirror'}) {
                $constchecked=' checked="checked"';
@@ -2142,6 +1941,7 @@ END
             my $text=&mt('By default, CodeMirror an editor with advanced functionality for editing code is activated for authors.');
             my $cmoff=&mt('Deactivate CodeMirror. This can improve performance on slow computers and accessibility.');
             my $change=&mt('Save');
+            my $returnurl = &HTML::Entities::encode($env{'form.returnurl'},'"<>&\'');
             $r->print(<<ENDSCREEN);
         <form name="prefs" action="/adm/preferences" method="post">
         <input type="hidden" name="returnurl" value="$returnurl" />
@@ -2151,7 +1951,6 @@ END
         <input type="submit" value="$change" />
         </form>
 ENDSCREEN
-        }
     }
 }
 
@@ -2161,8 +1960,6 @@ sub change_authoring_settings {
     my $domain     = $env{'user.domain'};
     my %author_roles = &Apache::lonnet::get_my_roles($user,$domain,'userroles','',['au','ca','aa']);
     if (keys(%author_roles) > 0) {
-        my $message;
-        if (0) {
             my %ausettings=('environment.nocodemirror' => '');
             if ($env{'form.cmoff'}) { $ausettings{'environment.nocodemirror'}='yes'; }
             &Apache::lonnet::put('environment',\%ausettings);
@@ -2173,143 +1970,25 @@ sub change_authoring_settings {
             } else {
                 $status=&mt('off');
             }
-            $message=&Apache::lonhtmlcommon::confirm_success(&mt('Set [_1] to [_2]','<i>'.&mt('Deactivate CodeMirror in Authoring Space').'</i>','<tt>'.$status.'</tt>'));
+            my $message=&Apache::lonhtmlcommon::confirm_success(&mt('Set [_1] to [_2]','<i>'.&mt('Deactivate CodeMirror in Authoring Space').'</i>','<tt>'.$status.'</tt>'));
             $message=&Apache::loncommon::confirmwrapper($message);
-        } else {
-            my @items = ('nocodemirror','copyright','sourceavail');
-            my %oldsettings = &Apache::lonnet::get('environment',\@items);
-            my %domdefs = &Apache::lonnet::get_domain_defaults($domain);
-            my %lt = &authoring_settings_text();
-            my %titles = &authoring_settings_titles();
-            my ($result,%newsettings,%changes,@delete,@unchanged,@delerrors,@adderrors);
-            foreach my $item (@items) {
-                if ($env{'form.'.$item} eq 'dom') {
-                    if ($oldsettings{$item} eq '') {
-                        push(@unchanged,$item);
-                    } else {
-                        push(@delete,$item);
-                    }
-                } elsif ($env{'form.'.$item} eq 'user') {
-                    my $newval = $env{'form.userchoice_'.$item};
-                    my @possibles;
-                    if ($item eq 'nocodemirror') {
-                        if ($newval =~ /^yes|no$/) {
-                            $newsettings{$item} = $newval;
-                        }
-                    } elsif ($item eq 'copyright') {
-                        @possibles = (grep !/^priv|custom$/,(&Apache::loncommon::copyrightids));
-                        if (grep(/^\Q$newval\E$/,@possibles)) {
-                            $newsettings{$item} = $newval;
-                        }
-                    } elsif ($item eq 'sourceavail') {
-                        @possibles = (&Apache::loncommon::source_copyrightids);
-                        if (grep(/^\Q$newval\E$/,@possibles)) {
-                            $newsettings{$item} = $newval;
-                        }
-                    }
-                    if ($oldsettings{$item} eq $newsettings{$item}) {
-                        push(@unchanged,$item);
-                    } else {
-                        $changes{$item} = $newsettings{$item};
-                    }
-                }
-            }
-            if (@delete) {
-                if (&Apache::lonnet::del('environment',\@delete) eq 'ok') {
-                    foreach my $key (@delete) {
-                        &Apache::lonnet::delenv('environment.'.$key);
-                    }
-                } else {
-                    @delerrors = @delete;
-                }
-            }
-            if (keys(%changes)) {
-                if (&Apache::lonnet::put('environment',\%changes) eq 'ok') {
-                    my %newenvhash;
-                    map {$newenvhash{'environment.'.$_} = $changes{$_}; } (keys(%changes));
-                    &Apache::lonnet::appenv(\%newenvhash);
-                } else {
-                    foreach my $item (@items) {
-                        if (exists($changes{$item})) {
-                            push(@adderrors,$item);
-                        }
-                    }
-                }
-            }
-            if (@adderrors) {
-                $result = &mt('An error occurred when saving user-specific settings for').': '.
-                          join(', ', map { $titles{$_} } @adderrors);
-                $message = &Apache::loncommon::confirmwrapper(&Apache::lonhtmlcommon::confirm_success($result,1));
-            } elsif (keys(%changes)) {
-                $result = &mt('User-specific settings saved:').'<ul>';
-                foreach my $item (@items) {
-                    next unless (exists($changes{$item}));
-                    my $value = $changes{$item};
-                    if ($item eq 'nocodemirror') {
-                        $value = $lt{$changes{$item}};
-                    } elsif ($item eq 'copyright') {
-                        $value = &Apache::loncommon::copyrightdescription($changes{$item});
-                    } elsif ($item eq 'sourceavail') {
-                        $value = &Apache::loncommon::source_copyrightdescription($changes{$item});
-                    }
-                    $result .= '<li>'.
-                               &mt('[_1] set to [_2]',
-                                   $titles{$item},
-                                   '<span style="font-style:italic">'.$value.'</span>').
-                               '</li>';
-                }
-                $result .= '</ul>';
-                $message = &Apache::loncommon::confirmwrapper(&Apache::lonhtmlcommon::confirm_success($result));
-            }
-            if (@delerrors) {
-                $result = &mt('An error occurred when deleting user-specific settings for').':<ul><li>'.
-                          join('</li><li>', map { $titles{$_} } @delerrors).'</li></ul>';
-                $message .= &Apache::loncommon::confirmwrapper(&Apache::lonhtmlcommon::confirm_success($result,1));
-            } elsif (@delete) {
-                $result = &mt('Set use of domain default for').':<ul><li>'.
-                          join('</li><li>', map { $titles{$_} } @delete).'</li></ul>';
-                $message .= &Apache::loncommon::confirmwrapper(&Apache::lonhtmlcommon::confirm_success($result));
-            }
-            if (@unchanged) {
-                $result = &mt('No changes made for').':<ul><li>'.
-                          join('</li><li>', map { $titles{$_} } @unchanged).'</li></ul>';
-                $message .= &Apache::loncommon::confirmwrapper(&Apache::lonhtmlcommon::confirm_success($result));
+            if ($env{'form.returnurl'}) {
+                &do_redirect($r,$env{'form.returnurl'},$message);
+            } else {
+                &print_main_menu($r,$message);
             }
-        }
-        if ($env{'form.returnurl'}) {
-            &do_redirect($r,$env{'form.returnurl'},$message);
-        } else {
-            &print_main_menu($r,$message);
-        }
     }
 }
 
-sub authoring_settings_text {
-    return &Apache::lonlocal::texthash(
-               'auss' => 'Authoring Space Settings',
-               'used' => 'Use domain default',
-               'usyo' => 'Use your own user-specific setting',
-               'curd' => 'Current domain default is',
-               'ousv' => 'Own user-specific value',
-               'save' => 'Save',
-               'yes'  => 'Deactivated',
-               'no'   => 'Activated',
-     );
-}
-
-sub authoring_settings_titles {
-    return &Apache::lonlocal::texthash(
-               'nocodemirror' => 'CodeMirror for EditXML editor',
-               'copyright'    => 'Default Copyright/Distribution in new metadata file',
-               'sourceavail'  => 'Default Source Available in new metadata file',
-    );
-}
-
 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='';
-    my $ended;
     if (&can_toggle_namelocking()) {
         if ($userenv{'lockedname'}) {
             $lockedname = ' checked="checked"';
@@ -2327,11 +2006,6 @@ sub lockednameschanger {
             }
         }
         if (keys(%updateable)) {
-            &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 %longnames = &Apache::lonlocal::texthash (
                                 firstname  => 'First Name',
                                 middlename => 'Middle Name',
@@ -2358,14 +2032,11 @@ 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);
-            $ended = 1;
         }
     } 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);
-        $ended = 1;
     }
-    return $ended;
 }
 
 sub verify_and_change_lockednames {
@@ -2396,91 +2067,6 @@ sub verify_and_change_lockednames {
     &print_main_menu($r,$message);
 }
 
-sub timezonechanger {
-    my $r = shift;
-    my $uname = $env{'user.name'};
-    my $udom = $env{'user.domain'};
-    if (&Apache::lonnet::usertools_access($uname,$udom,'timezone')) {
-        my $js = &toggle_options_js();
-        my $js = <<"ENDSCRIPT";
-        my %loaditems = (
-                           onload => "javascript:toggleOptions(document.prefs,'settimezone','LC_timezone_selector');",
-                        );
-        my $args = { 'add_entries' => \%loaditems };
-        &Apache::lonhtmlcommon::add_breadcrumb(
-                {   href => '/adm/preferences?action=',
-                    text => 'Set Your Time Zone'});
-        $r->print(Apache::loncommon::start_page('Set Your Time Zone',$js,$args));
-        $r->print(Apache::lonhtmlcommon::breadcrumbs('Set Your Time Zone'));
-        my %userenv = &Apache::lonnet::get('environment',['timezone']);
-        my $timezone = $userenv{'timezone'};
-        my %lt = &Apache::lonlocal::texthash(
-                     lctz  => 'Use Time Zone set by LON-CAPA',
-                     owntz => 'Use Time Zone set by you',
-                     save  => 'Save',
-        );
-        my (%checked,$tzsty);
-        if ($userenv{'timezone'} ne '') {
-            $checked{'owntz'} = ' checked="checked"';
-            $tzsty = 'inline-block';
-        } else {
-            $checked{'lctz'} = ' checked="checked"';
-            $tzsty = 'none';
-        }
-        my $onclick = ' onclick="javascript:toggleOptions(this.form,'."'settimezone','LC_timezone_selector'".');"';
-        my $selector = &Apache::loncommon::select_timezone('timezone',$timezone,undef,1);
-        $r->print(<<"END");
-<form name="prefs" action="/adm/preferences" method="post">
-<input type="hidden" name="action" value="verify_and_change_timezone" />
-<span class="LC_nobreak">
-<label><input type="radio" name="settimezone" value="0"$checked{'lctz'}$onclick />
-$lt{'lctz'}</label>&nbsp;&nbsp;&nbsp;&nbsp;
-<label><input type="radio" name="settimezone" value="1"$checked{'owntz'}$onclick />
-$lt{'owntz'}</label><div style="display:$tzsty" id="LC_timezone_selector">&nbsp;
-$selector
-</div></span><br /><br />
-<input type="submit" value="$lt{'save'}" />
-</form>
-END
-    }
-    return;
-}
-
-sub verify_and_change_timezone {
-    my $r = shift;
-    my $currtimezone = $env{'environment.timezone'};
-    my $newtimezone;
-    if ($env{'form.settimezone'}) {
-        $newtimezone = $env{'form.timezone'};
-        if (DateTime::TimeZone->is_valid_name($env{'form.timezone'})) {
-            $newtimezone = $env{'form.timezone'};
-        }
-    }
-    my $message='';
-    if ($newtimezone) {
-        if ($newtimezone eq $currtimezone) {
-            $message = &mt('Time Zone settings unchanged');
-        } else {
-            &Apache::lonnet::put('environment',{'timezone' => $newtimezone});
-            &Apache::lonnet::appenv({'environment.timezone' => $newtimezone});
-            $message=&Apache::lonhtmlcommon::confirm_success(
-                &mt('Set [_1] to [_2]',
-                    '<i>'.&mt('Your Time Zone').'</i>',
-                    '<tt>"'.$newtimezone.'"</tt>.')).
-               '<br />';
-        }
-    } elsif ($currtimezone) {
-        &Apache::lonnet::del('environment',['timezone']);
-        &Apache::lonnet::delenv('environment.timezone');
-        $message=&Apache::lonhtmlcommon::confirm_success(&mt('Time Zone now set by LON-CAPA'));
-    } else {
-        $message = &mt('Time Zone settings unchanged');
-    }
-    $message=&Apache::loncommon::confirmwrapper($message);
-    &print_main_menu($r,$message);
-    return;
-}
-
 sub print_main_menu {
     my ($r, $message) = @_;
     # Determine current authentication method
@@ -2495,11 +2081,6 @@ my %permissions;
 if (&Apache::lonnet::usertools_access($user,$domain,'aboutme')) {
     $permissions{'aboutme'} = 'F';
 }
-if (&Apache::lonnet::usertools_access($user,$domain,'timezone')) {
-    $permissions{'timezone'} = 'F';
-}
-my %author_roles = &Apache::lonnet::get_my_roles($user,$domain,'userroles','',['au']);
-my %author_coauthor_roles = &Apache::lonnet::get_my_roles($user,$domain,'userroles','',['au','ca','aa']);
 my @menu=
     ({	categorytitle=>'Personal Data',
 	items =>[
@@ -2542,14 +2123,6 @@ my @menu=
 		icon => 'dismath.png',
 		linktitle => 'Change how math is displayed.'
 	    },
-            {
-                linktext => 'Time Zone',
-                url => '/adm/preferences?action=changetimezone',
-                permission => $permissions{'timezone'},
-                #help => '',
-                icon => 'timezone.png',
-                linktitle => 'Set your time zone.',
-             }
 		]
     },
     {	categorytitle=>'Page Display Settings',
@@ -2588,33 +2161,6 @@ my @menu=
 	    },
 		]
     },
-    );
-if (keys(%author_coauthor_roles) > 0) {
-    push(@menu,
-    {    categorytitle=>'Authoring Settings',
-         items => [
-             {
-                  linktext => 'Authoring Space Configuration',
-                  url => '/adm/preferences?action=authorsettings',
-                  permission => 'F',
-                  icon => 'codemirror.png',
-                  linktitle => 'Settings for your authoring space.',
-             },
-                  ]
-    },
-    );
-    if (keys(%author_roles) > 0) {
-        push(@{ $menu[4]->{items} }, {
-        linktext => 'Restrict Domain Coordinator Access',
-        url => '/adm/preferences?action=changedomcoord',
-        permission => 'F',
-        #help => '',
-        icon => 'system-lock-screen.png',
-        linktitle => 'Restrict domain coordinator access.',
-        });
-    }
-}
-push(@menu,
     {	categorytitle=>'Other',
 	items =>[
 	    {	linktext => 'Register Response Devices (&quot;Clickers&quot;)',
@@ -2629,7 +2175,7 @@ push(@menu,
     );
 
     if ($currentauth =~ /^(unix|internal):/) {
-        push(@{ $menu[0]->{items} }, {
+push(@{ $menu[0]->{items} }, {
 	linktext => 'Password',
 	url => '/adm/preferences?action=changepass',
 	permission => 'F',
@@ -2638,25 +2184,6 @@ push(@menu,
 	linktitle => 'Change your password.',
 	});
     }
-    if ($env{'environment.remote'} eq 'off') {
-        push(@{ $menu[1]->{items} }, {
-        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&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} }, {
@@ -2669,10 +2196,22 @@ push(@{ $menu[1]->{items} }, {
         });
     }
 
+    my %author_roles = &Apache::lonnet::get_my_roles($user,$domain,'userroles','',['au']);
+    if (keys(%author_roles) > 0) {
+push(@{ $menu[4]->{items} }, {
+	linktext => 'Restrict Domain Coordinator Access',
+	url => '/adm/preferences?action=changedomcoord',
+	permission => 'F',
+	#help => '',
+	icon => 'system-lock-screen.png',
+	linktitle => 'Restrict domain coordinator access.',
+	});
+    }
+
     if (&Apache::lonnet::allowed('whn',$env{'request.course.id'})
 	|| &Apache::lonnet::allowed('whn',$env{'request.course.id'}.'/'
 				    .$env{'request.course.sec'})) {
-push(@{ $menu[-1]->{items} }, {
+push(@{ $menu[4]->{items} }, {
 	linktext => 'Course Initialization',
 	url => '/adm/preferences?action=changecourseinit',
 	permission => 'F',
@@ -2683,8 +2222,19 @@ push(@{ $menu[-1]->{items} }, {
 
     }
 
+    my %author_coauthor_roles = &Apache::lonnet::get_my_roles($user,$domain,'userroles','',['au','ca','aa']);
+    if (keys(%author_coauthor_roles) > 0) {
+        push(@{ $menu[4]->{items} }, {
+            linktext => 'Authoring Space Configuration',
+            url => '/adm/preferences?action=authorsettings',
+            permission => 'F',
+            icon => 'codemirror.png',
+            linktitle => 'Settings for your authoring space.',
+        });
+    }
+
     if (&can_toggle_debug()) {
-push(@{ $menu[-1]->{items} }, {
+push(@{ $menu[4]->{items} }, {
 	linktext => 'Toggle Debug Messages (Currently '.($env{'user.debug'} ? 'on)' : 'off)'),
 	url => '/adm/preferences?action=debugtoggle',
 	permission => 'F',
@@ -2739,19 +2289,19 @@ sub handler {
     } else {
         $brlink ='/adm/preferences';
         $brtxt = 'Set User Preferences';
-        $brhelp = 'Prefs_About_Me,Prefs_Language,Prefs_Screen_Name_Nickname,Change_Colors,Change_Password,Prefs_Messages,Change_Discussion_Display';
+        $brhelp = 'Prefs_About_Me,Prefs_Language,Prefs_Screen_Name_Nickname,Change_Colors,Change_Password,Prefs_Messages,Change_Discussion_Display';   
     }
     Apache::lonhtmlcommon::add_breadcrumb
         ({href => $brlink,
           text => $brtxt,
           help => $brhelp,});
     if(!exists $env{'form.action'}) {
-	    &print_main_menu($r);
-            $ended = 1;
+	&print_main_menu($r);
+        $ended = 1;
     }elsif($env{'form.action'} eq 'changepass'){
         &passwordchanger($r);
     }elsif($env{'form.action'} eq 'verify_and_change_pass'){
-        &verify_and_change_password($r,'preferences','','','',\$ended);
+        &verify_and_change_password($r,'preferences','',\$ended);
     }elsif($env{'form.action'} eq 'changescreenname'){
         &screennamechanger($r);
     }elsif($env{'form.action'} eq 'verify_and_change_screenname'){
@@ -2827,14 +2377,10 @@ sub handler {
 	&print_main_menu($r);
         $ended = 1;
     } elsif ($env{'form.action'} eq 'changelockednames') {
-        $ended = &lockednameschanger($r);
+        &lockednameschanger($r);
     } elsif ($env{'form.action'} eq 'verify_and_change_lockednames') {
         &verify_and_change_lockednames($r);
         $ended = 1;
-    } elsif ($env{'form.action'} eq 'changetimezone') {
-        &timezonechanger($r);
-    } elsif ($env{'form.action'} eq 'verify_and_change_timezone') {
-        &verify_and_change_timezone($r);
     }
 
     # Properly end the HTML page of all preference pages
@@ -2916,66 +2462,13 @@ sub updateable_userinfo {
 sub do_redirect {
     my ($r,$url,$msg) = @_;
     $r->print(
-        &Apache::loncommon::start_page('Loading ...',undef,
-                                       {'redirect'       => [2,$url]}).
+        &Apache::loncommon::start_page('Switching Server ...',undef,
+                                       {'redirect'       => [0.5,$url]}).
         '<div style="padding:0;clear:both;margin:0;border:0"></div>'."\n".
         "$msg\n".
         &Apache::loncommon::end_page());
     return;
 }
 
-sub toggle_options_js {
-    return <<"ENDSCRIPT";
-<script type="text/javascript">
-// <![CDATA[
-function toggleOptions(form,radioname,divid) {
-    var num = form.elements[radioname].length;
-    if (num) {
-        var setvis = '';
-        var onvalue = 'user';
-        if (radioname == 'settimezone') {
-            onvalue = '1';
-        }
-        for (var i=0; i<num; i++) {
-            if (form.elements[radioname][i].checked) {
-                if (form.elements[radioname][i].value == onvalue) {
-                    if (document.getElementById(divid)) {
-                        document.getElementById(divid).style.display = 'inline-block';
-                    }
-                    setvis = 1;
-                }
-                break;
-            }
-        }
-        if (!setvis) {
-            if (document.getElementById(divid)) {
-                document.getElementById(divid).style.display = 'none';
-            }
-        }
-    }
-    return;
-}
-// ]]>
-</script>
-ENDSCRIPT
-}
-
-sub selectbox {
-    my ($name,$value,$readonly,$functionref,@idlist)=@_;
-    my $selout = '<select name="'.$name.'">';
-    foreach my $id (@idlist) {
-        $selout.='<option value="'.$id.'"';
-        if ($id eq $value) {
-            $selout.=' selected="selected"';
-        }
-        if ($readonly) {
-            $selout .= ' disabled="disabled"';
-        }
-        $selout.='>'.&{$functionref}($id).'</option>';
-    }
-    $selout.='</select>';
-    return $selout;
-}
-
 1;
 __END__