diff --git a/libraries/common.lib.php b/libraries/common.lib.php index 63987661b..65fc5c3c6 100644 --- a/libraries/common.lib.php +++ b/libraries/common.lib.php @@ -2729,7 +2729,7 @@ function PMA_getTitleForTarget($target) { function PMA_js_mootools_domready($code, $print=true) { $out = ''; - $out .= ''."\n"; diff --git a/libraries/replication_gui.lib.php b/libraries/replication_gui.lib.php index e1115fe21..d460e2e27 100644 --- a/libraries/replication_gui.lib.php +++ b/libraries/replication_gui.lib.php @@ -11,6 +11,7 @@ if (! defined('PHPMYADMIN')) { $jscode['master_replication'] = 'divShowHideFunc(\'master_status_href\', \'replication_master_section\');'."\n"; +// Add JS events to generate example my.cnf config lines $jscode['configure_master'] = 'var c_output = "";'."\n". 'var c_text = "server-id='.$serverid.'log-bin=mysql-binlog-error=mysql-bin.err";'."\n". @@ -179,9 +180,8 @@ function PMA_replication_print_status_table ($type, $hidden = false, $title = tr && ${"{$type}_variables_alerts"}[$variable] == ${"server_{$type}_replication"}[0][$variable] ) { echo ''."\n"; - } - if (isset(${"{$type}_variables_oks"}[$variable]) + } elseif (isset(${"{$type}_variables_oks"}[$variable]) && ${"{$type}_variables_oks"}[$variable] == ${"server_{$type}_replication"}[0][$variable] ) { echo ''."\n"; diff --git a/server_replication.php b/server_replication.php index a27d014d0..01cddecaa 100644 --- a/server_replication.php +++ b/server_replication.php @@ -194,7 +194,7 @@ if ($server_master_status) { echo ''. $GLOBALS['strReplicationMaster'] .''."\n"; echo $GLOBALS['strReplicationConfiguredMaster']."\n"; echo ''."\n"; - echo ' '. $GLOBALS['strReplicationShowMasterStatus'] .' '; + echo ' '. $GLOBALS['strReplicationShowMasterStatus'] .''; PMA_replication_print_status_table('master', true, false); $_url_params = $GLOBALS['url_params']; $_url_params['mr_adduser'] = true; @@ -473,7 +473,7 @@ if (!isset($GLOBALS['repl_clear_scr'])) { echo PMA_js_mootools_domready($jscode['slave_control_sync']); echo ' '.$GLOBALS['strReplicationSynchronize'].''."\n"; echo ' '."\n"; - echo ' '."\n"; + echo ' '."\n"; echo PMA_generate_common_hidden_inputs('', ''); echo ' '. $GLOBALS['strStructure']. ''."\n"; // this is just for vizualization, it has no other purpose echo ' '. $GLOBALS['strData'] .' '."\n"; @@ -482,22 +482,23 @@ if (!isset($GLOBALS['repl_clear_scr'])) { echo ' '."\n"; echo ' '."\n"; } - echo ' '. $GLOBALS['strReplicationControlSlave'] .''."\n"; + echo ' '. $GLOBALS['strReplicationControlSlave'] .''."\n"; echo ' '."\n"; echo ' '."\n"; echo ' '. (($server_slave_replication[0]['Slave_IO_Running'] == 'No' || $server_slave_replication[0]['Slave_SQL_Running'] == 'No') ? $GLOBALS['strFullStart'] : $GLOBALS['strFullStop']). ' '."\n"; - echo ' '. $GLOBALS['strReplicationSlaveReset'] .''."\n"; + echo ' '. $GLOBALS['strReplicationSlaveReset'] .''."\n"; echo ' '. sprintf($GLOBALS['strReplicationSlaveSQLThread'], ($server_slave_replication[0]['Slave_SQL_Running'] == 'No' ? $GLOBALS['strStart'] : $GLOBALS['strStop'])) .''."\n"; echo ' '. sprintf($GLOBALS['strReplicationSlaveIOThread'], ($server_slave_replication[0]['Slave_IO_Running'] == 'No' ? $GLOBALS['strStart'] : $GLOBALS['strStop'])) .''."\n"; echo ' '."\n"; echo ' '."\n"; - echo ' '. $GLOBALS['strReplicationSlaveErrorManagement'] .''."\n"; + echo ' '."\n"; + echo ' '. $GLOBALS['strReplicationSlaveErrorManagement'] .''."\n"; echo ' '."\n"; PMA_Message::warning($GLOBALS['strReplicationSkippingErrorWarn'])->display(); echo ' '."\n"; echo ' '. $GLOBALS['strReplicationSlaveSkipCurrentError'] .''."\n"; echo ' '.$GLOBALS['strReplicationSlaveSkipNext']."\n"; - echo ' '."\n"; + echo ' '."\n"; echo PMA_generate_common_hidden_inputs('', ''); echo ' '.$GLOBALS['strReplicationSlaveSkipNextErrors']."\n"; echo ' '."\n"; @@ -505,6 +506,7 @@ if (!isset($GLOBALS['repl_clear_scr'])) { echo ' '."\n"; echo ' '."\n"; echo ' '."\n"; + echo ' '."\n"; echo ' '.$GLOBALS['strReplicationSlaveChangeMaster'].''."\n"; echo ''."\n"; @@ -515,11 +517,11 @@ if (!isset($GLOBALS['repl_clear_scr'])) { echo sprintf($GLOBALS['strReplicationSlaveNotConfigured'], PMA_generate_common_url($_url_params))."\n"; } + echo ''."\n"; echo ''."\n"; } if (isset($GLOBALS['sl_configure'])) { PMA_replication_gui_changemaster("slave_changemaster"); } -echo ''."\n"; require_once './libraries/footer.inc.php'; ?>