Fixes + asserts

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

diff --git a/inc/libs/user_functions.php b/inc/libs/user_functions.php
index c199c3affce760aeba5f8477bf8e0fc299d3872d..4587ea84a93eef09ee5704915cf6ab4b4751fd64 100644 (file)
--- a/inc/libs/user_functions.php
+++ b/inc/libs/user_functions.php
@@ -303,10 +303,10 @@ function doUserLogin ($userid, $passwd, $successUrl = '', $errorUrl = 'modules.p
        } // END - if
 
        // Debug message
-       //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'userid=' . $userid . ',isUserDataValid()=' . intval(isUserDataValid()) . ',userStatus=' . getUserData('status') . ',errorCode=' . $errorCode . ',ext=' . $ext . ',isFound=' . intval($isFound));
+       //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'userid=' . $userid . ',isValidUserData()=' . intval(isValidUserData()) . ',userStatus=' . getUserData('status') . ',errorCode=' . $errorCode . ',ext=' . $ext . ',isFound=' . intval($isFound));
 
        // Is there an entry?
-       if (($errorCode == '0') && (isUserDataValid()) && (getUserData('status') == 'CONFIRMED') && (!empty($content['userid']))) {
+       if (($errorCode == '0') && (isValidUserData()) && (getUserData('status') == 'CONFIRMED') && (!empty($content['userid']))) {
                // Check for old MD5 passwords
                if ((strlen(getUserData('password')) == 32) && (md5($passwd) == getUserData('password'))) {
                        // Just set the hash to the password from DB... :)
@@ -393,13 +393,13 @@ function doUserLogin ($userid, $passwd, $successUrl = '', $errorUrl = 'modules.p
                        // Wrong password!
                        $errorCode = getCode('WRONG_PASS');
                }
-       } elseif ((isUserDataValid()) && (getUserData('status') != 'CONFIRMED')) {
+       } elseif ((isValidUserData()) && (getUserData('status') != 'CONFIRMED')) {
                // Create an error code from given status
                $errorCode = generateErrorCodeFromUserStatus(getUserData('status'));
 
                // Set userid in session
                setSession('userid', getUserData('userid'));
-       } elseif (!isUserDataValid()) {
+       } elseif (!isValidUserData()) {
                // User id not found
                $errorCode = getCode('WRONG_ID');
        } else {
@@ -948,7 +948,7 @@ function doExpressionUser ($data) {
                        // Fix all together
                        $functionName = "getFetchedUserData('userid', " . $data['matches'][4][$data['key']] . ", '" . $data['callback'] . "')";
                }
-       } elseif ((!empty($data['callback'])) && (isUserDataValid())) {
+       } elseif ((!empty($data['callback'])) && (isValidUserData())) {
                // "Call-back" alias column for current logged in user's data
                $functionName = "getUserData('" . $data['callback'] . "')";
        }