Fix

[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 74e03ce2fbe8dab21a228a3d77848fd5a765c9aa..bc0a4213626dafb222e25f354a47ec72f8cf395b 100644 (file)
--- a/inc/modules/member/what-categories.php
+++ b/inc/modules/member/what-categories.php
@@ -46,7 +46,6 @@ if (!defined('__SECURITY')) {
 // Add description as navigation point
 addMenuDescription('member', __FILE__);
 
-$UID = getMemberId();
 $whereStatement = " WHERE `visible`='Y'";
 if (isAdmin()) $whereStatement = '';
 
@@ -57,12 +56,12 @@ if ($cats > 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');
+                       unsetPostRequestParameter('ok');
                        $LEAST = true;
                } // END - if
        } // END - if
@@ -73,7 +72,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 = '';
 
@@ -81,7 +80,7 @@ if ($cats > 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($UID, bigintval($cat)), __FILE__, __LINE__);
+                                               array(getMemberId(), bigintval($cat)), __FILE__, __LINE__);
 
                                        if (SQL_NUMROWS($result_user) == '0') {
                                                $sql = "INSERT INTO `{?_MYSQL_PREFIX?}_user_cats` (userid, cat_id) VALUES ('%s','%s')";
@@ -98,7 +97,7 @@ if ($cats > 0) {
 
                        if (!empty($sql)) {
                                // Run SQL command
-                               SQL_QUERY_ESC(trim($sql), array($UID, bigintval($cat)), __FILE__, __LINE__);
+                               SQL_QUERY_ESC(trim($sql), array(getMemberId(), bigintval($cat)), __FILE__, __LINE__);
 
                                // Count this row
                                $cnt += SQL_AFFECTEDROWS();
@@ -114,9 +113,9 @@ if ($cats > 0) {
                        loadTemplate('admin_settings_saved', false, getMessage('MEMBER_CATS_NOT_SAVED'));
                }
        } else {
-               if ($LEAST) {
+               if ($LEAST === true) {
                        // Also here we have to secure it... :(
-                       loadTemplate('admin_settings_saved', false, sprintf(getMessage('CATS_LEAST'), getConfig('least_cats')));
+                       loadTemplate('admin_settings_saved', false, getMessage('CATS_LEAST'));
                } // END - if
 
                // Put some data into constants for the template
@@ -134,15 +133,15 @@ if ($cats > 0) {
                        $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'] = '';
                                }
                        } else {
                                // Check if he has an entry
-                               if (countSumTotalData($UID, 'user_cats', 'id', 'userid', true, sprintf(" AND `cat_id`=%s", bigintval($content['id']))) == 1) {
+                               if (countSumTotalData(getMemberId(), 'user_cats', 'id', 'userid', true, sprintf(" AND `cat_id`=%s", bigintval($content['id']))) == 1) {
                                        $content['jn'] = '';
                                        $content['jy'] = ' checked="checked"';
                                }