Permalink
Browse files

Better UTF-8 detection

git-svn-id: https://adminer.svn.sourceforge.net/svnroot/adminer/trunk@664 7c3ca157-0c34-0410-bff1-cbf682f78f5c
  • Loading branch information...
1 parent a76c555 commit 017ffb51fcbe6d8e49260e6654880d9926e01062 jakubvrana committed Jun 11, 2009
Showing with 6 additions and 2 deletions.
  1. +5 −1 include/functions.inc.php
  2. +1 −1 select.inc.php
@@ -199,7 +199,7 @@ function select($result, $dbh2 = null) {
if (!isset($val)) {
$val = "<i>NULL</i>";
} else {
- if ($blobs[$key] && preg_match('~[\\x80-\\xFF]~', $val)) {
+ if ($blobs[$key] && !is_utf8($val)) {
$val = "<i>" . lang('%d byte(s)', strlen($val)) . "</i>";
} else {
$val = nl2br(htmlspecialchars($val));
@@ -224,6 +224,10 @@ function select($result, $dbh2 = null) {
$result->free();
}
+function is_utf8($val) {
+ return (preg_match('~~u', $val) && !preg_match('~[\\0-\\x8\\xB\\xC\\xE-\\x1F]~', $val));
+}
+
function shorten_utf8($string, $length) {
preg_match("~^(.{0,$length})(.?)~su", $string, $match);
return nl2br(htmlspecialchars($match[1])) . ($match[2] ? "<em>...</em>" : "");
View
@@ -246,7 +246,7 @@
foreach ($row as $key => $val) {
if (!isset($val)) {
$val = "<i>NULL</i>";
- } elseif (preg_match('~blob|binary~', $fields[$key]["type"]) && preg_match('~[\\0-\\x8\\xb\\xc\\xe-\\x1F\\x80-\\xFF]~', $val)) {
+ } elseif (preg_match('~blob|binary~', $fields[$key]["type"]) && !is_utf8($val)) {
$val = '<a href="' . htmlspecialchars($SELF) . 'download=' . urlencode($_GET["select"]) . '&amp;field=' . urlencode($key) . '&amp;' . $unique_idf . '">' . lang('%d byte(s)', strlen($val)) . '</a>';
} else {
if (intval($text_length) > 0 && preg_match('~blob|text~', $fields[$key]["type"])) {

0 comments on commit 017ffb5

Please sign in to comment.