Huge script change, see http://forum.mxchange.org/topic-458.html for details:

[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 c74bf25aa40a1c2044bec35b0733a6dee19cd252..24b550ea4edd6f96e7041030e32e43a86ff734d4 100644 (file)
--- a/inc/modules/member/what-categories.php
+++ b/inc/modules/member/what-categories.php
@@ -17,7 +17,7 @@
  * Needs to be in all Files and every File needs "svn propset           *
  * svn:keywords Date Revision" (autoprobset!) at least!!!!!!            *
  * -------------------------------------------------------------------- *
  * Needs to be in all Files and every File needs "svn propset           *
  * svn:keywords Date Revision" (autoprobset!) at least!!!!!!            *
  * -------------------------------------------------------------------- *

- * Copyright (c) 2003 - 2008 by Roland Haeder                           *
+ * Copyright (c) 2003 - 2009 by Roland Haeder                           *

  * For more information visit: http://www.mxchange.org                  *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
  * For more information visit: http://www.mxchange.org                  *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *


@@ -38,46 +38,45 @@
 
 // Some security stuff...
 if (!defined('__SECURITY')) {
 
 // Some security stuff...
 if (!defined('__SECURITY')) {

-       $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), '/inc') + 4) . '/security.php';
-       require($INC);
-} elseif (!IS_MEMBER()) {
-       redirectToUrl('modules.php?module=index');
+       die();
+} elseif (!isMember()) {
+       redirectToIndexMemberOnlyModule();

 }
 
 // Add description as navigation point
 }
 
 // Add description as navigation point

-ADD_DESCR('member', __FILE__);
+addMenuDescription('member', __FILE__);

 
 $UID = getUserId();
 $whereStatement = " WHERE `visible`='Y'";
 
 $UID = getUserId();
 $whereStatement = " WHERE `visible`='Y'";

-if (IS_ADMIN()) $whereStatement = '';
+if (isAdmin()) $whereStatement = '';

 
 

-$result = SQL_QUERY("SELECT id, cat FROM `{!_MYSQL_PREFIX!}_cats`".$whereStatement." ORDER BY `sort`", __FILE__, __LINE__);
+$result = SQL_QUERY("SELECT id, cat FROM `{?_MYSQL_PREFIX?}_cats`".$whereStatement." ORDER BY `sort`", __FILE__, __LINE__);

 $cats = SQL_NUMROWS($result);
 
 if ($cats > 0) {
        $LEAST = false;
        if (isFormSent()) {
                $cnt = 0;
 $cats = SQL_NUMROWS($result);
 
 if ($cats > 0) {
        $LEAST = false;
        if (isFormSent()) {
                $cnt = 0;

-               foreach (REQUEST_POST('cat') as $cat => $joined) {
-                       if ($joined == 'N') $cnt++;
+               foreach (postRequestElement('cat') as $cat => $joined) {
+                       if ($joined != 'Y') $cnt++;

                }
 
                if (($cats - $cnt) < getConfig('least_cats')) {
                }
 
                if (($cats - $cnt) < getConfig('least_cats')) {

-                       REQUEST_UNSET_POST('ok');
+                       unsetPostRequestElement('ok');

                        $LEAST = true;
                }
        }
 
        if (isFormSent()) {
                        $LEAST = true;
                }
        }
 
        if (isFormSent()) {

-               foreach (REQUEST_POST('cat') as $cat => $joined) {
+               foreach (postRequestElement('cat') as $cat => $joined) {

                        switch ($joined) {
                                case 'Y':
                                        $sql = '';
                        switch ($joined) {
                                case 'Y':
                                        $sql = '';

-                                       $result_user = SQL_QUERY_ESC("SELECT `id` FROM `{!_MYSQL_PREFIX!}_user_cats` WHERE userid=%s AND cat_id=%s LIMIT 1",
+                                       $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__);
 
                                        if (SQL_NUMROWS($result_user) == 0) {
                                        array($UID, bigintval($cat)), __FILE__, __LINE__);
 
                                        if (SQL_NUMROWS($result_user) == 0) {

-                                               $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')";

                                        } else {
                                                // Free memory
                                                SQL_FREERESULT($result_user);
                                        } else {
                                                // Free memory
                                                SQL_FREERESULT($result_user);


@@ -85,7 +84,7 @@ if ($cats > 0) {
                                        break;
 
                                case 'N':
                                        break;
 
                                case 'N':

-                                       $sql = "DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_user_cats` WHERE userid=%s AND cat_id=%s LIMIT 1";
+                                       $sql = "DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_user_cats` WHERE `userid`=%s AND cat_id=%s LIMIT 1";

                                        break;
                        }
 
                                        break;
                        }
 


@@ -96,17 +95,18 @@ if ($cats > 0) {
                }
 
                // Categories saved...
                }
 
                // Categories saved...

-               LOAD_TEMPLATE('admin_settings_saved', true, getMessage('MEMBER_CATS_SAVED'));
+               loadTemplate('admin_settings_saved', true, getMessage('MEMBER_CATS_SAVED'));

        } else {
                if ($LEAST) {
                        // Also here we have to secure it... :(
        } else {
                if ($LEAST) {
                        // Also here we have to secure it... :(

-                       LOAD_TEMPLATE('admin_settings_saved', false, sprintf(getMessage('CATS_LEAST'), getConfig('least_cats')));
+                       loadTemplate('admin_settings_saved', false, sprintf(getMessage('CATS_LEAST'), getConfig('least_cats')));

                }
                }

+

                // Put some data into constants for the template
                // Put some data into constants for the template

-               define('__ROWS', ($cats*2+4));
+               $content['rows'] = ($cats*2+4);

 
                // Load header template
 
                // Load header template

-               LOAD_TEMPLATE("member_cats_header");
+               loadTemplate('member_cats_header', false, $content);

 
                // Start switching colors and load all visible categories
                // @TODO Rewrite this to use $OUT .= ...
 
                // Start switching colors and load all visible categories
                // @TODO Rewrite this to use $OUT .= ...


@@ -117,15 +117,15 @@ if ($cats > 0) {
                        $content['jy'] = '';
 
                        // When we found an entry don't read it, just change the jx elements
                        $content['jy'] = '';
 
                        // When we found an entry don't read it, just change the jx elements

-                       if (REQUEST_ISSET_POST(('cat'))) {
+                       if (isPostRequestElementSet(('cat'))) {

                                // Form sent?
                                // Form sent?

-                               if (REQUEST_POST('cat', $content['id']) =='Y') {
+                               if (postRequestElement('cat', $content['id']) =='Y') {

                                        $content['jy'] = ' checked="checked"';
                                        $content['jn'] = '';
                                }
                        } else {
                                // Check if he has an entry
                                        $content['jy'] = ' checked="checked"';
                                        $content['jn'] = '';
                                }
                        } else {
                                // Check if he has an entry

-                               if (GET_TOTAL_DATA($UID, "user_cats", 'id', 'userid', true, sprintf(" AND cat_id=%s", bigintval($content['id']))) == 1) {
+                               if (countSumTotalData($UID, 'user_cats', 'id', 'userid', true, sprintf(" AND `cat_id`=%s", bigintval($content['id']))) == 1) {

                                        $content['jn'] = '';
                                        $content['jy'] = ' checked="checked"';
                                }
                                        $content['jn'] = '';
                                        $content['jy'] = ' checked="checked"';
                                }


@@ -135,16 +135,16 @@ if ($cats > 0) {
                        $content['sw'] = $SW;
 
                        // Load row template and switch colors
                        $content['sw'] = $SW;
 
                        // Load row template and switch colors

-                       LOAD_TEMPLATE("member_cat_row", false, $content);
+                       loadTemplate('member_cat_row', false, $content);

                        $SW = 3 - $SW;
                }
 
                // Load footer template
                        $SW = 3 - $SW;
                }
 
                // Load footer template

-               LOAD_TEMPLATE("member_cats_footer");
+               loadTemplate('member_cats_footer');

        }
 } else {
        // No cateogries are defined yet
        }
 } else {
        // No cateogries are defined yet

-       LOAD_TEMPLATE('admin_settings_saved', true, getMessage('MEMBER_NO_CATS'));
+       loadTemplate('admin_settings_saved', true, getMessage('MEMBER_NO_CATS'));

 }
 
 // Free result
 }
 
 // Free result