X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmodules%2Fmember%2Fwhat-order.php;h=c9bfafc8b1a5d2b84a7716cb103e554e2ccad803;hb=0f0e365a0e710b750d74ef8587dde8b37881dbeb;hp=d85b9fea8159956842c7bc8ac562ac8440f64bbe;hpb=b3ac0295ae2be81269cc35b15565adeb08b90d63;p=mailer.git

diff --git a/inc/modules/member/what-order.php b/inc/modules/member/what-order.php
index d85b9fea81..c9bfafc8b1 100644
--- a/inc/modules/member/what-order.php
+++ b/inc/modules/member/what-order.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 *
@@ -62,14 +63,17 @@ $links = countSumTotalData(getMemberId(), 'user_links', 'id', 'userid', true);
 
 // Do we have ext-holiday installed?
 // @TODO Rewrite this to a filter
-$HOLIDAY = 'userid';
-if ((isExtensionActive('holiday')) && (getExtensionVersion('holiday') >= '0.1.3')) {
+$extraColumn = 'userid';
+if (isExtensionInstalledAndNewer('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
@@ -93,7 +97,7 @@ if (getConfig('order_max_full') == 'MAX') $ALLOWED = $MAXI;
 // Now check his points amount
 $total = countSumTotalData(getMemberId(), 'user_points', 'points') - countSumTotalData(getMemberId(), 'user_data', 'used_points');;
 
-if (($HOLIDAY == 'Y') && (getExtensionVersion('holiday') >= '0.1.3')) {
+if (($HOLIDAY == 'Y') && (isExtensionInstalledAndNewer('holiday', '0.1.3'))) {
 	// Holiday is active!
 	loadTemplate('admin_settings_saved', false, getMessage('HOLIDAY_ORDER_NOT_POSSIBLE'));
 } elseif ((isPostRequestParameterSet('frametester')) && ($ALLOWED > 0) && (postRequestParameter('receiver') > 0)) {
@@ -197,7 +201,13 @@ LIMIT 1",
 				// Remove any HTML code
 				setPostRequestParameter('text', str_replace('<', '{OPEN_HTML}', str_replace('>', '{CLOSE_HTML}', postRequestParameter('text'))));
 			}
-		}
+		} // END - if
+
+		// Is mail type set?
+		if ((!isPostRequestParameterSet('mail_type')) || (postRequestParameter('mail_type') < 1)) {
+			// Not correctly set
+			$URL = 'modules.php?module=login&amp;what=order&amp;code=' . getCode('NO_MAIL_TYPE');
+		} // END - if
 	} elseif (!isAdmin()) {
 		// He has already sent a mail within a specific time
 		$URL = 'modules.php?module=login&amp;what=order&amp;code=' . getCode('URL_TLOCK') . '&amp;id=' . $id;
@@ -207,7 +217,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
@@ -222,7 +232,11 @@ LEFT JOIN
 ON
 	c.userid=d.userid
 WHERE
-	c.cat_id=%s AND c.userid != '%s' AND d.`status`='CONFIRMED' AND d.receive_mails > 0".$add."
+	c.cat_id=%s AND
+	c.userid != '%s' AND
+	d.`status`='CONFIRMED' AND
+	d.receive_mails > 0
+	".$add."
 ORDER BY
 	d.%s %s",
 			array(
@@ -234,17 +248,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 (isExtensionInstalledAndNewer('holiday', '0.1.3')) {
 					// Check for his holiday status
 					$result_holiday = SQL_QUERY_ESC("SELECT
 	`id`
@@ -284,7 +291,7 @@ LIMIT 1",
 			if ($content['target_send'] > postRequestParameter('receiver')) $content['target_send'] = bigintval(postRequestParameter('receiver'));
 
 			// Calculate used points
-			$USED = $content['target_send'] * getPaymentPoints(bigintval(postRequestParameter('type')));
+			$USED = $content['target_send'] * getPaymentPoints(bigintval(postRequestParameter('mail_type')));
 
 			// Fix empty zip code
 			if (!isPostRequestParameterSet('zip')) setPostRequestParameter('zip', 0);
@@ -298,33 +305,33 @@ LIMIT 1",
 					if (isExtensionActive('html_mail')) {
 						// HTML extension is active
 						SQL_QUERY_ESC("INSERT INTO `{?_MYSQL_PREFIX?}_pool` (`sender`, `subject`, `text`, `receivers`, `payment_id`, `data_type`, `timestamp`, `url`, `cat_id`, `target_send`, `zip`, `html_msg`)
- VALUES ('%s','%s','%s','%s','%s','TEMP',UNIX_TIMESTAMP(),'%s','%s','%s','%s','%s')",
+VALUES (%s,'%s','%s','%s','%s','TEMP',UNIX_TIMESTAMP(),'%s',%s,%s,%s,'%s')",
 							array(
 								getMemberId(),
 								postRequestParameter('subject'),
 								postRequestParameter('text'),
 								$receiver,
-								bigintval(postRequestParameter('type')),
+								bigintval(postRequestParameter('mail_type')),
 								postRequestParameter('url'),
 								bigintval(postRequestParameter('cat')),
 								$content['target_send'],
-								bigintval(postRequestParameter('zip')),
+								bigintval(postRequestParameter('zip'), true, false),
 								postRequestParameter('html')
 							), __FILE__, __LINE__);
 					} else {
 						// No HTML extension is active
 						SQL_QUERY_ESC("INSERT INTO `{?_MYSQL_PREFIX?}_pool` (`sender`, `subject`, `text`, `receivers`, `payment_id`, `data_type`, `timestamp`, `url`, `cat_id`, `target_send`, `zip`)
- VALUES ('%s','%s','%s','%s','%s','TEMP',UNIX_TIMESTAMP(),'%s','%s','%s','%s')",
+VALUES (%s,'%s','%s','%s','%s','TEMP',UNIX_TIMESTAMP(),'%s',%s,%s,%s)",
 							array(
 								getMemberId(),
 								postRequestParameter('subject'),
 								postRequestParameter('text'),
 								$receiver,
-								bigintval(postRequestParameter('type')),
+								bigintval(postRequestParameter('mail_type')),
 								postRequestParameter('url'),
 								bigintval(postRequestParameter('cat')),
 								$content['target_send'],
-								bigintval(postRequestParameter('zip')),
+								bigintval(postRequestParameter('zip'), true, false),
 							), __FILE__, __LINE__);
 					}
 				} else {
@@ -351,7 +358,7 @@ LIMIT 1",
 								postRequestParameter('subject'),
 								postRequestParameter('text'),
 								$receiver,
-								bigintval(postRequestParameter('type')),
+								bigintval(postRequestParameter('mail_type')),
 								postRequestParameter('url'),
 								bigintval(postRequestParameter('cat')),
 								$content['target_send'],
@@ -380,7 +387,7 @@ LIMIT 1",
 								postRequestParameter('subject'),
 								postRequestParameter('text'),
 								$receiver,
-								bigintval(postRequestParameter('type')),
+								bigintval(postRequestParameter('mail_type')),
 								postRequestParameter('url'),
 								bigintval(postRequestParameter('cat')),
 								$content['target_send'],
@@ -397,7 +404,7 @@ LIMIT 1",
 						array(
 							getMemberId(),
 							postRequestParameter('subject'),
-							bigintval(postRequestParameter('type'))
+							bigintval(postRequestParameter('mail_type'))
 						), __FILE__, __LINE__);
 
 					// Get pool id
@@ -447,11 +454,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') {
+			if (isExtensionInstalledAndNewer('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
@@ -467,7 +474,7 @@ ORDER BY
 				while (list($ucat) = SQL_FETCHROW($result_userids)) {
 					// Check for holiday system
 					$HOL_ACTIVE = false;
-					if ($HOLIDAY) {
+					if (isExtensionInstalledAndNewer('holiday', '0.1.3')) {
 						// Check user's holiday status
 						$result_holiday = SQL_QUERY_ESC("SELECT
 	d.userid FROM `{?_MYSQL_PREFIX?}_user_data` AS d
@@ -626,12 +633,13 @@ LIMIT 1",
 						} // END - if
 					} // END - foreach
 
+					// No content is default
+					$content['zip_content'] = '';
+
 					if (isPostRequestParameterSet('zip')) {
 						// Output entered ZIP code
 						$content['zip_content'] = loadTemplate('member_order-zip2', true, postRequestParameter('zip'));
-					} else {
-						$content['zip_content'] = '<tr><td colspan="3" height="5" class="seperator">&nbsp;</td></tr>';
-					}
+					} // END - if
 
 					// HTML extension
 					if ((isExtensionActive('html_mail')) && (postRequestParameter('html') == 'Y')) {
@@ -646,10 +654,8 @@ LIMIT 1",
 					loadTemplate('member_order_page2', false, $content);
 				} else {
 					// Remember maybe entered ZIP code in constant
-					$add = '';
 					if (isExtensionActive('html_mail')) {
 						// Add some content when html extension is active
-						if ((getConfig('order_multi_page') == 'Y') || (isAdmin())) $add = '<tr><td colspan="3" class="seperator bottom" height="5">&nbsp;</td></tr>';
 						$content['html_extension'] = loadTemplate('member_order-html_intro', true);
 					} else {
 						// No HTML extension installed
@@ -664,13 +670,11 @@ LIMIT 1",
 						// Yes
 						if (postRequestParameter('zip') > 0) {
 							$data = array(
-								'zip' => bigintval(postRequestParameter('zip')),
-								'add' => $add
+								'zip' => bigintval(postRequestParameter('zip'))
 							);
 						} else {
 							$data = array(
-								'zip' => '',
-								'add' => $add
+								'zip' => ''
 							);
 						}
 						$content['zip_content'] = loadTemplate('member_order-zip1', true, $data);