From 3bc521fc37d34c66b3483cdeef37038408f95b63 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Roland=20H=C3=A4der?= <roland@mxchange.org>
Date: Fri, 15 Jan 2010 20:40:07 +0000
Subject: [PATCH] Possible fix for bigint() problem, some code-cleanups

---
 inc/modules/member/what-order.php | 23 ++++++++---------------
 1 file changed, 8 insertions(+), 15 deletions(-)

diff --git a/inc/modules/member/what-order.php b/inc/modules/member/what-order.php
index 6485664fa7..a950b0993d 100644
--- a/inc/modules/member/what-order.php
+++ b/inc/modules/member/what-order.php
@@ -63,14 +63,14 @@ $links = countSumTotalData(getMemberId(), 'user_links', 'id', 'userid', true);
 
 // Do we have ext-holiday installed?
 // @TODO Rewrite this to a filter
-$HOLIDAY = 'userid';
+$extraColumn = 'userid';
 if ((isExtensionActive('holiday')) && (getExtensionVersion('holiday') >= '0.1.3')) {
 	// Fetch also holiday activation data
-	$HOLIDAY = 'holiday_active';
+	$extraColumn = 'holiday_active';
 } // END - if
 
 $result_mmails = SQL_QUERY_ESC("SELECT
-	`userid`, `receive_mails`, `mail_orders`, `".$HOLIDAY."`
+	`userid`, `receive_mails`, `mail_orders`, `".$extraColumn."`
 FROM
 	`{?_MYSQL_PREFIX?}_user_data`
 WHERE
@@ -208,7 +208,7 @@ LIMIT 1",
 	if (empty($URL)) {
 		// Check if category and number of receivers is okay
 		$add = '';
-		if ((getConfig('order_multi_page') == 'Y') && (isPostRequestParameterSet('zip'))) {
+		if ((getConfig('order_multi_page') == 'Y') && (isPostRequestParameterSet('zip')) && (postRequestParameter('zip') != '')) {
 			// Choose recipients by ZIP code
 			$add = " AND d.zip LIKE '".bigintval(postRequestParameter('zip'))."{PER}'";
 		} // END - if
@@ -235,17 +235,10 @@ ORDER BY
 
 		// Do we enougth receivers left?
 		if (SQL_NUMROWS($result) >= postRequestParameter('receiver')) {
-			// Check for holiday extensions
-			$HOLIDAY = false;
-			if (getExtensionVersion('holiday') >= '0.1.3') {
-				// Include checking for users in holiday
-				$HOLIDAY = true;
-			} // END - if
-
 			// Load receivers from database
 			$TEST = array(); $cnt = '0';
 			while ($holidayContent = SQL_FETCHARRAY($result)) {
-				if ($HOLIDAY) {
+				if (getExtensionVersion('holiday') >= '0.1.3') {
 					// Check for his holiday status
 					$result_holiday = SQL_QUERY_ESC("SELECT
 	`id`
@@ -448,11 +441,11 @@ ORDER BY
 
 			// Enable HTML checking
 			// @TODO Rewrite this to a filter
-			$HTML = ''; $HOLIDAY = false; $HOL_STRING = '';
+			$HTML = ''; $HOL_STRING = '';
 			if ((isExtensionActive('html_mail')) && (postRequestParameter('html') == 'Y')) $HTML = " AND `html`='Y'";
 			if (getExtensionVersion('holiday') >= '0.1.3') {
 				// Extension's version is fine
-				$HOLIDAY = true; $HOL_STRING = " AND `holiday_active`='N'";
+				$HOL_STRING = " AND `holiday_active`='N'";
 			} // END - if
 
 			// ... and begin loading stuff
@@ -468,7 +461,7 @@ ORDER BY
 				while (list($ucat) = SQL_FETCHROW($result_userids)) {
 					// Check for holiday system
 					$HOL_ACTIVE = false;
-					if ($HOLIDAY) {
+					if (getExtensionVersion('holiday') >= '0.1.3') {
 						// Check user's holiday status
 						$result_holiday = SQL_QUERY_ESC("SELECT
 	d.userid FROM `{?_MYSQL_PREFIX?}_user_data` AS d
-- 
2.30.2