From ed477440787b92b56edde4c337f4e2d30fc61eb0 Mon Sep 17 00:00:00 2001
From: Alan Garcia <a.garcia@nnx.com>
Date: Thu, 8 Nov 2012 19:57:31 +0000
Subject: [PATCH] Fix #1366

---
 bureau/admin/menu_adm.php      |  2 +-
 bureau/admin/sql_admin.php     |  2 +-
 bureau/admin/sql_getparam.php  |  4 ++--
 etc/alternc/phpmyadmin.inc.php | 25 +++++++++++++++++--------
 4 files changed, 21 insertions(+), 12 deletions(-)

diff --git a/bureau/admin/menu_adm.php b/bureau/admin/menu_adm.php
index 543875a1..5d1f6bdc 100644
--- a/bureau/admin/menu_adm.php
+++ b/bureau/admin/menu_adm.php
@@ -38,7 +38,7 @@ if ($mem->checkRight()) { ?>
 <li><a href="quotas_users.php?mode=4"><span style="color: red;"><?php __("User Quotas"); ?></span></a></li>
 <?php if ($cuid == 2000) {  ?>
   <li><a href="adm_panel.php"><span style="color: red;"><?php __("Admin Control Panel"); ?></span></a></li>
-  <li><a href="/alternc-sql/?server=2"><span style="color: red;"><?php __("General PhpMyAdmin"); ?></span></a></li>
+  <li><a href="/alternc-sql/"><span style="color: red;"><?php __("General PhpMyAdmin"); ?></span></a></li>
 												       <li><a href="alternc_debugme.php?enable=<?php echo $debug_alternc->status?"0":"1"; ?>"><span style="color: red;"><?php if ($debug_alternc->status) __("Switch debug Off"); else __("Switch debug On");  ?></span></a></li>
 <?php } ?>
 </ul>
diff --git a/bureau/admin/sql_admin.php b/bureau/admin/sql_admin.php
index 4e4f7609..567acd1e 100644
--- a/bureau/admin/sql_admin.php
+++ b/bureau/admin/sql_admin.php
@@ -37,7 +37,7 @@ if (!$r=$mysql->php_myadmin_connect()) {
 	setcookie("REMOTE_PASSWORD",$r[0]["pass"],0,"/");
 	if ($lang) $l="&lang=".substr($lang,0,2);
 	// TODO : make it an absolute url ! (even in httpS :))
-	header("Location: /alternc-sql/index.php?server=1");
+	header("Location: /alternc-sql/index.php?server=3");
 	exit();
 }
 
diff --git a/bureau/admin/sql_getparam.php b/bureau/admin/sql_getparam.php
index d315fc78..ed3f7fc0 100644
--- a/bureau/admin/sql_getparam.php
+++ b/bureau/admin/sql_getparam.php
@@ -73,9 +73,9 @@ if(isset($r['user'])){
 	</tr>
 	<tr>
 		<td colspan=2 align=center>
-                  <a href="/alternc-sql/?server=2" target=_blank><?php __("Web interface PhpMyAdmin"); ?></a>
+                  <a href="/alternc-sql/" target=_blank><?php __("Web interface PhpMyAdmin"); ?></a>
                   <br/>
-                  <xmp>http://<?php echo $L_FQDN; ?>/alternc-sql/?server=2</xmp>
+                  <xmp>http://<?php echo $L_FQDN; ?>/alternc-sql/</xmp>
                 </td>
 	</tr>
 <?php
diff --git a/etc/alternc/phpmyadmin.inc.php b/etc/alternc/phpmyadmin.inc.php
index ca75588a..0c063732 100644
--- a/etc/alternc/phpmyadmin.inc.php
+++ b/etc/alternc/phpmyadmin.inc.php
@@ -22,20 +22,29 @@ $cfg['LoginCookieRecall'] = false;
 
 $i = 1;
 
+// Usual auth with web form
+$cfg['Servers'][$i]['host']          = $GLOBALS['L_MYSQL_HOST']; // MySQL hostname or IP address
+$cfg['Servers'][$i]['connect_type']  = 'tcp';    // How to connect to MySQL server ('tcp' or 'socket')
+$cfg['Servers'][$i]['auth_type']     = 'cookie';    // Authentication method (config, http or cookie based)?
+$cfg['Servers'][$i]['hide_db'] = 'information_schema'; 
+
+$i++;
+// Usual auth with web form
+// two time same thing for backward compatibility
+$cfg['Servers'][$i]['host']          = $GLOBALS['L_MYSQL_HOST']; // MySQL hostname or IP address
+$cfg['Servers'][$i]['connect_type']  = 'tcp';    // How to connect to MySQL server ('tcp' or 'socket')
+$cfg['Servers'][$i]['auth_type']     = 'cookie';    // Authentication method (config, http or cookie based)?
+$cfg['Servers'][$i]['hide_db'] = 'information_schema'; 
+
+
+$i++;
+// Magic auth with AlternC
 $cfg['Servers'][$i]['host']          = $GLOBALS['L_MYSQL_HOST']; // MySQL hostname or IP address
 $cfg['Servers'][$i]['connect_type']  = 'tcp';    // How to connect to MySQL server ('tcp' or 'socket')
 $cfg['Servers'][$i]['auth_type']     = 'config';    // Authentication method (config, http or cookie based)?
 $cfg['Servers'][$i]['user']          = $_COOKIE["REMOTE_USER"];    ;      // MySQL user
 $cfg['Servers'][$i]['password']      = $_COOKIE["REMOTE_PASSWORD"]; ;          // MySQL password (only needed
 $cfg['Servers'][$i]['hide_db'] = 'information_schema'; 
-//                                                    // with 'config' auth_type)
 
-$i++;
-
-// Uncomment to override the default configuration
-$cfg['Servers'][$i]['host']          = $GLOBALS['L_MYSQL_HOST']; // MySQL hostname or IP address
-$cfg['Servers'][$i]['connect_type']  = 'tcp';    // How to connect to MySQL server ('tcp' or 'socket')
-$cfg['Servers'][$i]['auth_type']     = 'cookie';    // Authentication method (config, http or cookie based)?
-$cfg['Servers'][$i]['hide_db'] = 'information_schema'; 
 
 ?>