Possible final fixes for user login, debug lines rewritten to logfile, some old lost...

[mailer.git] / inc / mysql-manager.php

diff --git a/inc/mysql-manager.php b/inc/mysql-manager.php
index f3ef16d5933ebff8c9abfbd337798267c7c1c4ff..9033db1373b0ca4845d2d5e6bae392156d68022f 100644 (file)
--- a/inc/mysql-manager.php
+++ b/inc/mysql-manager.php
@@ -559,13 +559,17 @@ function isMember () {
        // is the cache entry there?
        if (isset($GLOBALS['is_member'])) {
                // Then return it
+               //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'CACHED! (' . intval($GLOBALS['is_member']) . ')');
                return $GLOBALS['is_member'];
-       } elseif (getMemberId() == '0') {
+       } elseif ((!isSessionVariableSet('userid')) || (!isSessionVariableSet('u_hash'))) {
                // No member
+               //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'No member set in cookie/session.');
                return false;
        } else {
-               // Transfer userid=>current
-               setCurrentUserid(getMemberId());
+               // Get it secured from session
+               setMemberId(getSession('userid'));
+               setCurrentUserId(getMemberId());
+               //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'userid=' . getSession('userid') . ' used from cookie/session.');
        }
 
        // Init user data array
@@ -591,15 +595,17 @@ function isMember () {
                                $ret = true;
                        } else {
                                // Maybe got locked etc.
-                               logDebugMessage(__FUNCTION__, __LINE__, 'status=' . getUserData('status'));
+                               //* DEBUG */ logDebugMessage(__FUNCTION__, __LINE__, 'status=' . getUserData('status') . ',' . $valPass . '(' . strlen($valPass) . ')/' . getSession('u_hash') . '(' . strlen(getSession('u_hash')) . ')/' . getUserData('password') . '(' . strlen(getUserData('password')) . ')');
                                destroyMemberSession();
                        }
                } else {
                        // Cookie data is invalid!
+                       //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Cookie data invalid or user not found.');
                        destroyMemberSession();
                }
        } else {
                // Cookie data is invalid!
+               //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Cookie data not complete.');
                destroyMemberSession();
        }
 
@@ -607,6 +613,7 @@ function isMember () {
        $GLOBALS['is_member'] = $ret;
 
        // Return status
+       //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'ret=' . intval($ret));
        return $ret;
 }
 
@@ -698,7 +705,7 @@ function isAdmin ($adminLogin = '') {
        $ret = false;
        $passCookie = '';
        $valPass = '';
-       //* DEBUG: */ print(__FUNCTION__.':'.$adminLogin.'<br />');
+       //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, $adminLogin.'<br />');
 
        // If admin login is not given take current from cookies...
        if ((empty($adminLogin)) && (isSessionVariableSet('admin_login')) && (isSessionVariableSet('admin_md5'))) {
@@ -706,7 +713,7 @@ function isAdmin ($adminLogin = '') {
                $adminLogin = getSession('admin_login');
                $passCookie = getSession('admin_md5');
        } // END - if
-       //* DEBUG: */ print(__FUNCTION__.':'.$adminLogin.'/'.$passCookie.'<br />');
+       //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, $adminLogin.'/'.$passCookie.'<br />');
 
        // Do we have cache?
        if (!isset($GLOBALS['is_admin'][$adminLogin])) {
@@ -736,7 +743,7 @@ function isAdmin ($adminLogin = '') {
 
                if (!empty($valPass)) {
                        // Check if password is valid
-                       //* DEBUG: */ print(__FUNCTION__ . ':(' . $valPass . '==' . $passCookie . ')='.intval($valPass == $passCookie).'<br />');
+                       //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, '(' . $valPass . '==' . $passCookie . ')='.intval($valPass == $passCookie));
                        $GLOBALS['is_admin'][$adminLogin] = (($valPass == $passCookie) || ((strlen($valPass) == 32) && ($valPass == md5($passCookie))) || (($valPass == '*FAILED*') && (!isExtensionActive('cache'))));
                } // END - if
        } // END - if