Syntax errors fixed, naming convention applied, wrappers used:

[mailer.git] / inc / modules / member / what-categories.php

diff --git a/inc/modules/member/what-categories.php b/inc/modules/member/what-categories.php
index 228c699b4a89133fcf4d44608e63dfa3491c01b7..1117465b0d19fed15510dee85f5e03a2118e865c 100644 (file)
--- a/inc/modules/member/what-categories.php
+++ b/inc/modules/member/what-categories.php
@@ -18,6 +18,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 *
@@ -49,19 +50,22 @@ addMenuDescription('member', __FILE__);
 $whereStatement = " WHERE `visible`='Y'";
 if (isAdmin()) $whereStatement = '';
 
-$result = SQL_QUERY("SELECT id, cat FROM `{?_MYSQL_PREFIX?}_cats`".$whereStatement." ORDER BY `sort`", __FILE__, __LINE__);
-$cats = SQL_NUMROWS($result);
+// Get all categories
+$result = SQL_QUERY("SELECT `id`, `cat` FROM `{?_MYSQL_PREFIX?}_cats`".$whereStatement." ORDER BY `sort` ASC", __FILE__, __LINE__);
 
-if ($cats > 0) {
+// Get num rows
+$numCategories = SQL_NUMROWS($result);
+
+if ($numCategories > 0) {
        $LEAST = false;
        if (isFormSent()) {
                $cnt = '0';
-               foreach (postRequestElement('cat') as $cat => $joined) {
+               foreach (postRequestParameter('cat') as $cat => $joined) {
                        if ($joined != 'Y') $cnt++;
                } // END - foreach
 
-               if (($cats - $cnt) < getConfig('least_cats')) {
-                       unsetPostRequestElement('ok');
+               if (($numCategories - $cnt) < getConfig('least_cats')) {
+                       unsetPostRequestParameter('ok');
                        $LEAST = true;
                } // END - if
        } // END - if
@@ -72,7 +76,7 @@ if ($cats > 0) {
                $cnt = '0';
 
                // Go through all entries
-               foreach (postRequestElement('cat') as $cat => $joined) {
+               foreach (postRequestParameter('cat') as $cat => $joined) {
                        // Ini sql here
                        $sql = '';
 
@@ -82,7 +86,7 @@ if ($cats > 0) {
                                        $result_user = SQL_QUERY_ESC("SELECT `id` FROM `{?_MYSQL_PREFIX?}_user_cats` WHERE `userid`=%s AND `cat_id`=%s LIMIT 1",
                                                array(getMemberId(), bigintval($cat)), __FILE__, __LINE__);
 
-                                       if (SQL_NUMROWS($result_user) == '0') {
+                                       if (!SQL_HASZERONUMS($result_user)) {
                                                $sql = "INSERT INTO `{?_MYSQL_PREFIX?}_user_cats` (userid, cat_id) VALUES ('%s','%s')";
                                        } // END - if
 
@@ -107,38 +111,38 @@ if ($cats > 0) {
                // Categories saved?
                if ($cnt > 0) {
                        // Output message
-                       loadTemplate('admin_settings_saved', false, getMessage('MEMBER_CATS_SAVED'));
+                       loadTemplate('admin_settings_saved', false, '{--MEMBER_CATEGORIES_SAVED--}');
                } else {
                        // None save
-                       loadTemplate('admin_settings_saved', false, getMessage('MEMBER_CATS_NOT_SAVED'));
+                       loadTemplate('admin_settings_saved', false, '{--MEMBER_CATEGORIES_NOT_SAVED--}');
                }
        } else {
                if ($LEAST === true) {
                        // Also here we have to secure it... :(
-                       loadTemplate('admin_settings_saved', false, getMessage('CATS_LEAST'));
+                       loadTemplate('admin_settings_saved', false, '{--CATS_LEAST--}');
                } // END - if
 
                // Put some data into constants for the template
-               $content['rows'] = ($cats*2+4);
+               $content['rows'] = ($numCategories * 2 + 4);
 
                // Load header template
                loadTemplate('member_cats_header', false, $content);
 
                // Start switching colors and load all visible categories
                // @TODO Rewrite this to use $OUT .= ...
-               $OUT = ''; $SW = 2;
+               $OUT = '';
                while ($content = SQL_FETCHARRAY($result)) {
                        // Default he has not joined
                        $content['jn'] = ' checked="checked"';
                        $content['jy'] = '';
 
                        // When we found an entry don't read it, just change the jx elements
-                       if (isPostRequestElementSet(('cat'))) {
+                       if (isPostRequestParameterSet('cat')) {
                                // Form sent?
-                               if (postRequestElement('cat', $content['id']) =='Y') {
+                               if (postRequestParameter('cat', $content['id']) =='Y') {
                                        $content['jy'] = ' checked="checked"';
                                        $content['jn'] = '';
-                               }
+                               } // END - if
                        } else {
                                // Check if he has an entry
                                if (countSumTotalData(getMemberId(), 'user_cats', 'id', 'userid', true, sprintf(" AND `cat_id`=%s", bigintval($content['id']))) == 1) {
@@ -147,24 +151,20 @@ if ($cats > 0) {
                                }
                        }
 
-                       // Add some more
-                       $content['sw'] = $SW;
-
                        // Load row template and switch colors
                        loadTemplate('member_cat_row', false, $content);
-                       $SW = 3 - $SW;
-               }
+               } // END - while
 
                // Load footer template
                loadTemplate('member_cats_footer');
        }
 } else {
        // No cateogries are defined yet
-       loadTemplate('admin_settings_saved', true, getMessage('MEMBER_NO_CATS'));
+       loadTemplate('admin_settings_saved', false, '{--MEMBER_NO_CATEGORIES--}');
 }
 
 // Free result
 SQL_FREERESULT($result);
 
-//
+// [EOF]
 ?>