From f9059d8c9573ab61a5b492261b27b600cd7c435f Mon Sep 17 00:00:00 2001
From: Marc Delisle <marc@infomarc.info>
Date: Sat, 17 Feb 2007 13:50:59 +0000
Subject: [PATCH] avoid displaying a too wide selector

---
 ChangeLog                       |  1 +
 libraries/select_server.lib.php | 16 ++++++++--------
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index fd254d27e..c79cd5e90 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -8,6 +8,7 @@ $HeadURL$
 2007-02-17 Marc Delisle  <lem9@users.sourceforge.net>
     * Documentation.html: patch #1659347, missing doc for some config,
       thanks to Isaac Bennetch
+    * libraries/select_server.lib.php: avoid displaying a wide selector
 
 2007-02-16 Marc Delisle  <lem9@users.sourceforge.net>
     * libraries/common.lib.php, footer.inc.php: avoid generating big links
diff --git a/libraries/select_server.lib.php b/libraries/select_server.lib.php
index 3b94c4601..630f25e50 100644
--- a/libraries/select_server.lib.php
+++ b/libraries/select_server.lib.php
@@ -1,4 +1,5 @@
 <?php
+// vim: expandtab sw=4 ts=4 sts=4:
 /*
  * Code for displaying server selection written by nijel
  * $Id$
@@ -65,14 +66,13 @@ function PMA_select_server($not_only_options, $ommit_fieldset)
                 $label .= ':' . $server['port'];
             }
         }
-        // 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($server['only_db'])) {
-            /**
-             * @todo this can become a really big/long/wide selectbox ...
-             */
-            $label .= ' - ' . (is_array($server['only_db']) ? implode(', ', $server['only_db']) : $server['only_db']);
+        if (! empty($server['only_db'])) {
+            if (! is_array($server['only_db'])) {
+                $label .= ' - ' . $server['only_db'];
+            // try to avoid displaying a too wide selector
+            } elseif (count($server['only_db']) < 4) {
+		        $label .= ' - ' . implode(', ', $server['only_db']);
+            }
         }
         if (!empty($server['user']) && $server['auth_type'] == 'config') {
             $label .= '  (' . $server['user'] . ')';