X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Fwhat-list_cats.php;h=d581889e30ae86fc90d9074554ae33f24ac240f3;hp=f5eeb03c7b0e8da874d112166f753fd65ed23921;hb=04b69ac9f33369cbf654396c4a42cb1fff710ff4;hpb=9f6c30cc0e06098171d773d671292081ecee3d29

diff --git a/inc/modules/admin/what-list_cats.php b/inc/modules/admin/what-list_cats.php
index f5eeb03c7b..d581889e30 100644
--- a/inc/modules/admin/what-list_cats.php
+++ b/inc/modules/admin/what-list_cats.php
@@ -1,7 +1,7 @@
 <?php
 /************************************************************************
- * MXChange v0.2.1                                    Start: 01/27/2004 *
- * ================                             Last change: 07/13/2004 *
+ * Mailer v0.2.1-FINAL                                Start: 01/27/2004 *
+ * ===================                          Last change: 07/13/2004 *
  *                                                                      *
  * -------------------------------------------------------------------- *
  * File              : what-list_cats.php                               *
@@ -19,6 +19,7 @@
  * svn:keywords Date Revision" (autoprobset!) at least!!!!!!            *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
+ * Copyright (c) 2009, 2010 by Mailer Developer Team                    *
  * For more information visit: http://www.mxchange.org                  *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
@@ -45,17 +46,16 @@ if ((!defined('__SECURITY')) || (!isAdmin())) {
 // Add description as navigation point
 addMenuDescription('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('__CATS_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__);
@@ -63,14 +63,18 @@ if (isGetRequestElementSet('userid')) {
 		if (SQL_NUMROWS($result_cats) > 0) {
 			// List categories
 			$cnt = 1; $OUT = ''; $SW = 2;
-			while ($content = merge_array($content, SQL_FETCHARRAY($result_cats))) {
+			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;
@@ -83,7 +87,7 @@ if (isGetRequestElementSet('userid')) {
 			} // END - while
 
 			// Free memory
-			SQL_FREERESULT($result);
+			SQL_FREERESULT($result_cats);
 
 			// Remember all rows in the array
 			$content['rows'] = $OUT;
@@ -96,7 +100,7 @@ if (isGetRequestElementSet('userid')) {
 		}
 	} else {
 		// User not found
-		loadTemplate('admin_settings_saved', false, sprintf(getMessage('ADMIN_MEMBER_404'), $content['userid']));
+		loadTemplate('admin_settings_saved', false, getMaskedMessage('ADMIN_MEMBER_404', $content['userid']));
 	}
 } else {
 	// Output selection form with all confirmed user accounts listed