[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_7-21932-gc380102

Marc Delisle lem9 at users.sourceforge.net
Sat Oct 29 14:24:34 CEST 2011 

The branch, master has been updated
       via  c3801028167ed4e3734c7e5205c07310b2d22ecb (commit)
       via  8fd1ae10bb15e5c861c30e233aab493220c78e68 (commit)
       via  46ce1d765e4322a5765bc49b427168c44c2ca07d (commit)
       via  991cbfcc97c2c616f77f911c8de172f88dec4de0 (commit)
       via  af8a61f73c25bdf6b2259d2ac6a9eae5f5835ce1 (commit)
      from  240cb2418cbe7f870801451e89002f07871d2381 (commit)


- Log -----------------------------------------------------------------
commit c3801028167ed4e3734c7e5205c07310b2d22ecb
Author: Marc Delisle <marc at infomarc.info>
Date:   Sat Oct 29 08:24:11 2011 -0400

    Setup for controlhost

commit 8fd1ae10bb15e5c861c30e233aab493220c78e68
Author: Marc Delisle <marc at infomarc.info>
Date:   Sat Oct 29 08:11:02 2011 -0400

    Documentation for controlhost

commit 46ce1d765e4322a5765bc49b427168c44c2ca07d
Author: Marc Delisle <marc at infomarc.info>
Date:   Sat Oct 29 08:07:44 2011 -0400

    Default values for controlhost

commit 991cbfcc97c2c616f77f911c8de172f88dec4de0
Author: Marc Delisle <marc at infomarc.info>
Date:   Sat Oct 29 07:58:40 2011 -0400

    Provide for the case when controlhost is not defined

commit af8a61f73c25bdf6b2259d2ac6a9eae5f5835ce1
Author: Marco Gergele <mgergele at users.sourceforge.net>
Date:   Sat Oct 29 07:55:39 2011 -0400

    patch #3428376 [pmadb] pmadb on a different MySQL server

-----------------------------------------------------------------------

Summary of changes:
 ChangeLog                         |    1 +
 Documentation.html                |    6 ++++++
 config.sample.inc.php             |    1 +
 libraries/common.inc.php          |   11 +++++++++--
 libraries/config.default.php      |    9 +++++++++
 libraries/config/messages.inc.php |    2 ++
 libraries/config/setup.forms.php  |    1 +
 7 files changed, 29 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 3e2e9c4..d10a483 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -52,6 +52,7 @@ phpMyAdmin - ChangeLog
 + [interface] Remove DefaultPropDisplay feature
 - bug #3299486 [prettyprint] Order By in a query containing comment character
 - [interface] Improved ENUM/SET editor
++ patch #3428376 [pmadb] pmadb on a different MySQL server
 
 3.4.8.0 (not yet released)
 - bug #3425230 [interface] enum data split at space char (more space to edit)
diff --git a/Documentation.html b/Documentation.html
index 9aeaa66..e1ce310 100644
--- a/Documentation.html
+++ b/Documentation.html
@@ -710,6 +710,12 @@ since this link provides funding for phpMyAdmin.
     <dd>Whether to use a compressed protocol for the MySQL server connection
         or not (experimental).</dd>
 
+    <dt id="controlhost">
+        <span id="cfg_Servers_controlhost">$cfg['Servers'][$i]['controlhost']</span> string<br />
+    </dt>
+    <dd>Permits to use an alternate host to hold the configuration storage
+    data.</dd>
+
     <dt id="controluser">
         <span id="cfg_Servers_controluser">$cfg['Servers'][$i]['controluser']</span> string<br />
         <span id="cfg_Servers_controlpass">$cfg['Servers'][$i]['controlpass']</span> string
diff --git a/config.sample.inc.php b/config.sample.inc.php
index aa363d6..0eab148 100644
--- a/config.sample.inc.php
+++ b/config.sample.inc.php
@@ -40,6 +40,7 @@ $cfg['Servers'][$i]['AllowNoPassword'] = false;
  */
 
 /* User used to manipulate with storage */
+// $cfg['Servers'][$i]['controlhost'] = '';
 // $cfg['Servers'][$i]['controluser'] = 'pma';
 // $cfg['Servers'][$i]['controlpass'] = 'pmapass';
 
diff --git a/libraries/common.inc.php b/libraries/common.inc.php
index 1c7e4d1..730cf19 100644
--- a/libraries/common.inc.php
+++ b/libraries/common.inc.php
@@ -919,8 +919,15 @@ if (! defined('PMA_MINIMUM_COMMON')) {
         // scripts)
         $controllink = false;
         if ($cfg['Server']['controluser'] != '') {
-            $controllink = PMA_DBI_connect($cfg['Server']['controluser'],
-                $cfg['Server']['controlpass'], true);
+            if (! empty($cfg['Server']['controlhost'])) {
+                $controllink = PMA_DBI_connect($cfg['Server']['controluser'],
+                    $cfg['Server']['controlpass'], true,
+                    array('host' => $cfg['Server']['controlhost'])
+                );
+            } else {
+                $controllink = PMA_DBI_connect($cfg['Server']['controluser'],
+                    $cfg['Server']['controlpass'], true);
+            }
         }
 
         // Connects to the server (validates user's login)
diff --git a/libraries/config.default.php b/libraries/config.default.php
index e91638d..98ace3f 100644
--- a/libraries/config.default.php
+++ b/libraries/config.default.php
@@ -152,6 +152,15 @@ $cfg['Servers'][$i]['extension'] = 'mysqli';
 $cfg['Servers'][$i]['compress'] = false;
 
 /**
+ * MySQL control host. This permits to use a host different than the
+ * main host, for the phpMyAdmin configuration storage. If left empty, 
+ * $cfg['Servers'][$i]['host'] is used instead. 
+ *
+ * @global string $cfg['Servers'][$i]['controlhost']
+ */
+$cfg['Servers'][$i]['controlhost'] = '';
+
+/**
  * MySQL control user settings (this user must have read-only
  * access to the "mysql/user" and "mysql/db" tables). The controluser is also
  * used for all relational features (pmadb)
diff --git a/libraries/config/messages.inc.php b/libraries/config/messages.inc.php
index f396550..5d19922 100644
--- a/libraries/config/messages.inc.php
+++ b/libraries/config/messages.inc.php
@@ -378,6 +378,8 @@ $strConfigServers_connect_type_name = __('Connection type');
 $strConfigServers_controlpass_name = __('Control user password');
 $strConfigServers_controluser_desc = __('A special MySQL user configured with limited permissions, more information available on [a at http://wiki.phpmyadmin.net/pma/controluser]wiki[/a]');
 $strConfigServers_controluser_name = __('Control user');
+$strConfigServers_controlhost_desc = __('An alternate host to hold the configuration storage; leave blank to use the already defined host');
+$strConfigServers_controlhost_name = __('Control host');
 $strConfigServers_CountTables_desc = __('Count tables when showing database list');
 $strConfigServers_CountTables_name = __('Count tables');
 $strConfigServers_designer_coords_desc = __('Leave blank for no Designer support, suggested: [kbd]pma_designer_coords[/kbd]');
diff --git a/libraries/config/setup.forms.php b/libraries/config/setup.forms.php
index cddb88d..a8b8591 100644
--- a/libraries/config/setup.forms.php
+++ b/libraries/config/setup.forms.php
@@ -64,6 +64,7 @@ $forms['Servers']['Server_config'] = array('Servers' => array(1 => array(
     'CountTables')));
 $forms['Servers']['Server_pmadb'] = array('Servers' => array(1 => array(
     'pmadb' => 'phpmyadmin',
+    'controlhost',
     'controluser',
     'controlpass',
     'verbose_check',


hooks/post-receive
-- 
phpMyAdmin

More information about the Git mailing list