--- loncom/interface/lonpreferences.pm	2021/12/14 00:30:54	1.196.4.28
+++ loncom/interface/lonpreferences.pm	2016/09/16 22:42:26	1.223
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Preferences
 #
-# $Id: lonpreferences.pm,v 1.196.4.28 2021/12/14 00:30:54 raeburn Exp $
+# $Id: lonpreferences.pm,v 1.223 2016/09/16 22:42:26 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -27,6 +27,8 @@
 #
 # This package uses the "londes.js" javascript code. 
 #
+# TODOs that have to be completed:
+#    interface with lonnet to change the password
  
 package Apache::lonpreferences;
 
@@ -165,7 +167,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 +184,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 +282,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 +365,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 />'.
@@ -475,6 +477,7 @@ sub verify_and_change_rolespref {
 }
 
 
+
 ################################################################
 #         Anonymous Discussion Name Change Subroutines         #
 ################################################################
@@ -627,7 +630,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 +639,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 +686,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);
 }
@@ -719,10 +757,8 @@ sub domcoordchanger {
     my $text=&mt('By default, the Domain Coordinator can enter your Authoring Space.');
     my $construction=&mt('Block access to Authoring Space');
     my $change=&mt('Save');
-    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" />
 <input type="hidden" name="action" value="verify_and_change_domcoord" />
 $text<br />
 <label><input type="checkbox" name="construction"$constchecked />$construction</label><br />
@@ -747,11 +783,7 @@ sub verify_and_change_domcoord {
     }
     my $message=&Apache::lonhtmlcommon::confirm_success(&mt('Set [_1] to [_2]','<i>'.&mt('Block access to Authoring Space').'</i>','<tt>'.$status.'</tt>'));
     $message=&Apache::loncommon::confirmwrapper($message);
-    if ($env{'form.returnurl'}) {
-        &do_redirect($r,$env{'form.returnurl'},$message);
-    } else {
-        &print_main_menu($r,$message);
-    }
+    &print_main_menu($r,$message);
 }
 
 #################################################################
@@ -1142,10 +1174,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 +1229,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});
@@ -1226,12 +1258,11 @@ sub verify_and_change_colors {
 #            password handler subroutines            #
 ######################################################
 sub passwordchanger {
-    my ($r,$errormessage,$caller,$mailtoken,$timelimit,$extrafields) = @_;
+    my ($r,$errormessage,$caller,$mailtoken) = @_;
     # 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,61 +1270,55 @@ 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) {
-            $r->print(
-                '<p class="LC_warning">'
-               .&mt('Sorry, the URL you provided to complete the reset of your password was invalid. Either the token included in the URL has been deleted or the URL you provided was invalid. Please submit a [_1]new request[_2] for a password reset, and follow the link to the new URL included in the e-mail that will be sent to you, to allow you to enter a new password.'
-                   ,'<a href="/adm/resetpw">','</a>')
-               .'</p>'
-            );
-            return;
-        }
-        if (defined($data{time})) {
-            if (time - $data{'time'} < $timelimit) {
-                $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>');
+            my %data = &Apache::lonnet::tmpget($mailtoken);
+            if (keys(%data) == 0) {
+                $r->print(
+                    '<p class="LC_warning">'
+                   .&mt('Sorry, the URL you provided to complete the reset of your password was invalid. Either the token included in the URL has been deleted or the URL you provided was invalid. Please submit a [_1]new request[_2] for a password reset, and follow the link to the new URL included in the e-mail that will be sent to you, to allow you to enter a new password.'
+                       ,'<a href="/adm/resetpw">','</a>')
+                   .'</p>'
+                );
+                return;
+            }
+            if (defined($data{time})) {
+                if (time - $data{'time'} < 7200) {
+                    $user = $data{'username'};
+                    $domain = $data{'domain'};
+                    $currentpass = $data{'temppasswd'};
+                } else {
+                    $r->print(
+                        '<p class="LC_warning">'
+                       .&mt('Sorry, the token generated when you requested'
+                           .' a password reset has expired.')
+                       .'</p>'
+                    );
                     return;
                 }
             } else {
                 $r->print(
                     '<p class="LC_warning">'
-                   .&mt('Sorry, the token generated when you requested'
-                       .' a password reset has expired.')
+                   .&mt('Sorry, the URL generated when you requested reset of'
+                       .' your password contained incomplete information.')
                    .'</p>'
                 );
                 return;
             }
-        } else {
-            $r->print(
-                '<p class="LC_warning">'
-                .&mt('Sorry, the URL generated when you requested reset of'
-                    .' your password contained incomplete information.')
-                .'</p>'
-            );
-            return;
-        }
-        if (&Apache::lonnet::domain($domain) eq '') {
-            $domain = $r->dir_config('lonDefDomain');
-        }
+            if (&Apache::lonnet::domain($domain) eq '') {
+                $domain = $r->dir_config('lonDefDomain');
+            }
     } else {
         $r->print(
             '<p class="LC_error">'
@@ -1332,7 +1357,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));
     $r->print(<<ENDFORM);
 $errormessage
 
@@ -1341,113 +1366,19 @@ $errormessage
      ensure that unencrypted passwords will not be sent out by a
      crappy browser -->
 ENDFORM
-    $r->print(&server_form($logtoken,$caller,$mailtoken,$extrafields));
-    $r->print(&client_form($caller,\%hexkey,$currentpass,$domain,$extrafields));
+    $r->print(&server_form($logtoken,$caller,$mailtoken));
+    $r->print(&client_form($caller,\%hexkey,$currentpass,$domain));
 
     #
     return;
 }
 
 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) = @_;
     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();
@@ -1465,20 +1396,14 @@ $passwdcheck
             =getCrypted(this.document.client.elements.newpass_2.value);
 |;
     if ($caller eq 'reset_by_email') {
-        if ((ref($extrafields) eq 'HASH') && ($extrafields->{'username'})) {
-            $output .= qq|
+        $output .= qq|
         this.document.pserver.elements.uname.value =
                    this.document.client.elements.uname.value;
         this.document.pserver.elements.udom.value =
                    this.document.client.elements.udom.options[this.document.client.elements.udom.selectedIndex].value;
-|;
-        }
-        if ((ref($extrafields) eq 'HASH') && ($extrafields->{'email'})) {
-            $output .= qq|
         this.document.pserver.elements.email.value =
                    this.document.client.elements.email.value;
 |;
-        }
     }
     $ output .= qq|
         this.document.pserver.submit();
@@ -1489,7 +1414,7 @@ $passwdcheck
 }
 
 sub client_form {
-    my ($caller,$hexkey,$currentpass,$defdom,$extrafields) = @_;
+    my ($caller,$hexkey,$currentpass,$defdom) = @_;
     my %lt=&Apache::lonlocal::texthash(
                 'email' => 'E-mail Address',
                 'username' => 'Username',
@@ -1503,22 +1428,25 @@ sub client_form {
     my $output = '<form name="client" action="">'
                 .&Apache::lonhtmlcommon::start_pick_box();
     if ($caller eq 'reset_by_email') {
-        if ((ref($extrafields) eq 'HASH') && ($extrafields->{'email'})) {
-            $output .= &Apache::lonhtmlcommon::row_title(
-                       '<label for="email">'.$lt{'email'}.'</label>')
-                      .'<input type="text" name="email" size="30" autocapitalize="off" autocorrect="off" />'
-                      .&Apache::lonhtmlcommon::row_closure();
+        my $mobileargs;
+        (undef,undef,undef,undef,undef,undef,my $clientmobile) =
+            &Apache::loncommon::decode_user_agent();
+        if ($clientmobile) {
+            $mobileargs = 'autocapitalize="off" autocorrect="off" ';
         }
-        if ((ref($extrafields) eq 'HASH') && ($extrafields->{'username'})) {
-            $output .= &Apache::lonhtmlcommon::row_title(
+        $output .= &Apache::lonhtmlcommon::row_title(
+                       '<label for="email">'.$lt{'email'}.'</label>')
+                  .'<input type="text" name="email" size="30" '.$mobileargs.'/>'
+                  .&Apache::lonhtmlcommon::row_closure()
+                  .&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()
-                      .&Apache::lonhtmlcommon::row_title(
+                  .'<input type="text" name="uname" size="20" '.$mobileargs.'/>'
+                  .'<input type="hidden" name="currentpass" value="'.$currentpass.'" />'
+                  .&Apache::lonhtmlcommon::row_closure()
+                  .&Apache::lonhtmlcommon::row_title(
                        '<label for="udom">'.$lt{'domain'}.'</label>')
-                      .&Apache::loncommon::select_dom_form($defdom,'udom')
-                      .&Apache::lonhtmlcommon::row_closure();
-        }
+                  .&Apache::loncommon::select_dom_form($defdom,'udom')
+                  .&Apache::lonhtmlcommon::row_closure();
     } else {
         $output .= &Apache::lonhtmlcommon::row_title(
                        '<label for="currentpass">'.$lt{'currentpass'}.'</label>')
@@ -1534,9 +1462,6 @@ sub client_form {
               .'<input type="password" name="newpass_2" size="20" />'
               .&Apache::lonhtmlcommon::row_closure(1)
               .&Apache::lonhtmlcommon::end_pick_box();
-    if ($caller eq 'reset_by_email') {
-        $output .= '<input type="hidden" name="currentpass" value="'.$currentpass.'" />';
-    }
     $output .= '<p><input type="button" value="'.$lt{'changepass'}.'" onclick="send();" /></p>'
               .qq|
 <input type="hidden" name="ukey_cpass"  value="$hexkey->{'ukey_cpass'}" />
@@ -1552,7 +1477,7 @@ sub client_form {
 }
 
 sub server_form {
-    my ($logtoken,$caller,$mailtoken,$extrafields) = @_;
+    my ($logtoken,$caller,$mailtoken) = @_;
     my $action = '/adm/preferences';
     if ($caller eq 'reset_by_email') {
         $action = '/adm/resetpw';
@@ -1563,22 +1488,15 @@ sub server_form {
 <input type="hidden" name="currentpass" value="" />
 <input type="hidden" name="newpass_1"   value="" />
 <input type="hidden" name="newpass_2"   value="" />
-|;
+    |;
     if ($caller eq 'reset_by_email') {
         $output .=  qq|
 <input type="hidden" name="token"   value="$mailtoken" />
-|;
-       if ((ref($extrafields) eq 'HASH') && ($extrafields->{'username'})) {
-           $output .=  qq|
 <input type="hidden" name="uname"   value="" />
 <input type="hidden" name="udom"   value="" />
-|;
-       }
-       if ((ref($extrafields) eq 'HASH') && ($extrafields->{'email'})) {
-           $output .=  qq|
 <input type="hidden" name="email"   value="" />
+
 |;
-       }
     }
     $output .= qq|
 <input type="hidden" name="action" value="verify_and_change_pass" />
@@ -1588,8 +1506,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) = @_;
+    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 +1522,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 +1543,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 +1560,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 +1579,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 +1593,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 +1635,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)
@@ -1773,32 +1651,20 @@ ENDERROR
             $r->print($message.'<br />');
         } else {
             &print_main_menu($r, $message);
-            if (ref($ended)) {
-                $$ended = 1;
-            }
         }
     } else {
 	# 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)) {
-                $$ended = 1;
-            }
         }
     }
     return;
@@ -2053,10 +1919,8 @@ sub author_space_settings {
             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" />
         <input type="hidden" name="action" value="change_authoring_settings" />
         $text<br />
         <label><input type="checkbox" name="cmoff"$constchecked />$cmoff</label><br />
@@ -2084,11 +1948,7 @@ sub change_authoring_settings {
             }
             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);
-            if ($env{'form.returnurl'}) {
-                &do_redirect($r,$env{'form.returnurl'},$message);
-            } else {
-                &print_main_menu($r,$message);
-            }
+            &print_main_menu($r,$message);
     }
 }
 
@@ -2296,25 +2156,6 @@ push(@{ $menu[0]->{items} }, {
 	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} }, {
@@ -2359,7 +2200,7 @@ push(@{ $menu[4]->{items} }, {
             linktext => 'Authoring Space Configuration',
             url => '/adm/preferences?action=authorsettings',
             permission => 'F',
-            icon => 'codemirror.png',
+            icon => 'course_ini.png',
             linktitle => 'Settings for your authoring space.',
         });
     }
@@ -2401,26 +2242,14 @@ sub handler {
                                    ['action','wysiwyg','returnurl','refpage']);
     #
     Apache::lonhtmlcommon::clear_breadcrumbs();
-    my ($brlink,$brtxt,$brhelp,$ended);
+    my ($brlink,$brtxt,$brhelp);
     if (($env{'form.action'} eq 'changerolespref') && ($env{'form.returnurl'} eq '/adm/roles')) {
         $brlink ='/adm/roles';
         $brtxt = 'User Roles';
-    } elsif ((($env{'form.action'} eq 'changedomcoord') ||
-              ($env{'form.action'} eq 'authorsettings')) &&
-             (($env{'form.returnurl'} =~ m{^/(priv/|res($|/))}) ||
-              ($env{'form.returnurl'} eq '/adm/createuser'))) {
-        $brlink = $env{'form.returnurl'};
-        if ($env{'form.returnurl'} eq '/adm/createuser') {
-            $brtxt = 'User Management';
-        } elsif ($env{'form.returnurl'} =~ m{^/res($\/)}) {
-            $brtxt = 'Browse published resources';
-        } else {
-            $brtxt = 'Authoring Space';
-        }
     } 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,
@@ -2428,16 +2257,14 @@ sub handler {
           help => $brhelp,});
     if(!exists $env{'form.action'}) {
 	    &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');
     }elsif($env{'form.action'} eq 'changescreenname'){
         &screennamechanger($r);
     }elsif($env{'form.action'} eq 'verify_and_change_screenname'){
         &verify_and_change_screenname($r);
-        $ended = 1;
     }elsif($env{'form.action'} eq 'changemsgforward'){
         &msgforwardchanger($r);
     }elsif($env{'form.action'} eq 'verify_and_change_msgforward'){
@@ -2446,47 +2273,38 @@ sub handler {
         &colorschanger($r);
     }elsif($env{'form.action'} eq 'verify_and_change_colors'){
         &verify_and_change_colors($r);
-        $ended = 1;
     }elsif($env{'form.action'} eq 'changelanguages'){
         &languagechanger($r);
     }elsif($env{'form.action'} eq 'verify_and_change_languages'){
         &verify_and_change_languages($r);
-        $ended = 1;
     }elsif($env{'form.action'} eq 'changewysiwyg'){
         &wysiwygchanger($r);
     }elsif($env{'form.action'} eq 'set_wysiwyg'){
         &verify_and_change_wysiwyg($r);
-        $ended = 1;
     }elsif($env{'form.action'} eq 'changediscussions'){
         &discussionchanger($r);
     }elsif($env{'form.action'} eq 'verify_and_change_discussion'){
         &verify_and_change_discussion($r);
-        $ended = 1;
     }elsif($env{'form.action'} eq 'changerolespref'){
         &rolesprefchanger($r);
     }elsif($env{'form.action'} eq 'verify_and_change_rolespref'){
         &verify_and_change_rolespref($r);
-        $ended = 1;
     }elsif($env{'form.action'} eq 'changetexenginepref'){
         &texenginechanger($r);
     }elsif($env{'form.action'} eq 'verify_and_change_texengine'){
         &verify_and_change_texengine($r);
-        $ended = 1;
     }elsif($env{'form.action'} eq 'changeicons'){
         &iconchanger($r);
     }elsif($env{'form.action'} eq 'verify_and_change_icons'){
         &verify_and_change_icons($r);
-        $ended = 1;
     }elsif($env{'form.action'} eq 'changeclicker'){
         &clickerchanger($r);
     }elsif($env{'form.action'} eq 'verify_and_change_clicker'){
         &verify_and_change_clicker($r);
-        $ended = 1;
     }elsif($env{'form.action'} eq 'changedomcoord'){
         &domcoordchanger($r);
     }elsif($env{'form.action'} eq 'verify_and_change_domcoord'){
         &verify_and_change_domcoord($r);
-        $ended = 1;
     }elsif($env{'form.action'} eq 'lockwarning'){
         &lockwarning($r);
     }elsif($env{'form.action'} eq 'verify_and_change_locks'){
@@ -2495,29 +2313,26 @@ sub handler {
         &coursedisplaychanger($r);
     }elsif($env{'form.action'} eq 'verify_and_change_coursepage'){
         &verify_and_change_coursepage($r);
-        $ended = 1;
     }elsif($env{'form.action'} eq 'authorsettings'){
         &author_space_settings($r);
     }elsif($env{'form.action'} eq 'change_authoring_settings'){
         &change_authoring_settings($r);
-        $ended = 1;
     }elsif($env{'form.action'} eq 'debugtoggle'){
         if (&can_toggle_debug()) {
             &toggle_debug();
         }
 	&print_main_menu($r);
-        $ended = 1;
     } elsif ($env{'form.action'} eq 'changelockednames') {
         &lockednameschanger($r);
     } elsif ($env{'form.action'} eq 'verify_and_change_lockednames') {
         &verify_and_change_lockednames($r);
-        $ended = 1;
     }
 
     # 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 ($ended) {
+    unless (!exists $env{'form.action'} ||
+            $env{'form.action'} eq 'debugtoggle') {
         $r->print(&Apache::loncommon::end_page());
     }
 
@@ -2590,16 +2405,5 @@ sub updateable_userinfo {
     return %updateable;
 }
 
-sub do_redirect {
-    my ($r,$url,$msg) = @_;
-    $r->print(
-        &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;
-}
-
 1;
 __END__