/trunk/includes/classes/OIDplusGui.class.php |
---|
81,7 → 81,7 |
if (count($dirs) > 0) { |
$dir = substr($dirs[0], strlen(OIDplus::localpath())); |
$langbox_entries[$code] = '<span class="lang_flag_bg"><a '.($useJs ? 'onclick="setLanguage(\''.$code.'\'); return false" ' : '').'href="?lang='.$code.$add.'"><img src="'.OIDplus::webpath(null,true).$dir.'/'.$flag.'" alt="'.$pluginManifest->getName().'" title="'.$pluginManifest->getName().'" class="'.$class.'" id="lng_flag_'.$code.'" height="20"></a></span> '; |
$langbox_entries[$code] = '<span class="lang_flag_bg"><a '.($useJs ? 'onclick="setLanguage(\''.$code.'\'); return false" ' : '').'href="?lang='.$code.$add.'"><img src="'.OIDplus::webpath(null,true).$dir.$flag.'" alt="'.$pluginManifest->getName().'" title="'.$pluginManifest->getName().'" class="'.$class.'" id="lng_flag_'.$code.'" height="20"></a></span> '; |
} |
} |
if ($non_default_languages > 0) { |
/trunk/includes/functions.inc.php |
---|
48,6 → 48,7 |
} |
function verify_private_public_key($privKey, $pubKey) { |
if (!function_exists('openssl_public_encrypt')) return false; |
try { |
if (empty($privKey)) return false; |
if (empty($pubKey)) return false; |
197,12 → 198,23 |
} |
} |
function extractHtmlContents($cont) { |
// make sure the program works even if the user provided HTML is not UTF-8 |
$cont = iconv(mb_detect_encoding($cont, mb_detect_order(), true), 'UTF-8//IGNORE', $cont); |
function convert_to_utf8_no_bom($cont) { |
$encoding = mb_detect_encoding($cont, mb_detect_order(), true); |
if (($encoding !== false) && ($encoding !== 'ASCII') && ($encoding !== 'UTF-8')) { |
$cont = iconv($encoding, 'UTF-8//IGNORE', $cont); |
} |
// Remove BOM |
$bom = pack('H*','EFBBBF'); |
$cont = preg_replace("/^$bom/", '', $cont); |
return $cont; |
} |
function extractHtmlContents($cont) { |
// make sure the program works even if the user provided HTML is not UTF-8 |
$cont = convert_to_utf8_no_bom($cont); |
$out_js = ''; |
$m = array(); |
preg_match_all('@<script[^>]*>(.+)</script>@ismU', $cont, $m); |
/trunk/plugins/viathinksoft/adminPages/120_registration/OIDplusPageAdminRegistration.class.php |
---|
500,9 → 500,7 |
} |
// make sure the program works even if the user provided HTML is not UTF-8 |
$info = iconv(mb_detect_encoding($info, mb_detect_order(), true), 'UTF-8//IGNORE', $info); |
$bom = pack('H*','EFBBBF'); |
$info = preg_replace("/^$bom/", '', $info); |
$info = convert_to_utf8_no_bom($info); |
echo $info; |
/trunk/plugins/viathinksoft/publicPages/500_resources/OIDplusPagePublicResources.class.php |
---|
64,9 → 64,7 |
$cont = file_get_contents($file); |
// make sure the program works even if the user provided HTML is not UTF-8 |
$cont = iconv(mb_detect_encoding($cont, mb_detect_order(), true), 'UTF-8//IGNORE', $cont); |
$bom = pack('H*','EFBBBF'); |
$cont = preg_replace("/^$bom/", '', $cont); |
$cont = convert_to_utf8_no_bom($cont); |
$m = array(); |
if (preg_match('@<title>(.+)</title>@ismU', $cont, $m)) return $m[1]; |
/trunk/vendor/composer/InstalledVersions.php |
---|
92,7 → 92,7 |
array ( |
0 => '9999999-dev', |
), |
'reference' => '2f646245865273217be08873a9c158f81f753797', |
'reference' => '53cc75763e247535acd013f4aad7e0b1a41cee34', |
), |
'danielmarschall/vnag' => |
array ( |
/trunk/vendor/composer/installed.json |
---|
233,18 → 233,18 |
"source": { |
"type": "git", |
"url": "https://github.com/danielmarschall/uuid_mac_utils.git", |
"reference": "2f646245865273217be08873a9c158f81f753797" |
"reference": "53cc75763e247535acd013f4aad7e0b1a41cee34" |
}, |
"dist": { |
"type": "zip", |
"url": "https://api.github.com/repos/danielmarschall/uuid_mac_utils/zipball/2f646245865273217be08873a9c158f81f753797", |
"reference": "2f646245865273217be08873a9c158f81f753797", |
"url": "https://api.github.com/repos/danielmarschall/uuid_mac_utils/zipball/53cc75763e247535acd013f4aad7e0b1a41cee34", |
"reference": "53cc75763e247535acd013f4aad7e0b1a41cee34", |
"shasum": "" |
}, |
"require": { |
"php": ">=7.0" |
}, |
"time": "2021-12-28T23:40:13+00:00", |
"time": "2022-01-06T22:36:33+00:00", |
"default-branch": true, |
"type": "library", |
"installation-source": "dist", |
/trunk/vendor/composer/installed.php |
---|
66,7 → 66,7 |
array ( |
0 => '9999999-dev', |
), |
'reference' => '2f646245865273217be08873a9c158f81f753797', |
'reference' => '53cc75763e247535acd013f4aad7e0b1a41cee34', |
), |
'danielmarschall/vnag' => |
array ( |
/trunk/vendor/danielmarschall/uuid_mac_utils/includes/uuid_utils.inc.php |
---|
2,8 → 2,8 |
/* |
* UUID utils for PHP |
* Copyright 2011 - 2021 Daniel Marschall, ViaThinkSoft |
* Version 2021-12-29 |
* Copyright 2011 - 2022 Daniel Marschall, ViaThinkSoft |
* Version 2022-01-06 |
* |
* Licensed under the Apache License, Version 2.0 (the "License"); |
* you may not use this file except in compliance with the License. |
313,7 → 313,7 |
} |
function is_uuid_oid($oid, $only_allow_root=false) { |
if (substr(oid,0,1) == '.') $oid = substr($oid, 1); // remove leading dot |
if (substr($oid,0,1) == '.') $oid = substr($oid, 1); // remove leading dot |
$ary = explode('.', $oid); |
/trunk/vendor/licenses |
---|
8,7 → 8,7 |
components/jqueryui 1.12.1 MIT |
danielmarschall/fileformats dev-master acfeaf4 Apache-2.0 |
danielmarschall/php_utils dev-master eb0b3f8 Apache-2.0 |
danielmarschall/uuid_mac_utils dev-master 2f64624 Apache-2.0 |
danielmarschall/uuid_mac_utils dev-master 53cc757 Apache-2.0 |
danielmarschall/vnag dev-master 8bf513c Apache-2.0 |
dcodeio/bcrypt.js master master BSD-3-Clause, MIT |
emn178/js-sha3 master master MIT |