Code rewritings, load base config improved and many minor fixes...

[mailer.git] / 0.2.1 / inc / modules / member / what-order.php

diff --git a/0.2.1/inc/modules/member/what-order.php b/0.2.1/inc/modules/member/what-order.php
index fb2137bccfa9a51c3f1553099a4505aabb4da76b..5b39004faf99a2902d28c44a6ea59850c40af757 100644 (file)
--- a/0.2.1/inc/modules/member/what-order.php
+++ b/0.2.1/inc/modules/member/what-order.php
@@ -34,7 +34,7 @@
 // Some security stuff...\r
 if (ereg(basename(__FILE__), $_SERVER['PHP_SELF']))\r
 {\r
-       $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4)."/security.php";\r
+       $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4) . "/security.php";\r
        require($INC);\r
 }\r
  elseif (!IS_LOGGED_IN())\r
@@ -229,7 +229,7 @@ if (($HOLIDAY == "Y") && (GET_EXT_VERSION("holiday") >= "0.1.3"))
        {\r
                // Check if category and number of receivers is okay\r
                $ADD = "";\r
-               if (($CONFIG['order_multi'] == "Y") && (!empty($_POST['zip']))) $ADD = "AND d.zip LIKE '".bigintval($_POST['zip'])."{PER}'";\r
+               if (($CONFIG['order_multi_page'] == "Y") && (!empty($_POST['zip']))) $ADD = "AND d.zip LIKE '".bigintval($_POST['zip'])."{PER}'";\r
 \r
                // Check for userids\r
                $result = SQL_QUERY_ESC("SELECT DISTINCT c.userid FROM "._MYSQL_PREFIX."_user_cats AS c\r
@@ -515,7 +515,7 @@ LIMIT 1", array(bigintval($ucat)), __FILE__, __LINE__);
                                                $result_ver = SQL_QUERY_ESC("SELECT zip FROM "._MYSQL_PREFIX."_user_data WHERE userid=%d".$HTML." AND receive_mails > 0 AND status='CONFIRMED' LIMIT 1",\r
                                                 array(bigintval($ucat)), __FILE__, __LINE__);\r
 \r
-                                               if ((SQL_NUMROWS($result_ver) == 1) && (!empty($_POST['zip'])) && ($CONFIG['order_multi'] == "Y"))\r
+                                               if ((SQL_NUMROWS($result_ver) == 1) && (!empty($_POST['zip'])) && ($CONFIG['order_multi_page'] == "Y"))\r
                                                {\r
                                                        list($zip) = SQL_FETCHROW($result_ver);\r
                                                        SQL_FREERESULT($result_ver);\r
@@ -688,7 +688,7 @@ LIMIT 1", array(bigintval($ucat)), __FILE__, __LINE__);
                                }\r
 \r
                                // 01      2                       21    12                             2    23         443    3          3210\r
-                               if ((!empty($_POST['data'])) || (($CONFIG['order_multi'] == "N") && ((!IS_ADMIN()) && (!$HTML_EXT))))\r
+                               if ((!empty($_POST['data'])) || (($CONFIG['order_multi_page'] == "N") && ((!IS_ADMIN()) && (!$HTML_EXT))))\r
                                {\r
                                        // Pre-output categories\r
                                        $CAT = "";\r
@@ -751,7 +751,7 @@ LIMIT 1", array(bigintval($ucat)), __FILE__, __LINE__);
                                        if ($HTML_EXT)\r
                                        {\r
                                                // Add some content when html extension is active\r
-                                               if (($CONFIG['order_multi'] == "Y") || (IS_ADMIN())) $ADD = "<TR><TD colspan=\"2\" class=\"seperator bottom2\" height=\"5\">&nbsp;</TD></TR>\n";\r
+                                               if (($CONFIG['order_multi_page'] == "Y") || (IS_ADMIN())) $ADD = "<TR><TD colspan=\"2\" class=\"seperator bottom2\" height=\"5\">&nbsp;</TD></TR>\n";\r
                                                define('MEMBER_HTML_EXTENSION', LOAD_TEMPLATE("member_order-html_intro", true));\r
                                        }\r
                                         else\r
@@ -760,7 +760,7 @@ LIMIT 1", array(bigintval($ucat)), __FILE__, __LINE__);
                                                define('MEMBER_HTML_EXTENSION', "<TR><TD colspan=\"2\"><INPUT type=\"hidden\" name=\"html\" value=\"N\"></TD></TR>");\r
                                        }\r
                                        // Do we want ZIP code or not?\r
-                                       if (($CONFIG['order_multi'] == "Y") || (IS_ADMIN()))\r
+                                       if (($CONFIG['order_multi_page'] == "Y") || (IS_ADMIN()))\r
                                        {\r
                                                // Yes\r
                                                $content = array(\r