X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Fwhat-list_cats.php;h=74ae670e96de0cbc64baf4ff9cbc01fa06166c6a;hb=e5dde615db05fb62ebe91bd1c030f40c9b91fe17;hp=23cdb66c6b232c3c165c4527ac0854d48c8e9147;hpb=09f5758c42a33a56bdd461c946ffe759a59c54aa;p=mailer.git

diff --git a/inc/modules/admin/what-list_cats.php b/inc/modules/admin/what-list_cats.php
index 23cdb66c6b..74ae670e96 100644
--- a/inc/modules/admin/what-list_cats.php
+++ b/inc/modules/admin/what-list_cats.php
@@ -53,38 +53,40 @@ if (isGetRequestParameterSet('userid')) {
 		$content = getUserDataArray();
 
 		// Prepare constants
-		// @TODO No longer needed? define('__CATS_BASE'   , '<a href="{%url=modules.php?module=admin&amp;userid=');
+		// @TODO No longer needed? define('__CATEGORIES_BASE'   , '<a href="{%url=modules.php?module=admin&amp;userid=');
 		$content['userid']       = bigintval(getRequestParameter('userid'));
-		$content['member_links'] = generateMemberAdminActionLinks($content['userid']);
 		$content['email']        = '<a href="' . generateEmailLink($content['email'], 'user_data') . '">' . $content['surname'] . ' ' . $content['family'] . '</a>';
 
 		// Ok, list categories of this user
 		$result_cats = SQL_QUERY("SELECT `id`, `cat` FROM `{?_MYSQL_PREFIX?}_cats` ORDER BY `sort` ASC", __FILE__, __LINE__);
 
-		if (SQL_NUMROWS($result_cats) > 0) {
+		if (!SQL_HASZERONUMS($result_cats)) {
 			// List categories
-			$cnt = 1; $OUT = ''; $SW = 2;
-			while ($content = merge_array($content, SQL_FETCHARRAY($result_cats))) {
+			$cnt = 1; $OUT = '';
+			while ($row = SQL_FETCHARRAY($result_cats)) {
+				// Merge both arrays
+				$content = merge_array($content, $row);
+
 				// Check user's selection
+				// @TODO Rewrite this to countSum.....() function
 				$result_user = SQL_QUERY_ESC("SELECT `id` FROM `{?_MYSQL_PREFIX?}_user_cats` WHERE `userid`=%s AND `cat_id`=%s LIMIT 1",
 					array(bigintval(getRequestParameter('userid')), bigintval($content['id'])), __FILE__, __LINE__);
 
 				// Set selection
-				$selection = "<font color=\"#ee0000\">{--NO--}</div>";
-				if (SQL_NUMROWS($result_user) == 1) $selection = "<font color=\"#00ee00\">{--YES--}</div>";
+				$selection = '<font color="#ee0000">{--NO--}</div>';
+				if (SQL_NUMROWS($result_user) == 1) $selection = '<font color="#00ee00">{--YES--}</div>';
 
 				// Add more elements
-				$content['sw']  = $SW;
 				$content['cnt'] = $cnt;
 				$content['sel'] = $selection;
 
-				// Load row template and switch colors + count up
+				// Load row template and count up
 				$OUT .= loadTemplate('admin_list_cats_row', true, $content);
-				$SW = 3 - $SW; $cnt++;
+				$cnt++;
 			} // END - while
 
 			// Free memory
-			SQL_FREERESULT($result);
+			SQL_FREERESULT($result_cats);
 
 			// Remember all rows in the array
 			$content['rows'] = $OUT;