X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Ffilter%2Forder_filter.php;h=f8866822d65468c94ab047ae08315003444fa83b;hb=d7d40e177e09a7161b79bfc95a1d2e91fdff4691;hp=3fd044f61466cf061e60cec7d01bdbee8240a820;hpb=60929c313ccc10e74e2724373f7bc9ee00d774d1;p=mailer.git

diff --git a/inc/filter/order_filter.php b/inc/filter/order_filter.php
index 3fd044f614..f8866822d6 100644
--- a/inc/filter/order_filter.php
+++ b/inc/filter/order_filter.php
@@ -16,7 +16,7 @@
  * $Author::                                                          $ *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
- * Copyright (c) 2009 - 2012 by Mailer Developer Team                   *
+ * Copyright (c) 2009 - 2013 by Mailer Developer Team                   *
  * For more information visit: http://mxchange.org                      *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
@@ -82,17 +82,30 @@ function FILTER_GET_ALL_ORDER_POINTS_COLUMN_NAMES ($filterData) {
 // Filter for ZIP code inclusion (not exclusion but it must be run in exclusion filter chain)
 function FILTER_ORDER_ZIP_CODE_SQL ($sql) {
 	// Check if category and number of receivers is okay
-	if ((isOrderMultiPageEnabled()) && (isPostRequestElementSet('zip')) && (postRequestElement('zip') != '')) {
-		// Choose recipients by ZIP code
-		if (empty($sql)) {
-			$sql = sprintf(" WHERE `zip` LIKE '%s%%%%'",
-				bigintval(postRequestElement('zip'))
-			);
-		} else {
-			$sql .= sprintf(" AND `zip` LIKE '%s%%%%'",
-				bigintval(postRequestElement('zip'))
-			);
+	if (isOrderMultiPageEnabled()) {
+		// Default is no zip code limitation
+		$zip = NULL;
+
+		// POST or GET elements?
+		if ((isPostRequestElementSet('zip')) && (postRequestElement('zip') != '')) {
+			// Choose recipients by zip code from POST
+			$zip = bigintval(postRequestElement('zip'));
+		} elseif ((isGetRequestElementSet('zip')) && (getRequestElement('zip') != '')) {
+			// Choose recipients by zip code from GET
+			$zip = bigintval(getRequestElement('zip'));
 		}
+
+		// Is the zip code set?
+		if (!is_null($zip)) {
+			// Is the previous SQL statement empty?
+			if (empty($sql)) {
+				// SQL statemet is empty, so use WHERE
+				$sql = sprintf(" WHERE `zip` LIKE '%s%%%%'", $zip);
+			} else {
+				// ... otherwise use AND
+				$sql .= sprintf(" AND `zip` LIKE '%s%%%%'", $zip);
+			}
+		} // END - if
 	} // END - if
 
 	// Return expanded SQL