More wrapper functions added

diff --git a/inc/libs/register_functions.php b/inc/libs/register_functions.php
index 13be207a739286c5286cce380f0d5b55667d5bc1..cfbca85c3f9c03b8379451e5063ee89e4136526e 100644 (file)
--- a/inc/libs/register_functions.php
+++ b/inc/libs/register_functions.php
@@ -266,11 +266,11 @@ function doRegistration () {
 
        // Get total ...
        // ... confirmed, ...
-       $confirmedUsers   = countSumTotalData('CONFIRMED'  , 'user_data', 'userid', 'status', true);
+       $confirmedUsers   = getTotalConfirmedUser();
        // ... unconfirmed ...
-       $unconfirmedUsers = countSumTotalData('UNCONFIRMED', 'user_data', 'userid', 'status', true);
+       $unconfirmedUsers = getTotalUnconfirmedUser();
        // ... and locked users!
-       $lockedUsers      = countSumTotalData('LOCKED'     , 'user_data', 'userid', 'status', true);
+       $lockedUsers      = getTotalLockedUser();
 
        // Generate hash which will be inserted into confirmation mail
        $hash = generateHash(sha1(

diff --git a/inc/libs/task_functions.php b/inc/libs/task_functions.php
index 09c7788bae890a4ae04d4fe3e01a05ea7fc33540..1ac3596bd77dc5a92b2c03d82cc3c802e50ba6c5 100644 (file)
--- a/inc/libs/task_functions.php
+++ b/inc/libs/task_functions.php
@@ -101,7 +101,7 @@ function outputAdvancedOverview (&$result_main) {
        } // END - if
 
        // Unconfirmed accounts
-       $value = countSumTotalData('UNCONFIRMED', 'user_data', 'userid', 'status', true);
+       $value = getTotalUnconfirmedUser();
 
        if ($value > 0) {
                $content['unconfirmed_members'] = '<a href="{%url=modules.php?module=admin&amp;what=chk_regs%}">' . $value . '</a>';
@@ -109,7 +109,7 @@ function outputAdvancedOverview (&$result_main) {
 
 
        // And locked accounts
-       $value = countSumTotalData('LOCKED', 'user_data', 'userid', 'status', true);
+       $value = getTotalLockedUser();
        if ($value > 0) {
                $content['locked_members'] = '<a href="{%url=modules.php?module=admin&amp;what=list_user&amp;status=locked%}">' . $value . '</a>';
        } // END - if

diff --git a/inc/modules/guest/what-mediadata.php b/inc/modules/guest/what-mediadata.php
index 36b4b8a9adc9a8d0dc154b52e4fd61a17b7c5b45..6fd3e085d1201f16b3c5b193eac09b69bf2d5ba0 100644 (file)
--- a/inc/modules/guest/what-mediadata.php
+++ b/inc/modules/guest/what-mediadata.php
@@ -56,9 +56,9 @@ if ((!isExtensionActive('mediadata')) && (!isAdmin())) {
 } // END - if
 
 // Get total confirmed user ids...
-$content['user_confirmed']   = round(countSumTotalData('CONFIRMED'  , 'user_data', 'userid', 'status', true));
-$content['user_unconfirmed'] = round(countSumTotalData('UNCONFIRMED', 'user_data', 'userid', 'status', true));
-$content['user_locked']      = round(countSumTotalData('LOCKED'     , 'user_data', 'userid', 'status', true));
+$content['user_confirmed']   = getTotalConfirmedUser();
+$content['user_unconfirmed'] = getTotalUnconfirmedUser();
+$content['user_locked']      = getTotalLockedUser();
 $content['user_count']       = ($content['user_confirmed'] + $content['user_unconfirmed'] + $content['user_locked']);
 
 // Start of this exchange

diff --git a/inc/mysql-manager.php b/inc/mysql-manager.php
index 571697aabd7266bfe36a17ee8d45b071eb230dad..910f6a551360e8c2d021bb3062e53d10177a66c6 100644 (file)
--- a/inc/mysql-manager.php
+++ b/inc/mysql-manager.php
@@ -1443,9 +1443,7 @@ function FILTER_ACTIVATE_EXCHANGE () {
        } // END - if
 
        // Check total amount of users
-       $totalUsers = countSumTotalData('CONFIRMED', 'user_data', 'userid', 'status', true, ' AND max_mails > 0');
-
-       if ($totalUsers >= getConfig('activate_xchange')) {
+       if (getTotalConfirmedUser() >= getConfig('activate_xchange')) {
                // Activate System
                setSqlsArray(array(
                        "UPDATE `{?_MYSQL_PREFIX?}_mod_reg` SET `locked`='N', `hidden`='N', `mem_only`='Y' WHERE `module`='order' LIMIT 1",

diff --git a/inc/wrapper-functions.php b/inc/wrapper-functions.php
index e47587883efb0fbb6d6aee38744878399a9d7df3..58674e06497c8a84ff2f52a4aa55287735c46c3e 100644 (file)
--- a/inc/wrapper-functions.php
+++ b/inc/wrapper-functions.php
@@ -1010,6 +1010,30 @@ function getTotalConfirmedUser () {
        return $GLOBALS['total_confirmed_users'];
 }
 
+// "Getter" for total unconfirmed user accounts
+function getTotalUnconfirmedUser () {
+       // Is it cached?
+       if (!isset($GLOBALS['total_unconfirmed_users'])) {
+               // Then do it
+               $GLOBALS['total_unconfirmed_users'] = countSumTotalData('UNCONFIRMED', 'user_data', 'userid', 'status', true);
+       } // END - if
+
+       // Return cached value
+       return $GLOBALS['total_unconfirmed_users'];
+}
+
+// "Getter" for total locked user accounts
+function getTotalLockedUser () {
+       // Is it cached?
+       if (!isset($GLOBALS['total_locked_users'])) {
+               // Then do it
+               $GLOBALS['total_locked_users'] = countSumTotalData('LOCKED', 'user_data', 'userid', 'status', true);
+       } // END - if
+
+       // Return cached value
+       return $GLOBALS['total_locked_users'];
+}
+
 // Is given userid valid?
 function isValidUserId ($userid) {
        // Do we have cache?