A lot while() conditions rewritten to SQL_FETCHARRAY(), see bug #107, @TODO tags...

[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 4b1eac18edae23289c95d83209307e290968fffa..50e83a57a3d06f26e4a673d5f8ec4b93647583af 100644 (file)
--- a/inc/modules/admin/what-list_cats.php
+++ b/inc/modules/admin/what-list_cats.php
@@ -44,7 +44,7 @@ ADD_DESCR("admin", __FILE__);
 if (REQUEST_ISSET_GET(('uid'))) {
        // Check if the user already exists
        $result = SQL_QUERY_ESC("SELECT surname, family, email FROM `{!_MYSQL_PREFIX!}_user_data` WHERE userid=%s LIMIT 1",
 if (REQUEST_ISSET_GET(('uid'))) {
        // Check if the user already exists
        $result = SQL_QUERY_ESC("SELECT surname, family, email FROM `{!_MYSQL_PREFIX!}_user_data` WHERE userid=%s LIMIT 1",

-        array(bigintval(REQUEST_GET('uid'))), __FILE__, __LINE__);
+               array(bigintval(REQUEST_GET('uid'))), __FILE__, __LINE__);

        if (SQL_NUMROWS($result) == 1) {
                // Loads surname, family's name and the email address
                list($sname, $fname, $email) = SQL_FETCHROW($result);
        if (SQL_NUMROWS($result) == 1) {
                // Loads surname, family's name and the email address
                list($sname, $fname, $email) = SQL_FETCHROW($result);


@@ -53,7 +53,7 @@ if (REQUEST_ISSET_GET(('uid'))) {
                // Prepare constants
                define('__CATS_BASE'   , "<a href=\"{!URL!}/modules.php?module=admin&amp;uid=");
                define('__UID'         , bigintval(REQUEST_GET('uid')));
                // Prepare constants
                define('__CATS_BASE'   , "<a href=\"{!URL!}/modules.php?module=admin&amp;uid=");
                define('__UID'         , bigintval(REQUEST_GET('uid')));

-               define('__MEMBER_LINKS', MEMBER_ACTION_LINKS(__UID));
+               define('__MEMBER_LINKS', MEMBER_ACTION_LINKS(constant('__UID')));

                define('__EMAIL'       , "<a href=\"".CREATE_EMAIL_LINK($email, "user_data")."\">".$sname." ".$fname."</a>");
 
                // Ok, list categories of this user
                define('__EMAIL'       , "<a href=\"".CREATE_EMAIL_LINK($email, "user_data")."\">".$sname." ".$fname."</a>");
 
                // Ok, list categories of this user


@@ -61,31 +61,30 @@ if (REQUEST_ISSET_GET(('uid'))) {
 
                if (SQL_NUMROWS($result_cats) > 0) {
                        // List categories
 
                if (SQL_NUMROWS($result_cats) > 0) {
                        // List categories

-                       $cnt = "1"; $SW = 2; $OUT = "";
-                       while (list($cid, $cat) = SQL_FETCHROW($result_cats)) {
+                       $cnt = 1; $OUT = ""; $SW = 2;
+                       while ($content = SQL_FETCHARRAY($result_cats)) {

                                // Check user's selection
                                $result_user = SQL_QUERY_ESC("SELECT id FROM `{!_MYSQL_PREFIX!}_user_cats` WHERE userid=%s AND cat_id=%s LIMIT 1",
                                // Check user's selection
                                $result_user = SQL_QUERY_ESC("SELECT id FROM `{!_MYSQL_PREFIX!}_user_cats` WHERE userid=%s AND cat_id=%s LIMIT 1",

-                                array(bigintval(REQUEST_GET('uid')), bigintval($cid)), __FILE__, __LINE__);
+                                       array(bigintval(REQUEST_GET('uid')), bigintval($content['id'])), __FILE__, __LINE__);

 
                                // Set selection
 
                                // Set selection

-                               $SELECTED = "<font color=\"red\">{--NO--}</div>";
-                               if (SQL_NUMROWS($result_user) == 1) $SELECTED = "<font color=\"green\">{--YES--}</div>";
+                               $selection = "<font color=\"#ee0000\">{--NO--}</div>";
+                               if (SQL_NUMROWS($result_user) == 1) $selection = "<font color=\"#00ee00\">{--YES--}</div>";

 
 

-                               // Prepare array for the row template
-                               $content = array(
-                                       'sw'  => $SW,
-                                       'cnt' => $cnt,
-                                       'cat' => $cat,
-                                       'sel' => $SELECTED,
-                               );
+                               // Add more elements
+                               $content['sw']  = $SW;
+                               $content['cnt'] = $cnt;
+                               $content['sel'] = $selection;

 
                                // Load row template and switch colors + count up
                                $OUT .= LOAD_TEMPLATE("admin_list_cats_row", true, $content);
                                $SW = 3 - $SW; $cnt++;
 
                                // Load row template and switch colors + count up
                                $OUT .= LOAD_TEMPLATE("admin_list_cats_row", true, $content);
                                $SW = 3 - $SW; $cnt++;

-                       }
+                       } // END - while

 
                        // Free memory
                        SQL_FREERESULT($result);
 
                        // Free memory
                        SQL_FREERESULT($result);

+
+                       // @TODO Rewrite this constant

                        define('__CATS_ROWS', $OUT);
 
                        // Load main template
                        define('__CATS_ROWS', $OUT);
 
                        // Load main template