From 8996ff60a19957a08c04e7e0d97c242701f48c41 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= <michal@cihar.com>
Date: Wed, 23 Nov 2005 15:03:57 +0000
Subject: [PATCH] Functionalised server selection and use it in cookie auth
 (RFE #1362727).

---
 ChangeLog                          |  4 +++
 libraries/auth/cookie.auth.lib.php | 36 ++-------------------
 libraries/left_header.inc.php      |  7 ++--
 libraries/select_server.lib.php    | 52 ++++++++++++++++++------------
 main.php                           |  4 +--
 5 files changed, 45 insertions(+), 58 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index f3f4999c1..e849ccf35 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -38,6 +38,10 @@ $Source$
       information.
     * libraries/display_select_lang.lib.php,
       libraries/auth/cookie.auth.lib.php: Use fieldset for language selection.
+    * main.php, libraries/left_header.inc.php,
+      libraries/select_server.lib.php, libraries/auth/cookie.auth.lib.php:
+      Functionalised server selection and use it in cookie auth (RFE
+      #1362727).
 
 2005-11-22 Sebastian Mendel <cybot_tm@users.sourceforge.net>
     * added test/theme.php: for testing themes
diff --git a/libraries/auth/cookie.auth.lib.php b/libraries/auth/cookie.auth.lib.php
index 8076abb35..95724f6a1 100644
--- a/libraries/auth/cookie.auth.lib.php
+++ b/libraries/auth/cookie.auth.lib.php
@@ -201,40 +201,8 @@ echo sprintf( $GLOBALS['strWelcome'],
             ?>
             >
         <?php
-        echo "\n";
-        // Displays the MySQL servers choice
-        foreach ($cfg['Servers'] AS $key => $val) {
-            if (!empty($val['host'])) {
-                echo '                <option value="' . $key . '"';
-                if (!empty($server) && ($server == $key)) {
-                    echo ' selected="selected"';
-                }
-                echo '>';
-                if ($val['verbose'] != '') {
-                    echo htmlspecialchars($val['verbose']);
-                } else {
-                    echo htmlspecialchars($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'] == 'basic')) {
-                    echo '  (' . $val['user'] . ')';
-                }
-                echo '&nbsp;</option>' . "\n";
-            } // end if (!empty($val['host']))
-        } // end while
+        require_once('./libraries/select_server.lib.php');
+        PMA_select_server(FALSE, FALSE);
         ?>
             </select>
         </div>
diff --git a/libraries/left_header.inc.php b/libraries/left_header.inc.php
index 4af01693f..0b361fa7b 100644
--- a/libraries/left_header.inc.php
+++ b/libraries/left_header.inc.php
@@ -80,8 +80,11 @@ if ($GLOBALS['cfg']['MainPageIconic']) {
 }
 echo '</div>' . "\n";
 
-if ( $GLOBALS['cfg']['LeftDisplayServers'] ) {
-    $show_server_left = TRUE;
+/**
+ * Displays the MySQL servers choice form
+ */
+if ( $GLOBALS['cfg']['LeftDisplayServers'] && count($cfg['Servers']) > 1 ) {
     include('./libraries/select_server.lib.php');
+    PMA_select_server(TRUE, TRUE);
 } // end if LeftDisplayServers
 ?>
diff --git a/libraries/select_server.lib.php b/libraries/select_server.lib.php
index 307d5ba9f..ffb8c57f2 100644
--- a/libraries/select_server.lib.php
+++ b/libraries/select_server.lib.php
@@ -4,20 +4,30 @@
  * $Id$
  */
 
-if (count($cfg['Servers']) > 1) {
-    if ($show_server_left) {
-        echo '<div class="heada">' . $strServer . ':</div>';
-    } else {
-        ?> 
-<fieldset>
-<legend><?php echo $strServerChoice; ?></legend>
-        <?php
+function PMA_select_server($form, $left) {
+    global $cfg, $lang, $convcharset;
+   
+    // Show as list?
+    $list = $cfg['DisplayServersList'];
+    if (!$form) {
+        $list = FALSE;
     }
-    if (!$cfg['DisplayServersList']) {
-        ?> 
-    <form method="post" action="index.php" target="_parent">
-        <select name="server" onchange="this.form.submit();">
-        <?php
+   
+    if ($form) {
+        if ($left) {
+            echo '<div class="heada">' . $GLOBALS['strServer']. ':</div>';
+        } else {
+            ?> 
+    <fieldset>
+    <legend><?php echo $GLOBALS['strServerChoice']; ?></legend>
+            <?php
+        }
+        if (!$list) {
+            ?> 
+        <form method="post" action="index.php" target="_parent">
+            <select name="server" onchange="this.form.submit();">
+            <?php
+        }
     }
     foreach ($cfg['Servers'] AS $key => $val) {
         if (!empty($val['host'])) {
@@ -43,8 +53,8 @@ if (count($cfg['Servers']) > 1) {
                 $label .= '  (' . $val['user'] . ')';
             }
 
-            if ($cfg['DisplayServersList']){
-                if ($selected && !$show_server_left) {
+            if ($list){
+                if ($selected && !$left) {
                     echo '&raquo; <b>' . htmlspecialchars($label) . '</b><br />';
                 }else{
                     echo '&raquo; <a class="item" href="index.php?server=' . $key . '&amp;lang=' . $lang . '&amp;convcharset=' . $convcharset . '" target="_top">' . htmlspecialchars($label) . '</a><br />';
@@ -56,23 +66,25 @@ if (count($cfg['Servers']) > 1) {
         } // end if (!empty($val['host']))
     } // end while
 
-    if ( ! $cfg['DisplayServersList'] ) {
+    if ($form) {
+        if ( ! $list ) {
         ?> 
         </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; ?>" />
+        <input type="submit" value="<?php echo $GLOBALS['strGo']; ?>" />
         </noscript>
     </form>
         <?php
     }
-    if (!$show_server_left) {
+        if (!$left) {
         ?> 
 </fieldset>
         <?php
-    } else {
-        echo '<hr />';
+        } else {
+            echo '<hr />';
+        }
     }
 }
 ?> 
diff --git a/main.php b/main.php
index 6d1c152d7..1be923775 100644
--- a/main.php
+++ b/main.php
@@ -126,9 +126,9 @@ if (($server > 0) && isset($mode) && ($mode == 'reload')) {
 /**
  * Displays the MySQL servers choice form
  */
-if (!$cfg['LeftDisplayServers']) {
-    $show_server_left = FALSE;
+if (!$cfg['LeftDisplayServers'] && count($cfg['Servers']) > 1) {
     include('./libraries/select_server.lib.php');
+    PMA_select_server(TRUE, FALSE);
 }
 
 // nested table needed