Possible fix for 'errno=8,errstr=Undefined offset: 13,errfile=load_cache-modules...

[mailer.git] / inc / libs / user_functions.php

diff --git a/inc/libs/user_functions.php b/inc/libs/user_functions.php
index a3772fa4f5e5597897f8ef7aa54f5a51c38cb863..ef8c29fa9672373c42f9825beeecfbc2be4abb1e 100644 (file)
--- a/inc/libs/user_functions.php
+++ b/inc/libs/user_functions.php
@@ -18,6 +18,7 @@
  * svn:keywords Date Revision" (autoprobset!) at least!!!!!!            *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
+ * Copyright (c) 2009, 2010 by Mailer Developer Team                    *
  * For more information visit: http://www.mxchange.org                  *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
@@ -289,9 +290,12 @@ function doUserLogin ($userid, $passwd, $successUrl = '', $errorUrl = 'modules.p
                fetchUserData($userid);
        }
 
-       // Get user data array and set userid (e.g. important if we login with nickname)
-       $content = getUserDataArray();
-       if (!empty($content['userid'])) $userid = bigintval($content['userid']);
+       // No error found?
+       if ($errorCode == '0') {
+               // Get user data array and set userid (e.g. important if we login with nickname)
+               $content = getUserDataArray();
+               if (!empty($content['userid'])) $userid = bigintval($content['userid']);
+       } // END - if
 
        // Is there an entry?
        if ((isUserDataValid()) && (getUserData('status') == 'CONFIRMED') && (!empty($content['userid']))) {
@@ -330,16 +334,14 @@ function doUserLogin ($userid, $passwd, $successUrl = '', $errorUrl = 'modules.p
                                if ((getExtensionVersion('bonus') >= '0.3.5') && (getConfig('bonus_mode') != 'ADD')) handleBonusPoints('login_bonus');
                        } // END - if
 
-                       // Calculate new hash with the secret key and master salt together
-                       $content['hash'] = encodeHashForCookie($content['hash']);
-
                        // @TODO Make this filter working: $URL = runFilterChain('do_login', array('content' => $content, 'addon' => $ADDON));
 
                        // Set member id
                        setMemberId($userid);
 
                        // Try to set session data (which shall normally always work!)
-                       if ((setSession('userid', $userid )) && (setSession('u_hash', $content['hash']))) {
+                       //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'userid=' . $userid . ',hash=' . $content['hash'] . '(' . strlen($content['hash']) . ')');
+                       if ((setSession('userid', $userid )) && (setSession('u_hash', encodeHashForCookie($content['hash'])))) {
                                // Update database records
                                SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_user_data` SET `total_logins`=`total_logins`+1" . $add . " WHERE `userid`=%s LIMIT 1",
                                        array($userid), __FUNCTION__, __LINE__);