Fixed category saving, added unique key, removed deprecated templates:

[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 ce92c895308e3f28bba80909d9ca3d27a11e02ac..13075a351e7460a95849f4b0e5960920c7176cfa 100644 (file)
--- a/inc/modules/member/what-categories.php
+++ b/inc/modules/member/what-categories.php
@@ -14,8 +14,6 @@
  * $Date::                                                            $ *
  * $Tag:: 0.2.1-FINAL                                                 $ *
  * $Author::                                                          $ *
- * Needs to be in all Files and every File needs "svn propset           *
- * svn:keywords Date Revision" (autoprobset!) at least!!!!!!            *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
  * Copyright (c) 2009, 2010 by Mailer Developer Team                    *
@@ -50,18 +48,19 @@ 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) {
+// Do we have entries?
+if (!SQL_HASZERONUMS($result)) {
        $LEAST = false;
        if (isFormSent()) {
-               $cnt = '0';
+               $count = '0';
                foreach (postRequestParameter('cat') as $cat => $joined) {
-                       if ($joined != 'Y') $cnt++;
+                       if ($joined != 'Y') $count++;
                } // END - foreach
 
-               if (($cats - $cnt) < getConfig('least_cats')) {
+               if ((SQL_NUMROWS($result) - $count) < getLeastCats()) {
                        unsetPostRequestParameter('ok');
                        $LEAST = true;
                } // END - if
@@ -70,7 +69,7 @@ if ($cats > 0) {
        // Is the form sent?
        if (isFormSent()) {
                // Start counting all
-               $cnt = '0';
+               $count = '0';
 
                // Go through all entries
                foreach (postRequestParameter('cat') as $cat => $joined) {
@@ -83,8 +82,11 @@ 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_HASZERONUMS($result_user)) {
-                                               $sql = "INSERT INTO `{?_MYSQL_PREFIX?}_user_cats` (userid, cat_id) VALUES ('%s','%s')";
+                                       // Debug message
+                                       //* DEBUG: */ logDebugMessage(__FILE__, __LINE__, 'cat='.$cat.',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
@@ -101,12 +103,12 @@ if ($cats > 0) {
                                SQL_QUERY_ESC(trim($sql), array(getMemberId(), bigintval($cat)), __FILE__, __LINE__);
 
                                // Count this row
-                               $cnt += SQL_AFFECTEDROWS();
+                               $count += SQL_AFFECTEDROWS();
                        } // END - if
                } // END - foreach
 
                // Categories saved?
-               if ($cnt > 0) {
+               if ($count > 0) {
                        // Output message
                        loadTemplate('admin_settings_saved', false, '{--MEMBER_CATEGORIES_SAVED--}');
                } else {
@@ -116,11 +118,11 @@ if ($cats > 0) {
        } else {
                if ($LEAST === true) {
                        // Also here we have to secure it... :(
-                       loadTemplate('admin_settings_saved', false, '{--CATS_LEAST--}');
+                       loadTemplate('admin_settings_saved', false, '{--CHOOSE_MORE_CATEGORIES--}');
                } // END - if
 
                // Put some data into constants for the template
-               $content['rows'] = ($cats*2+4);
+               $content['rows'] = (SQL_NUMROWS($result) * 2 + 4);
 
                // Load header template
                loadTemplate('member_cats_header', false, $content);
@@ -134,7 +136,7 @@ if ($cats > 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"';
@@ -145,7 +147,7 @@ if ($cats > 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