PHP 5.5 fix
This commit is contained in:
parent
9b29b3e764
commit
80f74acbd0
|
@ -283,7 +283,7 @@ class PageRender extends Visitor {
|
||||||
break;
|
break;
|
||||||
|
|
||||||
default:
|
default:
|
||||||
$vals[$i] = password_hash($passwordvalue,$enc);
|
$vals[$i] = pla_password_hash($passwordvalue,$enc);
|
||||||
}
|
}
|
||||||
|
|
||||||
$vals = array_unique($vals);
|
$vals = array_unique($vals);
|
||||||
|
|
|
@ -2041,7 +2041,7 @@ function password_types() {
|
||||||
* crypt, ext_des, md5crypt, blowfish, md5, sha, smd5, ssha, or clear.
|
* crypt, ext_des, md5crypt, blowfish, md5, sha, smd5, ssha, or clear.
|
||||||
* @return string The hashed password.
|
* @return string The hashed password.
|
||||||
*/
|
*/
|
||||||
function password_hash($password_clear,$enc_type) {
|
function pla_password_hash($password_clear,$enc_type) {
|
||||||
if (DEBUG_ENABLED && (($fargs=func_get_args())||$fargs='NOARGS'))
|
if (DEBUG_ENABLED && (($fargs=func_get_args())||$fargs='NOARGS'))
|
||||||
debug_log('Entered (%%)',1,0,__FILE__,__LINE__,__METHOD__,$fargs);
|
debug_log('Entered (%%)',1,0,__FILE__,__LINE__,__METHOD__,$fargs);
|
||||||
|
|
||||||
|
@ -2167,7 +2167,7 @@ function password_check($cryptedpassword,$plainpassword,$attribute='userpassword
|
||||||
|
|
||||||
# SHA crypted passwords
|
# SHA crypted passwords
|
||||||
case 'sha':
|
case 'sha':
|
||||||
if (strcasecmp(password_hash($plainpassword,'sha'),'{SHA}'.$cryptedpassword) == 0)
|
if (strcasecmp(pla_password_hash($plainpassword,'sha'),'{SHA}'.$cryptedpassword) == 0)
|
||||||
return true;
|
return true;
|
||||||
else
|
else
|
||||||
return false;
|
return false;
|
||||||
|
@ -2176,7 +2176,7 @@ function password_check($cryptedpassword,$plainpassword,$attribute='userpassword
|
||||||
|
|
||||||
# MD5 crypted passwords
|
# MD5 crypted passwords
|
||||||
case 'md5':
|
case 'md5':
|
||||||
if( strcasecmp(password_hash($plainpassword,'md5'),'{MD5}'.$cryptedpassword) == 0)
|
if( strcasecmp(pla_password_hash($plainpassword,'md5'),'{MD5}'.$cryptedpassword) == 0)
|
||||||
return true;
|
return true;
|
||||||
else
|
else
|
||||||
return false;
|
return false;
|
||||||
|
|
Loading…
Reference in New Issue