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

Code style improvements, fixed JS errors, fixd HTML validity issues

Browse Source
This commit is contained in:
Herman van Rink
2009-09-13 13:45:52 +00:00
parent 35ee91c422
commit 180cc73c09
3 changed files with 13 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
libraries/common.lib.php
View File

@@ -2729,7 +2729,7 @@ function PMA_getTitleForTarget($target) {
function PMA_js_mootools_domready($code, $print=true) function PMA_js_mootools_domready($code, $print=true)
{ {
$out = ''; $out = '';
$out .= '<script language="JavaScript">'."\n"; $out .= '<script type="text/javascript">'."\n";
$out .= 'window.addEvent(\'domready\',function() {'."\n"; $out .= 'window.addEvent(\'domready\',function() {'."\n";
$out .= $code; $out .= $code;
$out .= '});'."\n"; $out .= '});'."\n";
@@ -2744,7 +2744,7 @@ function PMA_js_mootools_domready($code, $print=true)
function PMA_js($code, $print=true) function PMA_js($code, $print=true)
{ {
$out = ''; $out = '';
$out .= '<script language="JavaScript">'."\n"; $out .= '<script type="text/javascript">'."\n";
$out .= $code; $out .= $code;
$out .= '</script>'."\n"; $out .= '</script>'."\n";

4
libraries/replication_gui.lib.php
View File

@@ -11,6 +11,7 @@ if (! defined('PHPMYADMIN')) {
$jscode['master_replication'] = 'divShowHideFunc(\'master_status_href\', \'replication_master_section\');'."\n"; $jscode['master_replication'] = 'divShowHideFunc(\'master_status_href\', \'replication_master_section\');'."\n";
// Add JS events to generate example my.cnf config lines
$jscode['configure_master'] = $jscode['configure_master'] =
'var c_output = "";'."\n". 'var c_output = "";'."\n".
'var c_text = "server-id='.$serverid.'<br />log-bin=mysql-bin<br />log-error=mysql-bin.err<br />";'."\n". 'var c_text = "server-id='.$serverid.'<br />log-bin=mysql-bin<br />log-error=mysql-bin.err<br />";'."\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] && ${"{$type}_variables_alerts"}[$variable] == ${"server_{$type}_replication"}[0][$variable]
) { ) {
echo '<span class="attention">'."\n"; echo '<span class="attention">'."\n";
}
if (isset(${"{$type}_variables_oks"}[$variable]) } elseif (isset(${"{$type}_variables_oks"}[$variable])
&& ${"{$type}_variables_oks"}[$variable] == ${"server_{$type}_replication"}[0][$variable] && ${"{$type}_variables_oks"}[$variable] == ${"server_{$type}_replication"}[0][$variable]
) { ) {
echo '<span class="allfine">'."\n"; echo '<span class="allfine">'."\n";

16
server_replication.php
View File

@@ -194,7 +194,7 @@ if ($server_master_status) {
echo '<legend>'. $GLOBALS['strReplicationMaster'] .'</legend>'."\n"; echo '<legend>'. $GLOBALS['strReplicationMaster'] .'</legend>'."\n";
echo $GLOBALS['strReplicationConfiguredMaster']."\n"; echo $GLOBALS['strReplicationConfiguredMaster']."\n";
echo '<ul>'."\n"; echo '<ul>'."\n";
echo ' <li><a href="#" id="master_status_href">'. $GLOBALS['strReplicationShowMasterStatus'] .'</a> </li>'; echo ' <li><a href="#" id="master_status_href">'. $GLOBALS['strReplicationShowMasterStatus'] .'</a></li>';
PMA_replication_print_status_table('master', true, false); PMA_replication_print_status_table('master', true, false);
$_url_params = $GLOBALS['url_params']; $_url_params = $GLOBALS['url_params'];
$_url_params['mr_adduser'] = true; $_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 PMA_js_mootools_domready($jscode['slave_control_sync']);
echo ' <li><a href="#" id="slave_synchronization_href">'.$GLOBALS['strReplicationSynchronize'].'</a></li>'."\n"; echo ' <li><a href="#" id="slave_synchronization_href">'.$GLOBALS['strReplicationSynchronize'].'</a></li>'."\n";
echo ' <div id="slave_synchronization_gui" style="display: none">'."\n"; echo ' <div id="slave_synchronization_gui" style="display: none">'."\n";
echo ' <form method="post">'."\n"; echo ' <form method="post" action="server_replication.php">'."\n";
echo PMA_generate_common_hidden_inputs('', ''); echo PMA_generate_common_hidden_inputs('', '');
echo ' <input type="checkbox" name="repl_struc" value="1" checked disabled /> '. $GLOBALS['strStructure']. '<br />'."\n"; // this is just for vizualization, it has no other purpose echo ' <input type="checkbox" name="repl_struc" value="1" checked disabled /> '. $GLOBALS['strStructure']. '<br />'."\n"; // this is just for vizualization, it has no other purpose
echo ' <input type="checkbox" name="repl_data" value="1" checked /> '. $GLOBALS['strData'] .' <br />'."\n"; echo ' <input type="checkbox" name="repl_data" value="1" checked /> '. $GLOBALS['strData'] .' <br />'."\n";
@@ -482,22 +482,23 @@ if (!isset($GLOBALS['repl_clear_scr'])) {
echo ' </form>'."\n"; echo ' </form>'."\n";
echo ' </div>'."\n"; echo ' </div>'."\n";
} }
echo ' <li><a href="#" id="slave_control_href">'. $GLOBALS['strReplicationControlSlave'] .'</li>'."\n"; echo ' <li><a href="#" id="slave_control_href">'. $GLOBALS['strReplicationControlSlave'] .'</a>'."\n";
echo ' <div id="slave_control_gui" style="display: none">'."\n"; echo ' <div id="slave_control_gui" style="display: none">'."\n";
echo ' <ul>'."\n"; echo ' <ul>'."\n";
echo ' <li><a href="'. $slave_control_full_link .'">'. (($server_slave_replication[0]['Slave_IO_Running'] == 'No' || $server_slave_replication[0]['Slave_SQL_Running'] == 'No') ? $GLOBALS['strFullStart'] : $GLOBALS['strFullStop']). ' </a></li>'."\n"; echo ' <li><a href="'. $slave_control_full_link .'">'. (($server_slave_replication[0]['Slave_IO_Running'] == 'No' || $server_slave_replication[0]['Slave_SQL_Running'] == 'No') ? $GLOBALS['strFullStart'] : $GLOBALS['strFullStop']). ' </a></li>'."\n";
echo ' <li><a href="'. $slave_control_reset_link .'">'. $GLOBALS['strReplicationSlaveReset'] .'</li>'."\n"; echo ' <li><a href="'. $slave_control_reset_link .'">'. $GLOBALS['strReplicationSlaveReset'] .'</a></li>'."\n";
echo ' <li><a href="'. $slave_control_sql_link .'">'. sprintf($GLOBALS['strReplicationSlaveSQLThread'], ($server_slave_replication[0]['Slave_SQL_Running'] == 'No' ? $GLOBALS['strStart'] : $GLOBALS['strStop'])) .'</a></li>'."\n"; echo ' <li><a href="'. $slave_control_sql_link .'">'. sprintf($GLOBALS['strReplicationSlaveSQLThread'], ($server_slave_replication[0]['Slave_SQL_Running'] == 'No' ? $GLOBALS['strStart'] : $GLOBALS['strStop'])) .'</a></li>'."\n";
echo ' <li><a href="'. $slave_control_io_link .'">'. sprintf($GLOBALS['strReplicationSlaveIOThread'], ($server_slave_replication[0]['Slave_IO_Running'] == 'No' ? $GLOBALS['strStart'] : $GLOBALS['strStop'])) .'</a></li>'."\n"; echo ' <li><a href="'. $slave_control_io_link .'">'. sprintf($GLOBALS['strReplicationSlaveIOThread'], ($server_slave_replication[0]['Slave_IO_Running'] == 'No' ? $GLOBALS['strStart'] : $GLOBALS['strStop'])) .'</a></li>'."\n";
echo ' </ul>'."\n"; echo ' </ul>'."\n";
echo ' </div>'."\n"; echo ' </div>'."\n";
echo ' <li><a href="#" id="slave_errormanagement_href">'. $GLOBALS['strReplicationSlaveErrorManagement'] .'</a></li>'."\n"; echo ' </li>'."\n";
echo ' <li><a href="#" id="slave_errormanagement_href">'. $GLOBALS['strReplicationSlaveErrorManagement'] .'</a>'."\n";
echo ' <div id="slave_errormanagement_gui" style="display: none">'."\n"; echo ' <div id="slave_errormanagement_gui" style="display: none">'."\n";
PMA_Message::warning($GLOBALS['strReplicationSkippingErrorWarn'])->display(); PMA_Message::warning($GLOBALS['strReplicationSkippingErrorWarn'])->display();
echo ' <ul>'."\n"; echo ' <ul>'."\n";
echo ' <li><a href="'. $slave_skip_error_link .'">'. $GLOBALS['strReplicationSlaveSkipCurrentError'] .'</a></li>'."\n"; echo ' <li><a href="'. $slave_skip_error_link .'">'. $GLOBALS['strReplicationSlaveSkipCurrentError'] .'</a></li>'."\n";
echo ' <li>'.$GLOBALS['strReplicationSlaveSkipNext']."\n"; echo ' <li>'.$GLOBALS['strReplicationSlaveSkipNext']."\n";
echo ' <form method="post">'."\n"; echo ' <form method="post" action="server_replication.php">'."\n";
echo PMA_generate_common_hidden_inputs('', ''); echo PMA_generate_common_hidden_inputs('', '');
echo ' <input type="text" name="sr_skip_errors_count" value="1" style="width: 30px" />'.$GLOBALS['strReplicationSlaveSkipNextErrors']."\n"; echo ' <input type="text" name="sr_skip_errors_count" value="1" style="width: 30px" />'.$GLOBALS['strReplicationSlaveSkipNextErrors']."\n";
echo ' <input type="submit" name="sr_slave_skip_error" value="'. $GLOBALS['strGo'] .'" />'."\n"; echo ' <input type="submit" name="sr_slave_skip_error" value="'. $GLOBALS['strGo'] .'" />'."\n";
@@ -505,6 +506,7 @@ if (!isset($GLOBALS['repl_clear_scr'])) {
echo ' </form></li>'."\n"; echo ' </form></li>'."\n";
echo ' </ul>'."\n"; echo ' </ul>'."\n";
echo ' </div>'."\n"; echo ' </div>'."\n";
echo ' </li>'."\n";
echo ' <li><a href="'. $reconfiguremaster_link .'">'.$GLOBALS['strReplicationSlaveChangeMaster'].'</a></li>'."\n"; echo ' <li><a href="'. $reconfiguremaster_link .'">'.$GLOBALS['strReplicationSlaveChangeMaster'].'</a></li>'."\n";
echo '</ul>'."\n"; echo '</ul>'."\n";
@@ -515,11 +517,11 @@ if (!isset($GLOBALS['repl_clear_scr'])) {
echo sprintf($GLOBALS['strReplicationSlaveNotConfigured'], PMA_generate_common_url($_url_params))."\n"; echo sprintf($GLOBALS['strReplicationSlaveNotConfigured'], PMA_generate_common_url($_url_params))."\n";
} }
echo '</div>'."\n";
echo '</fieldset>'."\n"; echo '</fieldset>'."\n";
} }
if (isset($GLOBALS['sl_configure'])) { if (isset($GLOBALS['sl_configure'])) {
PMA_replication_gui_changemaster("slave_changemaster"); PMA_replication_gui_changemaster("slave_changemaster");
} }
echo '</div>'."\n";
require_once './libraries/footer.inc.php'; require_once './libraries/footer.inc.php';
?> ?>