gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Partial fix for bug #3583312 - Broken replication forms/links

Browse Source
This commit is contained in:
Rouslan Placella 2012-11-04 23:19:56 +00:00
parent 9c280588c1
commit a31140d159
2 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libraries/replication_gui.lib.php
View File

@ -75,7 +75,8 @@ function PMA_replication_gui_changemaster($submitname)
echo ' </fieldset>';
echo ' <fieldset id="fieldset_user_privtable_footer" class="tblFooters">';
echo ' <input type="hidden" name="sr_take_action" value="true" />';
echo ' <input type="submit" name="' . $submitname . '" id="confslave_submit" value="' . __('Go') . '" />';
echo ' <input type="hidden" name="' . $submitname . '" value="1" />';
echo ' <input type="submit" id="confslave_submit" value="' . __('Go') . '" />';
echo ' </fieldset>';
echo '</form>';
}
@ -391,7 +392,8 @@ function PMA_replication_gui_master_addslaveuser()
. '</div>'
. '</fieldset>';
echo '<fieldset id="fieldset_user_privtable_footer" class="tblFooters">'
. ' <input type="submit" name="adduser_submit" id="adduser_submit" value="' . __('Go') . '" />'
. ' <input type="hidden" name="adduser_submit" value="1" />'
. ' <input type="submit" id="adduser_submit" value="' . __('Go') . '" />'
. '</fieldset>';
echo '</form>';
echo '</div>';

20
server_replication.php
View File

@ -203,7 +203,7 @@ if (isset($GLOBALS['sr_take_action'])) {
}
if ($refresh) {
Header("Location: ". PMA_generate_common_url($GLOBALS['url_params']));
Header("Location: server_replication.php" . PMA_generate_common_url($GLOBALS['url_params']));
}
unset($refresh);
}
@ -246,7 +246,7 @@ if ($server_master_status) {
$_url_params['mr_adduser'] = true;
$_url_params['repl_clear_scr'] = true;
echo ' <li><a href="' . PMA_generate_common_url($_url_params) . '" id="master_addslaveuser_href">';
echo ' <li><a href="server_replication.php' . PMA_generate_common_url($_url_params) . '" id="master_addslaveuser_href">';
echo __('Add slave replication user') . '</a></li>';
}
@ -263,7 +263,7 @@ if ($server_master_status) {
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?'), PMA_generate_common_url($_url_params));
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>';
}
@ -315,7 +315,7 @@ if (! isset($GLOBALS['repl_clear_scr'])) {
}
$_url_params['sr_slave_control_parm'] = 'IO_THREAD';
$slave_control_io_link = PMA_generate_common_url($_url_params);
$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';
@ -324,7 +324,7 @@ if (! isset($GLOBALS['repl_clear_scr'])) {
}
$_url_params['sr_slave_control_parm'] = 'SQL_THREAD';
$slave_control_sql_link = PMA_generate_common_url($_url_params);
$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'
@ -335,14 +335,14 @@ if (! isset($GLOBALS['repl_clear_scr'])) {
}
$_url_params['sr_slave_control_parm'] = null;
$slave_control_full_link = PMA_generate_common_url($_url_params);
$slave_control_full_link = 'server_replication.php' . PMA_generate_common_url($_url_params);
$_url_params['sr_slave_action'] = 'reset';
$slave_control_reset_link = PMA_generate_common_url($_url_params);
$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 = PMA_generate_common_url($_url_params);
$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();
@ -355,7 +355,7 @@ if (! isset($GLOBALS['repl_clear_scr'])) {
$_url_params['sl_configure'] = true;
$_url_params['repl_clear_scr'] = true;
$reconfiguremaster_link = PMA_generate_common_url($_url_params);
$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 />';
@ -417,7 +417,7 @@ if (! isset($GLOBALS['repl_clear_scr'])) {
$_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?'), PMA_generate_common_url($_url_params));
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>';
}