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

Query window

Browse Source
This commit is contained in:
Garvin Hicking
2003-04-15 08:20:11 +00:00
parent 5eae86494f
commit dee67a454a
3 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@@ -5,6 +5,11 @@ phpMyAdmin - Changelog
$Id$ $Id$
$Source$ $Source$
2003-04-15 Garvin Hicking <me@supergarv.de>
* footer.inc.php3, queryframe.php3: Changed anchor target
and window name of queryframe as suggested by Armel
Fauveau (thanks!)
2003-04-14 Marc Delisle <lem9@users.sourceforge.net> 2003-04-14 Marc Delisle <lem9@users.sourceforge.net>
* libraries/sqlparser.data.php3: bug 647705: 'NO' is not * libraries/sqlparser.data.php3: bug 647705: 'NO' is not
a reserved word in MySQL a reserved word in MySQL

2
footer.inc.php3
View File

@@ -50,7 +50,7 @@ if ($cfg['QueryFrame'] && $cfg['QueryFrameJS']) {
return false; return false;
} else if (top.frames.queryframe) { } else if (top.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) : '', '&'); ?>';
top.frames.queryframe.querywindow=window.open(new_win_url, 'js_querywindow','toolbar=0,location=1,directories=0,status=1,menubar=0,scrollbars=yes,resizable=yes,width=<?php echo $cfg['QueryWindowWidth']; ?>,height=<?php echo $cfg['QueryWindowHeight']; ?>'); top.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 (!top.frames.queryframe.querywindow.opener) { if (!top.frames.queryframe.querywindow.opener) {
top.frames.queryframe.querywindow.opener = top.frames.queryframe; top.frames.queryframe.querywindow.opener = top.frames.queryframe;

6
queryframe.php3
View File

@@ -57,7 +57,7 @@ function open_querywindow(url) {
if (!querywindow.closed && querywindow.location) { if (!querywindow.closed && querywindow.location) {
querywindow.focus(); querywindow.focus();
} else { } else {
querywindow=window.open(url + '&db=' + document.queryframeform.db.value + '&table=' + document.queryframeform.table.value, 'js_querywindow','toolbar=0,location=0,directories=0,status=1,menubar=0,scrollbars=yes,resizable=yes,width=<?php echo $cfg['QueryWindowWidth']; ?>,height=<?php echo $cfg['QueryWindowHeight']; ?>'); querywindow=window.open(url + '&db=' + document.queryframeform.db.value + '&table=' + document.queryframeform.table.value, '','toolbar=0,location=0,directories=0,status=1,menubar=0,scrollbars=yes,resizable=yes,width=<?php echo $cfg['QueryWindowWidth']; ?>,height=<?php echo $cfg['QueryWindowHeight']; ?>');
} }
if (!querywindow.opener) { if (!querywindow.opener) {
@@ -86,9 +86,9 @@ function open_querywindow(url) {
<?php <?php
$anchor = 'querywindow.php3?' . PMA_generate_common_url('', ''); $anchor = 'querywindow.php3?' . PMA_generate_common_url('', '');
if ($cfg['QueryFrameJS']) { if ($cfg['QueryFrameJS']) {
$href = '#'; $href = $anchor;
$target = ''; $target = '';
$onclick = 'onClick="javascript:open_querywindow(\'' . $anchor . '\'); return false;"'; $onclick = 'onClick="javascript:open_querywindow(this.href); return false;"';
} else { } else {
$href = $anchor; $href = $anchor;
$target = 'target="phpmain"'; $target = 'target="phpmain"';