Rewrote 'we' word a little, rewrote mail order to use SQL_INSERTID() instead of anoth...

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

diff --git a/inc/libs/user_functions.php b/inc/libs/user_functions.php
index 75f0edf54bb65790ab68a85e30c2815055d96fbf..1168748f6c0c6fcd08a0c1d982f5a3a81ca1dcdb 100644 (file)
--- a/inc/libs/user_functions.php
+++ b/inc/libs/user_functions.php
@@ -209,7 +209,7 @@ WHERE
 LIMIT 1",
                array($email), __FUNCTION__, __LINE__);
 
-       // Do we have an entry?
+       // Is there an entry?
        if (SQL_NUMROWS($result) == 1) {
                // Load userid
                list($userid) = SQL_FETCHROW($result);
@@ -235,7 +235,7 @@ function determineRandomReferralId () {
                // Get all user ids
                $totalUsers = countSumTotalData('CONFIRMED', 'user_data', 'userid', 'status', true, runFilterChain('user_exclusion_sql', ' AND `rand_confirmed` >= {?user_min_confirmed?}'));
 
-               // Do we have at least one?
+               // Is there at least one?
                if ($totalUsers > 0) {
                        // Then choose random userid
                        $randUserid = mt_rand(0, ($totalUsers - 1));
@@ -244,7 +244,7 @@ function determineRandomReferralId () {
                        $result = SQL_QUERY_ESC("SELECT `userid` FROM `{?_MYSQL_PREFIX?}_user_data` " . runFilterChain('user_exclusion_sql', "WHERE `status`='CONFIRMED'") . ' AND `rand_confirmed` >= {?user_min_confirmed?} ORDER BY `rand_confirmed` DESC LIMIT %s, 1',
                                array($randUserid), __FUNCTION__, __LINE__);
 
-                       // Do we have one entry there?
+                       // Is there one entry there?
                        if (SQL_NUMROWS($result) == 1) {
                                // Use that userid as new referral id
                                list($refid) = SQL_FETCHROW($result);
@@ -725,7 +725,7 @@ function getConfirmationMessageFromUserStatus ($status) {
 
 // "Getter" for total tester accounts
 function getTotalTesterUsers () {
-       // Do we have cache?
+       // Is there cache?
        if (!isset($GLOBALS[__FUNCTION__])) {
                // Determine it
                $GLOBALS[__FUNCTION__] = countSumTotalData('', 'user_data', 'userid', '', true, runFilterChain('user_inclusion_sql'));
@@ -834,12 +834,12 @@ function doExpressionUser ($data) {
 
        // User-related data, so is there a userid?
        if (!empty($data['matches'][4][$data['key']])) {
-               // Do we have a userid or $userid?
+               // Is there a userid or $userid?
                if (substr($data['matches'][4][$data['key']], 0, 1) == '$') {
                        // Use dynamic call
                        $functionName = "getFetchedUserData('userid', " . $data['matches'][4][$data['key']] . ", '" . $data['callback'] . "')";
                } elseif (!empty($data['matches'][4][$data['key']])) {
-                       // Do we have a number or a dollar sign in front of it?
+                       // Is there a number or a dollar sign in front of it?
                        if (preg_replace('/[^0123456789]/', '', $data['matches'][4][$data['key']]) != $data['matches'][4][$data['key']]) {
                                // Possible database column, so get it again
                                $data['matches'][4][$data['key']] = "getFetchedUserData('userid', getMemberId(), '" . $data['matches'][4][$data['key']] . "')";
@@ -853,7 +853,7 @@ function doExpressionUser ($data) {
                $functionName = "getUserData('" . $data['callback'] . "')";
        }
 
-       // Do we have another function to run (e.g. translations)
+       // Is there another function to run (e.g. translations)
        if (!empty($data['extra_func'])) {
                // Surround the original function call with it
                $functionName = $data['extra_func'] . '(' . $functionName . ')';
@@ -879,7 +879,7 @@ function doTemplateAdminListUserTitle ($template, $clear = false) {
        // Init title with "all accounts"
        $code = '{--ADMIN_LIST_ALL_ACCOUNTS--}';
 
-       // Do we have a 'status' or 'do' set?
+       // Is there a 'status' or 'do' set?
        if (isGetRequestElementSet('status')) {
                // Set title according to the 'status'
                $code = sprintf("{--ADMIN_LIST_STATUS_%s_ACCOUNTS--}", strtoupper(getRequestElement('status')));
@@ -900,7 +900,7 @@ function doTemplateDisplayUsername ($template, $clear = false, $userid = NULL) {
                reportBug(__FUNCTION__, __LINE__, 'template=' . $template . ',clear=' . intval($clear) . ',userid[' . gettype($userid) . ']=' . intval($userid) . ' - Invalid userid provided.');
        } // END - if
 
-       // Do we have cache?
+       // Is there cache?
        if (!isset($GLOBALS[__FUNCTION__][$userid])) {
                // Generate code
                $GLOBALS[__FUNCTION__][$userid] = $userid . ' ({%user,nickname,fixEmptyContentToDashes=' . $userid . '%})';
@@ -927,7 +927,7 @@ function addXmlSpecialMemberAddDoSubid () {
 
 // Getter for user_alpha
 function getUserAlpha () {
-       // Do we have cache?
+       // Is there cache?
        if (!isset($GLOBALS[__FUNCTION__])) {
                // Determine it
                $GLOBALS[__FUNCTION__] = getConfig('user_alpha');
@@ -939,7 +939,7 @@ function getUserAlpha () {
 
 // Getter for user_limit
 function getUserLimit () {
-       // Do we have cache?
+       // Is there cache?
        if (!isset($GLOBALS[__FUNCTION__])) {
                // Determine it
                $GLOBALS[__FUNCTION__] = getConfig('user_limit');
@@ -951,7 +951,7 @@ function getUserLimit () {
 
 // Getter for tester_user_surname_prefix
 function getTesterUserSurnamePrefix () {
-       // Do we have cache?
+       // Is there cache?
        if (!isset($GLOBALS[__FUNCTION__])) {
                // Determine it
                $GLOBALS[__FUNCTION__] = getConfig('tester_user_surname_prefix');
@@ -963,7 +963,7 @@ function getTesterUserSurnamePrefix () {
 
 // Getter for tester_user_maximum
 function getTesterUserMaximum () {
-       // Do we have cache?
+       // Is there cache?
        if (!isset($GLOBALS[__FUNCTION__])) {
                // Determine it
                $GLOBALS[__FUNCTION__] = getConfig('tester_user_maximum');
@@ -975,7 +975,7 @@ function getTesterUserMaximum () {
 
 // Getter for tester_user_check_cat
 function getTesterUserCheckCat () {
-       // Do we have cache?
+       // Is there cache?
        if (!isset($GLOBALS[__FUNCTION__])) {
                // Determine it
                $GLOBALS[__FUNCTION__] = getConfig('tester_user_check_cat');
@@ -987,7 +987,7 @@ function getTesterUserCheckCat () {
 
 // Getter for tester_user_gender
 function getTesterUserGender () {
-       // Do we have cache?
+       // Is there cache?
        if (!isset($GLOBALS[__FUNCTION__])) {
                // Determine it
                $GLOBALS[__FUNCTION__] = getConfig('tester_user_gender');
@@ -999,7 +999,7 @@ function getTesterUserGender () {
 
 // Getter for tester_user_family
 function getTesterUserFamily () {
-       // Do we have cache?
+       // Is there cache?
        if (!isset($GLOBALS[__FUNCTION__])) {
                // Determine it
                $GLOBALS[__FUNCTION__] = getConfig('tester_user_family');
@@ -1011,7 +1011,7 @@ function getTesterUserFamily () {
 
 // Getter for tester_user_password
 function getTesterUserPassword () {
-       // Do we have cache?
+       // Is there cache?
        if (!isset($GLOBALS[__FUNCTION__])) {
                // Determine it
                $GLOBALS[__FUNCTION__] = getConfig('tester_user_password');
@@ -1023,7 +1023,7 @@ function getTesterUserPassword () {
 
 // Getter for tester_user_street_nr
 function getTesterUserStreetNr () {
-       // Do we have cache?
+       // Is there cache?
        if (!isset($GLOBALS[__FUNCTION__])) {
                // Determine it
                $GLOBALS[__FUNCTION__] = getConfig('tester_user_street_nr');
@@ -1035,7 +1035,7 @@ function getTesterUserStreetNr () {
 
 // Getter for tester_user_zip
 function getTesterUserZip () {
-       // Do we have cache?
+       // Is there cache?
        if (!isset($GLOBALS[__FUNCTION__])) {
                // Determine it
                $GLOBALS[__FUNCTION__] = getConfig('tester_user_zip');
@@ -1047,7 +1047,7 @@ function getTesterUserZip () {
 
 // Getter for tester_user_city
 function getTesterUserCity () {
-       // Do we have cache?
+       // Is there cache?
        if (!isset($GLOBALS[__FUNCTION__])) {
                // Determine it
                $GLOBALS[__FUNCTION__] = getConfig('tester_user_city');
@@ -1059,7 +1059,7 @@ function getTesterUserCity () {
 
 // Getter for tester_user_email
 function getTesterUserEmail () {
-       // Do we have cache?
+       // Is there cache?
        if (!isset($GLOBALS[__FUNCTION__])) {
                // Determine it
                $GLOBALS[__FUNCTION__] = getConfig('tester_user_email');