Getting total/own points rewritten to filter:

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

diff --git a/inc/wrapper-functions.php b/inc/wrapper-functions.php
index 0c2c4425efa2beb4bc47669cf68636dd3a46396e..eb9419c94e5f07279ce1377e9ab169636f293b3f 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
@@ -752,7 +752,7 @@ function redirectToConfiguredUrl ($configEntry) {
 // Wrapper function to redirect from member-only modules to index
 function redirectToIndexMemberOnlyModule () {
        // Do the redirect here
-       redirectToUrl('modules.php?module=index&code=' . getCode('MODULE_MEMBER_ONLY') . '&mod=' . getModule());
+       redirectToUrl('modules.php?module=index&code=' . getCode('MODULE_MEMBER_ONLY') . '&mod=' . getModule());
 }
 
 // Wrapper function to redirect to current URL
@@ -761,9 +761,9 @@ function redirectToRequestUri () {
 }
 
 // Wrapper function to redirect to de-refered URL
-function redirectToDereferedUrl ($URL) {
+function redirectToDereferedUrl ($url) {
        // Redirect to to
-       redirectToUrl(generateDerefererUrl($URL));
+       redirectToUrl(generateDerefererUrl($url));
 }
 
 // Wrapper function for checking if extension is installed and newer or same version
@@ -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
@@ -2335,8 +2347,17 @@ function isVerboseSqlEnabled () {
 function getTotalPoints ($userid) {
        // Do we have cache?
        if (!isset($GLOBALS[__FUNCTION__][$userid])) {
+               // Init array for filter chain
+               $data = array(
+                       'userid' => $userid,
+                       'points' => 0
+               );
+
+               // Run filter chain for getting more point values
+               $data = runFilter('get_total_points', $data);
+
                // Determine it
-               $GLOBALS[__FUNCTION__][$userid] = countSumTotalData($userid, 'user_points', 'points') - countSumTotalData($userid, 'user_data', 'used_points');
+               $GLOBALS[__FUNCTION__][$userid] = $data['points']  - countSumTotalData($userid, 'user_data', 'used_points');
        } // END - if
 
        // Return cache