1
0
mirror of https://github.com/vrana/adminer.git synced 2025-08-12 09:34:10 +02:00

Shorten displayed SQL query

git-svn-id: https://adminer.svn.sourceforge.net/svnroot/adminer/trunk@689 7c3ca157-0c34-0410-bff1-cbf682f78f5c
This commit is contained in:
jakubvrana
2009-06-15 08:36:30 +00:00
parent d481a57169
commit 33e80150d3
3 changed files with 3 additions and 3 deletions

View File

@@ -232,7 +232,7 @@ function is_utf8($val) {
function shorten_utf8($string, $length) {
preg_match("~^(.{0,$length})(.?)~su", $string, $match);
return nl2br(htmlspecialchars($match[1])) . ($match[2] ? "<em>...</em>" : "");
return htmlspecialchars($match[1]) . ($match[2] ? "<em>...</em>" : "");
}
function friendly_url($val) {

View File

@@ -253,7 +253,7 @@ if (!$columns) {
if (!strlen(trim($val))) {
$val = "&nbsp;";
} elseif (intval($text_length) > 0 && preg_match('~blob|text~', $fields[$key]["type"])) {
$val = shorten_utf8($val, intval($text_length));
$val = nl2br(shorten_utf8($val, intval($text_length)));
} else {
$val = nl2br(htmlspecialchars($val));
if ($fields[$key]["type"] == "char") {

View File

@@ -24,7 +24,7 @@ if (!$error && $_POST) {
$offset = $match[0][1] + strlen($match[0][0]);
} else {
$empty = false;
echo "<pre class='jush-sql'>" . htmlspecialchars(trim(substr($query, 0, $match[0][1]))) . "</pre>\n";
echo "<pre class='jush-sql'>" . shorten_utf8(trim(substr($query, 0, $match[0][1])), 100) . "</pre>\n";
flush();
$start = explode(" ", microtime());
//! don't allow changing of character_set_results, convert encoding of displayed query