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 debdd3bcede01b51dcd2225e9df5205479fe0074..026a0e6a6fe7385e3370f3eacadf62541bcda3a4 100644 (file)
--- a/inc/modules/member/what-categories.php
+++ b/inc/modules/member/what-categories.php
@@ -16,7 +16,7 @@
  * $Author::                                                          $ *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
- * Copyright (c) 2009, 2010 by Mailer Developer Team                    *
+ * Copyright (c) 2009 - 2011 by Mailer Developer Team                   *
  * For more information visit: http://www.mxchange.org                  *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
@@ -43,24 +43,24 @@ if (!defined('__SECURITY')) {
 }
 
 // Add description as navigation point
-addMenuDescription('member', __FILE__);
+addYouAreHereLink('member', __FILE__);
 
 $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_NUMROWS($result) > 0) {
+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
 
-               if ((SQL_NUMROWS($result) - $count) < getConfig('least_cats')) {
+               if ((SQL_NUMROWS($result) - $count) < getLeastCats()) {
                        unsetPostRequestParameter('ok');
                        $LEAST = true;
                } // END - if
@@ -72,7 +72,7 @@ if (SQL_NUMROWS($result) > 0) {
                $count = '0';
 
                // Go through all entries
-               foreach (postRequestParameter('cat') as $cat => $joined) {
+               foreach (postRequestParameter('cat') as $categoryId => $joined) {
                        // Ini sql here
                        $sql = '';
 
@@ -80,10 +80,13 @@ if (SQL_NUMROWS($result) > 0) {
                        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__);
 
-                                       if (!SQL_HASZERONUMS($result_user)) {
-                                               $sql = "INSERT INTO `{?_MYSQL_PREFIX?}_user_cats` (userid, cat_id) VALUES ('%s','%s')";
+                                       // Debug message
+                                       //* 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)";
                                        } // END - if
 
                                        // Free memory
@@ -97,7 +100,7 @@ if (SQL_NUMROWS($result) > 0) {
 
                        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();
@@ -107,15 +110,15 @@ if (SQL_NUMROWS($result) > 0) {
                // 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, '{--CATS_LEAST--}');
+                       displayMessage('{--CHOOSE_MORE_CATEGORIES--}');
                } // END - if
 
                // Put some data into constants for the template
@@ -133,7 +136,7 @@ if (SQL_NUMROWS($result) > 0) {
                        $content['jy'] = '';
 
                        // When we found an entry don't read it, just change the jx elements
-                       if (isPostRequestParameterSet('cat')) {
+                       if ((isFormSent()) && (isPostRequestParameterSet('cat'))) {
                                // Form sent?
                                if (postRequestParameter('cat', $content['id']) =='Y') {
                                        $content['jy'] = ' checked="checked"';
@@ -144,7 +147,7 @@ if (SQL_NUMROWS($result) > 0) {
                                if (countSumTotalData(getMemberId(), 'user_cats', 'id', 'userid', true, sprintf(" AND `cat_id`=%s", bigintval($content['id']))) == 1) {
                                        $content['jn'] = '';
                                        $content['jy'] = ' checked="checked"';
-                               }
+                               } // END - if
                        }
 
                        // Load row template and switch colors
@@ -156,7 +159,7 @@ if (SQL_NUMROWS($result) > 0) {
        }
 } else {
        // No cateogries are defined yet
-       loadTemplate('admin_settings_saved', false, '{--MEMBER_NO_CATEGORIES--}');
+       displayMessage('{--MEMBER_NO_CATEGORIES--}');
 }
 
 // Free result