Cleanup of message displaying and navigation reloading.

This commit is contained in:
Michal Čihař
2004-10-21 10:18:12 +00:00
parent 1293dc1a24
commit 3f258cfb45
22 changed files with 161 additions and 128 deletions

View File

@@ -52,20 +52,6 @@ if (isset($table)) {
}
$show_query = '1';
require_once('./header.inc.php');
if (isset($message)) {
PMA_showMessage($message);
}
else if (isset($reload) && $reload) {
// Reloads the navigation frame via JavaScript if required
echo "\n";
?>
<script type="text/javascript" language="javascript1.2">
<!--
window.parent.frames['nav'].location.replace('./left.php?<?php echo PMA_generate_common_url('', '', '&');?>&hash=' + <?php echo (($cfg['QueryFrame'] && $cfg['QueryFrameJS']) ? 'window.parent.frames[\'queryframe\'].document.hashform.hash.value' : "'" . md5($cfg['PmaAbsoluteUri']) . "'"); ?>);
//-->
</script>
<?php
}
echo "\n";
@@ -85,6 +71,7 @@ echo "\n";
?>
</h1>
<?php
// Don't display server info if $server == 0 (no server selected)
// loic1: modified in order to have a valid words order whatever is the
// language used
@@ -117,6 +104,13 @@ if ($server > 0) {
} // end if
// Any message to display?
if (isset($message)) {
PMA_showMessage($message);
unset($message);
}
/**
* Reload mysql (flush privileges)
*/