Removed obsolete QueryFrameDebug configuration directive.

This commit is contained in:
Garvin Hicking
2004-05-03 08:20:12 +00:00
parent e6993ccfce
commit 0c7173146e
6 changed files with 3 additions and 51 deletions

View File

@@ -6,6 +6,9 @@ $Id$
$Source$ $Source$
2004-05-03 Garvin Hicking <pma@supergarv.de> 2004-05-03 Garvin Hicking <pma@supergarv.de>
* config.inc.php, libraries/config_import.lib.php, querywindow.php,
footer.inc.php, Documentation.html: Removed obsolete
QueryFrameDebug configuration directive
* tbl_row_delete.php: Multi Row edit/delete: Fixed wrong switch * tbl_row_delete.php: Multi Row edit/delete: Fixed wrong switch
structure to take previous settings into account. structure to take previous settings into account.

View File

@@ -1722,7 +1722,6 @@ Defaults to FALSE (drop-down). <br />
<dt><b>$cfg['QueryFrame'] </b>boolean<br /> <dt><b>$cfg['QueryFrame'] </b>boolean<br />
<b>$cfg['QueryFrameJS'] </b>boolean<br /> <b>$cfg['QueryFrameJS'] </b>boolean<br />
<b>$cfg['QueryFrameDebug'] </b>boolean<br />
<b>$cfg['QueryWindowWidth'] </b>integer<br /> <b>$cfg['QueryWindowWidth'] </b>integer<br />
<b>$cfg['QueryWindowHeight'] </b>integer<br /> <b>$cfg['QueryWindowHeight'] </b>integer<br />
<b>$cfg['QueryHistoryDB'] </b>boolean<br /> <b>$cfg['QueryHistoryDB'] </b>boolean<br />
@@ -1773,9 +1772,6 @@ Defaults to FALSE (drop-down). <br />
default tab to be used when opening the query window. It can be set to default tab to be used when opening the query window. It can be set to
either 'sql', 'files', 'history' or 'full'. either 'sql', 'files', 'history' or 'full'.
<br /><br /> <br /><br />
The variable $cfg['QueryFrameDebug'] can be used by developers for
easier future feature integration.
<br /><br />
</dd> </dd>
<dt><b>$cfg['BrowseMIME'] </b>boolean</dt> <dt><b>$cfg['BrowseMIME'] </b>boolean</dt>

View File

@@ -495,7 +495,6 @@ $cfg['RepeatCells'] = 100; // repeat header names every X cells
$cfg['QueryFrame'] = TRUE; // displays a new frame where a link to a querybox is always displayed. $cfg['QueryFrame'] = TRUE; // displays a new frame where a link to a querybox is always displayed.
$cfg['QueryFrameJS'] = TRUE; // whether to use JavaScript functions for opening a new window for SQL commands. $cfg['QueryFrameJS'] = TRUE; // whether to use JavaScript functions for opening a new window for SQL commands.
// if set to 'false', the target of the querybox is always the right frame. // if set to 'false', the target of the querybox is always the right frame.
$cfg['QueryFrameDebug'] = FALSE; // display JS debugging link (DEVELOPERS only)
$cfg['QueryWindowWidth'] = 550; // Width of Query window $cfg['QueryWindowWidth'] = 550; // Width of Query window
$cfg['QueryWindowHeight'] = 310; // Height of Query window $cfg['QueryWindowHeight'] = 310; // Height of Query window
$cfg['QueryHistoryDB'] = FALSE; // Set to TRUE if you want DB-based query history. $cfg['QueryHistoryDB'] = FALSE; // Set to TRUE if you want DB-based query history.

View File

@@ -20,15 +20,6 @@ if ($cfg['QueryFrame'] && $cfg['QueryFrameJS']) {
<script type="text/javascript"> <script type="text/javascript">
<!-- <!--
<?php <?php
if ($cfg['QueryFrameDebug']) {
?>
document.writeln("Updating query window. DB: <?php echo (isset($db) ? addslashes($db) : 'FALSE'); ?>, Table: <?php echo (isset($table) ? addslashes($table) : 'FALSE'); ?><br />");
document.writeln("Window: " + parent.frames.queryframe.querywindow.location + "<br />");
<?php
}
?>
<?php
if (!isset($no_history) && (!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) {
@@ -41,8 +32,6 @@ if ($cfg['QueryFrame'] && $cfg['QueryFrameJS']) {
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 <?php
if (!isset($no_history) && (!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)) {
@@ -61,7 +50,6 @@ if ($cfg['QueryFrame'] && $cfg['QueryFrameJS']) {
<?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"; ?>
parent.frames.queryframe.querywindow.document.querywindow.submit(); parent.frames.queryframe.querywindow.document.querywindow.submit();
} }
<?php <?php

View File

@@ -767,10 +767,6 @@ if (!isset($cfg['QueryFrameJS'])) {
$cfg['QueryFrameJS'] = TRUE; $cfg['QueryFrameJS'] = TRUE;
} }
if (!isset($cfg['QueryFrameDebug'])) {
$cfg['QueryFrameDebug'] = FALSE;
}
if (!isset($cfg['QueryWindowWidth'])) { if (!isset($cfg['QueryWindowWidth'])) {
$cfg['QueryWindowWidth'] = 550; $cfg['QueryWindowWidth'] = 550;
} }

View File

@@ -48,25 +48,6 @@ require_once('./libraries/header_meta_style.inc.php');
?> ?>
<script type="text/javascript" language="javascript"> <script type="text/javascript" language="javascript">
<?php
if ($cfg['QueryFrame'] && $cfg['QueryFrameJS'] && $cfg['QueryFrameDebug']) {
$js_db = (isset($db) ? $db : 'FALSE');
$js_table = (isset($table) ? $table : 'FALSE');
$js_server = (isset($server) ? $server : 'FALSE');
$js_true_db = '\' + document.querywindow.db.value + \'';
$js_true_table = '\' + document.querywindow.table.value + \'';
$js_true_server = '\' + document.querywindow.server.value + \'';
$js_parent = '\' + opener.location.href + \'';
$js_frame = '\' + opener.parent.location.href + \'';
?>
function debug() {
alert('<?php echo sprintf($strQueryFrameDebugBox, $js_db, $js_table, $js_server, $js_true_db, $js_true_table, $js_true_server, $js_parent, $js_frame); ?>');
return false;
}
<?php
}
?> ?>
function query_auto_commit() { function query_auto_commit() {
document.sqlform.submit(); document.sqlform.submit();
@@ -262,17 +243,6 @@ if ($cfg['QueryFrame'] && $cfg['QueryFrameJS']) {
</form> </form>
<?php <?php
} }
/* REMOVE ME */
if ($cfg['QueryFrame'] && $cfg['QueryFrameJS'] && $cfg['QueryFrameDebug']) {
?>
<br />
<center>
<a href='#' onClick='return debug();'><?php echo $strQueryFrameDebug; ?></a>
</center>
<?php
}
/* REMOVE ME */
?> ?>
</body> </body>