From 03f052c23a113770072c4e07c5bd1504b6385eb7 Mon Sep 17 00:00:00 2001
From: Marc Delisle <marc@infomarc.info>
Date: Mon, 5 Jul 2004 13:18:08 +0000
Subject: [PATCH] bug 981939 and problem with db dropdown in original theme

---
 ChangeLog      |  6 ++++++
 footer.inc.php | 26 ++++++++++++++++++--------
 index.php      |  2 +-
 queryframe.php |  2 +-
 4 files changed, 26 insertions(+), 10 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 0d0c6c6d4..6b1beea52 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,12 @@ phpMyAdmin - Changelog
 $Id$
 $Source$
 
+2004-07-05 Marc Delisle  <lem9@users.sourceforge.net>
+    * footer.inc.php, index.php, queryframe.php: bug 981939, database
+      selection in left frame under Opera, and problems with dropdown
+      in left frame when many databases are there (original theme),
+      thanks to Michael Keck
+
 2004-07-02 Marc Delisle  <lem9@users.sourceforge.net>
     * main.php: put Create button on the same line as the input field
 
diff --git a/footer.inc.php b/footer.inc.php
index fecc0a52f..ebcc18e53 100644
--- a/footer.inc.php
+++ b/footer.inc.php
@@ -30,18 +30,28 @@ if ($cfg['QueryFrame'] && $cfg['QueryFrameJS']) {
             $num_tables_disp = ' (-)';
         }
     ?>
+    var dbBoxSetupDone = false;
+    function dbBoxSetup() {
+        if (dbBoxSetupDone != true) {
+            if (parent.frames.queryframe && parent.frames.queryframe.document.left && parent.frames.queryframe.document.left.lightm_db) {
+                parent.frames.queryframe.document.left.lightm_db.value = '<?php echo addslashes($db); ?>';
+                dbBoxSetupDone = true;
+            } else {
+                setTimeout("dbBoxSetup();",500);
+            }
+        }		
+    }
     if (parent.frames.queryframe && parent.frames.queryframe.document && parent.frames.queryframe.document.queryframeform) {
         parent.frames.queryframe.document.queryframeform.db.value = "<?php echo (isset($db) ? addslashes($db) : ''); ?>";
         parent.frames.queryframe.document.queryframeform.table.value = "<?php echo (isset($table) ? addslashes($table) : ''); ?>";
     }
-    if (parent.frames.queryframe && parent.frames.queryframe.document && parent.frames.queryframe.document.left) {
-        parent.frames.queryframe.document.left.lightm_db.value = "<?php echo (isset($db) ? addslashes($db) : ''); ?>";
-        for (i=0;i<parent.frames.queryframe.document.left.lightm_db.options.length;i++) {
-            if (parent.frames.queryframe.document.left.lightm_db.options[i].selected) {
-                noption=new Option("<?php echo addslashes($db) . $num_tables_disp; ?>","<?php echo addslashes($db); ?>");
-                parent.frames.queryframe.document.left.lightm_db.options[i]=noption;
-                parent.frames.queryframe.document.left.lightm_db.value = "<?php echo (isset($db) ? addslashes($db) : ''); ?>";
-            }
+    if (parent.frames.queryframe && parent.frames.queryframe.document && parent.frames.queryframe.document.left && parent.frames.queryframe.document.left.lightm_db) {
+        selidx = parent.frames.queryframe.document.left.lightm_db.selectedIndex;
+        if (parent.frames.queryframe.document.left.lightm_db.options[selidx].value == "<?php echo addslashes($db); ?>") {
+            parent.frames.queryframe.document.left.lightm_db.options[selidx].text = "<?php echo addslashes($db) . $num_tables_disp; ?>";
+        } else {
+            parent.frames.queryframe.location.reload();
+            setTimeout("dbBoxSetup();",2000);
         }
     }
     <?php
diff --git a/index.php b/index.php
index eeef41cda..45c214e86 100644
--- a/index.php
+++ b/index.php
@@ -65,7 +65,7 @@ $logo_image = $GLOBALS['pmaThemeImage'] . 'logo_left.png';
 $query_frame_height = 0;
 if (@file_exists($logo_image)) {
    $tmp_imgsize = @getimagesize($logo_image);
-   $query_frame_height = ($tmp_imgsize[1] + 15);
+   $query_frame_height = ($tmp_imgsize[1] + 15 + ((!isset($_COOKIE['pma_theme']) || $_COOKIE['pma_theme']=='original') ? 25 : 0));
 }
 if ($query_frame_height == 0) {
     $query_frame_height = 60;
diff --git a/queryframe.php b/queryframe.php
index a8d049078..ab7461b33 100644
--- a/queryframe.php
+++ b/queryframe.php
@@ -229,7 +229,7 @@ if ($num_dbs > 1) {
         echo PMA_generate_common_hidden_inputs();
         echo '        <input type="hidden" name="hash" value="' . $hash . '" />' . "\n";
         ?>
-        <select name="lightm_db" onchange="this.form.submit();this.blur();">
+        <select name="lightm_db" onchange="this.form.submit();">
         <?php
         echo '            <option value="">(' . $strDatabases . ') ...</option>' . "\n";
         $table_list = '';