diff --git a/htdocs/accountancy/admin/export.php b/htdocs/accountancy/admin/export.php index 23a16340c0b..30cc0144a1f 100644 --- a/htdocs/accountancy/admin/export.php +++ b/htdocs/accountancy/admin/export.php @@ -269,9 +269,9 @@ if ($num2) { // Value print ''; if (is_array($key['param'])) { - print $form->selectarray($label, $key['param'], $conf->global->$label, 0); + print $form->selectarray($label, $key['param'], getDolGlobalString($label), 0); } else { - print ''; + print ''; } print ''; diff --git a/htdocs/core/lib/security.lib.php b/htdocs/core/lib/security.lib.php index 7ee9f7ce9b5..aeb58d34c0f 100644 --- a/htdocs/core/lib/security.lib.php +++ b/htdocs/core/lib/security.lib.php @@ -267,9 +267,9 @@ function dol_verifyHash($chain, $hash, $type = '0') if ($type == '0' && !empty($conf->global->MAIN_SECURITY_HASH_ALGO) && $conf->global->MAIN_SECURITY_HASH_ALGO == 'password_hash' && function_exists('password_verify')) { if (! empty($hash[0]) && $hash[0] == '$') { return password_verify($chain, $hash); - } elseif (strlen($hash) == 32) { + } elseif (dol_strlen($hash) == 32) { return dol_verifyHash($chain, $hash, '3'); // md5 - } elseif (strlen($hash) == 40) { + } elseif (dol_strlen($hash) == 40) { return dol_verifyHash($chain, $hash, '2'); // sha1md5 }