Even more checks for ext-user

[mailer.git] / inc / wrapper-functions.php

diff --git a/inc/wrapper-functions.php b/inc/wrapper-functions.php
index eeed642ae71b576ecc4d3e9579e18db71b39c107..279c8dec7232e58b35d903c07d7a9667a3e694f0 100644 (file)
--- a/inc/wrapper-functions.php
+++ b/inc/wrapper-functions.php
@@ -740,7 +740,7 @@ function addPointsDirectly ($subject, $userid, $points) {
        unset($GLOBALS['ref_level']);
 
        // Call more complicated method (due to more parameters)
-       return addPointsThroughReferalSystem($subject, $userid, $points, false, 0, 'direct');
+       return addPointsThroughReferalSystem($subject, $userid, $points, false, 0, 'DIRECT');
 }
 
 // Wrapper for redirectToUrl but URL comes from a configuration entry
@@ -1148,7 +1148,11 @@ function getTotalConfirmedUser () {
        // Is it cached?
        if (!isset($GLOBALS[__FUNCTION__])) {
                // Then do it
-               $GLOBALS[__FUNCTION__] = countSumTotalData('CONFIRMED', 'user_data', 'userid', 'status', true);
+               if (isExtensionActive('user')) {
+                       $GLOBALS[__FUNCTION__] = countSumTotalData('CONFIRMED', 'user_data', 'userid', 'status', true);
+               } else {
+                       $GLOBALS[__FUNCTION__] = 0;
+               }
        } // END - if
 
        // Return cached value
@@ -1160,7 +1164,11 @@ function getTotalUnconfirmedUser () {
        // Is it cached?
        if (!isset($GLOBALS[__FUNCTION__])) {
                // Then do it
-               $GLOBALS[__FUNCTION__] = countSumTotalData('UNCONFIRMED', 'user_data', 'userid', 'status', true);
+               if (isExtensionActive('user')) {
+                       $GLOBALS[__FUNCTION__] = countSumTotalData('UNCONFIRMED', 'user_data', 'userid', 'status', true);
+               } else {
+                       $GLOBALS[__FUNCTION__] = 0;
+               }
        } // END - if
 
        // Return cached value
@@ -1172,7 +1180,11 @@ function getTotalLockedUser () {
        // Is it cached?
        if (!isset($GLOBALS[__FUNCTION__])) {
                // Then do it
-               $GLOBALS[__FUNCTION__] = countSumTotalData('LOCKED', 'user_data', 'userid', 'status', true);
+               if (isExtensionActive('user')) {
+                       $GLOBALS[__FUNCTION__] = countSumTotalData('LOCKED', 'user_data', 'userid', 'status', true);
+               } else {
+                       $GLOBALS[__FUNCTION__] = 0;
+               }
        } // END - if
 
        // Return cached value
@@ -2336,7 +2348,7 @@ function getTotalPoints ($userid) {
        // Do we have cache?
        if (!isset($GLOBALS[__FUNCTION__][$userid])) {
                // Determine it
-               $GLOBALS[__FUNCTION__][$userid] = countSumTotalData($userid, 'user_points', 'points') - countSumTotalData($userid, 'user_data', 'used_points');
+               $GLOBALS[__FUNCTION__][$userid] = countSumTotalData($userid, 'user_points', 'points') - countSumTotalData($userid, 'user_points', 'order_points') - countSumTotalData($userid, 'user_data', 'used_points');
        } // END - if
 
        // Return cache