Replace $replication_info by a global variable.

Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>

11 files changed, 43 insertions, 41 deletions

diff --git a/db_create.php b/db_create.php
index 902cc22e02..5349465d77 100644
--- a/db_create.php
+++ b/db_create.php
@@ -114,7 +114,7 @@ if (! $result) {
 
         list($column_order, $generated_html) = PMA_buildHtmlForDb(
             $current, $is_superuser, $url_query,
-            $column_order, $replication_types, $replication_info
+            $column_order, $replication_types, $GLOBALS['replication_info']
         );
         $new_db_string .= $generated_html;
 
diff --git a/db_structure.php b/db_structure.php
index d764cf2c90..70c69d94a6 100644
--- a/db_structure.php
+++ b/db_structure.php
@@ -67,7 +67,7 @@ if ($GLOBALS['is_ajax_request']
 if (!PMA_DRIZZLE) {
     include_once 'libraries/replication.inc.php';
 } else {
-    $replication_info['slave']['status'] = false;
+    $GLOBALS['replication_info']['slave']['status'] = false;
 }
 
 require_once 'libraries/bookmark.lib.php';
@@ -123,7 +123,9 @@ $response->addHTML(
 $response->addHTML(PMA_URL_getHiddenInputs($db));
 
 $response->addHTML(
-    PMA_tableHeader($db_is_system_schema, $replication_info['slave']['status'])
+    PMA_tableHeader(
+        $db_is_system_schema, $GLOBALS['replication_info']['slave']['status']
+    )
 );
 
 $i = $sum_entries = 0;
@@ -256,12 +258,12 @@ foreach ($tables as $keyname => $current_table) {
         );
 
         $response->addHTML(
-            PMA_tableHeader(false, $replication_info['slave']['status'])
+            PMA_tableHeader(false, $GLOBALS['replication_info']['slave']['status'])
         );
     }
 
     list($do, $ignored) = PMA_getServerSlaveStatus(
-        $replication_info['slave']['status'], $truename
+        $GLOBALS['replication_info']['slave']['status'], $truename
     );
     // Handle favorite table list. ----START----
     $already_favorite = PMA_checkFavoriteTable($db, $current_table['TABLE_NAME']);
@@ -284,7 +286,7 @@ foreach ($tables as $keyname => $current_table) {
 
     list($html_output, $odd_row, $approx_rows) = PMA_getHtmlForStructureTableRow(
         $i, $odd_row, $table_is_view, $current_table,
-        $browse_table_label, $tracking_icon, $replication_info['slave']['status'],
+        $browse_table_label, $tracking_icon, $GLOBALS['replication_info']['slave']['status'],
         $browse_table, $tbl_url_query, $search_table, $db_is_system_schema,
         $titles, $empty_table, $drop_query, $drop_message, $collation,
         $formatted_size, $unit, $overhead,
@@ -301,7 +303,7 @@ foreach ($tables as $keyname => $current_table) {
 $response->addHTML('</tbody>');
 $response->addHTML(
     PMA_getHtmlBodyForTableSummary(
-        $num_tables, $replication_info['slave']['status'], $db_is_system_schema,
+        $num_tables, $GLOBALS['replication_info']['slave']['status'], $db_is_system_schema,
         $sum_entries, $db_collation, $is_show_stats, $sum_size, $overhead_size,
         $create_time_all, $update_time_all, $check_time_all,
         isset($approx_rows) ? $approx_rows : false
diff --git a/libraries/replication.inc.php b/libraries/replication.inc.php
index ee394011e6..4aec54c963 100644
--- a/libraries/replication.inc.php
+++ b/libraries/replication.inc.php
@@ -115,21 +115,21 @@ $slave_variables_oks = array(
 // set $server_{master/slave}_status and assign values
 
 // replication info is more easily passed to functions
-$replication_info = array();
+$GLOBALS['replication_info'] = array();
 
 foreach ($replication_types as $type) {
     if (count(${"server_{$type}_replication"}) > 0) {
-        $replication_info[$type]['status'] = true;
+        $GLOBALS['replication_info'][$type]['status'] = true;
     } else {
-        $replication_info[$type]['status'] = false;
+        $GLOBALS['replication_info'][$type]['status'] = false;
     }
-    if ($replication_info[$type]['status']) {
+    if ($GLOBALS['replication_info'][$type]['status']) {
         if ($type == "master") {
-            $replication_info[$type]['Do_DB'] = explode(
+            $GLOBALS['replication_info'][$type]['Do_DB'] = explode(
                 ",", $server_master_replication[0]["Binlog_Do_DB"]
             );
 
-            $replication_info[$type]['Ignore_DB'] = explode(
+            $GLOBALS['replication_info'][$type]['Ignore_DB'] = explode(
                 ",", $server_master_replication[0]["Binlog_Ignore_DB"]
             );
         } elseif ($type == "slave") {
@@ -137,27 +137,27 @@ foreach ($replication_types as $type) {
                 ",", $server_slave_replication[0]["Replicate_Do_DB"]
             );
             if (!empty($doDB)) {
-                $replication_info[$type]['Do_DB'] = $doDB;
+                $GLOBALS['replication_info'][$type]['Do_DB'] = $doDB;
             }
             unset($doDB);
 
-            $replication_info[$type]['Ignore_DB'] = explode(
+            $GLOBALS['replication_info'][$type]['Ignore_DB'] = explode(
                 ",", $server_slave_replication[0]["Replicate_Ignore_DB"]
             );
 
-            $replication_info[$type]['Do_Table'] = explode(
+            $GLOBALS['replication_info'][$type]['Do_Table'] = explode(
                 ",", $server_slave_replication[0]["Replicate_Do_Table"]
             );
 
-            $replication_info[$type]['Ignore_Table'] = explode(
+            $GLOBALS['replication_info'][$type]['Ignore_Table'] = explode(
                 ",", $server_slave_replication[0]["Replicate_Ignore_Table"]
             );
 
-            $replication_info[$type]['Wild_Do_Table'] = explode(
+            $GLOBALS['replication_info'][$type]['Wild_Do_Table'] = explode(
                 ",", $server_slave_replication[0]["Replicate_Wild_Do_Table"]
             );
 
-            $replication_info[$type]['Wild_Ignore_Table'] = explode(
+            $GLOBALS['replication_info'][$type]['Wild_Ignore_Table'] = explode(
                 ",", $server_slave_replication[0]["Replicate_Wild_Ignore_Table"]
             );
         }
diff --git a/server_databases.php b/server_databases.php
index 2ee0c2b580..8e9cffdc4b 100644
--- a/server_databases.php
+++ b/server_databases.php
@@ -22,7 +22,7 @@ if (! PMA_DRIZZLE) {
     include_once 'libraries/replication.inc.php';
 } else {
     $replication_types = array();
-    $replication_info = null;
+    $GLOBALS['replication_info'] = null;
 }
 require 'libraries/build_html_for_db.lib.php';
 
@@ -105,7 +105,7 @@ if ($databases_count > 0) {
         $is_superuser,
         $cfg,
         $replication_types,
-        $replication_info,
+        $GLOBALS['replication_info'],
         $url_query
     );
 } else {
diff --git a/server_replication.php b/server_replication.php
index ac73701819..3197cbd0bf 100644
--- a/server_replication.php
+++ b/server_replication.php
@@ -52,7 +52,7 @@ $response->addHTML(PMA_getHtmlForSubPageHeader('replication'));
 // Display error messages
 $response->addHTML(PMA_getHtmlForErrorMessage());
 
-if ($replication_info['master']['status']) {
+if ($GLOBALS['replication_info']['master']['status']) {
     $response->addHTML(PMA_getHtmlForMasterReplication());
 } elseif (! isset($_REQUEST['mr_configure'])
     && ! isset($_REQUEST['repl_clear_scr'])
@@ -72,7 +72,7 @@ if (! isset($_REQUEST['repl_clear_scr'])) {
     // Render the 'Slave configuration' section
     $response->addHTML(
         PMA_getHtmlForSlaveConfiguration(
-            $replication_info['slave']['status'],
+            $GLOBALS['replication_info']['slave']['status'],
             $server_slave_replication
         )
     );
diff --git a/server_status.php b/server_status.php
index d0fe74d0e5..9eb4d52e84 100644
--- a/server_status.php
+++ b/server_status.php
@@ -15,9 +15,9 @@ require_once 'libraries/server_status.lib.php';
  * Replication library
  */
 if (PMA_DRIZZLE) {
-    $replication_info = array();
-    $replication_info['master']['status'] = false;
-    $replication_info['slave']['status'] = false;
+    $GLOBALS['replication_info'] = array();
+    $GLOBALS['replication_info']['master']['status'] = false;
+    $GLOBALS['replication_info']['slave']['status'] = false;
 } else {
     include_once 'libraries/replication.inc.php';
     include_once 'libraries/replication_gui.lib.php';
diff --git a/server_status_advisor.php b/server_status_advisor.php
index e79c43ecb5..4ab2ed60bc 100644
--- a/server_status_advisor.php
+++ b/server_status_advisor.php
@@ -12,9 +12,9 @@ require_once 'libraries/ServerStatusData.class.php';
 require_once 'libraries/server_status_advisor.lib.php';
 
 if (PMA_DRIZZLE) {
-    $replication_info = array();
-    $replication_info['master']['status'] = false;
-    $replication_info['slave']['status'] = false;
+    $GLOBALS['replication_info'] = array();
+    $GLOBALS['replication_info']['master']['status'] = false;
+    $GLOBALS['replication_info']['slave']['status'] = false;
 } else {
     include_once 'libraries/replication.inc.php';
     include_once 'libraries/replication_gui.lib.php';
diff --git a/server_status_monitor.php b/server_status_monitor.php
index 15ce6ba12e..82010f3cc7 100644
--- a/server_status_monitor.php
+++ b/server_status_monitor.php
@@ -12,9 +12,9 @@ require_once 'libraries/ServerStatusData.class.php';
 require_once 'libraries/server_status_monitor.lib.php';
 
 if (PMA_DRIZZLE) {
-    $replication_info = array();
-    $replication_info['master']['status'] = false;
-    $replication_info['slave']['status'] = false;
+    $GLOBALS['replication_info'] = array();
+    $GLOBALS['replication_info']['master']['status'] = false;
+    $GLOBALS['replication_info']['slave']['status'] = false;
 } else {
     include_once 'libraries/replication.inc.php';
     include_once 'libraries/replication_gui.lib.php';
diff --git a/server_status_processes.php b/server_status_processes.php
index 0c748b16db..f9a0a8052b 100644
--- a/server_status_processes.php
+++ b/server_status_processes.php
@@ -15,9 +15,9 @@ require_once 'libraries/server_status_processes.lib.php';
  * Replication library
  */
 if (PMA_DRIZZLE) {
-    $replication_info = array();
-    $replication_info['master']['status'] = false;
-    $replication_info['slave']['status'] = false;
+    $GLOBALS['replication_info'] = array();
+    $GLOBALS['replication_info']['master']['status'] = false;
+    $GLOBALS['replication_info']['slave']['status'] = false;
 } else {
     include_once 'libraries/replication.inc.php';
     include_once 'libraries/replication_gui.lib.php';
diff --git a/server_status_queries.php b/server_status_queries.php
index 05b2f27fda..644774cfaa 100644
--- a/server_status_queries.php
+++ b/server_status_queries.php
@@ -13,9 +13,9 @@ require_once 'libraries/ServerStatusData.class.php';
 require_once 'libraries/server_status_queries.lib.php';
 
 if (PMA_DRIZZLE) {
-    $replication_info = array();
-    $replication_info['master']['status'] = false;
-    $replication_info['slave']['status'] = false;
+    $GLOBALS['replication_info'] = array();
+    $GLOBALS['replication_info']['master']['status'] = false;
+    $GLOBALS['replication_info']['slave']['status'] = false;
 } else {
     include_once 'libraries/replication.inc.php';
     include_once 'libraries/replication_gui.lib.php';
diff --git a/server_status_variables.php b/server_status_variables.php
index b9970649c7..cfa108ab3d 100644
--- a/server_status_variables.php
+++ b/server_status_variables.php
@@ -12,9 +12,9 @@ require_once 'libraries/ServerStatusData.class.php';
 require_once 'libraries/server_status_variables.lib.php';
 
 if (PMA_DRIZZLE) {
-    $replication_info = array();
-    $replication_info['master']['status'] = false;
-    $replication_info['slave']['status'] = false;
+    $GLOBALS['replication_info'] = array();
+    $GLOBALS['replication_info']['master']['status'] = false;
+    $GLOBALS['replication_info']['slave']['status'] = false;
 } else {
     include_once 'libraries/replication.inc.php';
     include_once 'libraries/replication_gui.lib.php';