X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Fadmin-inc.php;h=76e4a85d13b06dd44e19b14047ad4f3b392e5a02;hb=3fce27f277e3316c33a7e904ef499370c0c95dde;hp=47d8c45e2dc14dc4f1ebcc0616a53cea01489c42;hpb=067dc339f4058c7834f5e5d2f7d8d44ce6d7cea3;p=mailer.git diff --git a/inc/modules/admin/admin-inc.php b/inc/modules/admin/admin-inc.php index 47d8c45e2d..76e4a85d13 100644 --- a/inc/modules/admin/admin-inc.php +++ b/inc/modules/admin/admin-inc.php @@ -197,7 +197,7 @@ function ifAdminLoginDataIsValid ($admin, $password) { // Try to login the admin by setting some session/cookie variables function doAdminLogin ($adminLogin, $passHash) { // Reset failure counter on matching admins version - if ((isExtensionInstalledAndNewer('admins', '0.7.0')) && ((isExtensionOlder('sql_patches', '0.3.6')) || (!isExtensionInstalled('sql_patches')))) { + if ((isExtensionInstalledAndNewer('admins', '0.7.0')) && ((isExtensionInstalledAndOlder('sql_patches', '0.3.6')) || (!isExtensionInstalled('sql_patches')))) { // Reset counter on out-dated sql_patches version SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_admins` SET `login_failures`=0, `last_failure`='0000-00-00 00:00:00' WHERE `login`='%s' LIMIT 1", array($adminLogin), __FUNCTION__, __LINE__); @@ -208,7 +208,7 @@ function doAdminLogin ($adminLogin, $passHash) { // Now set all session variables and return the result return (( - setSession('admin_md5', generatePassString($passHash)) + setSession('admin_md5', generatePassString(generateHash($passHash, '', false))) ) && ( setSession('admin_login', $adminLogin) ) && (