Next wave of lesser getMessage() usage and more EL

[mailer.git] / inc / modules / admin / what-list_cats.php

diff --git a/inc/modules/admin/what-list_cats.php b/inc/modules/admin/what-list_cats.php
index 4b41510cc5bff98ae301b0b2e45dae5f5e286631..d581889e30ae86fc90d9074554ae33f24ac240f3 100644 (file)
--- a/inc/modules/admin/what-list_cats.php
+++ b/inc/modules/admin/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 *
@@ -54,7 +55,6 @@ if (isGetRequestParameterSet('userid')) {
                // Prepare constants
                // @TODO No longer needed? define('__CATS_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
@@ -63,14 +63,18 @@ if (isGetRequestParameterSet('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(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 (isGetRequestParameterSet('userid')) {
                        } // END - while
 
                        // Free memory
-                       SQL_FREERESULT($result);
+                       SQL_FREERESULT($result_cats);
 
                        // Remember all rows in the array
                        $content['rows'] = $OUT;