More fixes for reflink and rallye extension

[mailer.git] / inc / modules / admin / admin-inc.php

diff --git a/inc/modules/admin/admin-inc.php b/inc/modules/admin/admin-inc.php
index f391b42a8c16bf03071cd51cab8f69b7ebaa0276..74ba0ce258a39acad47cd8aa6d384cbe224d6128 100644 (file)
--- a/inc/modules/admin/admin-inc.php
+++ b/inc/modules/admin/admin-inc.php
@@ -67,7 +67,7 @@ function CHECK_ADMIN_LOGIN ($admin_login, $password)
        $data = array();
 
        // Is the cache valid?
        $data = array();
 
        // Is the cache valid?

-       if (!empty($cacheArray['admins']['aid'][$admin_login])) {
+       if (!empty($cacheArray['admins']['password'][$admin_login])) {

                // Get password from cache
                $data['password'] = $cacheArray['admins']['password'][$admin_login];
                $ret = "pass";
                // Get password from cache
                $data['password'] = $cacheArray['admins']['password'][$admin_login];
                $ret = "pass";


@@ -79,7 +79,7 @@ function CHECK_ADMIN_LOGIN ($admin_login, $password)
                        $data['login_failtures'] = $cacheArray['admins']['login_failtures'][$admin_login];
                        $data['last_failture']   = $cacheArray['admins']['last_failture'][$admin_login];
                } // END - if
                        $data['login_failtures'] = $cacheArray['admins']['login_failtures'][$admin_login];
                        $data['last_failture']   = $cacheArray['admins']['last_failture'][$admin_login];
                } // END - if

-       } elseif (GET_EXT_VERSION("cache") == "") {
+       } elseif (EXT_IS_ACTIVE("cache")) {

                $ADD = "";
                if (GET_EXT_VERSION("admins") >= "0.7.0") {
                        // Load them here
                $ADD = "";
                if (GET_EXT_VERSION("admins") >= "0.7.0") {
                        // Load them here


@@ -122,7 +122,7 @@ function CHECK_ADMIN_LOGIN ($admin_login, $password)
 
        // Check if password is same
        //* DEBUG: */ echo "*".$ret.",".$data['password'].",".$password.",".$salt."*<br >\n";
 
        // Check if password is same
        //* DEBUG: */ echo "*".$ret.",".$data['password'].",".$password.",".$salt."*<br >\n";

-       if (($ret == "pass") && ($data['password'] == generateHash($password, $salt)) && (!empty($salt))) {
+       if (($ret == "pass") && ($data['password'] == generateHash($password, $salt)) && ((!empty($salt))) || ($data['password'] == $password)) {

                // Re-hash the plain passord with new random salt
                $data['password'] = generateHash($password);
 
                // Re-hash the plain passord with new random salt
                $data['password'] = generateHash($password);