A lot has been rewritten, ext-teams added, ext-forced continued:

[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 5c75e5f5bfe98a7aa080c905cb05742d2493acc5..026a0e6a6fe7385e3370f3eacadf62541bcda3a4 100644 (file)
--- a/inc/modules/member/what-categories.php
+++ b/inc/modules/member/what-categories.php
@@ -49,14 +49,14 @@ $whereStatement = " WHERE `visible`='Y'";
 if (isAdmin()) $whereStatement = '';
 
 // Get all categories
-$result = SQL_QUERY("SELECT `id`, `cat` FROM `{?_MYSQL_PREFIX?}_cats`".$whereStatement." ORDER BY `sort` ASC", __FILE__, __LINE__);
+$result = SQL_QUERY("SELECT `id`,`cat` FROM `{?_MYSQL_PREFIX?}_cats`".$whereStatement." ORDER BY `sort` ASC", __FILE__, __LINE__);
 
 // Do we have entries?
 if (!SQL_HASZERONUMS($result)) {
        $LEAST = false;
        if (isFormSent()) {
                $count = '0';
-               foreach (postRequestParameter('cat') as $cat => $joined) {
+               foreach (postRequestParameter('cat') as $categoryId => $joined) {
                        if ($joined != 'Y') $count++;
                } // END - foreach
 
@@ -72,7 +72,7 @@ if (!SQL_HASZERONUMS($result)) {
                $count = '0';
 
                // Go through all entries
-               foreach (postRequestParameter('cat') as $cat => $joined) {
+               foreach (postRequestParameter('cat') as $categoryId => $joined) {
                        // Ini sql here
                        $sql = '';
 
@@ -80,13 +80,13 @@ if (!SQL_HASZERONUMS($result)) {
                        switch ($joined) {
                                case 'Y':
                                        $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__);
+                                               array(getMemberId(), bigintval($categoryId)), __FILE__, __LINE__);
 
                                        // Debug message
-                                       //* DEBUG: */ logDebugMessage(__FILE__, __LINE__, 'cat='.$cat.',joined='.$joined.',getMemberId()='.getMemberId().',SQL_HASZERONUMS()='.intval(SQL_HASZERONUMS($result_user)));
+                                       //* DEBUG: */ logDebugMessage(__FILE__, __LINE__, 'categoryId='.$categoryId.',joined='.$joined.',getMemberId()='.getMemberId().',SQL_HASZERONUMS()='.intval(SQL_HASZERONUMS($result_user)));
 
                                        if (SQL_HASZERONUMS($result_user)) {
-                                               $sql = "INSERT INTO `{?_MYSQL_PREFIX?}_user_cats` (`userid`, `cat_id`) VALUES (%s,%s)";
+                                               $sql = "INSERT INTO `{?_MYSQL_PREFIX?}_user_cats` (`userid`,`cat_id`) VALUES (%s,%s)";
                                        } // END - if
 
                                        // Free memory
@@ -100,7 +100,7 @@ if (!SQL_HASZERONUMS($result)) {
 
                        if (!empty($sql)) {
                                // Run SQL command
-                               SQL_QUERY_ESC(trim($sql), array(getMemberId(), bigintval($cat)), __FILE__, __LINE__);
+                               SQL_QUERY_ESC(trim($sql), array(getMemberId(), bigintval($categoryId)), __FILE__, __LINE__);
 
                                // Count this row
                                $count += SQL_AFFECTEDROWS();
@@ -110,15 +110,15 @@ if (!SQL_HASZERONUMS($result)) {
                // Categories saved?
                if ($count > 0) {
                        // Output message
-                       loadTemplate('admin_settings_saved', false, '{--MEMBER_CATEGORIES_SAVED--}');
+                       displayMessage('{--MEMBER_CATEGORIES_SAVED--}');
                } else {
                        // None save
-                       loadTemplate('admin_settings_saved', false, '{--MEMBER_CATEGORIES_NOT_SAVED--}');
+                       displayMessage('{--MEMBER_CATEGORIES_NOT_SAVED--}');
                }
        } else {
                if ($LEAST === true) {
                        // Also here we have to secure it... :(
-                       loadTemplate('admin_settings_saved', false, '{--CHOOSE_MORE_CATEGORIES--}');
+                       displayMessage('{--CHOOSE_MORE_CATEGORIES--}');
                } // END - if
 
                // Put some data into constants for the template
@@ -159,7 +159,7 @@ if (!SQL_HASZERONUMS($result)) {
        }
 } else {
        // No cateogries are defined yet
-       loadTemplate('admin_settings_saved', false, '{--MEMBER_NO_CATEGORIES--}');
+       displayMessage('{--MEMBER_NO_CATEGORIES--}');
 }
 
 // Free result