| /trunk/ajax.php |
|---|
| 149,7 → 149,7 |
| if ($out === false) { |
| // Some modules (like ODBC) might output non-UTF8 data |
| $json_out['error'] = utf8_encode($errmsg); |
| $json_out['error'] = vts_utf8_encode($errmsg); |
| $out = json_encode($json_out); |
| } |
| /trunk/plugins/viathinksoft/database/odbc/OIDplusDatabaseConnectionODBC.class.php |
|---|
| 132,7 → 132,7 |
| public function error(): string { |
| $err = $this->last_error; |
| if ($err == null) $err = ''; |
| $err = utf8_encode($err); // because ODBC might output weird stuff ... |
| $err = vts_utf8_encode($err); // because ODBC might output weird stuff ... |
| return $err; |
| } |
| /trunk/vendor/composer/installed.json |
|---|
| 288,18 → 288,18 |
| "source": { |
| "type": "git", |
| "url": "https://github.com/danielmarschall/php_utils.git", |
| "reference": "ecd0bc377d8348cec61dd5d11431d68178ca43b3" |
| "reference": "e430ac9bcdb86116724bd55b737999e97935b660" |
| }, |
| "dist": { |
| "type": "zip", |
| "url": "https://api.github.com/repos/danielmarschall/php_utils/zipball/ecd0bc377d8348cec61dd5d11431d68178ca43b3", |
| "reference": "ecd0bc377d8348cec61dd5d11431d68178ca43b3", |
| "url": "https://api.github.com/repos/danielmarschall/php_utils/zipball/e430ac9bcdb86116724bd55b737999e97935b660", |
| "reference": "e430ac9bcdb86116724bd55b737999e97935b660", |
| "shasum": "" |
| }, |
| "require": { |
| "php": ">=7.0" |
| }, |
| "time": "2022-09-22T14:38:59+00:00", |
| "time": "2022-12-11T00:17:31+00:00", |
| "default-branch": true, |
| "type": "library", |
| "installation-source": "dist", |
| /trunk/vendor/composer/installed.php |
|---|
| 73,7 → 73,7 |
| 'danielmarschall/php_utils' => array( |
| 'pretty_version' => 'dev-master', |
| 'version' => 'dev-master', |
| 'reference' => 'ecd0bc377d8348cec61dd5d11431d68178ca43b3', |
| 'reference' => 'e430ac9bcdb86116724bd55b737999e97935b660', |
| 'type' => 'library', |
| 'install_path' => __DIR__ . '/../danielmarschall/php_utils', |
| 'aliases' => array( |
| /trunk/vendor/danielmarschall/php_utils/SecureMailer.class.php |
|---|
| 79,7 → 79,8 |
| } |
| public static function utf8Subject($subject) { |
| return '=?UTF-8?B?'.base64_encode(utf8_encode($subject)).'?='; |
| $subject = mb_convert_encoding($subject, 'UTF-8'); |
| return '=?UTF-8?B?'.base64_encode($subject).'?='; |
| } |
| private function _sendMail($recipient, $subject, $message, $add_headers='') { |
| /trunk/vendor/danielmarschall/php_utils/VtsBrowserDownload.class.php |
|---|
| 91,7 → 91,8 |
| header('Content-Disposition: '.$disposition.';filename="'.$name_msie.'"'); |
| } else if (strstr($ua, 'FIREFOX')) { |
| // TODO: Implement "encodeRFC5987ValueChars" described at https://developer.mozilla.org/de/docs/Web/JavaScript/Reference/Global_Objects/encodeURIComponent ? |
| header('Content-Disposition: '.$disposition.';filename*="UTF-8\'\''.utf8_encode($name).'"'); |
| $name_utf8 = mb_convert_encoding($name, 'UTF-8'); |
| header('Content-Disposition: '.$disposition.';filename*="UTF-8\'\''.$name_utf8.'"'); |
| } else { |
| // Note: There is possibly a bug in Google Chrome: https://stackoverflow.com/questions/61866508/chrome-ignores-content-disposition-filename |
| header('Content-Disposition: '.$disposition.';filename="'.$name.'"'); |
| /trunk/vendor/danielmarschall/php_utils/misc_functions.inc.php |
|---|
| 86,11 → 86,7 |
| } |
| function convert_to_utf8_no_bom($cont) { |
| if (mb_detect_encoding($cont, "auto", true) != 'UTF-8') { |
| # $cont = mb_convert_encoding($cont, 'UTF-8', 'Windows-1252'); |
| # $cont = mb_convert_encoding($cont, 'UTF-8', 'auto'); |
| $cont = mb_convert_encoding($cont, 'UTF-8'); |
| } |
| $cont = vts_utf8_encode($cont); |
| // Remove BOM |
| $bom = pack('H*','EFBBBF'); |
| 98,6 → 94,19 |
| return $cont; |
| } |
| function vts_utf8_encode($text) { |
| $enc = mb_detect_encoding($text, null, true); |
| if ($enc === false) $enc = mb_detect_encoding($text, ['ASCII', 'UTF-8', 'Windows-1252', 'ISO-8859-1'], true); |
| if ($enc === false) $enc = null; |
| if ($enc === 'UTF-8') return $text; |
| $res = mb_convert_encoding($text, 'UTF-8', $enc); |
| if ($res === false) $res = iconv('UTF-8', 'UTF-8//IGNORE', $text); |
| return $res; |
| } |
| function stripHtmlComments($html) { |
| // https://stackoverflow.com/questions/11337332/how-to-remove-html-comments-in-php |
| $html = preg_replace("~<!--(?!<!)[^\[>].*?-->~s", "", $html); |
| /trunk/vendor/danielmarschall/php_utils/xml_utils.inc.php |
|---|
| 141,7 → 141,7 |
| } |
| function html_named_to_numeric_entities($str) { |
| if (!mb_detect_encoding($str, 'UTF-8', true)) $str = utf8_encode($str); |
| $str = mb_convert_encoding($str, 'UTF-8'); |
| return mb_htmlentities(decodeNamedEntities($str)); |
| } |
| /trunk/vendor/licenses |
|---|
| 12,8 → 12,8 |
| danielmarschall/oidconverter dev-master 75088eb Apache-2.0 |
| danielmarschall/php-sha3 9999999-dev 130de4c MIT |
| danielmarschall/php-sha3 dev-master 130de4c MIT |
| danielmarschall/php_utils 9999999-dev ecd0bc3 Apache-2.0 |
| danielmarschall/php_utils dev-master ecd0bc3 Apache-2.0 |
| danielmarschall/php_utils 9999999-dev e430ac9 Apache-2.0 |
| danielmarschall/php_utils dev-master e430ac9 Apache-2.0 |
| danielmarschall/uuid_mac_utils 9999999-dev d0edce1 Apache-2.0 |
| danielmarschall/uuid_mac_utils dev-master d0edce1 Apache-2.0 |
| danielmarschall/vnag 9999999-dev 85fb29d Apache-2.0 |