X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Fwhat-list_user.php;h=5c8220c82393724919674abd414c5c35aa03569d;hp=ea74ef7da46bb8f7d9477a368b7000353cf0b5e0;hb=04b69ac9f33369cbf654396c4a42cb1fff710ff4;hpb=222b9cab2b3fb3c8fb01ff524f5d1d7cfbcb61e7

diff --git a/inc/modules/admin/what-list_user.php b/inc/modules/admin/what-list_user.php
index ea74ef7da4..5c8220c823 100644
--- a/inc/modules/admin/what-list_user.php
+++ b/inc/modules/admin/what-list_user.php
@@ -72,7 +72,7 @@ if (isExtensionInstalledAndNewer('user', '0.3.4')) {
 	// Add lock reason?
 	if (isExtensionInstalledAndNewer('user', '0.3.5')) {
 		// Add them...
-		$MORE .= ", `lock_reason`, UNIX_TIMESTAMP(`lock_timestamp`) AS lock_timestamp";
+		$MORE .= ", `lock_reason`, UNIX_TIMESTAMP(`lock_timestamp`) AS `lock_timestamp`";
 	} // END - if
 } // END - if
 
@@ -119,9 +119,9 @@ LIMIT 1",
 
 		// Add links to the numbers
 		if ($content['links'] > 0) $content['links'] = $base . '&amp;what=list_links&amp;userid=' . $userid . '%}">' . $content['links'] . '</a>]';
-		if ($content['refid'] > 0) $content['refid'] = $base . '&amp;what=list_user&amp;userid=' . $content['refid'] . '%}">'.$content['refid'] . '</a>]';
-		if ($content['refs']  > 0) $content['refs']  = $base . '&amp;what=list_refs&amp;userid=' . $userid . '%}">' . $content['refs'] . '</a>]';
-		if ($content['cats']  > 0) $content['cats']  = $base . '&amp;what=list_cats&amp;userid=' . $userid . '%}">' . $content['cats'] . '</a>]';
+		if (isValidUserId($content['refid'])) $content['refid'] = $base . '&amp;what=list_user&amp;userid=' . $content['refid'] . '%}">'.$content['refid'] . '</a>]';
+		if ($content['refs']  > 0) $content['refs']  = $base . '&amp;what=list_refs&amp;userid=' . $userid . '%}">' . translateComma($content['refs']) . '</a>]';
+		if ($content['cats']  > 0) $content['cats']  = $base . '&amp;what=list_cats&amp;userid=' . $userid . '%}">' . translateComma($content['cats']) . '</a>]';
 
 		// Fix empty module
 		if (empty($content['last_module'])) $content['last_module'] = '---';
@@ -139,15 +139,14 @@ LIMIT 1",
 		}
 
 		// Prepare data for template
-		$content['admin_links']       = generateMemberAdminActionLinks($userid, $content['status']);
 		$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 . '%}">' . 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']             = translateComma(countSumTotalData($userid, 'user_points', 'points'));
-		$content['locked']            = translateComma(countSumTotalData($userid, 'user_points', 'locked_points'));
+		$content['total']             = countSumTotalData($userid, 'user_points', 'points');
+		$content['locked']            = countSumTotalData($userid, 'user_points', 'locked_points');
 		$content['lock_timestamp']    = generateDateTime($content['lock_timestamp'], 2);
 
 		// Is the lock reason not set?
@@ -163,16 +162,10 @@ LIMIT 1",
 			$content['nickname'] = getMessage('EXT_NICKNAME_404');
 		}
 
-		// Is the user extension newer?
-		if (isExtensionInstalledAndNewer('user', '0.3.4')) {
-			// Then "translate" the number
-			$content['rand_confirmed'] = translateComma($content['rand_confirmed']);
-		} // END - if
-
 		// Clickrate
 		$content['click_rate'] = '0';
 		if ($content['emails_received'] > 0) {
-			$content['click_rate'] = translateComma($content['mails_confirmed'] / $content['emails_received'] * 100);
+			$content['click_rate'] = ($content['mails_confirmed'] / $content['emails_received'] * 100);
 		} // END - if
 
 		// Is the extension 'country' installed?
@@ -243,54 +236,47 @@ 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, getMessage('EXTENSION_WARNING_USER_LIMIT'));
+		loadTemplate('admin_settings_saved', false, '{--EXTENSION_WARNING_USER_LIMIT--}');
 	} // END - if
 
 	// Activate the extension please!
-	$PAGES = round(SQL_NUMROWS($result_master) / getConfig('user_limit') + 0.5);
+	$numPages = round(SQL_NUMROWS($result_master) / getConfig('user_limit') + 0.5);
 
 	if (!isGetRequestParameterSet('page'))   setGetRequestParameter('page'  , 1);
 	if (!isGetRequestParameterSet('offset')) setGetRequestParameter('offset', getConfig('user_limit'));
 
 	// Add limitation to SQL string and run him again
-	$sql .= " LIMIT ".(getRequestParameter('offset') * getRequestParameter('page') - getRequestParameter('offset')).", ".getRequestParameter('offset');
+	$sql .= ' LIMIT ' . (getRequestParameter('offset') * getRequestParameter('page') - getRequestParameter('offset')) . ', ' . getRequestParameter('offset');
 	$result = SQL_QUERY($sql, __FILE__, __LINE__);
 
-	// Count all confirmed users
-	$user_count = countSumTotalData('CONFIRMED','user_data','userid','status',true);
-
 	// Are there some entries?
 	if (SQL_NUMROWS($result_master) > 0) {
 		// We have some (new?) registrations!
-		define('__COLSPAN2'  , ($colspan + 2));
-		define('__USER_CNT'  , $user_count);
+		$templateContent['colspan2']   = ($colspan + 2);
+		$templateContent['user_count'] = getTotalConfirmedUser();
 
 		// Sorting links
-		define('__ALPHA_SORT', alpha(getRequestParameter('sortby'), $colspan, true));
-		define('__SORT_LINKS', addSortLinks(getRequestParameter('letter'), getRequestParameter('sortby'), $colspan, true));
+		$templateContent['alpha_sort'] = alpha(getRequestParameter('sortby'), ($colspan + 1), true);
+		$templateContent['sort_links'] = addSortLinks(getRequestParameter('letter'), getRequestParameter('sortby'), ($colspan + 1), true);
+		$templateContent['page_nav']   = '';
 
-		if ($PAGES > 1) {
-			define('__PAGE_NAV', addPageNavigation($PAGES, getConfig('user_limit'), true, $colspan, true));
-		} else {
-			// No page navigation is required
-			define('__PAGE_NAV', '');
-		}
+		if ($numPages > 1) {
+			$templateContent['page_nav'] = addPageNavigation($numPages, getConfig('user_limit'), true, $colspan, true);
+		} // END - if
 
 		// Column with nickname when nickname extension is present
-		// @TODO Rewrite this into a  filter
+		// @TODO Rewrite this into a filter
+		$templateContent['nickname_th'] = '';
 		if (isExtensionActive('nickname')) {
 			// Nickname extension found
-			define('__NICKNAME_TH', "  <td class=\"header_column bottom\" align=\"center\">{--NICKNAME--}</td>");
-		} else {
-			// Not found
-			define('__NICKNAME_TH', '');
-		}
+			$templateContent['nickname_th'] = '<td class="header_column bottom" align="center">{--NICKNAME--}</td>';
+		} // END - if
 
 		// Load all users
 		$OUT = ''; $SW = 2;
 		while ($content = SQL_FETCHARRAY($result)) {
-			// Set refid link
-			if ($content['refid'] > 0) $content['refid'] = generateUserProfileLink($content['refid']);
+			// Merge more data in
+			$content = merge_array($content, $templateContent);
 
 			// Get number of unconfirmed mails
 			$content['links'] = countSumTotalData($content['userid'], 'user_links', 'id', 'userid', true);
@@ -313,19 +299,13 @@ LIMIT 1",
 
 			// Transfer data to array
 			$content['sw']             = $SW;
-			$content['userid_link']    = generateUserProfileLink($content['userid']);
-			$content['gender']         = translateGender($content['gender']);
 			$content['email']          = '[<a href="' . generateEmailLink($content['email'], 'user_data') . '">' . $content['email'] . '</a>]';
-			$content['alinks']         = generateMemberAdminActionLinks($content['userid'], $content['status']);
-			$content['points']         = translateComma($content['points']);
-			$content['rate']           = translateComma($content['rate']);
-			$content['locked']         = translateComma(countSumTotalData($content['userid'], 'user_points', 'locked_points'));
 			$content['lock_timestamp'] = generateDateTime($content['lock_timestamp'], 2);
-			$content['status']         = translateUserStatus($content['status']);
 			$content['refs']           = countSumTotalData($content['userid'], 'user_refs', 'id', 'userid', true);
+			$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'] . '%}">' . $content['refs'] . '</a>]';
+			if ($content['refs'] > 0) $content['refs'] = $base . '&amp;what=list_refs&amp;userid=' . $content['userid'] . '%}">' . translateComma($content['refs']) . '</a>]';
 
 			// Is the lock reason not set?
 			if (!isset($content['lock_reason'])) $content['lock_reason'] = '---';
@@ -364,11 +344,14 @@ LIMIT 1",
 			$content['title'] = getMessage(sprintf("ADMIN_LIST_MODE_%s_ACCOUNTS", strtoupper(getRequestParameter('mode'))));
 		}
 
+		// Merge more data again
+		$content = merge_array($content, $templateContent);
+
 		// Load main template
 		loadTemplate('admin_list_user', false, $content);
 	} else {
 		// No one as registered so far! :-(
-		loadTemplate('admin_settings_saved', false, getMessage('ADMIN_NO_NONE_REGISTERED'));
+		loadTemplate('admin_settings_saved', false, '{--ADMIN_NO_NONE_REGISTERED--}');
 	}
 
 	// Free memory