Introduced new wrapper functions to make the code more readable, new extension ext...

[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 89ab90cfc410832208bf3630619f48a6497e7356..86263f07e8c26a7856f574434f11be56c51f8fdd 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 *
@@ -56,12 +57,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
@@ -72,7 +73,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 +83,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
 
@@ -113,9 +114,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
@@ -133,9 +134,9 @@ 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'] = '';
                                }