Getting total/own points rewritten to filter:

[mailer.git] / inc / modules / admin / what-list_user.php

diff --git a/inc/modules/admin/what-list_user.php b/inc/modules/admin/what-list_user.php
index 40f53bb89879c0c3f80bf128add605e809e683cf..2d6592c839600bcef9fb2f6624cbe27d51cf22a0 100644 (file)
--- a/inc/modules/admin/what-list_user.php
+++ b/inc/modules/admin/what-list_user.php
@@ -139,14 +139,26 @@ LIMIT 1",
                $content['joined']            = generateDateTime($content['joined'], 0);
                $content['last_update']       = generateDateTime($content['last_update'], 0);
                $content['last_profile_sent'] = generateDateTime($content['last_profile_sent'], 0);
-               $content['total']             = countSumTotalData($userid, 'user_points', 'points');
-               $content['locked']            = countSumTotalData($userid, 'user_points', 'locked_points');
+               $content['total_points']      = getTotalPoints($content['userid']);
+               $content['locked_points']     = countSumTotalData($content['userid'], 'user_points', 'locked_points') + countSumTotalData($content['userid'], 'user_points', 'locked_order_points');
+
+               // Prepare array for filter
+               $data = array(
+                       'userid' => $content['userid'],
+                       'points' => 0
+               );
+
+               // Run the filter chain
+               $data = runFilterChain('get_own_points', $data);
+
+               // Add more data
+               $content['own_points']        = $data['points'];
                $content['lock_timestamp']    = generateDateTime($content['lock_timestamp'], 2);
                $content['nickname']          = '{--EXT_NICKNAME_404--}';
 
                // Link to email_details if some are sent
                if ($content['emails_sent'] > 0) {
-                       $content['emails_sent'] = $base . '&amp;what=email_details&amp;userid=' . $userid . '%}">}{%pipe,translateComma=' . $content['emails_sent'] . '%}</a>]';
+                       $content['emails_sent'] = $base . '&amp;what=email_details&amp;userid=' . $content['userid'] . '%}">}{%pipe,translateComma=' . $content['emails_sent'] . '%}</a>]';
                } // END - if
 
                // Nickname inclusion?
@@ -298,7 +310,8 @@ LIMIT 1",
                        $content['email']          = '[<a href="' . generateEmailLink($content['email'], 'user_data') . '">' . $content['email'] . '</a>]';
                        $content['lock_timestamp'] = generateDateTime($content['lock_timestamp'], 2);
                        $content['refs']           = countSumTotalData($content['userid'], 'user_refs', 'id', 'userid', true);
-                       $content['locked']         = countSumTotalData($content['userid'], 'user_points', 'locked_points');
+                       $content['own_points']     = countSumTotalData($content['userid'], 'user_points', 'points') + countSumTotalData($content['userid'], 'user_points', 'order_points');
+                       $content['locked_points']  = countSumTotalData($content['userid'], 'user_points', 'locked_points') + countSumTotalData($content['userid'], 'user_points', 'locked_order_points');
 
                        // If we have at least one referal, make it clickable to referal list
                        if ($content['refs'] > 0) {