X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Fwhat-list_cats.php;h=dc827167058904671b50385855330d347ef959f3;hp=308ed2f32b3deb8ef81b65c493c0a75ac41b8398;hb=e17685c65d1a48c061b7c4f64c7a23c165430460;hpb=b8a6f8012aa3509d8e0f8fd078e044f20e80707a

diff --git a/inc/modules/admin/what-list_cats.php b/inc/modules/admin/what-list_cats.php
index 308ed2f32b..dc82716705 100644
--- a/inc/modules/admin/what-list_cats.php
+++ b/inc/modules/admin/what-list_cats.php
@@ -15,10 +15,9 @@
  * $Date::                                                            $ *
  * $Tag:: 0.2.1-FINAL                                                 $ *
  * $Author::                                                          $ *
- * Needs to be in all Files and every File needs "svn propset           *
- * svn:keywords Date Revision" (autoprobset!) at least!!!!!!            *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
+ * Copyright (c) 2009 - 2011 by Mailer Developer Team                   *
  * For more information visit: http://www.mxchange.org                  *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
@@ -43,60 +42,62 @@ if ((!defined('__SECURITY')) || (!isAdmin())) {
 } // END - if
 
 // Add description as navigation point
-addMenuDescription('admin', __FILE__);
+addYouAreHereLink('admin', __FILE__);
 
-if (isGetRequestElementSet('userid')) {
+if (isGetRequestParameterSet('userid')) {
 	// Check if the user already exists
-	if (fetchUserData(getRequestElement('userid'))) {
+	if (fetchUserData(getRequestParameter('userid'))) {
 		// Loads surname, family's name and the email address
 		$content = getUserDataArray();
 
 		// Prepare constants
-		// @TODO No longer needed? define('__CATS_BASE'   , "<a href=\"{%url=modules.php?module=admin&amp;userid=");
-		$content['userid']       = bigintval(getRequestElement('userid'));
-		$content['member_links'] = generateMemberAdminActionLinks($content['userid']);
-		$content['email']        = "<a href=\"".generateEmailLink($content['email'], 'user_data')."\">".$content['surname']." ".$content['family']."</a>";
+		// @TODO No longer needed? define('__CATEGORIES_BASE'   , '<a href="{%url=modules.php?module=admin&amp;userid=');
+		$content['userid']       = bigintval(getRequestParameter('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))) {
+			$count = 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(getRequestElement('userid')), bigintval($content['id'])), __FILE__, __LINE__);
+					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['cnt'] = $count;
 				$content['sel'] = $selection;
 
-				// Load row template and switch colors + count up
-				$OUT .= loadTemplate('admin_list_cats_row', true, $content);
-				$SW = 3 - $SW; $cnt++;
+				// Load row template and count up
+				$OUT .= loadTemplate('admin_list_user_cats_row', true, $content);
+				$count++;
 			} // END - while
 
 			// Free memory
-			SQL_FREERESULT($result);
+			SQL_FREERESULT($result_cats);
 
 			// Remember all rows in the array
 			$content['rows'] = $OUT;
 
 			// Load main template
-			loadTemplate('admin_list_cats', false, $content);
+			loadTemplate('admin_list_user_cats', false, $content);
 		} else {
 			// No categories selected! :-(
-			loadTemplate('admin_list_cats_404', false, $content);
+			loadTemplate('admin_list_user_cats_404', false, $content);
 		}
 	} else {
 		// User not found
-		loadTemplate('admin_settings_saved', false, sprintf(getMessage('ADMIN_MEMBER_404'), $content['userid']));
+		displayMessage(getMaskedMessage('ADMIN_MEMBER_404', $content['userid']));
 	}
 } else {
 	// Output selection form with all confirmed user accounts listed