--- loncom/interface/lonpreferences.pm	2009/10/09 04:13:55	1.125.4.8
+++ loncom/interface/lonpreferences.pm	2009/09/23 15:12:54	1.125.8.1
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Preferences
 #
-# $Id: lonpreferences.pm,v 1.125.4.8 2009/10/09 04:13:55 raeburn Exp $
+# $Id: lonpreferences.pm,v 1.125.8.1 2009/09/23 15:12:54 gci Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -42,7 +42,6 @@ use Apache::loncommon();
 use Apache::lonhtmlcommon();
 use Apache::lonlocal;
 use Apache::lonnet;
-use LONCAPA::lonauthcgi();
 use LONCAPA();
 
 #
@@ -1291,8 +1290,6 @@ sub jscript_send {
                    this.document.client.elements.uname.value;
         this.document.pserver.elements.udom.value =
                    this.document.client.elements.udom.options[this.document.client.elements.udom.selectedIndex].value;
-        this.document.pserver.elements.email.value =
-                   this.document.client.elements.email.value;
 |;
     }
     $ output .= qq|
@@ -1375,7 +1372,6 @@ sub server_form {
 <input type="hidden" name="token"   value="$mailtoken" />
 <input type="hidden" name="uname"   value="" />
 <input type="hidden" name="udom"   value="" />
-<input type="hidden" name="email"   value="" />
 
 |;
     }
@@ -1528,17 +1524,14 @@ ENDERROR
         }
     } else {
 	# error error: run in circles, scream and shout
+        $message = &Apache::lonhtmlcommon::confirm_success(
+                   &mt("The password for user [_1] was not changed.",'<i>'.$user.'</i>').' '.&mt('Please make sure your old password was entered correctly.'),1);
         if ($caller eq 'reset_by_email') {
-            if (!$result) {
-                return 1;
-            } else {
-                return $result;
-            }
+            $r->print($message.'<br />');
         } else {
-            $message = &Apache::lonhtmlcommon::confirm_success(
-                &mt("The password for user [_1] was not changed.",'<i>'.$user.'</i>').' '.&mt('Please make sure your old password was entered correctly.'),1);
             $r->print(&Apache::loncommon::confirmwrapper($message));
         }
+        return 1;
     }
     return;
 }
@@ -2041,7 +2034,7 @@ sub handler {
                        }));
     }
 
-    if (&can_toggle_debug()) {
+    if ($env{'user.name'} =~ /^(albertel|fox|foxr|kortemey|korte|raeburn)$/) {
         push (@Options,({ action => 'debugtoggle',
                           printmenu => 'yes',
                           subroutine => \&toggle_debug,
@@ -2073,11 +2066,13 @@ sub handler {
 	   || ($printmenu eq 'not_on_error' && !$error) )
 	 && (!$env{'form.returnurl'})) {
         my $optionlist = '<table cellpadding="5">';
-        if (&can_toggle_debug()) {
+        if ($env{'user.name'} =~ 
+                         /^(albertel|kortemey|fox|foxr|korte|hallmat3|turtle|raeburn)$/
+            ) {
             push (@Options,({ action => 'debugtoggle',
                               linktext => 'Toggle Debug Messages',
-                              text => 'Current Debug status is: '.
-                                      ($env{'user.debug'} ? 'on' : 'off'),
+                              text => 'Current Debug status is -'.
+                                  $env{'user.debug'}.'-.',
                               href => '/adm/preferences',
                               printmenu => 'yes',
                               subroutine => \&toggle_debug,
@@ -2119,26 +2114,12 @@ sub handler {
 }
 
 sub toggle_debug {
-    if (&can_toggle_debug()) {
-        if ($env{'user.debug'}) {
-            &Apache::lonnet::delenv('user.debug');
-        } else {
-            &Apache::lonnet::appenv({'user.debug' => 1});
-        }
-    }
-}
-
-sub can_toggle_debug {
-    my $can_toggle = 0;
-    my $page = 'toggledebug';
-    if (&LONCAPA::lonauthcgi::can_view($page)) {
-        $can_toggle = 1;
-    } elsif (&LONCAPA::lonauthcgi::check_ipbased_access($page)) {
-        $can_toggle = 1;
+    if ($env{'user.debug'}) {
+        &Apache::lonnet::delenv('user.debug');
+    } else {
+        &Apache::lonnet::appenv({'user.debug' => 1});
     }
-    return $can_toggle;
 }
 
-
 1;
 __END__