diff --git a/htdocs/sql/querywindow.php b/htdocs/sql/querywindow.php
new file mode 100755
--- /dev/null
+++ b/htdocs/sql/querywindow.php
@@ -0,0 +1,316 @@
+<?php
+/* vim: set expandtab sw=4 ts=4 sts=4: */
+/**
+ * this file is register_globals save
+ *
+ * @todo    move JavaScript out of here into .js files
+ * @uses    $cfg['QueryWindowDefTab']
+ * @uses    $cfg['PropertiesIconic']
+ * @uses    $cfg['QueryHistoryDB']
+ * @uses    $cfg['Server']['user']
+ * @uses    $cfg['AllowUserDropDatabase']
+ * @uses    $cfg['Confirm']
+ * @uses    $GLOBALS['db']
+ * @uses    $GLOBALS['table']
+ * @uses    $GLOBALS['strSQL']
+ * @uses    $GLOBALS['strImportFiles']
+ * @uses    $GLOBALS['strQuerySQLHistory']
+ * @uses    $GLOBALS['strAll']
+ * @uses    $GLOBALS['strChange']
+ * @uses    $GLOBALS['strFormEmpty']
+ * @uses    $GLOBALS['strNotNumber']
+ * @uses    $GLOBALS['strNoDropDatabases']
+ * @uses    $GLOBALS['strDoYouReally']
+ * @uses    $GLOBALS['strQuerySQLHistory']
+ * @uses    PMA_isSuperuser()
+ * @uses    PMA_outBufferPre()
+ * @uses    PMA_getRelationsParam()
+ * @uses    PMA_isValid()
+ * @uses    PMA_ifSetOr()
+ * @uses    PMA_getHistory()
+ * @uses    PMA_generate_common_url()
+ * @uses    PMA_generate_common_hidden_inputs()
+ * @uses    PMA_escapeJsString()
+ * @uses    PMA_getTabs()
+ * @uses    PMA_sqlQueryForm()
+ * @uses    PMA_jsFormat()
+ * @uses    in_array()
+ * @uses    strlen()
+ * @uses    preg_replace()
+ * @uses    htmlspecialchars()
+ * @version $Id: querywindow.php 11376 2008-07-09 14:17:19Z lem9 $
+ */
+
+/**
+ *
+ */
+require_once './libraries/common.inc.php';
+
+$is_superuser = PMA_isSuperuser();
+
+/**
+ * Gets a core script and starts output buffering work
+ */
+require_once './libraries/sql_query_form.lib.php';
+
+/**
+ * starts output buffering if requested and supported
+ */
+require_once './libraries/ob.lib.php';
+PMA_outBufferPre();
+
+/**
+ * load relations
+ */
+require_once './libraries/relation.lib.php';
+$cfgRelation = PMA_getRelationsParam();
+
+/**
+ * load bookmark support
+ */
+require_once './libraries/bookmark.lib.php';
+
+$querydisplay_tabs = array(
+    'sql',
+    'files',
+    'history',
+    'full',
+);
+
+if (isset($_REQUEST['querydisplay_tab'])
+ && in_array($_REQUEST['querydisplay_tab'], $querydisplay_tabs)) {
+    $querydisplay_tab = $_REQUEST['querydisplay_tab'];
+} else {
+    $querydisplay_tab = $GLOBALS['cfg']['QueryWindowDefTab'];
+}
+
+/**
+ * $_REQUEST['no_js'] is set if open new window by JavaScript failed
+ * so this page is loaded in main frame
+ */
+$no_js = PMA_ifSetOr($_REQUEST['no_js'], false);
+
+if ($no_js) {
+    $querydisplay_tab = 'full';
+    $tabs = false;
+} else {
+    $tabs = array();
+    $tabs['sql']['icon']   = 'b_sql.png';
+    $tabs['sql']['text']   = $GLOBALS['strSQL'];
+    $tabs['sql']['fragment']   = '#';
+    $tabs['sql']['attr']   = 'onclick="javascript:PMA_querywindowCommit(\'sql\');return false;"';
+    $tabs['sql']['active'] = (bool) ($querydisplay_tab == 'sql');
+    $tabs['import']['icon']   = 'b_import.png';
+    $tabs['import']['text']   = $GLOBALS['strImportFiles'];
+    $tabs['import']['fragment']   = '#';
+    $tabs['import']['attr']   = 'onclick="javascript:PMA_querywindowCommit(\'files\');return false;"';
+    $tabs['import']['active'] = (bool) ($querydisplay_tab == 'files');
+    $tabs['history']['icon']   = 'b_bookmark.png';
+    $tabs['history']['text']   = $GLOBALS['strQuerySQLHistory'];
+    $tabs['history']['fragment']   = '#';
+    $tabs['history']['attr']   = 'onclick="javascript:PMA_querywindowCommit(\'history\');return false;"';
+    $tabs['history']['active'] = (bool) ($querydisplay_tab == 'history');
+
+    if ($GLOBALS['cfg']['QueryWindowDefTab'] == 'full') {
+        $tabs['all']['text']   = $GLOBALS['strAll'];
+        $tabs['all']['fragment']   = '#';
+        $tabs['all']['attr']   = 'onclick="javascript:PMA_querywindowCommit(\'full\');return false;"';
+        $tabs['all']['active'] = (bool) ($querydisplay_tab == 'full');
+    }
+}
+
+if ($GLOBALS['cfg']['PropertiesIconic']) {
+    $titles['Change'] =
+         '<img class="icon" width="16" height="16" src="' . $pmaThemeImage
+        . 'b_edit.png" alt="' . $GLOBALS['strChange'] . '" title="' . $GLOBALS['strChange']
+        . '" />';
+
+    if ('both' === $GLOBALS['cfg']['PropertiesIconic']) {
+        $titles['Change'] .= $GLOBALS['strChange'];
+    }
+} else {
+    $titles['Change'] = $GLOBALS['strChange'];
+}
+
+$url_query = PMA_generate_common_url($db, $table);
+
+if (! empty($sql_query)) {
+    $show_query = 1;
+}
+
+if ($no_js) {
+    // ... we redirect to appropriate query sql page
+    // works only full if $db and $table is also stored/grabbed from $_COOKIE
+    if (strlen($table)) {
+        require './tbl_sql.php';
+    } elseif (strlen($db)) {
+        require './db_sql.php';
+    } else {
+        require './server_sql.php';
+    }
+    exit;
+}
+
+/**
+ * Defines the query to be displayed in the query textarea
+ */
+if (! empty($show_query)) {
+    $query_to_display = $sql_query;
+} else {
+    $query_to_display = '';
+}
+$sql_query = '';
+
+/**
+ * start HTML output
+ */
+require_once './libraries/header_http.inc.php';
+require_once './libraries/header_meta_style.inc.php';
+?>
+<script type="text/javascript">
+//<![CDATA[
+var errorMsg0   = '<?php echo PMA_escapeJsString($GLOBALS['strFormEmpty']); ?>';
+var errorMsg1   = '<?php echo PMA_escapeJsString($GLOBALS['strNotNumber']); ?>';
+var noDropDbMsg = '<?php echo (!$is_superuser && !$GLOBALS['cfg']['AllowUserDropDatabase'])
+    ? PMA_escapeJsString($GLOBALS['strNoDropDatabases']) : ''; ?>';
+var confirmMsg  = '<?php echo $GLOBALS['cfg']['Confirm']
+    ? PMA_escapeJsString($GLOBALS['strDoYouReally']) : ''; ?>';
+
+function PMA_queryAutoCommit() {
+    document.getElementById('sqlqueryform').target = window.opener.frame_content.name;
+    document.getElementById('sqlqueryform').submit();
+    return;
+}
+
+function PMA_querywindowCommit(tab) {
+    document.getElementById('hiddenqueryform').querydisplay_tab.value = tab;
+    document.getElementById('hiddenqueryform').submit();
+    return false;
+}
+
+function PMA_querywindowResize() {
+    // for Gecko
+    if (typeof(self.sizeToContent) == 'function') {
+        self.sizeToContent();
+        //self.scrollbars.visible = false;
+        // give some more space ... to prevent 'fli(pp/ck)ing'
+        self.resizeBy(10, 50);
+        return;
+    }
+
+    // for IE, Opera
+    if (document.getElementById && typeof(document.getElementById('querywindowcontainer')) != 'undefined') {
+
+        // get content size
+        var newWidth  = document.getElementById('querywindowcontainer').offsetWidth;
+        var newHeight = document.getElementById('querywindowcontainer').offsetHeight;
+
+        // set size to contentsize
+        // plus some offset for scrollbars, borders, statusbar, menus ...
+        self.resizeTo(newWidth + 45, newHeight + 75);
+    }
+}
+
+function PMA_querywindowInit()
+{
+<?php
+if (PMA_isValid($_REQUEST['auto_commit'], 'identical', 'true')) {
+    echo 'PMA_queryAutoCommit();' . "\n";
+}
+if (PMA_isValid($_REQUEST['init'])) {
+    echo 'PMA_querywindowResize();' . "\n";
+}
+if ($querydisplay_tab == 'sql' || $querydisplay_tab == 'full') {
+    echo "document.getElementById('sqlquery').focus();" . "\n";
+}
+?>
+}
+
+//]]>
+</script>
+<script src="./js/functions.js" type="text/javascript"></script>
+</head>
+
+<body id="bodyquerywindow" onload="PMA_querywindowInit();">
+<div id="querywindowcontainer">
+<?php
+
+if ($tabs) {
+    echo PMA_getTabs($tabs);
+    unset($tabs);
+}
+
+PMA_sqlQueryForm($query_to_display, $querydisplay_tab);
+
+// Hidden forms and query frame interaction stuff
+
+$_sql_history = PMA_getHistory($GLOBALS['cfg']['Server']['user']);
+if (! empty($_sql_history)
+ && ($querydisplay_tab == 'history' || $querydisplay_tab == 'full')) {
+    $tab = $querydisplay_tab != 'full' ? 'sql' : 'full';
+    echo $GLOBALS['strQuerySQLHistory'] . ':<br />' . "\n"
+        .'<ul>';
+    foreach ($_sql_history as $query) {
+        echo '<li>' . "\n";
+
+        // edit link
+        $url_params = array(
+            'querydisplay_tab' => $tab,
+            'sql_query' => $query['sqlquery'],
+            'db' => $query['db'],
+            'table' => $query['table'],
+        );
+        echo '<a href="querywindow.php' . PMA_generate_common_url($url_params)
+            . '">' . $titles['Change'] . '</a>';
+
+        // execute link
+        $url_params['auto_commit'] = 'true';
+        echo '<a href="import.php' . PMA_generate_common_url($url_params) . '"'
+            . ' target="frame_content">';
+
+        if (! empty($query['db'])) {
+            echo '[';
+            echo htmlspecialchars(PMA_backquote($query['db']));
+            if (! empty($query['table'])) {
+                echo '.' . htmlspecialchars(PMA_backquote($query['table']));
+            }
+            echo  '] ';
+        }
+        if (strlen($query['sqlquery']) > 120) {
+            echo '<span title="' . htmlspecialchars($query['sqlquery']) . '">';
+            echo htmlspecialchars(substr($query['sqlquery'], 0, 50)) . ' [...] ';
+            echo htmlspecialchars(substr($query['sqlquery'], -50));
+            echo '</span>';
+        } else {
+            echo htmlspecialchars($query['sqlquery']);
+        }
+        echo '</a>' . "\n";
+        echo '</li>' . "\n";
+    }
+    unset($tab, $_sql_history, $query);
+    echo '</ul>' . "\n";
+}
+?>
+<form action="querywindow.php" method="post" name="hiddenqueryform"
+    id="hiddenqueryform">
+    <?php echo PMA_generate_common_hidden_inputs('', ''); ?>
+    <input type="hidden" name="db" value="<?php echo htmlspecialchars($db); ?>" />
+    <input type="hidden" name="table" value="<?php echo htmlspecialchars($table); ?>" />
+    <input type="hidden" name="sql_query" value="" />
+    <input type="hidden" name="querydisplay_tab" value="<?php echo $querydisplay_tab; ?>" />
+</form>
+</div>
+</body>
+</html>
+
+<?php
+/**
+ * Close MySql connections
+ */
+if (! empty($controllink)) {
+    PMA_DBI_close($controllink);
+}
+if (! empty($userlink)) {
+    PMA_DBI_close($userlink);
+}
+?>