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 db3e3b30d39d9d16221d4d467ce2202dde7c184b..c2a5e2445854213130b8bf19e3fb7b11f659ef4a 100644 (file)
--- a/inc/modules/admin/admin-inc.php
+++ b/inc/modules/admin/admin-inc.php
@@ -64,14 +64,14 @@ function REGISTER_ADMIN ($user, $md5)
 // Only be executed on login procedure!
 function CHECK_ADMIN_LOGIN ($admin_login, $password)
 {
-       global $ADMINS, $CONFIG, $CACHE;
+       global $ADMINS, $_CONFIG, $CACHE;
        $ret = "404"; $pass = "";
        if (!empty($ADMINS['aid'][$admin_login]))
        {
                // Get password from cache
                $pass = $ADMINS['password'][$admin_login];
                $ret = "pass";
-               $CONFIG['cache_hits']++;
+               $_CONFIG['cache_hits']++;
        }
         else
        {
@@ -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)
-{
-       global $ADMINS, $CONFIG;
+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
-       {
+               $_CONFIG['cache_hits']++;
+       } 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;
 }
 //
@@ -225,7 +221,7 @@ function admin_WriteData ($file, $comment, $prefix, $suffix, $DATA, $seek=0)
 //
 function ADMIN_DO_ACTION($wht)
 {
-       global $menuDesription, $menuTitle, $CONFIG, $EXTENSIONS, $link, $DATA;
+       global $menuDesription, $menuTitle, $_CONFIG, $EXTENSIONS, $link, $DATA;
        //* DEBUG: */ echo __LINE__."*".$wht."/".$GLOBALS['module']."/".$GLOBALS['action']."/".$GLOBALS['what']."*<br />\n";
        if (EXT_IS_ACTIVE("cache"))
        {
@@ -249,8 +245,8 @@ function ADMIN_DO_ACTION($wht)
        $act = GET_ACTION($GLOBALS['module'], $wht);
 
        // Define admin login name and ID number
-       define('__ADMIN_LOGIN', SQL_ESCAPE($_COOKIE['admin_login']));
-       define('__ADMIN_ID'   , GET_ADMIN_ID($_COOKIE['admin_login']));
+       define('__ADMIN_LOGIN', SQL_ESCAPE($_SESSION['admin_login']));
+       define('__ADMIN_ID'   , GET_ADMIN_ID($_SESSION['admin_login']));
 
        // Preload templates
        if (EXT_IS_ACTIVE("admins")) {
@@ -522,9 +518,9 @@ function ADMIN_MENU_SELECTION($MODE, $default="", $defid="")
        return $OUT;
 }
 //
-function ADMIN_SAVE_SETTINGS (&$POST, $TABLE="_config", $WHERE="config=0", $translateComma = array(), $alwaysAdd=false)
+function ADMIN_SAVE_SETTINGS (&$POST, $tableName="_config", $whereStatement="config=0", $translateComma = array(), $alwaysAdd=false)
 {
-       global $CONFIG, $CFG_CACHE, $CACHE;
+       global $_CONFIG, $CFG_CACHE, $CACHE;
        $DATA = array();
        $skip = false; $TEST2 = "";
        foreach ($POST as $id=>$val) {
@@ -579,7 +575,7 @@ function ADMIN_SAVE_SETTINGS (&$POST, $TABLE="_config", $WHERE="config=0", $tran
                                }
 
                                // Update current configuration
-                               $CONFIG[$id] = $val;
+                               $_CONFIG[$id] = $val;
                        }
                }
        }
@@ -587,10 +583,10 @@ function ADMIN_SAVE_SETTINGS (&$POST, $TABLE="_config", $WHERE="config=0", $tran
        // Check if entry does exist
        $result = false;
        if (!$alwaysAdd) {
-               if (!empty($WHERE)) {
-                       $result = SQL_QUERY("SELECT * FROM "._MYSQL_PREFIX.$TABLE." WHERE ".$WHERE." LIMIT 1", __FILE__, __LINE__);
+               if (!empty($whereStatement)) {
+                       $result = SQL_QUERY("SELECT * FROM "._MYSQL_PREFIX.$tableName." WHERE ".$whereStatement." LIMIT 1", __FILE__, __LINE__);
                } else {
-                       $result = SQL_QUERY("SELECT * FROM "._MYSQL_PREFIX.$TABLE." LIMIT 1", __FILE__, __LINE__);
+                       $result = SQL_QUERY("SELECT * FROM "._MYSQL_PREFIX.$tableName." LIMIT 1", __FILE__, __LINE__);
                }
        }
 
@@ -599,7 +595,7 @@ function ADMIN_SAVE_SETTINGS (&$POST, $TABLE="_config", $WHERE="config=0", $tran
                $DATA_UPDATE = implode(", ", $DATA);
 
                // Generate SQL string
-               $SQL = "UPDATE "._MYSQL_PREFIX.$TABLE." SET ".$DATA_UPDATE." WHERE ".$WHERE." LIMIT 1";
+               $SQL = "UPDATE "._MYSQL_PREFIX.$tableName." SET ".$DATA_UPDATE." WHERE ".$whereStatement." LIMIT 1";
        } else {
                // Add Line (does only work with auto_increment!
                $KEYs = array(); $VALUEs = array();
@@ -614,7 +610,7 @@ function ADMIN_SAVE_SETTINGS (&$POST, $TABLE="_config", $WHERE="config=0", $tran
                $VALUEs = implode(", ", $VALUEs);
 
                // Generate SQL string
-               $SQL = "INSERT INTO "._MYSQL_PREFIX.$TABLE." (".$KEYs.") VALUES(".$VALUEs.")";
+               $SQL = "INSERT INTO "._MYSQL_PREFIX.$tableName." (".$KEYs.") VALUES(".$VALUEs.")";
        }
 
        // Free memory
@@ -624,7 +620,7 @@ function ADMIN_SAVE_SETTINGS (&$POST, $TABLE="_config", $WHERE="config=0", $tran
        $result = SQL_QUERY($SQL, __FILE__, __LINE__);
 
        // Is the config table updated and the cache extension installed?
-       if ((GET_EXT_VERSION("cache") >= "0.1.2") && ($TABLE == "_config")) {
+       if ((GET_EXT_VERSION("cache") >= "0.1.2") && ($tableName == "_config")) {
                // Remove it here...
                if ($CACHE->cache_file("config", true)) $CACHE->cache_destroy();
                unset($CFG_CACHE);
@@ -679,23 +675,23 @@ function ADMIN_USER_PROFILE_LINK($uid, $title="", $wht="list_user")
 //
 function ADMIN_CHECK_MENU_MODE()
 {
-       global $CONFIG, $ADMINS, $_COOKIE;
+       global $_CONFIG, $ADMINS, $_SESSION;
 
        // Set the global mode as the mode for all admins
-       $MODE = $CONFIG['admin_menu']; $ADMIN = $MODE;
+       $MODE = $_CONFIG['admin_menu']; $ADMIN = $MODE;
 
        // Check individual settings of current admin
-       if (isset($ADMINS['la_mode'][$_COOKIE['admin_login']]))
+       if (isset($ADMINS['la_mode'][$_SESSION['admin_login']]))
        {
                // Load from cache
-               $ADMIN = $ADMINS['la_mode'][$_COOKIE['admin_login']];
-               $CONFIG['cache_hits']++;
+               $ADMIN = $ADMINS['la_mode'][$_SESSION['admin_login']];
+               $_CONFIG['cache_hits']++;
        }
         elseif (GET_EXT_VERSION("admins") >= "0.6.7")
        {
                // Load from database when version of "admins" is enough
                $result = SQL_QUERY_ESC("SELECT la_mode FROM "._MYSQL_PREFIX."_admins WHERE login='%s' LIMIT 1",
-                array($_COOKIE['admin_login']), __FILE__, __LINE__);
+                array($_SESSION['admin_login']), __FILE__, __LINE__);
                if (SQL_NUMROWS($result) == 1)
                {
                        // Load data
@@ -714,7 +710,7 @@ function ADMIN_CHECK_MENU_MODE()
 }
 // Change activation status
 function ADMIN_CHANGE_ACTIVATION_STATUS ($IDs, $table, $row, $idRow = "id") {
-       global $CONFIG;
+       global $_CONFIG;
        $cnt = 0; $newStatus = 'Y';
        if ((is_array($IDs)) && (count($IDs) > 0)) {
                // "Walk" all through and count them
@@ -756,7 +752,7 @@ function ADMIN_CHANGE_ACTIVATION_STATUS ($IDs, $table, $row, $idRow = "id") {
 }
 // Delete rows by given ID numbers
 function ADMIN_DELETE_ENTRIES_CONFIRM ($IDs, $table, $row, $columns = array(), $filterFunctions = array(), $deleteNow=false, $idRow="id") {
-       global $CONFIG;
+       global $_CONFIG;
        $OUT = ""; $SW = 2;
        if ((is_array($IDs)) && (count($IDs) > 0)) {
                // "Walk" through all entries and count them