|
|
|
@ -164,7 +164,7 @@ function check_language($use_post = true) {
|
|
|
|
|
// prefer a $_POST['lang'] if present
|
|
|
|
|
if ($use_post && safepost('lang')) {
|
|
|
|
|
$lang = safepost('lang');
|
|
|
|
|
if(is_string($lang) && array_key_exists($lang, $supported_languages)) {
|
|
|
|
|
if (is_string($lang) && array_key_exists($lang, $supported_languages)) {
|
|
|
|
|
return $lang;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
@ -172,7 +172,7 @@ function check_language($use_post = true) {
|
|
|
|
|
// Failing that, is there a $_COOKIE['lang'] ?
|
|
|
|
|
if (safecookie('lang')) {
|
|
|
|
|
$lang = safecookie('lang');
|
|
|
|
|
if(is_string($lang) && array_key_exists($lang, $supported_languages)) {
|
|
|
|
|
if (is_string($lang) && array_key_exists($lang, $supported_languages)) {
|
|
|
|
|
return $lang;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
@ -1262,13 +1262,12 @@ function _pacrypt_sha512_b64($pw, $pw_db="") {
|
|
|
|
|
|
|
|
|
|
$password="#Thepasswordcannotbeverified";
|
|
|
|
|
if (strncmp($pw_db,'{SHA512-CRYPT.B64}',18)==0) {
|
|
|
|
|
$dcpwd = base64_decode(mb_substr($pw_db,18,NULL,'8bit'),true);
|
|
|
|
|
$dcpwd = base64_decode(mb_substr($pw_db,18,null,'8bit'),true);
|
|
|
|
|
if ($dcpwd !== false && !empty($dcpwd) && strncmp($dcpwd,'$6$',3)==0) {
|
|
|
|
|
$password = '{SHA512-CRYPT.B64}'.base64_encode(crypt($pw,$dcpwd));
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
elseif (strncmp($pw_db,'{MD5-CRYPT}',11)==0) {
|
|
|
|
|
$dcpwd = mb_substr($pw_db,11,NULL,'8bit');
|
|
|
|
|
} elseif (strncmp($pw_db,'{MD5-CRYPT}',11)==0) {
|
|
|
|
|
$dcpwd = mb_substr($pw_db,11,null,'8bit');
|
|
|
|
|
if (!empty($dcpwd) && strncmp($dcpwd,'$1$',3)==0) {
|
|
|
|
|
$password = '{MD5-CRYPT}'.crypt($pw,$dcpwd);
|
|
|
|
|
}
|
|
|
|
|