refactor server_replication.php

1. render HTML at once
2. split long functions

1 files changed, 30 insertions, 199 deletions

diff --git a/server_replication.php b/server_replication.php
index 3ac2c4da20..7694126f4a 100644
--- a/server_replication.php
+++ b/server_replication.php
@@ -6,9 +6,13 @@
  */
 
 /**
- *
+ * include files
  */
 require_once 'libraries/common.inc.php';
+require_once 'libraries/server_common.inc.php';
+
+require_once 'libraries/replication.inc.php';
+require_once 'libraries/replication_gui.lib.php';
 
 /**
  * Does the common work
@@ -19,19 +23,13 @@ $scripts  = $header->getScripts();
 $scripts->addFile('server_privileges.js');
 $scripts->addFile('replication.js');
 
-require 'libraries/server_common.inc.php';
-require 'libraries/replication.inc.php';
-require 'libraries/replication_gui.lib.php';
-
 /**
  * Checks if the user is allowed to do what he tries to...
  */
 if (! $is_superuser) {
-    echo '<h2>' . "\n"
-        . PMA_Util::getIcon('s_replication.png')
-        . __('Replication') . "\n"
-        . '</h2>' . "\n";
-    PMA_Message::error(__('No Privileges'))->display();
+    $html  = PMA_getSubPageHeader('replication');
+    $html .= PMA_Message::error(__('No Privileges'))->getDisplay();
+    $response->addHTML($html);
     exit;
 }
 
@@ -95,11 +93,19 @@ if (isset($GLOBALS['sr_take_action'])) {
 
             if (empty($position)) {
                 $_SESSION['replication']['sr_action_status'] = 'error';
-                $_SESSION['replication']['sr_action_info'] = __('Unable to read master log position. Possible privilege problem on master.');
+                $_SESSION['replication']['sr_action_info'] = 
+                    __('Unable to read master log position. Possible privilege problem on master.');
             } else {
                 $_SESSION['replication']['m_correct']  = true;
 
-                if (! PMA_Replication_Slave_changeMaster($sr['username'], $sr['pma_pw'], $sr['hostname'], $sr['port'], $position, true, false)) {
+                if (! PMA_Replication_Slave_changeMaster(
+                          $sr['username'], 
+                          $sr['pma_pw'], 
+                          $sr['hostname'], 
+                          $sr['port'], 
+                          $position, 
+                          true, 
+                          false)) {
                     $_SESSION['replication']['sr_action_status'] = 'error';
                     $_SESSION['replication']['sr_action_info'] = __('Unable to change master');
                 } else {
@@ -141,209 +147,34 @@ if (isset($GLOBALS['sr_take_action'])) {
     unset($refresh);
 }
 
-
-echo '<div id="replication">';
-echo ' <h2>';
-echo '   ' . PMA_Util::getImage('s_replication.png');
-echo     __('Replication');
-echo ' </h2>';
+/**
+ * start output
+ */
+$response->addHTML('<div id="replication">');
+$response->addHTML(PMA_getSubPageHeader('replication'));
 
 // Display error messages
-if (isset($_SESSION['replication']['sr_action_status'])
-    && isset($_SESSION['replication']['sr_action_info'])
-) {
-    if ($_SESSION['replication']['sr_action_status'] == 'error') {
-        PMA_Message::error($_SESSION['replication']['sr_action_info'])->display();
-        $_SESSION['replication']['sr_action_status'] = 'unknown';
-    } elseif ($_SESSION['replication']['sr_action_status'] == 'success') {
-        PMA_Message::success($_SESSION['replication']['sr_action_info'])->display();
-        $_SESSION['replication']['sr_action_status'] = 'unknown';
-    }
-}
+$response->addHTML(PMA_getHtmlForErrorMessage());
 
 if ($server_master_status) {
-    if (! isset($GLOBALS['repl_clear_scr'])) {
-        echo '<fieldset>';
-        echo '<legend>' . __('Master replication') . '</legend>';
-        echo __('This server is configured as master in a replication process.');
-        echo '<ul>';
-        echo '  <li><a href="#" id="master_status_href">' . __('Show master status') . '</a>';
-        PMA_replication_print_status_table('master', true, false);
-        echo '  </li>';
-
-        echo '  <li><a href="#" id="master_slaves_href">' . __('Show connected slaves') . '</a>';
-        PMA_replication_print_slaves_table(true);
-        echo '  </li>';
-
-        $_url_params = $GLOBALS['url_params'];
-        $_url_params['mr_adduser'] = true;
-        $_url_params['repl_clear_scr'] = true;
-
-        echo '  <li><a href="server_replication.php' . PMA_generate_common_url($_url_params) . '" id="master_addslaveuser_href">';
-        echo __('Add slave replication user') . '</a></li>';
-    }
-
-    // Display 'Add replication slave user' form
-    if (isset($GLOBALS['mr_adduser'])) {
-        PMA_replication_gui_master_addslaveuser();
-    } elseif (! isset($GLOBALS['repl_clear_scr'])) {
-        echo "</ul>";
-        echo "</fieldset>";
-    }
+    $response->addHTML(PMA_getHtmlForMasterReplication());
 } elseif (! isset($GLOBALS['mr_configure']) && ! isset($GLOBALS['repl_clear_scr'])) {
-    $_url_params = $GLOBALS['url_params'];
-    $_url_params['mr_configure'] = true;
-
-    echo '<fieldset>';
-    echo '<legend>' . __('Master replication') . '</legend>';
-    echo sprintf(__('This server is not configured as master in a replication process. Would you like to <a href="%s">configure</a> it?'), 'server_replication.php' . PMA_generate_common_url($_url_params));
-    echo '</fieldset>';
+    $response->addHTML(PMA_getHtmlForNotServerReplication());
 }
 
 if (isset($GLOBALS['mr_configure'])) {
     // Render the 'Master configuration' section
-    echo '<fieldset>';
-    echo '<legend>' . __('Master configuration') . '</legend>';
-    echo __('This server is not configured as master server in a replication process. You can choose from either replicating all databases and ignoring certain (useful if you want to replicate majority of databases) or you can choose to ignore all databases by default and allow only certain databases to be replicated. Please select the mode:') . '<br /><br />';
-
-    echo '<select name="db_type" id="db_type">';
-    echo '<option value="all">' . __('Replicate all databases; Ignore:') . '</option>';
-    echo '<option value="ign">' . __('Ignore all databases; Replicate:') . '</option>';
-    echo '</select>';
-    echo '<br /><br />';
-    echo __('Please select databases:') . '<br />';
-    echo PMA_replication_db_multibox();
-    echo '<br /><br />';
-    echo __('Now, add the following lines at the end of [mysqld] section in your my.cnf and please restart the MySQL server afterwards.') . '<br />';
-    echo '<pre id="rep"></pre>';
-    echo __('Once you restarted MySQL server, please click on Go button. Afterwards, you should see a message informing you, that this server <b>is</b> configured as master.');
-    echo '</fieldset>';
-    echo '<fieldset class="tblFooters">';
-    echo ' <form method="post" action="server_replication.php" >';
-    echo PMA_generate_common_hidden_inputs('', '');
-    echo '  <input type="submit" value="' . __('Go') . '" id="goButton" />';
-    echo ' </form>';
-    echo '</fieldset>';
-
+    $response->addHTML(PMA_getHtmlForMasterConfiguration());
     exit;
 }
 
-echo '</div>';
+$response->addHTML('</div>');
 
 if (! isset($GLOBALS['repl_clear_scr'])) {
     // Render the 'Slave configuration' section
-    echo '<fieldset>';
-    echo '<legend>' . __('Slave replication') . '</legend>';
-    if ($server_slave_status) {
-        echo '<div id="slave_configuration_gui">';
-
-        $_url_params = $GLOBALS['url_params'];
-        $_url_params['sr_take_action'] = true;
-        $_url_params['sr_slave_server_control'] = true;
-
-        if ($server_slave_replication[0]['Slave_IO_Running'] == 'No') {
-            $_url_params['sr_slave_action'] = 'start';
-        } else {
-            $_url_params['sr_slave_action'] = 'stop';
-        }
-
-        $_url_params['sr_slave_control_parm'] = 'IO_THREAD';
-        $slave_control_io_link = 'server_replication.php' . PMA_generate_common_url($_url_params);
-
-        if ($server_slave_replication[0]['Slave_SQL_Running'] == 'No') {
-            $_url_params['sr_slave_action'] = 'start';
-        } else {
-            $_url_params['sr_slave_action'] = 'stop';
-        }
-
-        $_url_params['sr_slave_control_parm'] = 'SQL_THREAD';
-        $slave_control_sql_link = 'server_replication.php' . PMA_generate_common_url($_url_params);
-
-        if ($server_slave_replication[0]['Slave_IO_Running'] == 'No'
-            || $server_slave_replication[0]['Slave_SQL_Running'] == 'No'
-        ) {
-            $_url_params['sr_slave_action'] = 'start';
-        } else {
-            $_url_params['sr_slave_action'] = 'stop';
-        }
-
-        $_url_params['sr_slave_control_parm'] = null;
-        $slave_control_full_link = 'server_replication.php' . PMA_generate_common_url($_url_params);
-
-        $_url_params['sr_slave_action'] = 'reset';
-        $slave_control_reset_link = 'server_replication.php' . PMA_generate_common_url($_url_params);
-
-        $_url_params = $GLOBALS['url_params'];
-        $_url_params['sr_slave_skip_error'] = true;
-        $slave_skip_error_link = 'server_replication.php' . PMA_generate_common_url($_url_params);
-
-        if ($server_slave_replication[0]['Slave_SQL_Running'] == 'No') {
-            PMA_Message::error(__('Slave SQL Thread not running!'))->display();
-        }
-        if ($server_slave_replication[0]['Slave_IO_Running'] == 'No') {
-            PMA_Message::error(__('Slave IO Thread not running!'))->display();
-        }
-
-        $_url_params = $GLOBALS['url_params'];
-        $_url_params['sl_configure'] = true;
-        $_url_params['repl_clear_scr'] = true;
-
-        $reconfiguremaster_link = 'server_replication.php' . PMA_generate_common_url($_url_params);
-
-        echo __('Server is configured as slave in a replication process. Would you like to:');
-        echo '<br />';
-        echo '<ul>';
-        echo ' <li><a href="#" id="slave_status_href">' . __('See slave status table') . '</a>';
-        PMA_replication_print_status_table('slave', true, false);
-        echo ' </li>';
-
-        echo ' <li><a href="#" id="slave_control_href">' . __('Control slave:') . '</a>';
-        echo ' <div id="slave_control_gui" style="display: none">';
-        echo '  <ul>';
-        echo '   <li><a href="'. $slave_control_full_link . '">' . (($server_slave_replication[0]['Slave_IO_Running'] == 'No' || $server_slave_replication[0]['Slave_SQL_Running'] == 'No') ? __('Full start') : __('Full stop')) . ' </a></li>';
-        echo '   <li><a href="'. $slave_control_reset_link . '">' . __('Reset slave') . '</a></li>';
-        if ($server_slave_replication[0]['Slave_SQL_Running'] == 'No') {
-            echo '   <li><a href="' . $slave_control_sql_link . '">' . __('Start SQL Thread only') . '</a></li>';
-        } else {
-            echo '   <li><a href="' . $slave_control_sql_link . '">' . __('Stop SQL Thread only') . '</a></li>';
-        }
-        if ($server_slave_replication[0]['Slave_IO_Running'] == 'No') {
-            echo '   <li><a href="' . $slave_control_io_link . '">' . __('Start IO Thread only') . '</a></li>';
-        } else {
-            echo '   <li><a href="' . $slave_control_io_link . '">' . __('Stop IO Thread only') . '</a></li>';
-        }
-        echo '  </ul>';
-        echo ' </div>';
-        echo ' </li>';
-        echo ' <li><a href="#" id="slave_errormanagement_href">' . __('Error management:') . '</a>';
-        echo ' <div id="slave_errormanagement_gui" style="display: none">';
-        PMA_Message::error(__('Skipping errors might lead into unsynchronized master and slave!'))->display();
-        echo '  <ul>';
-        echo '   <li><a href="' . $slave_skip_error_link . '">' . __('Skip current error') . '</a></li>';
-        echo '   <li>' . __('Skip next');
-        echo '    <form method="post" action="server_replication.php">';
-        echo PMA_generate_common_hidden_inputs('', '');
-        echo '      <input type="text" name="sr_skip_errors_count" value="1" style="width: 30px" />' . __('errors.');
-        echo '              <input type="submit" name="sr_slave_skip_error" value="' . __('Go') . '" />';
-        echo '      <input type="hidden" name="sr_take_action" value="1" />';
-        echo '    </form></li>';
-        echo '  </ul>';
-        echo ' </div>';
-        echo ' </li>';
-        echo ' <li><a href="' . $reconfiguremaster_link . '">' . __('Change or reconfigure master server') . '</a></li>';
-        echo '</ul>';
-        echo '</div>';
-
-    } elseif (! isset($GLOBALS['sl_configure'])) {
-        $_url_params = $GLOBALS['url_params'];
-        $_url_params['sl_configure'] = true;
-        $_url_params['repl_clear_scr'] = true;
-
-        echo sprintf(__('This server is not configured as slave in a replication process. Would you like to <a href="%s">configure</a> it?'), 'server_replication.php' . PMA_generate_common_url($_url_params));
-    }
-    echo '</fieldset>';
+    $response->addHTML(PMA_getHtmlForSlaveConfiguration($server_slave_status, $server_slave_replication));
 }
 if (isset($GLOBALS['sl_configure'])) {
-    PMA_replication_gui_changemaster("slave_changemaster");
+    $response->addHTML(PMA_GetHtmlForReplication_changemaster("slave_changemaster"));
 }
 ?>