From 02580c9b3bdffd6c11f97fab8e2489189848d8b9 Mon Sep 17 00:00:00 2001
From: Marc Delisle <marc@infomarc.info>
Date: Mon, 26 Apr 2004 14:01:25 +0000
Subject: [PATCH] optional server list as links in left panel

---
 ChangeLog                       |  6 ++++
 Documentation.html              |  5 +++
 config.inc.php                  |  1 +
 left.php                        | 54 ++++++++++++++++++++++++++-------
 libraries/common.lib.php        |  2 +-
 libraries/config_import.lib.php |  4 +++
 6 files changed, 60 insertions(+), 12 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index d7ff4ae78..e61e03950 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,12 @@ phpMyAdmin - Changelog
 $Id$
 $Source$
 
+2004-04-26 Marc Delisle  <lem9@users.sourceforge.net>
+    * config.inc.php, left.php, Documentation.html,
+      libraries/config_import.lib.php, libraries/common.lib.php:
+      $cfg['LeftDisplayServersList'] to display the server choice as links,
+      thanks to Cal Henderson
+
 2004-04-26 Michal Cihar  <michal@cihar.com>
     * libraries/string.lib.php: mb_* functions don't know some windows-*
       charsets (bug #940638).
diff --git a/Documentation.html b/Documentation.html
index 302b1e7ca..0014abfdd 100755
--- a/Documentation.html
+++ b/Documentation.html
@@ -1183,6 +1183,11 @@ Defaults to TRUE. <br />
     <dt><b>$cfg['LeftDisplayServers'] </b>boolean</dt>
     <dd>Defines whether to display a server choice at the top of the left frame or not.
 Defaults to FALSE. <br />
+    <br />
+    </dd>
+    <dt><b>$cfg['LeftDisplayServersList'] </b>boolean</dt>
+    <dd>Defines whether to display this server choice as links instead of in a drop-down.
+Defaults to FALSE (drop-down). <br />
     <br />
     </dd>
     <dt><b>$cfg['ShowStats'] </b>boolean</dt>
diff --git a/config.inc.php b/config.inc.php
index 25bdf6c2f..9d284c74a 100644
--- a/config.inc.php
+++ b/config.inc.php
@@ -225,6 +225,7 @@ $cfg['ShowTooltipAliasTB']    = FALSE;  // are shown (in the left menu and db_de
 
 $cfg['LeftDisplayLogo']       = TRUE;   // display logo at top of left frame
 $cfg['LeftDisplayServers']    = FALSE;  // display server choice at top of left frame
+$cfg['LeftDisplayServersList'] = FALSE;  // server choice as links
 
 // In the main frame, at startup...
 $cfg['ShowStats']             = TRUE;   // allow to display statistics and space usage in
diff --git a/left.php b/left.php
index 9d0e83d5c..7cabdc2c3 100644
--- a/left.php
+++ b/left.php
@@ -310,50 +310,82 @@ if ($cfg['LeftDisplayLogo']) {
 }
 echo "\n";
 if ($cfg['LeftDisplayServers']) {
+	if ($cfg['LeftDisplayServersList']){
 ?>
+
+	<br />
+
+<?php
+	}else{
+?>
+
         <form method="post" action="index.php" target="_parent">
             <select name="server" onchange="this.form.submit();">
     <?php
-    echo "\n";
+	}
+
     foreach($cfg['Servers'] AS $key => $val) {
         if (!empty($val['host'])) {
-            echo '                <option value="' . $key . '"';
+
+		$selected = 0;
+
             if (!empty($server) && ($server == $key)) {
-                echo ' selected="selected"';
+		$selected = 1;
             }
-            echo '>';
             if (!empty($val['verbose'])) {
-                echo $val['verbose'];
+                $label = $val['verbose'];
             } else {
-                echo $val['host'];
+                $label = $val['host'];
                 if (!empty($val['port'])) {
-                    echo ':' . $val['port'];
+                    $label .= ':' . $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'];
+                //     $label .= ':' . $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']);
+                $label .= ' - ' . (is_array($val['only_db']) ? implode(', ', $val['only_db']) : $val['only_db']);
             }
             if (!empty($val['user']) && ($val['auth_type'] == 'config')) {
-                echo '  (' . $val['user'] . ')';
+                $label .= '  (' . $val['user'] . ')';
             }
-            echo '&nbsp;</option>' . "\n";
+
+		if ($cfg['LeftDisplayServersList']){
+
+			if ($selected){
+				echo "&raquo; <b>$label</b><br />";
+			}else{
+				echo "&raquo; <a href=\"index.php?server=$key&lang=$lang&convcharset=$convcharset\" target=\"_top\">$label</a><br />";
+			}
+
+		} else {
+
+			echo "		<option value=\"$key\"".($selected?' selected':'').">$label</option>\n";
+		}
+
+
         } // end if (!empty($val['host']))
     } // end while
+	if ($cfg['LeftDisplayServersList']){
     ?>
+
+	<br />
+
+<?php
+	}else{
+?>
             </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";
 ?>
diff --git a/libraries/common.lib.php b/libraries/common.lib.php
index c1325bc9a..9b7d573f3 100644
--- a/libraries/common.lib.php
+++ b/libraries/common.lib.php
@@ -136,7 +136,7 @@ if (isset($cfg['FileRevision'])) {
 } else {
     $cfg['FileRevision'] = array(1, 1);
 }
-if ($cfg['FileRevision'][0] < 2 || ($cfg['FileRevision'][0] == 2 && $cfg['FileRevision'][1] < 13)) {
+if ($cfg['FileRevision'][0] < 2 || ($cfg['FileRevision'][0] == 2 && $cfg['FileRevision'][1] < 15)) {
     require_once('./libraries/config_import.lib.php');
 }
 
diff --git a/libraries/config_import.lib.php b/libraries/config_import.lib.php
index 0f110a72e..e28127f92 100644
--- a/libraries/config_import.lib.php
+++ b/libraries/config_import.lib.php
@@ -340,6 +340,10 @@ if (!isset($cfg['LeftDisplayServers'])) {
     $cfg['LeftDisplayServers'] = FALSE;
 }
 
+if (!isset($cfg['LeftDisplayServersList'])) {
+    $cfg['LeftDisplayServersList'] = FALSE;
+}
+
 if (!isset($cfg['ShowStats'])) {
     if (isset($cfgShowStats)) {
         $cfg['ShowStats'] = $cfgShowStats;