--- loncom/interface/lonpreferences.pm	2019/08/22 00:00:03	1.196.4.25
+++ loncom/interface/lonpreferences.pm	2016/01/31 21:25:37	1.218
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Preferences
 #
-# $Id: lonpreferences.pm,v 1.196.4.25 2019/08/22 00:00:03 raeburn Exp $
+# $Id: lonpreferences.pm,v 1.218 2016/01/31 21:25:37 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;
 
@@ -158,14 +160,12 @@ sub texenginechanger {
     my $domain     = $env{'user.domain'};
     my %userenv = &Apache::lonnet::get('environment',['texengine']);
     my $texengine=$userenv{'texengine'};
-    if (lc($texengine) eq 'jsmath') {
-        $texengine = 'MathJax';
-    }
 
     my %mathchoices=('' => 'Default',
 		     'tth' => 'tth (TeX to HTML)',
 		     #'ttm' => 'TeX to MathML',
-                     'MathJax' => 'MathJax',
+		     'jsMath' => 'jsMath',
+		     'MathJax' => 'MathJax',
 		     'mimetex' => 'mimetex (Convert to Images)',
                      'raw' => 'Raw (Screen Reader)'
                      );
@@ -176,17 +176,34 @@ sub texenginechanger {
                'texengine',
                \%mathchoices);
     my $MathJax_start=&Apache::lontexconvert::MathJax_header();
+    my $jsMath_start=&Apache::lontexconvert::jsMath_header();
     my %lt=&Apache::lonlocal::texthash(
       'headline' => 'Change how math is displayed',
       'preftxt'  => 'Preferred method to display math',
       '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.',
+      'jsmath'   => 'jsMath:',
       'tth'      => 'tth (TeX to HTML):',
       'mimetex'  => 'mimetex (Convert to Images):',
     );
 
+    my $jsMathWarning='<p>'
+                     .'<div class="LC_warning">'
+                     .&mt("It looks like you don't have the TeX math fonts installed.")
+                     .'</div>'
+                     .'<div>'
+                     .&mt('The jsMath example on this page may not look right without them. '
+                         .'The [_1]jsMath Home Page[_2] has information on how to download the '
+                         .'needed fonts. In the meantime, jsMath will do the best it can '
+                         .'with the fonts you have, but it may not be pretty and some equations '
+                         .'may not be rendered correctly.'
+                         ,'<a href="http://www.math.union.edu/locate/jsMath/" target="_blank">'
+                         ,'</a>')
+                     .'</div>'
+                     .'</p>';
+
     $r->print(<<ENDLSCREEN);
 <h2>$lt{'headline'}</h2>
 <form name="prefs" action="/adm/preferences" method="post">
@@ -209,6 +226,18 @@ $lt{'exmpl'}
 $lt{'mathjaxinfo'}
 </p>
 
+<h3>$lt{'jsmath'}</h3> 
+<p>
+$jsMath_start
+<script type="text/javascript" language="JavaScript">
+if (jsMath.nofonts == 1) {
+    document.writeln($jsMathWarning);
+}
+
+</script>
+<iframe src="/res/adm/pages/math_example.tex?inhibitmenu=yes&texengine=jsMath" width="400" height="150"></iframe>
+</p>
+
 <h3>$lt{'mimetex'}</h3>
 <p>
 <iframe src="/res/adm/pages/math_example.tex?inhibitmenu=yes&texengine=mimetex" width="400" height="150"></iframe>
@@ -219,6 +248,9 @@ $lt{'mathjaxinfo'}
 <iframe src="/res/adm/pages/math_example.tex?inhibitmenu=yes&texengine=tth" width="400" height="150"></iframe>
 </p>
 ENDLSCREEN
+    if ($env{'environment.texengine'} ne 'jsMath') {
+	$r->print('<script type="text/javascript" language="JavaScript">jsMath.Process()</script>');
+    }
 }
 
 
@@ -229,9 +261,6 @@ sub verify_and_change_texengine {
 # Screenname
     my $newtexengine  = $env{'form.texengine'};
     $newtexengine=~s/[^\-\w]//g;
-    if (lc($newtexengine) eq 'jsmath') {
-        $newtexengine = 'MathJax';
-    }
     if ($newtexengine eq 'ttm') {
 	&Apache::lonnet::appenv({'browser.mathml' => 1});
     } else {
@@ -280,7 +309,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 +392,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 +504,7 @@ sub verify_and_change_rolespref {
 }
 
 
+
 ################################################################
 #         Anonymous Discussion Name Change Subroutines         #
 ################################################################
@@ -683,16 +713,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 +784,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 +810,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 +1201,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 +1256,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,7 +1285,7 @@ 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 || '');
@@ -1251,42 +1310,42 @@ sub passwordchanger {
             $caller = 'preferences';
         }
     } 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 %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">'
@@ -1325,7 +1384,7 @@ sub passwordchanger {
 	my $jsh=Apache::File->new($include."/londes.js");
 	$r->print(<$jsh>);
     }
-    $r->print(&jscript_send($caller,$extrafields));
+    $r->print(&jscript_send($caller));
     $r->print(<<ENDFORM);
 $errormessage
 
@@ -1334,15 +1393,15 @@ $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,$extrafields) = @_;
+    my ($caller) = @_;
     my $output = qq|
 <script type="text/javascript" language="JavaScript">
 
@@ -1350,45 +1409,41 @@ sub jscript_send {
         uextkey=this.document.client.elements.ukey_cpass.value;
         lextkey=this.document.client.elements.lkey_cpass.value;
         initkeys();
-        this.document.pserver.elements.currentpass.value =
-            getCrypted(this.document.client.elements.currentpass.value);
+
+        this.document.pserver.elements.currentpass.value
+            =crypted(this.document.client.elements.currentpass.value);
+
         uextkey=this.document.client.elements.ukey_npass1.value;
         lextkey=this.document.client.elements.lkey_npass1.value;
         initkeys();
         this.document.pserver.elements.newpass_1.value
-            =getCrypted(this.document.client.elements.newpass_1.value);
+            =crypted(this.document.client.elements.newpass_1.value);
+
         uextkey=this.document.client.elements.ukey_npass2.value;
         lextkey=this.document.client.elements.lkey_npass2.value;
         initkeys();
         this.document.pserver.elements.newpass_2.value
-            =getCrypted(this.document.client.elements.newpass_2.value);
+            =crypted(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();
     }
-
 </script>
 |;
 }
 
 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',
@@ -1402,40 +1457,34 @@ 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(
+        $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();
-        }
-        if ((ref($extrafields) eq 'HASH') && ($extrafields->{'username'})) {
-            $output .= &Apache::lonhtmlcommon::row_title(
+                  .'<input type="text" name="email" size="30" />'
+                  .&Apache::lonhtmlcommon::row_closure()
+                  .&Apache::lonhtmlcommon::row_title(
                        '<label for="uname">'.$lt{'username'}.'</label>')
-                      .'<input type="text" name="uname" size="20" autocapitalize="off" autocorrect="off" />'
-                      .&Apache::lonhtmlcommon::row_closure()
-                      .&Apache::lonhtmlcommon::row_title(
+                  .'<input type="text" name="uname" size="15" />'
+                  .'<input type="hidden" name="currentpass" value="'.$currentpass.'" />'
+                  .&Apache::lonhtmlcommon::row_closure()
+                  .&Apache::lonhtmlcommon::row_title(
                        '<label for="udom">'.$lt{'domain'}.'</label>')
-                      .&Apache::loncommon::select_dom_form($defdom,'udom')
-                      .&Apache::lonhtmlcommon::row_closure();
-        }
+                  .&Apache::loncommon::select_dom_form($defdom,'udom')
+                  .&Apache::lonhtmlcommon::row_closure();
     } else {
         $output .= &Apache::lonhtmlcommon::row_title(
                        '<label for="currentpass">'.$lt{'currentpass'}.'</label>')
-                  .'<input type="password" name="currentpass" size="20"/>'
+                  .'<input type="password" name="currentpass" size="10"/>'
                   .&Apache::lonhtmlcommon::row_closure();
     }
     $output .= &Apache::lonhtmlcommon::row_title(
                    '<label for="newpass_1">'.$lt{'newpass'}.'</label>')
-              .'<input type="password" name="newpass_1" size="20" />'
+              .'<input type="password" name="newpass_1" size="10" />'
               .&Apache::lonhtmlcommon::row_closure()
               .&Apache::lonhtmlcommon::row_title(
                    '<label for="newpass_2">'.$lt{'confirmpass'}.'</label>')
-              .'<input type="password" name="newpass_2" size="20" />'
+              .'<input type="password" name="newpass_2" size="10" />'
               .&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'}" />
@@ -1451,7 +1500,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';
@@ -1462,22 +1511,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" />
@@ -1487,7 +1529,7 @@ sub server_form {
 }
 
 sub verify_and_change_password {
-    my ($r,$caller,$mailtoken,$ended) = @_;
+    my ($r,$caller,$mailtoken) = @_;
     my ($user,$domain,$homeserver);
     my ($blocked,$blocktext) =
         &Apache::loncommon::blocking_status('passwd');
@@ -1563,7 +1605,7 @@ ENDERROR
         return 1;
     }
     my ($ckey,$n1key,$n2key)=split(/&/,$tmpinfo);
-    #
+    # 
     $currentpass = &Apache::loncommon::des_decrypt($ckey ,$currentpass);
     $newpass1    = &Apache::loncommon::des_decrypt($n1key,$newpass1);
     $newpass2    = &Apache::loncommon::des_decrypt($n2key,$newpass2);
@@ -1584,7 +1626,7 @@ ENDERROR
                          &mt('Please try again.').'</span>',$caller,$mailtoken);
             return 1;
         }
-    }
+    } 
     if ($newpass1 ne $newpass2) {
 	&passwordchanger($r,
 			 '<span class="LC_warning">'.
@@ -1592,23 +1634,12 @@ ENDERROR
 			 &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);
-            return 1;
-        }
-    } 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);
-	    return 1;
-        }
+    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
@@ -1643,9 +1674,6 @@ 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
@@ -1656,19 +1684,10 @@ ENDERROR
                 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;
@@ -1923,10 +1942,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 />
@@ -1954,11 +1971,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);
     }
 }
 
@@ -2166,25 +2179,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} }, {
@@ -2223,13 +2217,13 @@ push(@{ $menu[4]->{items} }, {
 
     }
 
-    my %author_coauthor_roles = &Apache::lonnet::get_my_roles($user,$domain,'userroles','',['au','ca','aa']);
-    if (keys(%author_coauthor_roles) > 0) {
+    my %author_roles = &Apache::lonnet::get_my_roles($user,$domain,'userroles','',['au','ca','aa']);
+    if (keys(%author_roles) > 0) {
         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.',
         });
     }
@@ -2271,26 +2265,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,
@@ -2298,16 +2280,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);
     }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'){
@@ -2316,47 +2296,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'){
@@ -2365,29 +2336,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());
     }
 
@@ -2460,16 +2428,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__