From e7acbcb27fee4853c5c2a771cea8f8fc5324d2cf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= <michal@cihar.com>
Date: Thu, 5 Jun 2003 19:00:15 +0000
Subject: [PATCH] Optional dropdown for server list in left frame (RFE
 #555978).

---
 ChangeLog       |  2 ++
 config.inc.php3 |  1 +
 left.php3       | 48 ++++++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 51 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index 7e3ec279b..927c0a9b9 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -15,6 +15,8 @@ $Source$
     * db_details_links.php3: Display Query tab even with no tables.
     * libraries/charset_conversion.lib.php3: Default iconv parameters to empty
       string.
+    * config.inc.php3, left.php3: Optional dropdown for server list in left
+      frame (RFE #555978).
 
 2003-06-04 Marc Delisle  <lem9@users.sourceforge.net>
     * libraries/sqlparser.lib.php3: bug 592692, pretty printer
diff --git a/config.inc.php3 b/config.inc.php3
index 5e1a42baf..846328e95 100755
--- a/config.inc.php3
+++ b/config.inc.php3
@@ -207,6 +207,7 @@ $cfg['ShowTooltipAliasTB']    = FALSE;  // are shown (in the left menu and db_de
                                         // table/db names
 
 $cfg['LeftDisplayLogo']       = TRUE;   // display logo at top of left frame
+$cfg['LeftDisplayServers']    = FALSE;  // display server choice at top of left frame
 
 // In the main frame, at startup...
 $cfg['ShowStats']             = TRUE;   // allow to display statistics and space usage in
diff --git a/left.php3 b/left.php3
index 9c8fbe455..ec576a70f 100755
--- a/left.php3
+++ b/left.php3
@@ -340,6 +340,54 @@ if ($cfg['LeftDisplayLogo']) {
     <?php
 }
 echo "\n";
+if ($cfg['LeftDisplayServers']) {
+?>
+        <form method="post" action="index.php3" target="_parent">
+            <select name="server" onchange="this.form.submit();">
+    <?php
+    echo "\n";
+    reset($cfg['Servers']);
+    while (list($key, $val) = each($cfg['Servers'])) {
+        if (!empty($val['host'])) {
+            echo '                <option value="' . $key . '"';
+            if (!empty($server) && ($server == $key)) {
+                echo ' selected="selected"';
+            }
+            echo '>';
+            if (!empty($val['verbose'])) {
+                echo $val['verbose'];
+            } else {
+                echo $val['host'];
+                if (!empty($val['port'])) {
+                    echo ':' . $val['port'];
+                }
+                // loic1: skip this because it's not a so good idea to display
+                //        sockets used to everybody
+                // if (!empty($val['socket']) && PMA_PHP_INT_VERSION >= 30010) {
+                //     echo ':' . $val['socket'];
+                // }
+            }
+            // loic1: if 'only_db' is an array and there is more than one
+            //        value, displaying such informations may not be a so good
+            //        idea
+            if (!empty($val['only_db'])) {
+                echo ' - ' . (is_array($val['only_db']) ? implode(', ', $val['only_db']) : $val['only_db']);
+            }
+            if (!empty($val['user']) && ($val['auth_type'] == 'config')) {
+                echo '  (' . $val['user'] . ')';
+            }
+            echo '&nbsp;</option>' . "\n";
+        } // end if (!empty($val['host']))
+    } // end while
+    ?>
+            </select>
+            <input type="hidden" name="lang" value="<?php echo $lang; ?>" />
+            <input type="hidden" name="convcharset" value="<?php echo $convcharset; ?>" />
+            <noscript><input type="submit" value="<?php echo $strGo; ?>" /></noscript>
+        </form>
+<?php
+}
+echo "\n";
 ?>
     <!-- Link to the welcome page -->
     <div id="el1Parent" class="parent" style="margin-bottom: 5px">