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

Revert "Unuse binary characters"

Browse source 
This reverts commit f3c59bb3a5.
This commit is contained in:
Jakub Vrana 2012-09-26 21:45:04 -07:00
parent 7ce485bc78
commit 75c430a986
2 changed files with 10 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -978,13 +978,3 @@ function lzw_decompress($binary) {
} }
return $return; return $return;
} }
// used in compiled version
function latin_binary($s) {
return preg_replace_callback('~ (.)~', 'latin_binary_callback', $s);
}
// used in compiled version
function latin_binary_callback($match) {
return chr(ord($match[1]) - 48); // 48 = ord('0')
}

20
compile.php
View file

@ -8,12 +8,12 @@ function add_apo_slashes($s) {
return addcslashes($s, "\\'"); return addcslashes($s, "\\'");
} }
function binary_latin($s) { function add_quo_slashes($s) {
return preg_replace_callback('~[\0- ]~', 'binary_latin_callback', $s); $return = $s;
} $return = addcslashes($return, "\n\r\$\"\\");
$return = preg_replace('~\0(?![0-7])~', '\\\\0', $return);
function binary_latin_callback($match) { $return = addcslashes($return, "\0");
return ' ' . chr(ord($match[0]) + ord('0')); return $return;
} }
function remove_lang($match) { function remove_lang($match) {
@ -114,8 +114,8 @@ function put_file_lang($match) {
$translation_ids[$lang_ids[$key]] = implode("\t", (array) $val); $translation_ids[$lang_ids[$key]] = implode("\t", (array) $val);
} }
} }
$return .= " $return .= '
case '$lang': \$compressed = '" . add_apo_slashes(binary_latin(lzw_compress(implode("\n", $translation_ids)))) . "'; break;"; case "' . $lang . '": $compressed = "' . add_quo_slashes(lzw_compress(implode("\n", $translation_ids))) . '"; break;';
} }
$translations_version = crc32($return); $translations_version = crc32($return);
return '$translations = &$_SESSION["translations"]; return '$translations = &$_SESSION["translations"];
@ -127,7 +127,7 @@ if (!$translations) {
switch ($LANG) {' . $return . ' switch ($LANG) {' . $return . '
} }
$translations = array(); $translations = array();
foreach (explode("\n", lzw_decompress(latin_binary($compressed))) as $val) { foreach (explode("\n", lzw_decompress($compressed)) as $val) {
$translations[] = (strpos($val, "\t") ? explode("\t", $val) : $val); $translations[] = (strpos($val, "\t") ? explode("\t", $val) : $val);
} }
} }
@ -272,7 +272,7 @@ function compile_file($match) {
if ($match[2]) { if ($match[2]) {
$file = call_user_func($match[2], $file); $file = call_user_func($match[2], $file);
} }
return "latin_binary('" . add_apo_slashes(binary_latin($file)) . "')"; return '"' . add_quo_slashes($file) . '"';
} }
$project = "adminer"; $project = "adminer";