X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Fwhat-list_user.php;h=4d0fda767b809368cbc9a0456ecc1970df605a19;hb=0176313718a3887a7d833d578142ae41d3a06a15;hp=a900423913f9c23c2f4916917eeead3d0d082930;hpb=2e715eb7f3f8ca8d259aacb4cbbddde7d9d18e01;p=mailer.git

diff --git a/inc/modules/admin/what-list_user.php b/inc/modules/admin/what-list_user.php
index a900423913..4d0fda767b 100644
--- a/inc/modules/admin/what-list_user.php
+++ b/inc/modules/admin/what-list_user.php
@@ -45,7 +45,7 @@ addYouAreHereLink('admin', __FILE__);
 
 if ((!isExtensionInstalled('user')) || (!isExtensionActive('user'))) {
 	// Missing extension!
-	loadTemplate('admin_settings_saved', false, generateExtensionInactiveNotInstalledMessage('user'));
+	displayMessage(generateExtensionInactiveNotInstalledMessage('user'));
 	return;
 } // END - if
 
@@ -107,7 +107,7 @@ LIMIT 1",
 
 	// User found?
 	if (SQL_NUMROWS($result_user) == 1) {
-		// Account found!
+		// Account found
 		$content  = SQL_FETCHARRAY($result_user);
 
 		// Get count/sum of refs, selected categories, unconfirmed mails
@@ -136,18 +136,24 @@ 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['total_points']      = countSumTotalData($userid, 'user_points', 'points');
 		$content['locked']            = countSumTotalData($userid, 'user_points', 'locked_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';
@@ -171,7 +177,7 @@ LIMIT 1",
 		loadTemplate('admin_user_details', false, $content);
 	} else {
 		// Account does not exist!
-		loadTemplate('admin_settings_saved', false, getMaskedMessage('ADMIN_MEMBER_404', $userid));
+		displayMessage(getMaskedMessage('ADMIN_MEMBER_404', $userid));
 	}
 
 	// Free the result
@@ -223,7 +229,7 @@ LIMIT 1",
 	// Calculate page count (0.5 fixes a bug with page count)
 	if (getConfig('user_limit') == '0') {
 		setConfigEntry('user_limit', 100);
-		loadTemplate('admin_settings_saved', false, '{--EXTENSION_WARNING_USER_LIMIT--}');
+		displayMessage('{--EXTENSION_WARNING_USER_LIMIT--}');
 	} // END - if
 
 	// Activate the extension please!
@@ -267,14 +273,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';
@@ -289,7 +301,9 @@ LIMIT 1",
 			$content['locked']         = countSumTotalData($content['userid'], 'user_points', 'locked_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 +328,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);
 
@@ -331,7 +335,7 @@ LIMIT 1",
 		loadTemplate('admin_list_user', false, $content);
 	} else {
 		// No one as registered so far! :-(
-		loadTemplate('admin_settings_saved', false, '{--ADMIN_NO_NONE_REGISTERED--}');
+		displayMessage('{--ADMIN_NO_NONE_REGISTERED--}');
 	}
 
 	// Free memory