X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Fwhat-list_user.php;h=70120a8d3f678dfc2a520aec5a4c2382cd766fc0;hb=101e5f161c0c367c022c9288398226a57f3919d7;hp=4d0fda767b809368cbc9a0456ecc1970df605a19;hpb=0176313718a3887a7d833d578142ae41d3a06a15;p=mailer.git diff --git a/inc/modules/admin/what-list_user.php b/inc/modules/admin/what-list_user.php index 4d0fda767b..70120a8d3f 100644 --- 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_points'] = 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 . '&what=email_details&userid=' . $userid . '%}">}{%pipe,translateComma=' . $content['emails_sent'] . '%}]'; + $content['emails_sent'] = $base . '&what=email_details&userid=' . $content['userid'] . '%}">}{%pipe,translateComma=' . $content['emails_sent'] . '%}]'; } // END - if // Nickname inclusion? @@ -177,7 +189,7 @@ LIMIT 1", loadTemplate('admin_user_details', false, $content); } else { // Account does not exist! - displayMessage(getMaskedMessage('ADMIN_MEMBER_404', $userid)); + displayMessage('{%message,ADMIN_MEMBER_404=' . $userid . '%}'); } // Free the result @@ -298,7 +310,8 @@ LIMIT 1", $content['email'] = '[' . $content['email'] . ']'; $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) {