beenull/adminerevo
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Display images in Editor

Browse source 
git-svn-id: https://adminer.svn.sourceforge.net/svnroot/adminer/trunk@898 7c3ca157-0c34-0410-bff1-cbf682f78f5c
This commit is contained in:
jakubvrana 2009-07-24 10:14:36 +00:00
parent 78e49f0106
commit 97b8c7b666
3 changed files with 15 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
adminer/include/adminer.inc.php
View file

@ -114,6 +114,9 @@ function adminer_row_descriptions($rows, $foreign_keys) {
*/
function adminer_select_val($val, $link, $field) {
$return = ($field["type"] == "char" ? "<code>$val</code>" : $val);
if (ereg('blob|binary', $field["type"]) && !is_utf8($val)) {
$return = lang('%d byte(s)', strlen($val));
}
return call_adminer('select_val', ($link ? "<a href=\"$link\">$return</a>" : $return), $val, $link);
}

8
adminer/select.inc.php
View file

@ -319,13 +319,13 @@ if (!$columns) {
$link = "";
if (!isset($val)) {
$val = "<i>NULL</i>";
} elseif (ereg('blob|binary', $fields[$key]["type"]) && !is_utf8($val)) { //! download link may be printed even with is_utf8
$link = htmlspecialchars($SELF . 'download=' . urlencode($_GET["select"]) . '&field=' . urlencode($key) . '&') . $unique_idf;
$val = lang('%d byte(s)', strlen($val));
} else {
if (ereg('blob|binary', $fields[$key]["type"]) && strlen($val)) {
$link = htmlspecialchars($SELF . 'download=' . urlencode($_GET["select"]) . '&field=' . urlencode($key) . '&') . $unique_idf;
}
if (!strlen(trim($val, " \t"))) {
$val = "&nbsp;";
} elseif (strlen($text_length) && ereg('blob|text', $fields[$key]["type"])) {
} elseif (strlen($text_length) && ereg('blob|text', $fields[$key]["type"]) && is_utf8($val)) {
$val = nl2br(shorten_utf8($val, max(0, intval($text_length)))); // usage of LEFT() would reduce traffic but complicate query
} else {
$val = nl2br(htmlspecialchars($val));

12
editor/include/adminer.inc.php
View file

@ -108,10 +108,14 @@ function adminer_row_descriptions($rows, $foreign_keys) {
}
function adminer_select_val($val, $link, $field) {
return call_adminer('select_val', ($link
? "<a href=\"$link\">$val</a>"
: ($val == "<i>NULL</i>" ? "&nbsp;" : $val)
), $val, $link);
$return = ($val == "<i>NULL</i>" ? "&nbsp;" : $val);
if (ereg('blob|binary', $field["type"]) && !is_utf8($val)) {
$return = lang('%d byte(s)', strlen($val));
if (ereg("^(GIF|\xFF\xD8\xFF|\x89\x50\x4E\x47\x0D\x0A\x1A\x0A)", $val)) { // GIF|JPG|PNG, getimagetype() works with filename
$return = "<img src=\"$link\" alt='$return'>";
}
}
return call_adminer('select_val', ($link ? "<a href=\"$link\">$return</a>" : $return), $val, $link);
}
function adminer_message_query($query) {