X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Fwhat-list_user.php;h=c7a54704936c9baba8e6c7404b894f6434cec969;hb=8d0ed5ed9a9ca0e07b9582f2311b44bdcc5a95ea;hp=dc797f59ad31608b5ade0a839e5c204ab860ca86;hpb=4c221b6350439b8f91db58f142f03f79014f2eaf;p=mailer.git

diff --git a/inc/modules/admin/what-list_user.php b/inc/modules/admin/what-list_user.php
index dc797f59ad..c7a5470493 100644
--- a/inc/modules/admin/what-list_user.php
+++ b/inc/modules/admin/what-list_user.php
@@ -136,18 +136,25 @@ LIMIT 1",
 		// Prepare data for template
 		$content['email_link']        = generateEmailLink($content['email'], 'user_data');
 		$content['last_online']       = generateDateTime($content['last_online'], 0);
-		if ($content['emails_sent'] > 0) $content['emails_sent'] = $base . '&amp;what=email_details&amp;userid=' . $userid . '%}">}{%pipe,translateComma=' . $content['emails_sent'] . '%}</a>]';
 		$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($userid, 'user_points', 'locked_points') + countSumTotalData($userid, 'user_points', 'locked_order_points');
+		$content['own_points']        = countSumTotalData($userid, 'user_points', 'points') + countSumTotalData($userid, 'user_points', 'order_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>]';
+		} // END - if
+
 		// Nickname inclusion?
 		// @TODO Rewrite these to filters
-		if (isExtensionInstalled('nickname')) $content['nickname'] = getNickname($content['userid']);
+		if (isExtensionInstalled('nickname')) {
+			$content['nickname'] = getNickname($content['userid']);
+		} // END - if
 
 		// Clickrate
 		$content['click_rate'] = '0';
@@ -267,14 +274,20 @@ LIMIT 1",
 
 			// Get number of unconfirmed mails
 			$content['links'] = countSumTotalData($content['userid'], 'user_links', 'id', 'userid', true);
-			if ($content['links'] > 0) $content['links'] = $base . '&amp;what=list_links&amp;userid=' . $content['userid'] . '%}">{%pipe,translateComma=' . $content['links'] . '%}</a>]';
+			if ($content['links'] > 0) {
+				$content['links'] = $base . '&amp;what=list_links&amp;userid=' . $content['userid'] . '%}">{%pipe,translateComma=' . $content['links'] . '%}</a>]';
+			} // END - if
 
 			// Set link to sent mails if present
-			if ($content['emails_sent'] > 0) $content['emails_sent'] = $base . '&amp;what=email_details&amp;userid=' . $content['userid'] . '%}">{%pipe,translateComma=' . $content['emails_sent'] . '%}</a>]';
+			if ($content['emails_sent'] > 0) {
+				$content['emails_sent'] = $base . '&amp;what=email_details&amp;userid=' . $content['userid'] . '%}">{%pipe,translateComma=' . $content['emails_sent'] . '%}</a>]';
+			} // END - if
 
 			// Add nickname
 			$content['nickname'] = '{--EXT_NICKNAME_404--}';
-			if (isExtensionInstalled('nickname')) $content['nickname'] = getNickname($content['userid']);
+			if (isExtensionInstalled('nickname')) {
+				$content['nickname'] = getNickname($content['userid']);
+			} // END - if
 
 			// Clickrate
 			$content['rate'] = '0';
@@ -286,10 +299,13 @@ 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) $content['refs'] = $base . '&amp;what=list_refs&amp;userid=' . $content['userid'] . '%}">{%pipe,translateComma=' . $content['refs'] . '%}</a>]';
+			if ($content['refs'] > 0) {
+				$content['refs'] = $base . '&amp;what=list_refs&amp;userid=' . $content['userid'] . '%}">{%pipe,translateComma=' . $content['refs'] . '%}</a>]';
+			} // END - if
 
 			// Is the extension 'country' installed?
 			// @TODO Rewrite this into a filter
@@ -314,16 +330,6 @@ LIMIT 1",
 		// Remember all rows
 		$content['rows'] = $OUT;
 
-		// Init title with "all accounts"
-		$content['title'] = '{--ADMIN_ALL_ACCOUNTS--}';
-		if (isGetRequestParameterSet('status')) {
-			// Set title according to the 'status'
-			$content['title'] = sprintf("{--ADMIN_LIST_STATUS_%s_ACCOUNTS--}", strtoupper(getRequestParameter('status')));
-		} elseif (isGetRequestParameterSet('mode')) {
-			// Set title according to the "mode"
-			$content['title'] = sprintf("{--ADMIN_LIST_MODE_%s_ACCOUNTS--}", strtoupper(getRequestParameter('mode')));
-		}
-
 		// Merge more data again
 		$content = merge_array($content, $templateContent);