From 60329f14cbc865e5c312602529966e128a0402da Mon Sep 17 00:00:00 2001
From: Crack <piotrprz@gmail.com>
Date: Fri, 6 Aug 2010 14:36:26 +0200
Subject: [PATCH] blacklist and settings debug code shown if $cfg['DBG']['php']
 is true

---
 .gsoc/todo.txt                     |  8 --------
 libraries/user_preferences.inc.php | 24 +++++++++++++-----------
 2 files changed, 13 insertions(+), 19 deletions(-)

diff --git a/.gsoc/todo.txt b/.gsoc/todo.txt
index 959835c0c..4dd9492f8 100644
--- a/.gsoc/todo.txt
+++ b/.gsoc/todo.txt
@@ -1,9 +1 @@
 restore cache'ing in phpmyadmin.css.php
-remove debug from user preferences header
-
-
-info about setup script in prefs manage, it seems many people still don't know it exists
-(and maybe some description in docs on making it work with live configuration?)
-
-
-show blacklist (and debug?) on prefs manage page
diff --git a/libraries/user_preferences.inc.php b/libraries/user_preferences.inc.php
index 99b31f19a..633b27871 100644
--- a/libraries/user_preferences.inc.php
+++ b/libraries/user_preferences.inc.php
@@ -48,18 +48,20 @@ if (!empty($_GET['saved'])) {
     $message->display();
 }
 
-// todo: debug - remove
-$arr = ConfigFile::getInstance()->getConfigArray();
-$arr2 = array();
-foreach ($arr as $k => $v) {
-    $arr2[] = "<b>$k</b> " . var_export($v, true);
+// debug info
+if ($cfg['DBG']['php']) {
+    $arr = ConfigFile::getInstance()->getConfigArray();
+    $arr2 = array();
+    foreach ($arr as $k => $v) {
+        $arr2[] = "<b>$k</b> " . var_export($v, true);
+    }
+    $arr2 = implode(', ', $arr2);
+    $arr2 .= '<br />Blacklist: ' . (empty($cfg['UserprefsDisallow'])
+            ? '<i>empty</i>'
+            : implode(', ', $cfg['UserprefsDisallow']));
+    $msg = PMA_Message::notice('Settings: ' . $arr2);
+    $msg->display();
 }
-$arr2 = implode(', ', $arr2);
-$arr2 .= '<br />Blacklist: ' . (empty($cfg['UserprefsDisallow'])
-        ? '<i>empty</i>'
-        : implode(', ', $cfg['UserprefsDisallow']));
-$msg = PMA_Message::notice('Debug: ' . $arr2);
-$msg->display();
 
 // warn about using session storage for settings
 $cfgRelation = PMA_getRelationsParam();