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

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Weblate 2014-08-12 14:36:34 +02:00
commit b89f168aab
21 changed files with 20 additions and 501 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
doc/config.rst
View File

@ -2514,54 +2514,16 @@ Various display setting
Repeat the headers every X cells, or 0 to deactivate.
.. config:option:: $cfg['EditInWindow']
:type: boolean
:default: true
.. config:option:: $cfg['QueryWindowWidth']
:type: integer
:default: 550
.. config:option:: $cfg['QueryWindowHeight']
:type: integer
:default: 310
.. config:option:: $cfg['QueryHistoryDB']
:type: boolean
:default: false
.. config:option:: $cfg['QueryWindowDefTab']
:type: string
:default: ``'sql'``
.. config:option:: $cfg['QueryHistoryMax']
:type: integer
:default: 25
All those variables affect the query window feature. A :term:`SQL` link or
icon is always displayed in the navigation panel. If JavaScript is enabled
in your browser, a click on this opens a distinct query window, which is a
direct interface to enter :term:`SQL` queries. Otherwise, the right panel
changes to display a query box.
The size of this query window can be customized with
:config:option:`$cfg['QueryWindowWidth']` and
:config:option:`$cfg['QueryWindowHeight']` - both integers for the size in
pixels. Note that normally, those parameters will be modified in
:file:`layout.inc.php`` for the theme you are using.
If :config:option:`$cfg['EditInWindow']` is set to true, a click on [Edit]
from the results page (in the :guilabel:`Showing Rows` section) opens the
query window and puts the current query inside it. If set to false,
clicking on the link puts the :term:`SQL` query
in the right panel's query box.
If :config:option:`$cfg['QueryHistoryDB']` is set to ``true``, all your
Queries are logged to a table, which has to be created by you (see
:config:option:`$cfg['Servers'][$i]['history']`). If set to false, all your
@ -2584,11 +2546,6 @@ Various display setting
specify the amount of saved history items using
:config:option:`$cfg['QueryHistoryMax']`.
The query window also has a custom tabbed look to group the features.
Using the variable :config:option:`$cfg['QueryWindowDefTab']` you can
specify the default tab to be used when opening the query window. It can be
set to either ``sql``, ``files``, ``history`` or ``full``.
.. config:option:: $cfg['BrowseMIME']
:type: boolean

13
js/common.js
View File

@ -1,17 +1,6 @@
/* vim: set expandtab sw=4 ts=4 sts=4: */
/**
* Functionality for communicating with the querywindow
*/
$(function () {
/**
* Event handler for click on the open query window link
* in the top menu of the navigation panel
*/
$('#pma_open_querywindow').click(function (event) {
event.preventDefault();
PMA_querywindow.focus();
});
$(function () {
checkNumberOfFields();
});

2
js/functions.js
View File

@ -10,7 +10,7 @@
var $table_clone = false;
/**
* @var sql_box_locked lock for the sqlbox textarea in the querybox/querywindow
* @var sql_box_locked lock for the sqlbox textarea in the querybox
*/
var sql_box_locked = false;

25
js/querywindow.js
View File

@ -1,25 +0,0 @@
/* vim: set expandtab sw=4 ts=4 sts=4: */
function PMA_queryAutoCommit()
{
var sqlqueryform = document.getElementById('sqlqueryform');
sqlqueryform.target = window.opener.frame_content.name;
sqlqueryform.submit();
return;
}
function PMA_querywindowCommit(tab)
{
var $hiddenqueryform = $('#hiddenqueryform');
$hiddenqueryform.find("input[name='querydisplay_tab']").val(tab);
$hiddenqueryform.addClass('disableAjax').submit();
return false;
}
function PMA_querywindowSetFocus()
{
$('#sqlquery').focus();
}
$(function () {
$('#topmenucontainer').css('padding', 0);
});

2
libraries/Header.class.php
View File

@ -221,8 +221,6 @@ class PMA_Header
'common_query' => PMA_URL_getCommon('', '', '&'),
'opendb_url' => $GLOBALS['cfg']['DefaultTabDatabase'],
'safari_browser' => PMA_USR_BROWSER_AGENT == 'SAFARI' ? 1 : 0,
'querywindow_height' => $GLOBALS['cfg']['QueryWindowHeight'],
'querywindow_width' => $GLOBALS['cfg']['QueryWindowWidth'],
'collation_connection' => $GLOBALS['collation_connection'],
'lang' => $GLOBALS['lang'],
'server' => $GLOBALS['server'],

7
libraries/Util.class.php
View File

@ -1176,12 +1176,7 @@ class PMA_Util
// even if the query is big and was truncated, offer the chance
// to edit it (unless it's enormous, see linkOrButton() )
if (! empty($cfg['SQLQuery']['Edit'])) {
if ($cfg['EditInWindow'] == true) {
$onclick = 'PMA_querywindow.focus(\''
. PMA_jsFormat($sql_query, false) . '\'); return false;';
} else {
$onclick = '';
}
$onclick = '';
$edit_link .= PMA_URL_getCommon($url_params) . '#querybox';
$edit_link = ' ['

1
libraries/common.inc.php
View File

@ -380,7 +380,6 @@ $goto_whitelist = array(
'pdf_pages.php',
'pdf_schema.php',
//'phpinfo.php',
'querywindow.php',
'server_binlog.php',
'server_collations.php',
'server_databases.php',

30
libraries/config.default.php
View File

@ -2635,28 +2635,6 @@ $cfg['ShowDisplayDirection'] = false;
*/
$cfg['RepeatCells'] = 100;
/**
* Set to true if Edit link should open the query to edit in the query window
* and to false if we should edit in the right panel
*
* @global boolean $cfg['EditInWindow']
*/
$cfg['EditInWindow'] = true;
/**
* Width of Query window
*
* @global integer $cfg['QueryWindowWidth']
*/
$cfg['QueryWindowWidth'] = 550;
/**
* Height of Query window
*
* @global integer $cfg['QueryWindowHeight']
*/
$cfg['QueryWindowHeight'] = 310;
/**
* Set to true if you want DB-based query history.If false, this utilizes
* JS-routines to display query history (lost by window close)
@ -2665,14 +2643,6 @@ $cfg['QueryWindowHeight'] = 310;
*/
$cfg['QueryHistoryDB'] = false;
/**
* which tab to display in the querywindow on startup
* (sql|files|history|full)
*
* @global string $cfg['QueryWindowDefTab']
*/
$cfg['QueryWindowDefTab'] = 'sql';
/**
* When using DB-based query history, how many entries should be kept?
*

8
libraries/config.values.php
View File

@ -102,12 +102,6 @@ $cfg_db['DefaultTabTable'] = array(
'tbl_change.php', // insert row page
'sql.php' // browse page
);
$cfg_db['QueryWindowDefTab'] = array(
'sql', // SQL
'files', // Import files
'history', // SQL history
'full' // All (SQL and SQL history)
);
$cfg_db['InitialSlidersState'] = array(
'open' => __('Open'),
'closed' => __('Closed'),
@ -234,8 +228,6 @@ $cfg_db['_validators'] = array(
'MemoryLimit' => array(array('validateByRegex', '/^(-1|(\d+(?:[kmg])?))$/i')),
'NavigationTreeTableLevel' => 'validatePositiveNumber',
'QueryHistoryMax' => 'validatePositiveNumber',
'QueryWindowWidth' => 'validatePositiveNumber',
'QueryWindowHeight' => 'validatePositiveNumber',
'RepeatCells' => 'validateNonNegativeNumber',
'Server' => 'validateServer',
'Server_pmadb' => 'validatePMAStorage',

9
libraries/config/messages.inc.php
View File

@ -97,8 +97,6 @@ $strConfigDisableMultiTableMaintenance_desc = __(
. 'the selected tables of a database.'
);
$strConfigDisableMultiTableMaintenance_name = __('Disable multi table maintenance');
$strConfigEditInWindow_desc = __('Edit SQL queries in popup window.');
$strConfigEditInWindow_name = __('Edit in window');
$strConfigError_Handler_display_name = __('Display errors');
$strConfigExecTimeLimit_desc = __(
'Set the number of seconds a script is allowed to run ([kbd]0[/kbd] for no '
@ -518,13 +516,6 @@ $strConfigQueryHistoryDB_name = __('Permanent query history');
$strConfigQueryHistoryMax_cmt = __('Users cannot set a higher value');
$strConfigQueryHistoryMax_desc = __('How many queries are kept in history.');
$strConfigQueryHistoryMax_name = __('Query history length');
$strConfigQueryWindowDefTab_desc
= __('Tab displayed when opening a new query window.');
$strConfigQueryWindowDefTab_name = __('Default query window tab');
$strConfigQueryWindowHeight_desc = __('Query window height (in pixels).');
$strConfigQueryWindowHeight_name = __('Query window height');
$strConfigQueryWindowWidth_desc = __('Query window width (in pixels).');
$strConfigQueryWindowWidth_name = __('Query window width');
$strConfigRecodingEngine_desc
= __('Select which functions will be used for character set conversion.');
$strConfigRecodingEngine_name = __('Recoding engine');

8
libraries/config/setup.forms.php
View File

@ -154,10 +154,6 @@ $forms['Sql_queries']['Sql_queries'] = array(
'QueryHistoryMax',
'IgnoreMultiSubmitErrors',
'MaxCharactersInDisplayedSQL',
'EditInWindow',
//'QueryWindowWidth', // overridden in theme
//'QueryWindowHeight',
'QueryWindowDefTab',
'RetainQueryBox',
'CodemirrorEnable');
$forms['Sql_queries']['Sql_box'] = array('SQLQuery' => array(
@ -233,8 +229,8 @@ $forms['Main_panel']['Tabs'] = array(
'ActionLinksMode',
'DefaultTabServer',
'DefaultTabDatabase',
'DefaultTabTable',
'QueryWindowDefTab');
'DefaultTabTable'
);
$forms['Import']['Import_defaults'] = array('Import' => array(
'format',
'charset',

4
libraries/config/user_preferences.forms.php
View File

@ -67,10 +67,6 @@ $forms['Sql_queries']['Sql_queries'] = array(
'QueryHistoryMax',
'IgnoreMultiSubmitErrors',
'MaxCharactersInDisplayedSQL',
'EditInWindow',
//'QueryWindowWidth', // overridden in theme
//'QueryWindowHeight',
'QueryWindowDefTab',
'RetainQueryBox',
'CodemirrorEnable');
$forms['Sql_queries']['Sql_box'] = array(

12
libraries/navigation/NavigationHeader.class.php
View File

@ -160,18 +160,6 @@ class PMA_NavigationHeader
true
);
}
$link = 'querywindow.php?';
$link .= PMA_URL_getCommon($GLOBALS['db'], $GLOBALS['table']);
$link .= '&no_js=true';
$retval .= PMA_Util::getNavigationLink(
$link,
$showText,
__('Query window'),
$showIcon,
'b_selboard.png',
'pma_open_querywindow',
true
);
}
$retval .= PMA_Util::getNavigationLink(
PMA_Util::getDocuLink('index'),

84
libraries/sql_query_form.lib.php
View File

@ -8,7 +8,6 @@
* @usedby tbl_sql.php
* @usedby tbl_structure.php
* @usedby tbl_tracking.php
* @usedby querywindow.php
* @package PhpMyAdmin
*/
if (! defined('PHPMYADMIN')) {
@ -38,20 +37,14 @@ require_once './libraries/bookmark.lib.php'; // used for bookmarks
* @usedby tbl_sql.php
* @usedby tbl_structure.php
* @usedby tbl_tracking.php
* @usedby querywindow.php
*/
function PMA_getHtmlForSqlQueryForm(
$query = true, $display_tab = false, $delimiter = ';'
) {
$html = '';
// check tab to display if inside querywindow
if (! $display_tab) {
$display_tab = 'full';
$is_querywindow = false;
} else {
$is_querywindow = true;
}
// query to show
if (true === $query) {
$query = $GLOBALS['sql_query'];
@ -83,25 +76,10 @@ function PMA_getHtmlForSqlQueryForm(
}
// start output
if ($is_querywindow) {
$html .= '<form method="post" id="sqlqueryform"';
$html .= ' action="import.php" ' . $enctype . ' name="sqlform">';
} else {
$html .= '<form method="post" action="import.php" ' . $enctype;
$html .= ' class="ajax lock-page"';
$html .= ' id="sqlqueryform" name="sqlform">' . "\n";
}
$html .= '<form method="post" action="import.php" ' . $enctype;
$html .= ' class="ajax lock-page"';
$html .= ' id="sqlqueryform" name="sqlform">' . "\n";
if ($is_querywindow) {
$html .= '<input type="hidden" name="focus_querywindow"'
. ' value="true" />' . "\n";
if ($display_tab != 'sql' && $display_tab != 'full') {
$html .= '<input type="hidden" name="sql_query"'
. ' value="" />' . "\n";
$html .= '<input type="hidden" name="show_query"'
. ' value="1" />' . "\n";
}
}
$html .= '<input type="hidden" name="is_js_confirmed" value="0" />'
. "\n" . PMA_URL_getHiddenInputs($db, $table) . "\n"
. '<input type="hidden" name="pos" value="0" />' . "\n"
@ -115,7 +93,7 @@ function PMA_getHtmlForSqlQueryForm(
// display querybox
if ($display_tab === 'full' || $display_tab === 'sql') {
$html .= PMA_getHtmlForSqlQueryFormInsert(
$query, $is_querywindow, $delimiter
$query, $delimiter
);
}
@ -149,7 +127,6 @@ function PMA_getHtmlForSqlQueryForm(
* return HTML for Sql Query Form Insert
*
* @param string $query query to display in the textarea
* @param boolean $is_querywindow if inside querywindow or not
* @param string $delimiter default delimiter to use
*
* @return string
@ -157,7 +134,7 @@ function PMA_getHtmlForSqlQueryForm(
* @usedby PMA_getHtmlForSqlQueryForm()
*/
function PMA_getHtmlForSqlQueryFormInsert(
$query = '', $is_querywindow = false, $delimiter = ';'
$query = '', $delimiter = ';'
) {
// enable auto select text in textarea
if ($GLOBALS['cfg']['TextareaAutoSelect']) {
@ -166,15 +143,8 @@ function PMA_getHtmlForSqlQueryFormInsert(
$auto_sel = '';
}
// enable locking if inside query window
if ($is_querywindow) {
$locking = ' onkeypress="document.sqlform.elements[\'LockFromUpdate\'].'
. 'checked = true;"';
$height = $GLOBALS['cfg']['TextareaRows'] * 1.25;
} else {
$locking = '';
$height = $GLOBALS['cfg']['TextareaRows'] * 2;
}
$locking = '';
$height = $GLOBALS['cfg']['TextareaRows'] * 2;
$table = '';
$db = '';
@ -195,10 +165,6 @@ function PMA_getHtmlForSqlQueryFormInsert(
// if you want navigation:
$tmp_db_link = '<a href="' . $GLOBALS['cfg']['DefaultTabDatabase']
. '?' . PMA_URL_getCommon($db) . '"';
if ($is_querywindow) {
$tmp_db_link .= ' target="_self"'
. ' onclick="this.target=window.opener.frame_content.name"';
}
$tmp_db_link .= '>'
. htmlspecialchars($db) . '</a>';
// else use
@ -221,12 +187,6 @@ function PMA_getHtmlForSqlQueryFormInsert(
$tmp_db_link = '<a href="' . $GLOBALS['cfg']['DefaultTabDatabase']
. '?' . PMA_URL_getCommon($db) . '"';
if ($is_querywindow) {
$tmp_db_link .= 'target="_parent" '
. 'onclick="window.opener.location.href = \''
. $GLOBALS['cfg']['DefaultTabDatabase']
. '?' . PMA_URL_getCommon($db) . '\';return false;"';
}
$tmp_db_link .= '>'
. htmlspecialchars($db) . '</a>';
// else use
@ -343,13 +303,6 @@ function PMA_getHtmlForSqlQueryFormInsert(
$html .= '<fieldset id="queryboxfooter" class="tblFooters">' . "\n";
$html .= '<div class="formelement">' . "\n";
if ($is_querywindow) {
$html .= '<input type="checkbox" '
. 'name="LockFromUpdate" checked="checked" tabindex="120" '
. 'id="checkbox_lock" /> <label for="checkbox_lock">'
. __('Do not overwrite this query from outside the window')
. '</label>';
}
$html .= '</div>' . "\n";
$html .= '<div class="formelement">' . "\n";
$html .= '<label for="id_sql_delimiter">[ ' . __('Delimiter')
@ -363,15 +316,13 @@ function PMA_getHtmlForSqlQueryFormInsert(
. '<label for="checkbox_show_query">' . __('Show this query here again')
. '</label>';
if (! $is_querywindow) {
$html .= '<input type="checkbox" name="retain_query_box" value="1" '
. 'id="retain_query_box" tabindex="133" '
. ($GLOBALS['cfg']['RetainQueryBox'] === false
? '' : ' checked="checked"')
. ' />'
. '<label for="retain_query_box">' . __('Retain query box')
. '</label>';
}
$html .= '<input type="checkbox" name="retain_query_box" value="1" '
. 'id="retain_query_box" tabindex="133" '
. ($GLOBALS['cfg']['RetainQueryBox'] === false
? '' : ' checked="checked"')
. ' />'
. '<label for="retain_query_box">' . __('Retain query box')
. '</label>';
$html .= '<input type="checkbox" name="rollback_query" value="1" '
. 'id="rollback_query" tabindex="134" />'
@ -380,12 +331,7 @@ function PMA_getHtmlForSqlQueryFormInsert(
$html .= '</div>' . "\n";
$html .= '<input type="submit" id="button_submit_query" name="SQL"';
if ($is_querywindow) {
$html .= 'onclick="var form = this.parentNode.parentNode;'
. ' window.opener.name = \'sqlParentWindow\';'
. ' form.target = \'sqlParentWindow\';'
. ' return checkSqlQuery(form);"';
}
$html .= ' tabindex="200" value="' . __('Go') . '" />' . "\n";
$html .= '<div class="clearfloat"></div>' . "\n";
$html .= '</fieldset>' . "\n";

208
querywindow.php
View File

@ -1,208 +0,0 @@
<?php
/* vim: set expandtab sw=4 ts=4 sts=4: */
/**
* this file is register_globals safe
*
* @todo move JavaScript out of here into .js files
* @package PhpMyAdmin
*/
/**
*
*/
require_once 'libraries/common.inc.php';
$is_superuser = $GLOBALS['dbi']->isSuperuser();
/**
* Gets a core script and starts output buffering work
*/
require_once 'libraries/sql_query_form.lib.php';
/**
* load relation params
*/
$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'] = __('SQL');
$tabs['sql']['fragment'] = '#';
$tabs['sql']['attr'] = 'onclick="PMA_querywindowCommit(\'sql\');return false;"';
$tabs['sql']['active'] = (bool) ($querydisplay_tab == 'sql');
$tabs['import']['icon'] = 'b_import.png';
$tabs['import']['text'] = __('Import files');
$tabs['import']['fragment'] = '#';
$tabs['import']['attr']
= 'onclick="PMA_querywindowCommit(\'files\');return false;"';
$tabs['import']['active'] = (bool) ($querydisplay_tab == 'files');
$tabs['history']['icon'] = 'b_bookmark.png';
$tabs['history']['text'] = __('SQL history');
$tabs['history']['fragment'] = '#';
$tabs['history']['attr']
= 'onclick="PMA_querywindowCommit(\'history\');return false;"';
$tabs['history']['active'] = (bool) ($querydisplay_tab == 'history');
if ($GLOBALS['cfg']['QueryWindowDefTab'] == 'full') {
$tabs['all']['text'] = __('All');
$tabs['all']['fragment'] = '#';
$tabs['all']['attr']
= 'onclick="PMA_querywindowCommit(\'full\');return false;"';
$tabs['all']['active'] = (bool) ($querydisplay_tab == 'full');
}
}
$titles['Change'] = PMA_Util::getIcon('b_edit.png', __('Change'));
$url_query = PMA_URL_getCommon($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)) {
include 'tbl_sql.php';
} elseif (strlen($db)) {
include 'db_sql.php';
} else {
include 'server_sql.php';
}
exit;
}
/**
* Defines the query to be displayed in the query textarea
*/
if (! empty($show_query)) {
$query_to_display = $sql_query;
} else if (! empty($_REQUEST['sql_query'])) {
$query_to_display = htmlspecialchars($_REQUEST['sql_query']);
$show_query = 1;
} else {
$query_to_display = '';
}
$sql_query = '';
/**
* prepare JavaScript functionality
*/
$response = PMA_Response::getInstance();
$response->getFooter()->setMinimal();
$header = $response->getHeader();
$header->disableMenuAndConsole();
$header->setBodyId('bodyquerywindow');
$scripts = $header->getScripts();
$scripts->addFile('common.js');
$scripts->addFile('querywindow.js');
if (PMA_isValid($_REQUEST['auto_commit'], 'identical', 'true')) {
$scripts->addEvent('load', 'PMA_queryAutoCommit');
}
// always set focus to the textarea
if ($querydisplay_tab == 'sql' || $querydisplay_tab == 'full') {
$scripts->addEvent('load', 'PMA_querywindowSetFocus');
}
echo '<div id="querywindowcontainer">';
if ($tabs) {
echo PMA_Util::getHtmlTabs($tabs, array(), 'topmenu', true);
unset($tabs);
}
echo PMA_getHtmlForSqlQueryForm($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 __('SQL history:') . '<br />'
. '<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_URL_getCommon($url_params)
. '">' . $titles['Change'] . '</a>';
// execute link
$url_params['auto_commit'] = 'true';
echo '<a href="import.php' . PMA_URL_getCommon($url_params) . '"'
. ' target="frame_content">';
if (! empty($query['db'])) {
echo '[';
echo htmlspecialchars(PMA_Util::backquote($query['db']));
if (! empty($query['table'])) {
echo '.' . htmlspecialchars(PMA_Util::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";
}
echo '<form action="querywindow.php" method="post" name="hiddenqueryform"';
echo ' id="hiddenqueryform">';
echo PMA_URL_getHiddenInputs('', '');
echo '<input type="hidden" name="db" value="' . htmlspecialchars($db) . '" />';
echo '<input type="hidden" name="table" value="'
. htmlspecialchars($table) . '" />';
echo '<input type="hidden" name="sql_query" value="" />';
echo '<input type="hidden" name="querydisplay_tab" value="'
. $querydisplay_tab . '" />';
echo '</form>';
echo '</div>';
?>

2
test/libraries/PMA_server_privileges_test.php
View File

@ -65,8 +65,6 @@ class PMA_ServerPrivileges_Test extends PHPUnit_Framework_TestCase
$GLOBALS['cfg']['Server']['users'] = 'users';
$GLOBALS['cfg']['ActionLinksMode'] = "both";
$GLOBALS['cfg']['DefaultTabDatabase'] = 'db_structure.php';
$GLOBALS['cfg']['QueryWindowHeight'] = 100;
$GLOBALS['cfg']['QueryWindowWidth'] = 100;
$GLOBALS['cfg']['PmaAbsoluteUri'] = "PmaAbsoluteUri";
$GLOBALS['cfg']['DefaultTabTable'] = "db_structure.php";
$GLOBALS['cfg']['NavigationTreeDefaultTabTable'] = "db_structure.php";

1
test/libraries/core/PMA_checkPageValidity_test.php
View File

@ -29,7 +29,6 @@ class PMA_CheckPageValidity_Test extends PHPUnit_Framework_TestCase
'index.php',
'pdf_pages.php',
'pdf_schema.php',
'querywindow.php',
'server_binlog.php',
'server_variables.php',
'sql.php',

23
themes/original/css/common.css.php
View File

@ -1168,25 +1168,6 @@ div#logTable table {
}
/* end server variables */
/* querywindow */
body#bodyquerywindow {
margin: 0;
padding: 0;
background-image: none;
background-color: #F5F5F5;
}
div#querywindowcontainer {
margin: 0;
padding: 0;
width: 100%;
}
div#querywindowcontainer fieldset {
margin-top: 0;
}
/* end querywindow */
/* profiling */
div#profilingchart {
@ -1306,10 +1287,6 @@ li.no_bullets {
margin: .5em .5em 0 .5em;
}
#bodyquerywindow {
background: <?php echo $GLOBALS['cfg']['NaviBackground']; ?>;
}
#bodythemes {
width: 500px;
margin: auto;

8
themes/original/layout.inc.php
View File

@ -75,14 +75,6 @@ $GLOBALS['cfg']['BgOne'] = '#E5E5E5';
// table data row background, alternate
$GLOBALS['cfg']['BgTwo'] = '#D5D5D5';
/**
* query window
*/
// Width of Query window
$GLOBALS['cfg']['QueryWindowWidth'] = 600;
// Height of Query window
$GLOBALS['cfg']['QueryWindowHeight'] = 400;
/**
* Chart colors
*/

23
themes/pmahomme/css/common.css.php
View File

@ -1544,25 +1544,6 @@ p.notice a {
text-decoration: underline;
}
/* querywindow */
body#bodyquerywindow {
margin: 0;
padding: 0;
background-image: none;
background-color: #F5F5F5;
}
div#querywindowcontainer {
margin: 0;
padding: 0;
width: 100%;
}
div#querywindowcontainer fieldset {
margin-top: 0;
}
/* end querywindow */
/* profiling */
div#profilingchart {
@ -1755,10 +1736,6 @@ li.no_bullets {
margin: .5em .5em 0 .5em;
}
#bodyquerywindow {
background: <?php echo $GLOBALS['cfg']['NaviBackground']; ?>;
}
#bodythemes {
width: 500px;
margin: auto;

8
themes/pmahomme/layout.inc.php
View File

@ -76,14 +76,6 @@ $GLOBALS['cfg']['BgOne'] = '#E5E5E5';
// table data row background, alternate
$GLOBALS['cfg']['BgTwo'] = '#D5D5D5';
/**
* query window
*/
// Width of Query window
$GLOBALS['cfg']['QueryWindowWidth'] = 600;
// Height of Query window
$GLOBALS['cfg']['QueryWindowHeight'] = 400;
/**
* Chart colors
*/