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

RFE #1743983: replace $max_characters by a configurable param MaxCharactersInDisplayedSQL

Browse Source
This commit is contained in:
Marc Delisle
2007-07-01 19:26:41 +00:00
parent 0940641fae
commit f73d68265b
6 changed files with 20 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
libraries/Config.class.php
View File

@@ -103,9 +103,6 @@ class PMA_Config
$this->checkUpload();
$this->checkUploadSize();
$this->checkOutputCompression();
// other constants (no real need to put into config file)
$this->set('PMA_MAX_CHARACTERS_FOR_DISPLAYED_QUERY', 1000);
}
/**
@@ -899,8 +896,7 @@ class PMA_Config
'PMA_IS_GD2',
'PMA_USR_OS',
'PMA_USR_BROWSER_VER',
'PMA_USR_BROWSER_AGENT',
'PMA_MAX_CHARACTERS_FOR_DISPLAYED_QUERY'
'PMA_USR_BROWSER_AGENT'
);
foreach ($defines as $define) {

4
libraries/common.lib.php
View File

@@ -1046,7 +1046,7 @@ function PMA_showMessage($message, $sql_query = null)
$query_base = $sql_query;
}
if (strlen($query_base) > PMA_MAX_CHARACTERS_FOR_DISPLAYED_QUERY) {
if (strlen($query_base) > $cfg['MaxCharactersInDisplayedSQL']) {
$query_too_big = true;
$query_base = nl2br(htmlspecialchars($sql_query));
unset($GLOBALS['parsed_sql']);
@@ -1240,7 +1240,7 @@ function PMA_showMessage($message, $sql_query = null)
// I get a white page, strlen($query_base) is 2 x 700 Kio
// so put a hard limit here (let's say 1000)
if ($query_too_big) {
echo ' ' . substr($query_base,0,PMA_MAX_CHARACTERS_FOR_DISPLAYED_QUERY) . '[...]';
echo ' ' . substr($query_base, 0, $cfg['MaxCharactersInDisplayedSQL']) . '[...]';
} else {
echo ' ' . $query_base;
}

7
libraries/config.default.php
View File

@@ -349,6 +349,13 @@ $cfg['MaxDbList'] = 100;
*/
$cfg['MaxTableList'] = 100;
/**
* maximum number of characters when a SQL query is displayed
*
* @global integer $cfg['MaxCharactersInDisplayedSQL']
*/
$cfg['MaxCharactersInDisplayedSQL'] = 1000;
/**
* use GZIP output buffering if possible (true|false|'auto')
*

4
libraries/footer.inc.php
View File

@@ -32,7 +32,7 @@
* @uses $cfg['DBG']['enable']
* @uses $cfg['DBG']['profile']['enable']
* @uses $GLOBALS['strOpenNewWindow']
* @uses PMA_MAX_CHARACTERS_FOR_DISPLAYED_QUERY
* @uses $cfg['MaxCharactersInDisplayedSQL']
* @uses PMA_isValid()
* @uses PMA_setHistory()
* @uses PMA_ifSetOr()
@@ -88,7 +88,7 @@ if (window.parent.reload_querywindow) {
window.parent.reload_querywindow(
'<?php echo PMA_escapeJsString(PMA_ifSetOr($GLOBALS['db'], '')) ?>',
'<?php echo PMA_escapeJsString(PMA_ifSetOr($GLOBALS['table'], '')) ?>',
'<?php echo strlen($GLOBALS['sql_query']) > PMA_MAX_CHARACTERS_FOR_DISPLAYED_QUERY ? PMA_escapeJsString($GLOBALS['sql_query']) : ''; ?>');
'<?php echo strlen($GLOBALS['sql_query']) > $cfg['MaxCharactersInDisplayedSQL'] ? PMA_escapeJsString($GLOBALS['sql_query']) : ''; ?>');
}
<?php
}