From 15bafa3c336e8ee16639a4884564fb2658d74c3c Mon Sep 17 00:00:00 2001
From: Marc Delisle <marc@infomarc.info>
Date: Sat, 19 Jul 2008 15:15:59 +0000
Subject: [PATCH] no custom color picker if JS is not active

---
 libraries/url_generating.lib.php |  5 ++++-
 main.php                         | 26 ++++++++++++++++----------
 2 files changed, 20 insertions(+), 11 deletions(-)

diff --git a/libraries/url_generating.lib.php b/libraries/url_generating.lib.php
index 26e7dfa08..f93e74c70 100644
--- a/libraries/url_generating.lib.php
+++ b/libraries/url_generating.lib.php
@@ -124,8 +124,11 @@ function PMA_getHiddenFields($values, $pre = '')
         if (is_array($value)) {
             $fields .= PMA_getHiddenFields($value, $name);
         } else {
+            // do not generate an ending "\n" because 
+            // PMA_generate_common_hidden_inputs() is sometimes called
+            // from a JS document.write()
             $fields .= '<input type="hidden" name="' . htmlspecialchars($name)
-                . '" value="' . htmlspecialchars($value) . '" />' . "\n";
+                . '" value="' . htmlspecialchars($value) . '" />';
         }
     }
 
diff --git a/main.php b/main.php
index d14793a9a..9531fae71 100644
--- a/main.php
+++ b/main.php
@@ -149,16 +149,22 @@ if ($GLOBALS['cfg']['ThemeManager']) {
     echo '<li id="li_select_theme">';
     echo $_SESSION['PMA_Theme_Manager']->getHtmlSelectBox();
     echo '</li>';
-    echo '<li id="li_custom_color">';
-    echo $strCustomColor . ': ';
-    echo '<img id="myRainbow" src="js/mooRainbow/images/rainbow.png" alt="[r]" width="16" height="16" />';
-    echo '<form name="rainbowform" id="rainbowform" method="post" action="index.php" target="_parent">';
-    echo PMA_generate_common_hidden_inputs();
-    echo '<input type="hidden" name="custom_color" />';
-    echo '<input type="hidden" name="custom_color_rgb" />';
-    echo '<input type="submit" name="custom_color_reset" value="' . $strReset . '" />';
-    echo '</form>';
-    echo '</li>';
+?>
+    <script type="text/javascript">
+    //<![CDATA[
+    document.write('<li id="li_custom_color">');
+    document.write('<?php echo $strCustomColor . ': '; ?>');
+    document.write('<img id="myRainbow" src="js/mooRainbow/images/rainbow.png" alt="[r]" width="16" height="16" />');
+    document.write('<form name="rainbowform" id="rainbowform" method="post" action="index.php" target="_parent">');
+    document.write('<?php echo PMA_generate_common_hidden_inputs(); ?>');
+    document.write('<input type="hidden" name="custom_color" />');
+    document.write('<input type="hidden" name="custom_color_rgb" />');
+    document.write('<input type="submit" name="custom_color_reset" value="<?php echo $strReset; ?>" />');
+    document.write('</form>');
+    document.write('</li>');
+    //]]>
+    </script>
+    <?php
 }
 echo '<li id="li_select_fontsize">';
 echo PMA_Config::getFontsizeForm();