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

Bug 831181

Browse Source
This commit is contained in:
Garvin Hicking
2003-11-05 15:40:55 +00:00
parent 6f3399ac5a
commit 10dc5d05d3
3 changed files with 15 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@@ -6,6 +6,9 @@ $Id$
$Source$ $Source$
2003-11-05 Garvin Hicking <me@supergarv.de> 2003-11-05 Garvin Hicking <me@supergarv.de>
* libraries/common.lib.php3, footer.inc.php3: Bug #831181: Do not
store queries with errors in history, also when coming from the
database SQL tab.
* libraries/common.lib.php3: Bug #835854. The MySQL-error messages * libraries/common.lib.php3: Bug #835854. The MySQL-error messages
are now put inside a <code> HTML-container, not <pre>. This allows are now put inside a <code> HTML-container, not <pre>. This allows
wordwrapping to hide vertical scrollbars. Linebreak/Whitespace wordwrapping to hide vertical scrollbars. Linebreak/Whitespace

22
footer.inc.php3
View File

@@ -24,9 +24,9 @@ if ($cfg['QueryFrame'] && $cfg['QueryFrameJS']) {
<?php <?php
} }
?> ?>
<?php <?php
if (!isset($error_message) || $error_message == '') { if (!isset($no_history) && (!isset($error_message) || $error_message == '')) {
?> ?>
if (parent.frames.queryframe && parent.frames.queryframe.document && parent.frames.queryframe.document.queryframeform) { if (parent.frames.queryframe && parent.frames.queryframe.document && parent.frames.queryframe.document.queryframeform) {
parent.frames.queryframe.document.queryframeform.db.value = "<?php echo (isset($db) ? addslashes($db) : ''); ?>"; parent.frames.queryframe.document.queryframeform.db.value = "<?php echo (isset($db) ? addslashes($db) : ''); ?>";
@@ -35,13 +35,13 @@ if ($cfg['QueryFrame'] && $cfg['QueryFrameJS']) {
<?php <?php
} }
?> ?>
function reload_querywindow () { function reload_querywindow () {
if (parent.frames.queryframe && parent.frames.queryframe.querywindow && !parent.frames.queryframe.querywindow.closed && parent.frames.queryframe.querywindow.location) { if (parent.frames.queryframe && parent.frames.queryframe.querywindow && !parent.frames.queryframe.querywindow.closed && parent.frames.queryframe.querywindow.location) {
<?php echo ($cfg['QueryFrameDebug'] ? 'document.writeln("<a href=\'#\' onClick=\'parent.frames.queryframe.querywindow.focus(); return false;\'>Query Window</a> can be updated.<br>");' : ''); ?> <?php echo ($cfg['QueryFrameDebug'] ? 'document.writeln("<a href=\'#\' onClick=\'parent.frames.queryframe.querywindow.focus(); return false;\'>Query Window</a> can be updated.<br>");' : ''); ?>
<?php <?php
if (!isset($error_message) || $error_message == '') { if (!isset($no_history) && (!isset($error_message) || $error_message == '')) {
if (isset($LockFromUpdate) && $LockFromUpdate == '1' && isset($sql_query)) { if (isset($LockFromUpdate) && $LockFromUpdate == '1' && isset($sql_query)) {
// When the button 'LockFromUpdate' was selected in the querywindow, it does not submit it's contents to // When the button 'LockFromUpdate' was selected in the querywindow, it does not submit it's contents to
// itself. So we create a SQL-history entry here. // itself. So we create a SQL-history entry here.
@@ -55,9 +55,9 @@ if ($cfg['QueryFrame'] && $cfg['QueryFrameJS']) {
parent.frames.queryframe.querywindow.document.querywindow.query_history_latest_db.value = "<?php echo (isset($db) ? addslashes($db) : '') ?>"; parent.frames.queryframe.querywindow.document.querywindow.query_history_latest_db.value = "<?php echo (isset($db) ? addslashes($db) : '') ?>";
parent.frames.queryframe.querywindow.document.querywindow.table.value = "<?php echo (isset($table) ? addslashes($table) : '') ?>"; parent.frames.queryframe.querywindow.document.querywindow.table.value = "<?php echo (isset($table) ? addslashes($table) : '') ?>";
parent.frames.queryframe.querywindow.document.querywindow.query_history_latest_table.value = "<?php echo (isset($table) ? addslashes($table) : '') ?>"; parent.frames.queryframe.querywindow.document.querywindow.query_history_latest_table.value = "<?php echo (isset($table) ? addslashes($table) : '') ?>";
<?php echo (isset($sql_query) ? 'parent.frames.queryframe.querywindow.document.querywindow.query_history_latest.value = "' . urlencode($sql_query) . '";' : '// no sql query update') . "\n"; ?> <?php echo (isset($sql_query) ? 'parent.frames.queryframe.querywindow.document.querywindow.query_history_latest.value = "' . urlencode($sql_query) . '";' : '// no sql query update') . "\n"; ?>
<?php echo ($cfg['QueryFrameDebug'] ? 'alert(\'Querywindow submits. Last chance to check variables.\');' : '') . "\n"; ?> <?php echo ($cfg['QueryFrameDebug'] ? 'alert(\'Querywindow submits. Last chance to check variables.\');' : '') . "\n"; ?>
parent.frames.queryframe.querywindow.document.querywindow.submit(); parent.frames.queryframe.querywindow.document.querywindow.submit();
} }
@@ -86,7 +86,7 @@ if ($cfg['QueryFrame'] && $cfg['QueryFrameJS']) {
} else if (parent.frames.queryframe) { } else if (parent.frames.queryframe) {
new_win_url = 'querywindow.php3?sql_query=' + sql_query + '&<?php echo PMA_generate_common_url(isset($db) ? addslashes($db) : '', isset($table) ? addslashes($table) : '', '&'); ?>'; new_win_url = 'querywindow.php3?sql_query=' + sql_query + '&<?php echo PMA_generate_common_url(isset($db) ? addslashes($db) : '', isset($table) ? addslashes($table) : '', '&'); ?>';
parent.frames.queryframe.querywindow=window.open(new_win_url, '','toolbar=0,location=1,directories=0,status=1,menubar=0,scrollbars=yes,resizable=yes,width=<?php echo $cfg['QueryWindowWidth']; ?>,height=<?php echo $cfg['QueryWindowHeight']; ?>'); parent.frames.queryframe.querywindow=window.open(new_win_url, '','toolbar=0,location=1,directories=0,status=1,menubar=0,scrollbars=yes,resizable=yes,width=<?php echo $cfg['QueryWindowWidth']; ?>,height=<?php echo $cfg['QueryWindowHeight']; ?>');
if (!parent.frames.queryframe.querywindow.opener) { if (!parent.frames.queryframe.querywindow.opener) {
parent.frames.queryframe.querywindow.opener = parent.frames.queryframe; parent.frames.queryframe.querywindow.opener = parent.frames.queryframe;
} }
@@ -132,9 +132,9 @@ if (isset($GLOBALS['userlink']) && $GLOBALS['userlink']) {
/** /**
* Generates profiling data if requested * Generates profiling data if requested
*/ */
if (isset($GLOBALS['cfg']['DBG']['enable']) if (isset($GLOBALS['cfg']['DBG']['enable'])
&& $GLOBALS['cfg']['DBG']['enable'] && $GLOBALS['cfg']['DBG']['enable']
&& isset($GLOBALS['cfg']['DBG']['profile']['enable']) && isset($GLOBALS['cfg']['DBG']['profile']['enable'])
&& $GLOBALS['cfg']['DBG']['profile']['enable']) { && $GLOBALS['cfg']['DBG']['profile']['enable']) {
//run the basic setup code first //run the basic setup code first
include('./libraries/dbg/setup.php3'); include('./libraries/dbg/setup.php3');

2
libraries/common.lib.php3
View File

@@ -521,7 +521,7 @@ h1 {font-family: sans-serif; font-size: large; font-weight: bold}
echo PMA_showMySQLDocu('Error-returns', 'Error-returns'); echo PMA_showMySQLDocu('Error-returns', 'Error-returns');
if (!empty($back_url) && $exit) { if (!empty($back_url) && $exit) {
echo '&nbsp;&middot;&nbsp;[<a href="' . $back_url . '">' . $GLOBALS['strBack'] . '</a>]'; echo '&nbsp;&middot;&nbsp;[<a href="' . (strstr($back_url, '?') ? $back_url . '&amp;no_history=true' : $back_url . '?no_history=true') . '">' . $GLOBALS['strBack'] . '</a>]';
} }
echo "\n"; echo "\n";