--- loncom/interface/lonpreferences.pm	2009/10/09 01:44:26	1.125.4.7
+++ loncom/interface/lonpreferences.pm	2009/12/07 00:04:10	1.125.8.4
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Preferences
 #
-# $Id: lonpreferences.pm,v 1.125.4.7 2009/10/09 01:44:26 raeburn Exp $
+# $Id: lonpreferences.pm,v 1.125.8.4 2009/12/07 00:04:10 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -1864,22 +1864,24 @@ sub handler {
                       printmenu => 'yes',
                       subroutine => \&verify_and_change_colors,
                       }));
-    push (@Options,({ action => 'changelanguages',
-                      linktext => 'Change Language Preferences',
-                      href => '/adm/preferences',
-		      help => 'Prefs_Language',
-                      breadcrumb=>
-                          { href => '/adm/preferences?action=changelanguages',
-                            text => 'Change Language'},
-                      subroutine =>  \&languagechanger,
-                  },
-                    { action => 'verify_and_change_languages',
-                      breadcrumb=>
-                          {href => '/adm/preferences?action=changelanguages',
-                           text => 'Change Language'},
-                      printmenu => 'yes',
-                      subroutine=>\&verify_and_change_languages, }
+    if ($env{'user.adv'}) {
+        push (@Options,({ action => 'changelanguages',
+                          linktext => 'Change Language Preferences',
+                          href => '/adm/preferences',
+	    	          help => 'Prefs_Language',
+                          breadcrumb=>
+                              { href => '/adm/preferences?action=changelanguages',
+                                text => 'Change Language'},
+                          subroutine =>  \&languagechanger,
+                      },
+                        { action => 'verify_and_change_languages',
+                          breadcrumb=>
+                              {href => '/adm/preferences?action=changelanguages',
+                               text => 'Change Language'},
+                          printmenu => 'yes',
+                          subroutine=>\&verify_and_change_languages, }
                     ));
+    }
     push (@Options,({ action => 'changewysiwyg',
                       linktext => 'Change WYSIWYG Editor Preferences',
                       href => '/adm/preferences',
@@ -1972,22 +1974,23 @@ sub handler {
                             text => 'Change Main Menu'},
                       printmenu => 'yes',
                       }));
-
-    push (@Options,({ action   => 'changeclicker',
-                      linktext => 'Register Response Devices ("Clickers")',
-                      href     => '/adm/preferences',
-                      subroutine => \&clickerchanger,
-                      breadcrumb =>
-                          { href => '/adm/preferences?action=changeclicker',
-                            text => 'Register Clicker'},
-                      },
-                    { action   => 'verify_and_change_clicker',
-                      subroutine => \&verify_and_change_clicker,
-                      breadcrumb =>
-                          { href => '/adm/preferences?action=changeclicker',
-                            text => 'Register Clicker'},
-                      printmenu => 'yes',
-                      }));
+    if ($env{'user.adv'}) {
+        push (@Options,({ action   => 'changeclicker',
+                          linktext => 'Register Response Devices ("Clickers")',
+                          href     => '/adm/preferences',
+                          subroutine => \&clickerchanger,
+                          breadcrumb =>
+                              { href => '/adm/preferences?action=changeclicker',
+                                text => 'Register Clicker'},
+                          },
+                          { action   => 'verify_and_change_clicker',
+                          subroutine => \&verify_and_change_clicker,
+                          breadcrumb =>
+                              { href => '/adm/preferences?action=changeclicker',
+                                text => 'Register Clicker'},
+                          printmenu => 'yes',
+                          }));
+    }
     my %author_roles = &Apache::lonnet::get_my_roles($user,$domain,'userroles','',['au']);
     if (keys(%author_roles) > 0) {
       push (@Options,({ action   => 'changedomcoord',
@@ -2041,7 +2044,7 @@ sub handler {
                        }));
     }
 
-    if ($env{'user.name'} =~ /^(albertel|fox|foxr|kortemey|korte|raeburn)$/) {
+    if (&can_toggle_debug()) {
         push (@Options,({ action => 'debugtoggle',
                           printmenu => 'yes',
                           subroutine => \&toggle_debug,
@@ -2076,7 +2079,7 @@ sub handler {
         if (&can_toggle_debug()) {
             push (@Options,({ action => 'debugtoggle',
                               linktext => 'Toggle Debug Messages',
-                              text => 'Current Debug status is -'.
+                              text => 'Current Debug status is: '.
                                       ($env{'user.debug'} ? 'on' : 'off'),
                               href => '/adm/preferences',
                               printmenu => 'yes',
@@ -2120,11 +2123,9 @@ 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});
-        }
+        &Apache::lonnet::delenv('user.debug');
+    } else {
+        &Apache::lonnet::appenv({'user.debug' => 1});
     }
 }