X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmodules%2Fmember%2Fwhat-order.php;h=f87c555b36622607d644252c06210bca5f51c8e7;hb=49a9663311b732d12ba0c53af2f9eb39a7850fbc;hp=de7899c8f22587618be64879395ce65ce731a4d5;hpb=cf911469f718afb27ef9d239d375c7fe002cdc5e;p=mailer.git

diff --git a/inc/modules/member/what-order.php b/inc/modules/member/what-order.php
index de7899c8f2..f87c555b36 100644
--- a/inc/modules/member/what-order.php
+++ b/inc/modules/member/what-order.php
@@ -16,8 +16,8 @@
  * $Author::                                                          $ *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
- * Copyright (c) 2009 - 2011 by Mailer Developer Team                   *
- * For more information visit: http://www.mxchange.org                  *
+ * Copyright (c) 2009 - 2012 by Mailer Developer Team                   *
+ * For more information visit: http://mxchange.org                      *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
  * it under the terms of the GNU General Public License as published by *
@@ -35,7 +35,7 @@
 
 // Some security stuff...
 if (!defined('__SECURITY')) {
-	die();
+	exit();
 } elseif (!isMember()) {
 	redirectToIndexMemberOnlyModule();
 }
@@ -50,23 +50,22 @@ if ((!isExtensionActive('order')) && (!isAdmin())) {
 
 $url = ''; $id = '0';
 
-// Count unconfirmed mails
-$links = getTotalUnconfirmedMails(getMemberId());
-
 $ALLOWED = getUserData('receive_mails') - getUserData('mail_orders');
 if (getConfig('order_max_full') == 'MAX') $ALLOWED = getUserData('receive_mails');
 
 // Now check his points amount
-$total = getTotalPoints(getMemberId());
+$totalPoints = getTotalPoints(getMemberId());
 
 if ((isExtensionInstalledAndNewer('holiday', '0.1.3')) && (isUserDataEnabled('holiday_active'))) {
 	// Holiday is active!
 	displayMessage('{--MEMBER_HOLIDAY_ORDER_NOT_POSSIBLE--}');
-} elseif ((isPostRequestParameterSet('frametester')) && ($ALLOWED > 0) && (postRequestParameter('receiver') > 0)) {
+} elseif ((isPostRequestElementSet('frametester')) && ($ALLOWED > 0) && (postRequestElement('receiver') > 0)) {
 	// Continue with the frametester, we first need to store the data temporary in the pool
 	//
 	// First we would like to store the data and get it's pool position back...
-	$result = SQL_QUERY_ESC("SELECT `id`, `data_type`
+	$result = SQL_QUERY_ESC("SELECT
+	`id`,
+	`data_type`
 FROM
 	`{?_MYSQL_PREFIX?}_pool`
 WHERE
@@ -76,7 +75,7 @@ WHERE
 LIMIT 1",
 		array(
 			getMemberId(),
-			postRequestParameter('url')
+			postRequestElement('url')
 		), __FILE__, __LINE__);
 
 	$type = 'TEMP'; $id = '0';
@@ -95,13 +94,13 @@ LIMIT 1",
 		$url = '';
 		if (getConfig('allow_url_in_text') == 'Y') {
 			// Test submitted text against some filters (length, URLs in text etc.)
-			if ((strpos(strtolower(postRequestParameter('text')), 'https://') > -1) || (strpos(strtolower(postRequestParameter('text')), 'http://') > -1) || (strpos(strtolower(postRequestParameter('text')), "www") > -1)) {
+			if ((isInStringIgnoreCase('https://', postRequestElement('text'))) || (isInStringIgnoreCase('http://', postRequestElement('text'))) || (isInStringIgnoreCase('www', postRequestElement('text')))) {
 				// URL found
 				$url = 'modules.php?module=login&what=order&code=' . getCode('URL_FOUND');
 			} // END - if
 
 			// Remove new-line and carriage-return characters
-			$TEST = str_replace("\n", '', str_replace("\r", '', postRequestParameter('text')));
+			$TEST = str_replace(array(chr(10), chr(13)), array('', ''), postRequestElement('text'));
 
 			// Text length within allowed length?
 			if (strlen($TEST) > getConfig('max_tlength')) {
@@ -113,8 +112,8 @@ LIMIT 1",
 		// Shall I test the subject line against URLs?
 		if (getConfig('allow_url_in_subject') == 'Y') {
 			// Check the subject line for issues
-			setPostRequestParameter('subject', str_replace("\\", '[nl]', substr(postRequestParameter('subject'), 0, 200)));
-			if ((strpos(strtolower(postRequestParameter('subject')), 'http://') > -1) || (strpos(strtolower(postRequestParameter('subject')), "www") > -1)) {
+			setPostRequestElement('subject', str_replace(chr(92), '[nl]', substr(postRequestElement('subject'), 0, 200)));
+			if ((isInStringIgnoreCase('https://', postRequestElement('subject'))) || (isInStringIgnoreCase('http://', postRequestElement('subject'))) || (isInStringIgnoreCase('www', postRequestElement('subject')))) {
 				// URL in subject found
 				$url = 'modules.php?module=login&what=order&code=' . getCode('SUBJECT_URL');
 			} // END - if
@@ -124,7 +123,7 @@ LIMIT 1",
 		if (isUrlBlacklistEnabled()) {
 			// Ok, I do that for you know...
 			$result = SQL_QUERY_ESC("SELECT UNIX_TIMESTAMP(`timestamp`) AS tstamp FROM `{?_MYSQL_PREFIX?}_url_blacklist` WHERE `url`='%s' LIMIT 1",
-				array(postRequestParameter('url')), __FILE__, __LINE__);
+				array(postRequestElement('url')), __FILE__, __LINE__);
 
 			if (SQL_NUMROWS($result) == 1) {
 				// Jupp, we got one listed
@@ -139,13 +138,13 @@ LIMIT 1",
 		} // END - if
 
 		// Enougth receivers entered?
-		if ((postRequestParameter('receiver') < getConfig('order_min')) && (!isAdmin())) {
+		if ((postRequestElement('receiver') < getConfig('order_min')) && (!isAdmin())) {
 			// Less than allowed receivers entered!
 			$url = 'modules.php?module=login&amp;what=order&amp;code=' . getCode('MORE_RECEIVERS3');
 		} // END - if
 
 		// Validate URL
-		if (!isUrlValid(postRequestParameter('url'))) {
+		if (!isUrlValid(postRequestElement('url'))) {
 			// URL is invalid!
 			$url = 'modules.php?module=login&amp;what=order&amp;code=' . getCode('INVALID_URL');
 		} // END - if
@@ -153,20 +152,20 @@ LIMIT 1",
 		// Probe for HTML extension
 		if (isExtensionActive('html_mail')) {
 			// HTML or regular text mail?
-			if (postRequestParameter('html') == 'Y') {
+			if (postRequestElement('html') == 'Y') {
 				// Chek for valid HTML tags
-				setPostRequestParameter('text', checkHtmlTags(postRequestParameter('text')));
+				setPostRequestElement('text', checkHtmlTags(postRequestElement('text')));
 
 				// Maybe invalid tags found?
-				if (!isPostRequestParameterSet('text')) $url = 'modules.php?module=login&amp;what=order&amp;code=' . getCode('INVALID_TAGS')."&amp;id=".$id;
+				if (!isPostRequestElementSet('text')) $url = 'modules.php?module=login&amp;what=order&amp;code=' . getCode('INVALID_TAGS')."&amp;id=".$id;
 			} else {
 				// Remove any HTML code
-				setPostRequestParameter('text', str_replace('<', '{OPEN_HTML}', str_replace('>', '{CLOSE_HTML}', postRequestParameter('text'))));
+				setPostRequestElement('text', str_replace(array('<', '>'), array('{OPEN_HTML}', '{CLOSE_HTML}'), postRequestElement('text')));
 			}
 		} // END - if
 
 		// Is mail type set?
-		if ((!isPostRequestParameterSet('mail_type')) || (postRequestParameter('mail_type') < 1)) {
+		if ((!isPostRequestElementSet('mail_type')) || (postRequestElement('mail_type') < 1)) {
 			// Not correctly set
 			$url = 'modules.php?module=login&amp;what=order&amp;code=' . getCode('NO_MAIL_TYPE');
 		} // END - if
@@ -177,39 +176,30 @@ LIMIT 1",
 
 	// Still no error?
 	if (empty($url)) {
-		// Check if category and number of receivers is okay
-		$add = '';
-		if ((isOrderMultiPageEnabled()) && (isPostRequestParameterSet('zip')) && (postRequestParameter('zip') != '')) {
-			// Choose recipients by ZIP code
-			$add = sprintf(" AND d.zip LIKE '%s%%'",
-				bigintval(postRequestParameter('zip'))
-			);
-		} // END - if
-
 		// Check for userids
 		$result = SQL_QUERY_ESC("SELECT
-	c.userid
+	c.`userid`
 FROM
 	`{?_MYSQL_PREFIX?}_user_cats` AS c
-LEFT JOIN
+INNER JOIN
 	`{?_MYSQL_PREFIX?}_user_data` AS d
 ON
-	c.userid=d.userid
+	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'
+	" . runFilterChain('user_exclusion_sql', ' ') . " AND
+	d.`receive_mails` > 0
 ORDER BY
-	d.{?order_select?} {?order_mode?}",
+	d.`{?order_select?}` {?order_mode?}",
 			array(
-				bigintval(postRequestParameter('cat')),
+				bigintval(postRequestElement('cat')),
 				getMemberId()
 			), __FILE__, __LINE__);
 
 		// Do we enougth receivers left?
-		if (SQL_NUMROWS($result) >= postRequestParameter('receiver')) {
+		if (SQL_NUMROWS($result) >= postRequestElement('receiver')) {
 			// Load receivers from database
 			$TEST = array(); $count = '0';
 			while ($holidayContent = SQL_FETCHARRAY($result)) {
@@ -236,7 +226,7 @@ LIMIT 1",
 
 				if ($holidayContent['userid'] > 0) {
 					// Add receiver
-					$TEST[] = $holidayContent['userid'];
+					array_push($TEST, $holidayContent['userid']);
 					$count++;
 				} // END - if
 			} // END - while
@@ -258,21 +248,21 @@ LIMIT 1",
 				), __FILE__, __LINE__);
 
 			// Is calculated max receivers larger than wanted receivers then reset it
-			if ($content['target_send'] > postRequestParameter('receiver')) {
-				$content['target_send'] = bigintval(postRequestParameter('receiver'));
+			if ($content['target_send'] > postRequestElement('receiver')) {
+				$content['target_send'] = bigintval(postRequestElement('receiver'));
 			} // END - if
 
 			// Calculate used points
-			$USED = $content['target_send'] * getPaymentPoints(bigintval(postRequestParameter('mail_type')));
+			$usedPoints = $content['target_send'] * getPaymentData(bigintval(postRequestElement('mail_type')));
 
 			// Fix empty zip code
-			if (!isPostRequestParameterSet('zip')) {
-				setPostRequestParameter('zip', 0);
+			if (!isPostRequestElementSet('zip')) {
+				setPostRequestElement('zip', 0);
 			} // END - if
 
 			// Check if he has enougth points for this order and selected more than 0 receivers
-			if (($USED > 0) && ($USED <= $total) && ($content['target_send'] > 0)) {
-				// Gettings points is okay, so we can add $USED later from
+			if (($usedPoints > 0) && ($usedPoints <= $totalPoints) && ($content['target_send'] > 0)) {
+				// Gettings points is okay, so we can add $usedPoints later from
 				if (($id == '0') || ($type != 'TEMP')) {
 					// New order
 					$id = '0';
@@ -309,15 +299,15 @@ LIMIT 1",
 )",
 							array(
 								getMemberId(),
-								postRequestParameter('subject'),
-								postRequestParameter('text'),
+								postRequestElement('subject'),
+								postRequestElement('text'),
 								$receiver,
-								bigintval(postRequestParameter('mail_type')),
-								postRequestParameter('url'),
-								bigintval(postRequestParameter('cat')),
+								bigintval(postRequestElement('mail_type')),
+								postRequestElement('url'),
+								bigintval(postRequestElement('cat')),
 								bigintval($content['target_send']),
-								bigintval(postRequestParameter('zip'), true, false),
-								postRequestParameter('html')
+								bigintval(postRequestElement('zip'), true, false),
+								postRequestElement('html')
 							), __FILE__, __LINE__);
 					} else {
 						// No HTML extension is active
@@ -350,14 +340,14 @@ LIMIT 1",
 )",
 							array(
 								getMemberId(),
-								postRequestParameter('subject'),
-								postRequestParameter('text'),
+								postRequestElement('subject'),
+								postRequestElement('text'),
 								$receiver,
-								bigintval(postRequestParameter('mail_type')),
-								postRequestParameter('url'),
-								bigintval(postRequestParameter('cat')),
+								bigintval(postRequestElement('mail_type')),
+								postRequestElement('url'),
+								bigintval(postRequestElement('cat')),
 								bigintval($content['target_send']),
-								bigintval(postRequestParameter('zip'), true, false),
+								bigintval(postRequestElement('zip'), true, false),
 							), __FILE__, __LINE__);
 					}
 				} else {
@@ -381,15 +371,15 @@ WHERE
 	`id`=%s
 LIMIT 1",
 							array(
-								postRequestParameter('subject'),
-								postRequestParameter('text'),
+								postRequestElement('subject'),
+								postRequestElement('text'),
 								$receiver,
-								bigintval(postRequestParameter('mail_type')),
-								postRequestParameter('url'),
-								bigintval(postRequestParameter('cat')),
+								bigintval(postRequestElement('mail_type')),
+								postRequestElement('url'),
+								bigintval(postRequestElement('cat')),
 								$content['target_send'],
-								bigintval(postRequestParameter('zip')),
-								postRequestParameter('html'),
+								bigintval(postRequestElement('zip')),
+								postRequestElement('html'),
 								bigintval($id)
 							), __FILE__, __LINE__);
 					} else {
@@ -410,14 +400,14 @@ WHERE
 	`id`=%s
 LIMIT 1",
 							array(
-								postRequestParameter('subject'),
-								postRequestParameter('text'),
+								postRequestElement('subject'),
+								postRequestElement('text'),
 								$receiver,
-								bigintval(postRequestParameter('mail_type')),
-								postRequestParameter('url'),
-								bigintval(postRequestParameter('cat')),
+								bigintval(postRequestElement('mail_type')),
+								postRequestElement('url'),
+								bigintval(postRequestElement('cat')),
 								$content['target_send'],
-								bigintval(postRequestParameter('zip')),
+								bigintval(postRequestElement('zip')),
 								bigintval($id)
 							), __FILE__, __LINE__);
 					}
@@ -429,8 +419,8 @@ LIMIT 1",
 					$result = SQL_QUERY_ESC("SELECT `id` FROM `{?_MYSQL_PREFIX?}_pool` WHERE `sender`=%s AND `subject`='%s' AND `payment_id`=%s AND `data_type`='TEMP' AND `timestamp`=UNIX_TIMESTAMP() LIMIT 1",
 						array(
 							getMemberId(),
-							postRequestParameter('subject'),
-							bigintval(postRequestParameter('mail_type'))
+							postRequestElement('subject'),
+							bigintval(postRequestElement('mail_type'))
 						), __FILE__, __LINE__);
 
 					// Get pool id
@@ -454,13 +444,13 @@ LIMIT 1",
 			$url = 'modules.php?module=login&amp;what=order&amp;code=' . getCode('NO_RECS_LEFT');
 		}
 	} // END - if
-} elseif (postRequestParameter('receiver') == '0') {
+} elseif (postRequestElement('receiver') == '0') {
 	// Not enougth receivers selected
 	$url = 'modules.php?module=login&amp;what=order&amp;code=' . getCode('MORE_RECEIVERS1');
 } elseif (($ALLOWED == '0') && (getConfig('order_max_full') == 'ORDER')) {
 	// No more mail orders allowed
 	displayMessage('{--MEMBER_ORDER_ALLOWED_EXHAUSTED--}');
-} elseif ($links < getConfig('unconfirmed')) {
+} elseif (getTotalUnconfirmedMails(getMemberId()) < getConfig('unconfirmed')) {
 	// Show only enabled categories to the user ...
 	$whereStatement = " WHERE `visible`='Y'";
 
@@ -469,14 +459,18 @@ LIMIT 1",
 
 	// Display order form
 	$result_cats = SQL_QUERY("SELECT
-	`id`, `cat`
+	`id`,
+	`cat`
 FROM
 	`{?_MYSQL_PREFIX?}_cats`
 ".$whereStatement."
 ORDER BY
 	`sort` ASC", __FILE__, __LINE__);
+
+	// Some categories found?
 	if (!SQL_HASZERONUMS($result_cats)) {
-		if ($total > 0) {
+		// Enought points left?
+		if ($totalPoints > 0) {
 			// Initialize array...
 			$categories = array(
 				'id'      => array(),
@@ -487,7 +481,7 @@ ORDER BY
 			// Enable HTML checking
 			// @TODO Rewrite this to a filter
 			$HTML = ''; $HOL_STRING = '';
-			if ((isExtensionActive('html_mail')) && (postRequestParameter('html') == 'Y')) {
+			if ((isExtensionActive('html_mail')) && (postRequestElement('html') == 'Y')) {
 				$HTML = " AND `html`='Y'";
 			} // END - if
 			if (isExtensionInstalledAndNewer('holiday', '0.1.3')) {
@@ -498,7 +492,7 @@ ORDER BY
 			// ... and begin loading stuff
 			while ($categoriesContent = SQL_FETCHARRAY($result_cats)) {
 				$categories['id'][]   = bigintval($categoriesContent['id']);
-				$categories['name'][] = $categoriesContent['cat'];
+				array_push($categories['name'], $categoriesContent['cat']);
 
 				// Select users in current category
 				$result_userids = SQL_QUERY_ESC("SELECT `userid` FROM `{?_MYSQL_PREFIX?}_user_cats` WHERE `cat_id`=%s AND `userid` != '%s' ORDER BY `userid` ASC",
@@ -511,20 +505,20 @@ ORDER BY
 					if (isExtensionInstalledAndNewer('holiday', '0.1.3')) {
 						// Check user's holiday status
 						$result_holiday = SQL_QUERY_ESC("SELECT
-	COUNT(d.userid) AS `cnt`
+	COUNT(d.`userid`) AS `cnt`
 FROM
 	`{?_MYSQL_PREFIX?}_user_data` AS d
 LEFT JOIN
 	`{?_MYSQL_PREFIX?}_user_holidays` AS h
 ON
-	d.userid=h.userid
+	d.`userid`=h.`userid`
 WHERE
-	d.userid=%s AND
-	d.receive_mails > 0 AND
+	d.`userid`=%s AND
+	d.`receive_mails` > 0 AND
 	d.`status`='CONFIRMED' AND
 	d.`holiday_active`='Y' AND
-	h.holiday_start < UNIX_TIMESTAMP() AND
-	h.holiday_end > UNIX_TIMESTAMP()
+	h.`holiday_start` < UNIX_TIMESTAMP() AND
+	h.`holiday_end` > UNIX_TIMESTAMP()
 LIMIT 1",
 							array(bigintval($userid)), __FILE__, __LINE__);
 
@@ -543,10 +537,10 @@ LIMIT 1",
 						$result_ver = SQL_QUERY_ESC("SELECT `zip` FROM `{?_MYSQL_PREFIX?}_user_data` WHERE `userid`=%s".$HTML." AND `receive_mails` > 0 AND `status`='CONFIRMED' LIMIT 1",
 							array(bigintval($userid)), __FILE__, __LINE__);
 
-						if ((SQL_NUMROWS($result_ver) == 1) && (isPostRequestParameterSet('zip')) && (isOrderMultiPageEnabled())) {
+						if ((SQL_NUMROWS($result_ver) == 1) && (isPostRequestElementSet('zip')) && (isOrderMultiPageEnabled())) {
 							// Get zip code
 							list($zip) = SQL_FETCHROW($result_ver);
-							if (substr($zip, 0, strlen(postRequestParameter('zip'))) == postRequestParameter('zip')) {
+							if (substr($zip, 0, strlen(postRequestElement('zip'))) == postRequestElement('zip')) {
 								// Ok, ZIP code part is found
 								$userid_cnt++;
 							} // END - if
@@ -562,35 +556,33 @@ LIMIT 1",
 
 				// Free memory
 				SQL_FREERESULT($result_userids);
-				$categories['userids'][] = $userid_cnt;
+				array_push($categories['userids'], $userid_cnt);
 			} // END - while
 
 			// Free memory
 			SQL_FREERESULT($result_cats);
 
 			// Now we need to load the mail types...
-			$result = SQL_QUERY("SELECT `id`, `price`, `payment`, `mail_title` FROM `{?_MYSQL_PREFIX?}_payments` ORDER BY `payment` ASC", __FILE__, __LINE__);
+			$result = SQL_QUERY("SELECT `id`,`price`,`payment`,`mail_title` FROM `{?_MYSQL_PREFIX?}_payments` ORDER BY `payment` ASC", __FILE__, __LINE__);
 
 			$types = array();
 			if (!SQL_HASZERONUMS($result)) {
-				// Check for message id in URL
-				$message = getMessageFromErrorCode(getRequestParameter('code'));
-
-				if (!empty($message)) {
-					// We got system message so we drop it out to the user
-					displayMessage($message);
+				// Is the error code set?
+				if (isGetRequestElementSet('code')) {
+					// Display error message
+					displayMessage(getMessageFromErrorCode(getRequestElement('code')));
 				} // END - if
 
 				// Load all email types...
-				while ($types[] = SQL_FETCHROW($result)) {
-					// Nothing to do here... ;-)
+				while ($type = SQL_FETCHARRAY($result)) {
+					array_push($types, $type);
 				} // END - while
 
 				// Free memory
 				SQL_FREERESULT($result);
 
 				// Output user's points
-				$content['total_points'] = $total;
+				$content['total_points'] = $totalPoints;
 
 				// Check how many mail orders he has placed today and how many he's allowed to send
 				switch (getConfig('order_max_full')) {
@@ -619,7 +611,14 @@ LIMIT 1",
 
 				// Check if we already have an order placed and make it editable
 				$result = SQL_QUERY_ESC("SELECT
-	`subject`, `text`, `payment_id`, `timestamp`, `url`, `target_send`, `cat_id`, `zip`
+	`subject`,
+	`text`,
+	`payment_id`,
+	`timestamp`,
+	`url`,
+	`target_send`,
+	`cat_id`,
+	`zip`
 FROM
 	`{?_MYSQL_PREFIX?}_pool`
 WHERE
@@ -644,61 +643,56 @@ LIMIT 1",
 					// Default output for that your members don't forget it...
 					$content['url']         = 'http://';
 					$content['target_send'] = '{?order_min?}';
-					$content['subject']     = '{--ORDER_DEFAULT_SUBJECT--}';
-					$content['text']        = '{--ORDER_DEFAULT_TEXT--}';
+					$content['subject']     = '';
+					$content['text']        = '';
 				}
 
 				// Free result
 				SQL_FREERESULT($result);
 
-				if ((isPostRequestParameterSet('data')) || ((getOrderMultiPage() != 'Y') && ((!isAdmin()) && (!isExtensionActive('html_mail'))))) {
+				if ((isPostRequestElementSet('data')) || ((getOrderMultiPage() != 'Y') && ((!isAdmin()) && (!isExtensionActive('html_mail'))))) {
 					// Pre-output categories
-					$content['category_selection'] = '';
-					foreach ($categories['id'] as $key => $value) {
-						$content['category_selection'] .= '      <option value="' . $value . '"';
-						if (($OLD_ORDER) && ($content['cat_id'] == $value)) $content['category_selection'] .= ' selected="selected"';
-						$content['category_selection'] .= '>' . $categories['name'][$key]." (".$categories['userids'][$key] . ' {--USER_IN_CAT--})</option>';
-					} // END - foreach
+					$content['category_selection'] = generateCategoryOptionsList(((isExtensionActive('html_mail')) && (isPostRequestElementSet('html'))) ? postRequestElement('html') : 'N', getMemberId());
 
 					// Mail type
 					$content['type_selection'] = '';
 					foreach ($types as $key => $value) {
 						if (is_array($value)) {
 							// Output option line
-							$content['type_selection'] .= '      <option value="' . $types[$key][0] . '"';
-							if (($OLD_ORDER) && ($content['payment_id'] == $types[$key][0])) $content['type_selection'] .= ' selected="selected"';
-							$content['type_selection'] .= '>{%pipe,translateComma=' . $types[$key][1] . '%} {--PER_MAIL--} - ' . $types[$key][3] . ' - ' . round($types[$key][2]) . ' {--PAYMENT--}</option>';
+							$content['type_selection'] .= '      <option value="' . $types[$key]['id'] . '"';
+							if (($OLD_ORDER) && ($content['payment_id'] == $types[$key]['id'])) $content['type_selection'] .= ' selected="selected"';
+							$content['type_selection'] .= '>{%pipe,translateComma=' . $types[$key]['price'] . '%} {--PER_MAIL--} - ' . $types[$key]['mail_title'] . ' - ' . round($types[$key]['payment']) . ' {--PAYMENT--}</option>';
 						} // END - if
 					} // END - foreach
 
 					// No content is default
 					$content['zip_content'] = '';
 
-					if (isPostRequestParameterSet('zip')) {
+					if (isPostRequestElementSet('zip')) {
 						// Output entered ZIP code
-						$content['zip_content'] = loadTemplate('member_order-zip2', true, postRequestParameter('zip'));
+						$content['zip_content'] = loadTemplate('member_order_zip2', true, postRequestElement('zip'));
 					} // END - if
 
+					// No HTML extension installed by default
+					$content['html_extension'] = '<input type="hidden" name="html" value="N" />';
+
 					// HTML extension
-					if ((isExtensionActive('html_mail')) && (postRequestParameter('html') == 'Y')) {
+					if ((isExtensionActive('html_mail')) && (postRequestElement('html') == 'Y')) {
 						// Extension is active so output valid HTML tags
-						$content['html_extension'] = loadTemplate('member_order-html_ext', true, addValidHtmlTags());
-					} else {
-						// Extension not active and/or class not uploaded
-						$content['html_extension'] = '<tr><td colspan="3"><input type="hidden" name="html" value="N" /></td></tr>';
-					}
+						$content['html_extension'] = loadTemplate('member_order_html_ext', true);
+					} // END - if
 
 					// Output form for page 2
 					loadTemplate('member_order_page2', false, $content);
 				} else {
+					// No HTML extension installed by default
+					$content['html_extension'] = '<input type="hidden" name="html" value="N" />';
+
 					// Remember maybe entered ZIP code in constant
 					if (isExtensionActive('html_mail')) {
 						// Add some content when html extension is active
-						$content['html_extension'] = loadTemplate('member_order-html_intro', true);
-					} else {
-						// No HTML extension installed
-						$content['html_extension'] = '<tr><td colspan="3"><input type="hidden" name="html" value="N" /></td></tr>';
-					}
+						$content['html_extension'] = loadTemplate('member_order_html_intro', true);
+					} // END - if
 
 					// Default is no ZIP code
 					$content['zip_content'] = '';
@@ -706,16 +700,16 @@ LIMIT 1",
 					// Do we want ZIP code or not?
 					if ((isOrderMultiPageEnabled()) || (isAdmin())) {
 						// Yes
-						if (postRequestParameter('zip') > 0) {
+						if (postRequestElement('zip') > 0) {
 							$data = array(
-								'zip' => bigintval(postRequestParameter('zip'))
+								'zip' => bigintval(postRequestElement('zip'))
 							);
 						} else {
 							$data = array(
 								'zip' => ''
 							);
 						}
-						$content['zip_content'] = loadTemplate('member_order-zip1', true, $data);
+						$content['zip_content'] = loadTemplate('member_order_zip1', true, $data);
 					} // END - if
 
 					// Output form for page 1 (ZIP code or HTML)
@@ -723,19 +717,19 @@ LIMIT 1",
 				}
 			} else {
 				// No mail types defined
-				displayMessage('<span class="notice">{--MEMBER_ORDER_NO_PAYMENTS--}</span>');
+				displayMessage('<span class="bad">{--MEMBER_ORDER_NO_PAYMENTS--}</span>');
 			}
 		} else {
 			// No points left
-			displayMessage('<span class="notice">{--MEMBER_ORDER_NO_POINTS--}</span>');
+			displayMessage('<span class="bad">{--MEMBER_ORDER_NO_POINTS--}</span>');
 		}
 	} else {
 		// No cateogries are defined yet
-		displayMessage('<span class="notice">{--MEMBER_NO_CATEGORIES--}</span>');
+		displayMessage('<span class="bad">{--MEMBER_NO_CATEGORIES--}</span>');
 	}
 } else {
 	// Please confirm some mails first
-	displayMessage('<span class="notice">{%message,MEMBER_ORDER_LINKS_LEFT=' . $links . '%}</span>', $links);
+	displayMessage('<span class="notice">{%message,MEMBER_ORDER_LINKS_LEFT=' . getTotalUnconfirmedMails(getMemberId()) . '%}</span>');
 }
 
 if (!empty($url)) {