Mailer project rwritten:

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

diff --git a/inc/libs/user_functions.php b/inc/libs/user_functions.php
index 41c52078e24b3e0dab20157c338c81b2bd6b0a9c..2477532023cd1bff8db168ceda2a8236551611c0 100644 (file)
--- a/inc/libs/user_functions.php
+++ b/inc/libs/user_functions.php
@@ -436,7 +436,7 @@ function doNewUserPassword ($email, $userid) {
        } elseif ((isExtensionActive('nickname')) && (isNicknameOrUserid($userid))) {
                // Nickname entered
                $accountFound = fetchUserData($userid, 'nickname');
-       } elseif ((isValidUserId($userid)) && (empty($email))) {
+       } elseif ((isValidId($userid)) && (empty($email))) {
                // Direct userid entered
                $accountFound = fetchUserData($userid);
        } elseif (isDebugModeEnabled()) {
@@ -612,7 +612,7 @@ LIMIT 1",
                        sendEmail($userid, '{--GUEST_THANX_CONFIRM--}', $message);
 
                        // Maybe he got "referraled"?
-                       if ((isValidUserId($refid)) && ($refid != $userid)) {
+                       if ((isValidId($refid)) && ($refid != $userid)) {
                                // Select the referral userid
                                if (fetchUserData($refid)) {
                                        // Update ref counter...
@@ -867,11 +867,11 @@ function isUserSubIdAssignedToMember ($subId, $userid = NULL) {
                $GLOBALS[__FUNCTION__][$subId][$userid] = (
                        (
                                // Is a userid set or current set?
-                               (isValidUserId($userid)) || (isMember())
+                               (isValidId($userid)) || (isMember())
                        ) && (
                                // .. and it assigned with subid's id?
                                countSumTotalData(
-                                       (isValidUserId($userid) ? $userid : getMemberId()),
+                                       (isValidId($userid) ? $userid : getMemberId()),
                                                'user_subids',
                                                'id',
                                                'userid',
@@ -995,7 +995,7 @@ function doTemplateAdminListUserTitle ($template, $clear = FALSE) {
 // Template call-back function for displaying "username"
 function doTemplateDisplayUsername ($template, $clear = FALSE, $userid = NULL) {
        // Is a userid set?
-       if (!isValidUserId($userid)) {
+       if (!isValidId($userid)) {
                // Please don't call this without a valid userid
                reportBug(__FUNCTION__, __LINE__, 'template=' . $template . ',clear=' . intval($clear) . ',userid[' . gettype($userid) . ']=' . intval($userid) . ' - Invalid userid provided.');
        } // END - if