X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmodules%2Fmember%2Fwhat-order.php;h=f1627a9584533e4d15b66977e978bce25aeac4a1;hb=5bdeaf8b452206598b6c6cd4f941145b11a0eccc;hp=7753510fa860a5ea7f1053b07e8f63f46be0c1d8;hpb=d0f0f15c27d6af49056e2658bb683a469f49db38;p=mailer.git

diff --git a/inc/modules/member/what-order.php b/inc/modules/member/what-order.php
index 7753510fa8..f1627a9584 100644
--- a/inc/modules/member/what-order.php
+++ b/inc/modules/member/what-order.php
@@ -38,7 +38,7 @@ if (!defined('__SECURITY')) {
 } elseif (!IS_MEMBER()) {
 	LOAD_URL("modules.php?module=index");
 } elseif ((!EXT_IS_ACTIVE("order")) && (!IS_ADMIN())) {
-	ADD_FATAL(EXTENSION_PROBLEM_EXT_INACTIVE, "order");
+	addFatalMessage(EXTENSION_PROBLEM_EXT_INACTIVE, "order");
 	return;
 }
 
@@ -46,7 +46,7 @@ if (!defined('__SECURITY')) {
 ADD_DESCR("member", __FILE__);
 
 $URL = ""; $id = 0;
-$whereStatement = " WHERE visible='Y'";
+$whereStatement = " WHERE `visible`='Y'";
 
 // Set undefined array elements
 if (empty($_GET['msg']))       $_GET['msg']       = "";
@@ -59,22 +59,19 @@ if (IS_ADMIN()) $whereStatement = "";
 define('__MIN_VALUE', getConfig('order_min'));
 
 // Count unconfirmed mails
-$result_links = SQL_QUERY_ESC("SELECT id FROM "._MYSQL_PREFIX."_user_links WHERE userid=%s",
- array($GLOBALS['userid']), __FILE__, __LINE__);
-$links = SQL_NUMROWS($result_links);
-SQL_FREERESULT($result_links);
+$links = GET_TOTAL_DATA($GLOBALS['userid'], "user_links", "id", "userid", true);
 
 // Does the user has more than 0 mails per day set?
-$HOLIDAY="userid";
+$HOLIDAY = "userid";
 if (GET_EXT_VERSION("holiday") >= "0.1.3") {
 	// Fetch also holiday activation data
 	$HOLIDAY = "holiday_active";
 } // END - if
 
 $result_mmails = SQL_QUERY_ESC("SELECT userid, receive_mails, mail_orders, ".$HOLIDAY."
-FROM "._MYSQL_PREFIX."_user_data
+FROM `{!_MYSQL_PREFIX!}_user_data`
 WHERE userid=%s AND max_mails > 0 LIMIT 1",
- array($GLOBALS['userid']), __FILE__, __LINE__);
+	array($GLOBALS['userid']), __FILE__, __LINE__);
 
 $mmails = SQL_NUMROWS($result_mmails);
 list($DMY, $MAXI, $ORDERS, $HOLIDAY) = SQL_FETCHROW($result_mmails);
@@ -85,33 +82,25 @@ $ALLOWED = $MAXI - $ORDERS;
 if (getConfig('order_max_full') == "MAX") $ALLOWED = $MAXI;
 
 // Now check his points amount
-$TOTAL = GET_TOTAL_DATA($GLOBALS['userid'], "user_points", "points");
-
-if ($TOTAL > 0) {
-	// And subtract his used points...
-	$TOTAL -= GET_TOTAL_DATA($GLOBALS['userid'], "user_data", "used_points");
-
-	// Add (maybe) missing three zeros
-	if (!ereg(".", $TOTAL)) $TOTAL .= ".00000";
-} // END - if
+$TOTAL = GET_TOTAL_DATA($GLOBALS['userid'], "user_points", "points") - GET_TOTAL_DATA($GLOBALS['userid'], "user_data", "used_points");;
 
 if (($HOLIDAY == "Y") && (GET_EXT_VERSION("holiday") >= "0.1.3")) {
 	// Holiday is active!
-	SQL_FREERESULT($result_p);
 	LOAD_TEMPLATE("admin_settings_saved", false, HOLIDAY_ORDER_NOT_POSSIBLE);
 } elseif ((!empty($_POST['frametester'])) && ($ALLOWED > 0) && ($_POST['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
-FROM "._MYSQL_PREFIX."_pool
+FROM `{!_MYSQL_PREFIX!}_pool`
 WHERE sender=%s AND url='%s' AND timestamp > (UNIX_TIMESTAMP() - %s) LIMIT 1",
-	 array($GLOBALS['userid'], $_POST['url'], getConfig('url_tlock')), __FILE__, __LINE__);
+		array($GLOBALS['userid'], $_POST['url'], getConfig('url_tlock')), __FILE__, __LINE__);
 
 	$type = "TEMP"; $id = 0;
 	if (SQL_NUMROWS($result) == 1) {
+		// Load id and mail type
 		list($id, $type) = SQL_FETCHROW($result);
-	}
+	} // END - if
 
 	// Free result
 	SQL_FREERESULT($result);
@@ -124,7 +113,7 @@ WHERE sender=%s AND url='%s' AND timestamp > (UNIX_TIMESTAMP() - %s) LIMIT 1",
 			// Test submitted text against some filters (length, URLs in text etc.)
 			if ((strpos(strtolower($_POST['text']), "https://") > -1) || (strpos(strtolower($_POST['text']), "http://") > -1) || (strpos(strtolower($_POST['text']), "www") > -1)) {
 				// URL found!
-				$URL = URL."/modules.php?module=login&what=order&msg=".CODE_URL_FOUND;
+				$URL = "modules.php?module=login&what=order&msg=".CODE_URL_FOUND;
 			} // END - if
 
 			// Remove new-line and carriage-return characters
@@ -133,7 +122,7 @@ WHERE sender=%s AND url='%s' AND timestamp > (UNIX_TIMESTAMP() - %s) LIMIT 1",
 			// Text length within allowed length?
 			if (strlen($TEST) > getConfig('max_tlength')) {
 				// Text is too long!
-				$URL = URL."/modules.php?module=login&what=order&msg=".CODE_OVERLENGTH;
+				$URL = "modules.php?module=login&what=order&msg=".CODE_OVERLENGTH;
 			} // END - if
 		} // END - if
 
@@ -143,14 +132,14 @@ WHERE sender=%s AND url='%s' AND timestamp > (UNIX_TIMESTAMP() - %s) LIMIT 1",
 			$_POST['subject'] = str_replace("\\", "[nl]", substr($_POST['subject'], 0, 200));
 			if ((strpos(strtolower($_POST['subject']), "http://") > -1) || (strpos(strtolower($_POST['subject']), "www") > -1)) {
 				// URL in subject found
-				$URL = URL."/modules.php?module=login&what=order&msg=".CODE_SUBJ_URL;
+				$URL = "modules.php?module=login&what=order&msg=".CODE_SUBJ_URL;
 			} // END - if
 		} // END - if
 
 		// And shall I check that his URL is not in the black list?
 		if (getConfig('url_blacklist') == "Y") {
 			// 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",
+			$result = SQL_QUERY_ESC("SELECT UNIX_TIMESTAMP(`timestamp`) AS tstamp FROM `{!_MYSQL_PREFIX!}_url_blacklist` WHERE `url`='%s' LIMIT 1",
 				array($_POST['url']), __FILE__, __LINE__);
 
 			if (SQL_NUMROWS($result) == 1) {
@@ -158,7 +147,7 @@ WHERE sender=%s AND url='%s' AND timestamp > (UNIX_TIMESTAMP() - %s) LIMIT 1",
 				list($blist) = SQL_FETCHROW($result);
 
 				// Create redirect-URL
-				$URL = URL."/modules.php?module=login&what=order&msg=".CODE_BLIST_URL."&blist=".$blist;
+				$URL = "modules.php?module=login&what=order&msg=".CODE_BLIST_URL."&blist=".$blist;
 			} // END - if
 
 			// Free result
@@ -168,13 +157,13 @@ WHERE sender=%s AND url='%s' AND timestamp > (UNIX_TIMESTAMP() - %s) LIMIT 1",
 		// Enougth receivers entered?
 		if (($_POST['receiver'] < getConfig('order_min')) && (!IS_ADMIN())) {
 			// Less than allowed receivers entered!
-			$URL = URL."/modules.php?module=login&amp;what=order&amp;msg=".CODE_MORE_RECEIVERS3;
+			$URL = "modules.php?module=login&amp;what=order&amp;msg=".CODE_MORE_RECEIVERS3;
 		} // END - if
 
 		// Validate URL
 		if (!VALIDATE_URL($_POST['url'])) {
 			// URL is invalid!
-			$URL = URL."/modules.php?module=login&amp;what=order&amp;msg=".CODE_INVALID_URL;
+			$URL = "modules.php?module=login&amp;what=order&amp;msg=".CODE_INVALID_URL;
 		} // END - if
 
 		// Probe for HTML extension
@@ -185,7 +174,7 @@ WHERE sender=%s AND url='%s' AND timestamp > (UNIX_TIMESTAMP() - %s) LIMIT 1",
 				$_POST['text'] = HTML_CHECK_TAGS($_POST['text']);
 
 				// Maybe invalid tags found?
-				if (empty($_POST['text'])) $URL = URL."/modules.php?module=login&amp;what=order&amp;msg=".CODE_INVALID_TAGS."&id=".$id;
+				if (empty($_POST['text'])) $URL = "modules.php?module=login&amp;what=order&amp;msg=".CODE_INVALID_TAGS."&amp;id=".$id;
 			} else {
 				// Remove any HTML code
 				$_POST['text'] = str_replace("<", "{OPEN_HTML}", str_replace(">", "{CLOSE_HTML}", $_POST['text']));
@@ -193,7 +182,7 @@ WHERE sender=%s AND url='%s' AND timestamp > (UNIX_TIMESTAMP() - %s) LIMIT 1",
 		}
 	} elseif (!IS_ADMIN()) {
 		// He has already sent a mail within a specific time
-		$URL = URL."/modules.php?module=login&amp;what=order&amp;msg=".CODE_URL_TLOCK."&id=".$id;
+		$URL = "modules.php?module=login&amp;what=order&amp;msg=".CODE_URL_TLOCK."&amp;id=".$id;
 	}
 
 	// Still no error?
@@ -206,8 +195,8 @@ WHERE sender=%s AND url='%s' AND timestamp > (UNIX_TIMESTAMP() - %s) LIMIT 1",
 		} // END - if
 
 		// Check for userids
-		$result = SQL_QUERY_ESC("SELECT DISTINCT c.userid FROM "._MYSQL_PREFIX."_user_cats AS c
-LEFT JOIN `"._MYSQL_PREFIX."_user_data` AS d
+		$result = SQL_QUERY_ESC("SELECT DISTINCT c.userid FROM `{!_MYSQL_PREFIX!}_user_cats` AS c
+LEFT JOIN `{!_MYSQL_PREFIX!}_user_data` AS d
 ON c.userid=d.userid
 WHERE c.cat_id=%s AND c.userid != '%s' AND d.status='CONFIRMED' AND d.receive_mails > 0".$ADD."
 ORDER BY d.%s %s",
@@ -232,7 +221,7 @@ ORDER BY d.%s %s",
 			while (list($REC) = SQL_FETCHROW($result)) {
 				if ($HOLIDAY) {
 					// Check for his holiday status
-					$result_holiday = SQL_QUERY_ESC("SELECT id FROM "._MYSQL_PREFIX."_user_holidays
+					$result_holiday = SQL_QUERY_ESC("SELECT id FROM `{!_MYSQL_PREFIX!}_user_holidays`
 WHERE userid=%s AND holiday_start < UNIX_TIMESTAMP() AND holiday_end > UNIX_TIMESTAMP() LIMIT 1",
  array(bigintval($REC)), __FILE__, __LINE__);
  					if (SQL_NUMROWS($result_holiday) == 1) $REC = 0; // Exclude user who are in holiday
@@ -258,7 +247,7 @@ WHERE userid=%s AND holiday_start < UNIX_TIMESTAMP() AND holiday_end > UNIX_TIME
 			$MAX_SEND = count($TEST);
 
 			// Update receiver list
-			$result = SQL_QUERY_ESC("UPDATE `"._MYSQL_PREFIX."_user_data` SET receive_mails=receive_mails-1 WHERE userid IN (%s) LIMIT %s",
+			SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_user_data` SET receive_mails=receive_mails-1 WHERE userid IN (%s) LIMIT %s",
 				array(str_replace(";", ", ", $RECEIVER), $MAX_SEND), __FILE__, __LINE__);
 
 			// Is calculated max receivers larger than wanted receivers then reset it
@@ -279,7 +268,7 @@ WHERE userid=%s AND holiday_start < UNIX_TIMESTAMP() AND holiday_end > UNIX_TIME
 					$id = 0;
 					if (EXT_IS_ACTIVE("html_mail")) {
 						// HTML extension is active
-						$result = 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)
+						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','%s','%s','%s','%s','%s','%s')",
 array(
 	$GLOBALS['userid'],
@@ -296,7 +285,7 @@ array(
 ), __FILE__, __LINE__);
 					} else {
 						// No HTML extension is active
-						$result = SQL_QUERY_ESC("INSERT INTO "._MYSQL_PREFIX."_pool (sender, subject, text, receivers, payment_id, data_type, timestamp, url, cat_id, target_send, zip)
+						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','%s','%s','%s','%s','%s')",
 array(
 	$GLOBALS['userid'],
@@ -315,7 +304,7 @@ array(
 					// Change current order
 					if (EXT_IS_ACTIVE("html_mail")) {
 						// HTML extension is active
-						$result = SQL_QUERY_ESC("UPDATE "._MYSQL_PREFIX."_pool SET
+						SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_pool` SET
 subject='%s',
 text='%s',
 receivers='%s',
@@ -341,7 +330,7 @@ array(
 ), __FILE__, __LINE__);
 					} else {
 						// No HTML extension is active
-						$result = SQL_QUERY_ESC("UPDATE "._MYSQL_PREFIX."_pool SET
+						SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_pool` SET
 subject='%s',
 text='%s',
 receivers='%s',
@@ -369,7 +358,7 @@ array(
 				// Do we need to get the ID number?
 				if ($id == 0) {
 					// Order is placed as temporary. We need to get it's id for the frametester
-					$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=%s 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=%s LIMIT 1",
 					array(
 						$GLOBALS['userid'],
 						$_POST['subject'],
@@ -382,28 +371,28 @@ array(
 				}
 
 				// ID is received so we can redirect the user, used points will be added when he send's out the mail
-				$URL = URL."/modules.php?module=frametester&amp;order=".$id."";
+				$URL = "modules.php?module=frametester&amp;order=".$id."";
 			} elseif ($MAX_SEND == 0) {
 				// Not enougth receivers found which can receive mails
-				$URL = URL."/modules.php?module=login&amp;what=order&amp;msg=".CODE_MORE_RECEIVERS2;
+				$URL = "modules.php?module=login&amp;what=order&amp;msg=".CODE_MORE_RECEIVERS2;
 			} else {
 				// No enougth points left!
-				$URL = URL."/modules.php?module=login&amp;what=order&amp;msg=".CODE_MORE_POINTS;
+				$URL = "modules.php?module=login&amp;what=order&amp;msg=".CODE_MORE_POINTS;
 			}
 		} else 	{
 			// Ordered more mails than he can send in this category
-			$URL = URL."/modules.php?module=login&amp;what=order&amp;msg=".CODE_NO_RECS_LEFT;
+			$URL = "modules.php?module=login&amp;what=order&amp;msg=".CODE_NO_RECS_LEFT;
 		}
 	}
 } elseif ($_POST['receiver'] == "0") {
 	// Not enougth receivers selected
-	$URL = URL."/modules.php?module=login&amp;what=order&amp;msg=".CODE_MORE_RECEIVERS1;
+	$URL = "modules.php?module=login&amp;what=order&amp;msg=".CODE_MORE_RECEIVERS1;
 } elseif (($ALLOWED == 0) && (getConfig('order_max_full') == "ORDER")) {
 	// No more mail orders allowed
-	LOAD_TEMPLATE("admin_settings_saved", false, MEMBER_ORDER_ALLOWED_EXHAUSTED);
+	LOAD_TEMPLATE("admin_settings_saved", false, getMessage('MEMBER_ORDER_ALLOWED_EXHAUSTED'));
 } elseif (($links < getConfig('unconfirmed')) && ($mmails == "1")) {
 	// Display order form
-	$result_cats = SQL_QUERY("SELECT id, cat FROM "._MYSQL_PREFIX."_cats".$whereStatement." ORDER BY sort", __FILE__, __LINE__);
+	$result_cats = SQL_QUERY("SELECT id, cat FROM `{!_MYSQL_PREFIX!}_cats`".$whereStatement." ORDER BY `sort`", __FILE__, __LINE__);
 	if (SQL_NUMROWS($result_cats) > 0) {
 		if ($TOTAL > 0) {
 			// Initialize array...
@@ -427,7 +416,7 @@ array(
 				$CATS['name'][] = $cat;
 
 				// Select users in current category
-				$result_uids = SQL_QUERY_ESC("SELECT userid FROM "._MYSQL_PREFIX."_user_cats WHERE cat_id=%s AND userid != '%s' ORDER BY userid",
+				$result_uids = SQL_QUERY_ESC("SELECT userid FROM `{!_MYSQL_PREFIX!}_user_cats` WHERE cat_id=%s AND userid != '%s' ORDER BY userid",
 				 array(bigintval($id), $GLOBALS['userid']), __FILE__, __LINE__);
 
 				$uid_cnt = 0;
@@ -436,8 +425,8 @@ array(
 					$HOL_ACTIVE = false;
 					if ($HOLIDAY) {
 						// Check user's holiday status
-						$result_holiday = SQL_QUERY_ESC("SELECT DISTINCT d.userid FROM `"._MYSQL_PREFIX."_user_data` AS d
-LEFT JOIN "._MYSQL_PREFIX."_user_holidays AS h
+						$result_holiday = SQL_QUERY_ESC("SELECT DISTINCT d.userid FROM `{!_MYSQL_PREFIX!}_user_data` AS d
+LEFT JOIN `{!_MYSQL_PREFIX!}_user_holidays` AS h
 ON d.userid=h.userid
 WHERE 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()
@@ -453,8 +442,8 @@ LIMIT 1", array(bigintval($ucat)), __FILE__, __LINE__);
 
 					if (!$HOL_ACTIVE) {
 						// Check if the user want's to receive mails?
-						$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($ucat)), __FILE__, __LINE__);
+						$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($ucat)), __FILE__, __LINE__);
 
 						if ((SQL_NUMROWS($result_ver) == 1) && (!empty($_POST['zip'])) && (getConfig('order_multi_page') == "Y")) {
 							list($zip) = SQL_FETCHROW($result_ver);
@@ -479,7 +468,7 @@ LIMIT 1", array(bigintval($ucat)), __FILE__, __LINE__);
 			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", __FILE__, __LINE__);
+			$result = SQL_QUERY("SELECT id, price, payment, mail_title FROM `{!_MYSQL_PREFIX!}_payments` ORDER BY payment", __FILE__, __LINE__);
 
 			$typeS = array();
 			if (SQL_NUMROWS($result) > 0) {
@@ -488,7 +477,7 @@ LIMIT 1", array(bigintval($ucat)), __FILE__, __LINE__);
 				switch ($_GET['msg'])
 				{
 				case CODE_URL_TLOCK:
-					$result = SQL_QUERY_ESC("SELECT timestamp FROM "._MYSQL_PREFIX."_pool WHERE id=%s LIMIT 1",
+					$result = SQL_QUERY_ESC("SELECT timestamp FROM `{!_MYSQL_PREFIX!}_pool` WHERE id=%s LIMIT 1",
 					 array(bigintval($_GET['id'])), __FILE__, __LINE__);
 
 					// Load timestamp from last order
@@ -606,16 +595,15 @@ LIMIT 1", array(bigintval($ucat)), __FILE__, __LINE__);
 				$OLD_ORDER = false; $subject = ""; $text = ""; $target = "";
 
 				// 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 FROM "._MYSQL_PREFIX."_pool WHERE sender=%s AND data_type='TEMP' LIMIT 1",
+				$result = SQL_QUERY_ESC("SELECT subject, text, payment_id, timestamp, url, target_send, cat_id, zip FROM `{!_MYSQL_PREFIX!}_pool` WHERE sender=%s AND data_type='TEMP' LIMIT 1",
 				 array($GLOBALS['userid']), __FILE__, __LINE__);
 
 				if (SQL_NUMROWS($result) == 1) {
 					// Old order found
 					list($subject, $text, $payment, $tstamp, $url, $target, $cat, $zip) = SQL_FETCHROW($result);
-					SQL_FREERESULT($result);
 
 					// Fix max receivers when it is too much
-					if ($target > $CATS['uids'][$cat]) $target = $CATS['uids'][$cat];
+					if ((isset($CATS['uids'][$cat])) && ($target > $CATS['uids'][$cat])) $target = $CATS['uids'][$cat];
 
 					// Old order is grabbed
 					$OLD_ORDER = true;
@@ -624,14 +612,17 @@ LIMIT 1", array(bigintval($ucat)), __FILE__, __LINE__);
 					$url = "http://";
 				}
 
+				// Free result
+				SQL_FREERESULT($result);
+
 				// 01      2              21    12                                   2    23         443    3          3210
 				if ((!empty($_POST['data'])) || ((getConfig('order_multi_page') == "N") && ((!IS_ADMIN()) && (!EXT_IS_ACTIVE("html_mail"))))) {
 					// Pre-output categories
 					$CAT = "";
 					foreach ($CATS['id'] as $key => $value) {
-						$CAT .= "      <OPTION value=\"".$value."\"";
+						$CAT .= "      <option value=\"".$value."\"";
 						if (($OLD_ORDER) && ($cat == $value)) $CAT .= " selected=\"selected\"";
-						$CAT .= ">".$CATS['name'][$key]." (".$CATS['uids'][$key]." ".USER_IN_CAT.")</OPTION>\n";
+						$CAT .= ">".$CATS['name'][$key]." (".$CATS['uids'][$key]." ".USER_IN_CAT.")</option>\n";
 					} // END - foreach
 
 					// Mail type
@@ -640,9 +631,9 @@ LIMIT 1", array(bigintval($ucat)), __FILE__, __LINE__);
 						$P = TRANSLATE_COMMA($typeS[$key][1]);
 						if (is_array($value)) {
 							// Output option line
-							$type .= "      <OPTION value=\"".$typeS[$key][0]."\"";
+							$type .= "      <option value=\"".$typeS[$key][0]."\"";
 							if (($OLD_ORDER) && ($payment == $typeS[$key][0])) $type .= " selected=\"selected\"";
-							$type .= ">".$P." ".PER_MAIL." - ".$typeS[$key][3]." - ".round($typeS[$key][2])." ".PAYMENT."</OPTION>\n";
+							$type .= ">".$P." ".PER_MAIL." - ".$typeS[$key][3]." - ".round($typeS[$key][2])." ".PAYMENT."</option>\n";
 						} // END - if
 					} // END - foreach
 
@@ -658,7 +649,7 @@ LIMIT 1", array(bigintval($ucat)), __FILE__, __LINE__);
 						// Output entered ZIP code
 						define('ZIP_OUTPUT', LOAD_TEMPLATE("member_order-zip2", true, $_POST['zip']));
 					} else {
-						define('ZIP_OUTPUT', "<TR><TD colspan=\"5\" height=\"5\" class=\"seperator\">&nbsp;</TD></TR>");
+						define('ZIP_OUTPUT', "<tr><td colspan=\"5\" height=\"5\" class=\"seperator\">&nbsp;</td></tr>");
 					}
 
 					// HTML extension
@@ -667,7 +658,7 @@ LIMIT 1", array(bigintval($ucat)), __FILE__, __LINE__);
 						define('MEMBER_HTML_EXTENSION', LOAD_TEMPLATE("member_order-html_ext", true, HTML_ADD_VALID_TAGS()));
 					} else {
 						// Extension not active and/or class not uploaded
-						define('MEMBER_HTML_EXTENSION', "<TR><TD colspan=\"5\"><INPUT type=\"hidden\" name=\"html\" value=\"N\"></TD></TR>");
+						define('MEMBER_HTML_EXTENSION', "<tr><td colspan=\"5\"><input type=\"hidden\" name=\"html\" value=\"N\"> /</td></tr>");
 					}
 
 					// Output form for page 2
@@ -677,20 +668,27 @@ LIMIT 1", array(bigintval($ucat)), __FILE__, __LINE__);
 					$ADD = "";
 					if (EXT_IS_ACTIVE("html_mail")) {
 						// Add some content when html extension is active
-						if ((getConfig('order_multi_page') == "Y") || (IS_ADMIN())) $ADD = "<TR><TD colspan=\"2\" class=\"seperator bottom2\" height=\"5\">&nbsp;</TD></TR>\n";
+						if ((getConfig('order_multi_page') == "Y") || (IS_ADMIN())) $ADD = "<tr><td colspan=\"2\" class=\"seperator bottom2\" height=\"5\">&nbsp;</td></tr>\n";
 						define('MEMBER_HTML_EXTENSION', LOAD_TEMPLATE("member_order-html_intro", true));
 					} else {
 						// No HTML extension installed
-						define('MEMBER_HTML_EXTENSION', "<TR><TD colspan=\"2\"><INPUT type=\"hidden\" name=\"html\" value=\"N\"></TD></TR>");
+						define('MEMBER_HTML_EXTENSION', "<tr><td colspan=\"2\"><input type=\"hidden\" name=\"html\" value=\"N\" /></td></tr>");
 					}
 
 					// Do we want ZIP code or not?
 					if ((getConfig('order_multi_page') == "Y") || (IS_ADMIN())) {
 						// Yes
-						$content = array(
-							'zip' => bigintval($_POST['zip']),
-							'add' => $ADD
-						);
+						if ($_POST['zip'] > 0) {
+							$content = array(
+								'zip' => bigintval($_POST['zip']),
+								'add' => $ADD
+							);
+						} else {
+							$content = array(
+								'zip' => "",
+								'add' => $ADD
+							);
+						}
 						define('MEMBER_ZIP_CONTENT', LOAD_TEMPLATE("member_order-zip1", true, $content));
 					} else {
 						// No
@@ -702,19 +700,19 @@ LIMIT 1", array(bigintval($ucat)), __FILE__, __LINE__);
 				}
 			} else {
 				// No mail types defined
-				OUTPUT_HTML("<STRONG><SPAN class=\"member_failed\">".MEMBER_NO_PAYMENTS."</SPAN></STRONG>");
+				LOAD_TEMPLATE("admin_settings_saved", false, "<span class=\"member_failed\">{!MEMBER_NO_PAYMENTS!}</span>");
 			}
 		} else {
 			// No points left!
-			OUTPUT_HTML("<STRONG><SPAN class=\"member_failed\">".MEMBER_NO_POINTS."</SPAN></STRONG>");
+			LOAD_TEMPLATE("admin_settings_saved", false, "<span class=\"member_failed\">{!MEMBER_NO_POINTS!}</span>");
 		}
 	} else {
 		// No cateogries are defined yet
-		OUTPUT_HTML("<STRONG><SPAN class=\"member_failed\">".MEMBER_NO_CATS."</SPAN></STRONG>");
+		LOAD_TEMPLATE("admin_settings_saved", false, "<span class=\"member_failed\">{!MEMBER_NO_CATS!}</span>");
 	}
 } elseif ($mmails == "0") {
 	// Please set more than 0 mails per day!
-	LOAD_TEMPLATE("admin_settings_saved", false, MEMBER_HAS_ZERO_MMAILS);
+	LOAD_TEMPLATE("admin_settings_saved", false, getMessage('MEMBER_HAS_ZERO_MMAILS'));
 } else {
 	// Please confirm some mails first!
 	LOAD_TEMPLATE("admin_settings_saved", false, MEMBER_LINKS_LEFT_1.$links.MEMBER_LINKS_LEFT_2.getConfig('unconfirmed').MEMBER_LINKS_LEFT_3);