major login problems fixed and some code-improvements

[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 cb17ba380cafae6ce4333fc4375bd1839a3cd176..c2a5e2445854213130b8bf19e3fb7b11f659ef4a 100644 (file)
--- a/inc/modules/admin/admin-inc.php
+++ b/inc/modules/admin/admin-inc.php
@@ -127,24 +127,19 @@ function CHECK_ADMIN_LOGIN ($admin_login, $password)
        return $ret;
 }
 // Only be executed on cookie checking
-function CHECK_ADMIN_COOKIES ($admin_login, $password)
-{
+function CHECK_ADMIN_COOKIES ($admin_login, $password) {
        global $ADMINS, $_CONFIG;
        $ret = "404"; $pass = "";
-       if (!empty($ADMINS['aid'][$admin_login]))
-       {
+       if (!empty($ADMINS['aid'][$admin_login])) {
                // Get password from cache
                $pass = $ADMINS['password'][$admin_login];
                $ret = "pass";
                $_CONFIG['cache_hits']++;
-       }
-        else
-       {
+       } else {
                // Get password from DB
                $result = SQL_QUERY_ESC("SELECT password FROM "._MYSQL_PREFIX."_admins WHERE login='%s' LIMIT 1",
                 array($admin_login), __FILE__, __LINE__);
-               if (SQL_NUMROWS($result) == 1)
-               {
+               if (SQL_NUMROWS($result) == 1) {
                        $ret = "pass";
                        list($pass) = SQL_FETCHROW($result);
                        SQL_FREERESULT($result);
@@ -154,11 +149,12 @@ function CHECK_ADMIN_COOKIES ($admin_login, $password)
        //* DEBUG: */ echo "*".$pass."/".$password."<br />";
 
        // Check if password matches
-       if (($ret == "pass") && ((generatePassString($pass) == $password) || ($pass == $password)))
-       {
+       if (($ret == "pass") && ((generatePassString($pass) == $password) || ($pass == $password))) {
                // Passwords matches!
                $ret = "done";
        }
+
+       // Return result
        return $ret;
 }
 //