mirror/php-adminer
1
0
Fork 0
mirror of https://github.com/vrana/adminer.git synced 2025-08-16 11:34:10 +02:00
Code Issues Releases Wiki Activity

Parse UTF-16 and UTF-8 BOM in all text uploads

Browse Source
This commit is contained in:
Jakub Vrana
2011-03-07 14:27:03 +01:00
parent db030df487
commit 9ff10f8301
2 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
adminer/include/functions.inc.php
View File

@@ -489,10 +489,18 @@ function get_file($key, $decompress = false) {
if (!$file || $file["error"]) {
return $file["error"];
}
return file_get_contents($decompress && ereg('\\.gz$', $file["name"]) ? "compress.zlib://$file[tmp_name]"
$return = file_get_contents($decompress && ereg('\\.gz$', $file["name"]) ? "compress.zlib://$file[tmp_name]"
: ($decompress && ereg('\\.bz2$', $file["name"]) ? "compress.bzip2://$file[tmp_name]"
: $file["tmp_name"]
)); //! may not be reachable because of open_basedir
if ($decompress) {
if (function_exists("iconv") && ereg("^\xFE\xFF|^\xFF\xFE", $return, $regs)) {
$return = iconv("utf-16", "utf-8", $return);
} else { // not ternary operator to save memory
$return = ereg_replace("^\xEF\xBB\xBF", "", $return); // UTF-8 BOM
}
}
return $return;
}
/** Determine upload error