X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Fmodules%2Fmember%2Fwhat-order.php;h=c255e92df9a42ec2eac2f43d54adc915da46a6dd;hp=ae81c826143ee0476456f42a2ae8b8dd3e791e49;hb=1cf72a9c1a5e737509af79d49f0731da2eb6a218;hpb=ba973321465edf4c1239d3b499b6de1e4be1f10c

diff --git a/inc/modules/member/what-order.php b/inc/modules/member/what-order.php
index ae81c82614..c255e92df9 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())) {
-	addFatalMessage(EXTENSION_PROBLEM_EXT_INACTIVE, "order");
+	addFatalMessage(getMessage('EXTENSION_PROBLEM_EXT_INACTIVE'), "order");
 	return;
 }
 
@@ -147,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 = "modules.php?module=login&what=order&msg=".constant('CODE_BLIST_URL')."&blist=".$blist;
+				$URL = "modules.php?module=login&what=order&msg=".constant('CODE_BLIST_URL')."&blist=".$blist;
 			} // END - if
 
 			// Free result
@@ -498,9 +498,9 @@ LIMIT 1", array(bigintval($ucat)), __FILE__, __LINE__);
 
 					// Finally contruct the message
 					// @TODO Rewrite this old lost code to a template
-					$MSG = "{!MEMBER_URL_TIME_LOCK!}<br />{!CONFIG_URL_TLOCK!} ".$STD."
-						{!_HOURS!}, ".$MIN." {!_MINUTES!} {!_AND!} ".$SEC." {!_SECONDS!}<br />
-						{!MEMBER_LAST_TLOCK!}: ".$LORDER;
+					$MSG = "{--MEMBER_URL_TIME_LOCK--}<br />{--CONFIG_URL_TLOCK--} ".$STD."
+						{--_HOURS--}, ".$MIN." {--_MINUTES--} {--_AND--} ".$SEC." {--_SECONDS--}<br />
+						{--MEMBER_LAST_TLOCK--}: ".$LORDER;
 					break;
 
 				case constant('CODE_OVERLENGTH'):
@@ -516,7 +516,7 @@ LIMIT 1", array(bigintval($ucat)), __FILE__, __LINE__);
 					break;
 
 				case constant('CODE_BLIST_URL'):
-					$MSG = "{!MEMBER_URL_BLACK_LISTED!}<br />\n{!MEMBER_BLIST_TIME!}: ".MAKE_DATETIME($_GET['blist'], "0");
+					$MSG = "{--MEMBER_URL_BLACK_LISTED--}<br />\n{--MEMBER_BLIST_TIME--}: ".MAKE_DATETIME($_GET['blist'], "0");
 					break;
 
 				case constant('CODE_NO_RECS_LEFT'):
@@ -540,7 +540,7 @@ LIMIT 1", array(bigintval($ucat)), __FILE__, __LINE__);
 					break;
 
 				case constant('CODE_MORE_RECEIVERS3'):
-					$MSG = "{!MEMBER_ENTER_MORE_MIN_RECEIVERS_1!}".getConfig('order_min')."{!MEMBER_ENTER_MORE_MIN_RECEIVERS_2!}";
+					$MSG = "{--MEMBER_ENTER_MORE_MIN_RECEIVERS_1--}".getConfig('order_min')."{--MEMBER_ENTER_MORE_MIN_RECEIVERS_2--}";
 					break;
 
 				case constant('CODE_INVALID_URL'):
@@ -552,7 +552,7 @@ LIMIT 1", array(bigintval($ucat)), __FILE__, __LINE__);
 
 				default:
 					DEBUG_LOG(__FILE__, __LINE__, sprintf("Unknown error code %s detected.", $_GET['msg']));
-					$MSG = "{!UNKNOWN_CODE_1!}".$_GET['msg']."{!UNKNOWN_CODE_2!}";
+					$MSG = "{--UNKNOWN_CODE_1--}".$_GET['msg']."{--UNKNOWN_CODE_2--}";
 					break;
 				}
 
@@ -616,14 +616,14 @@ LIMIT 1", array(bigintval($ucat)), __FILE__, __LINE__);
 				// 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"))))) {
+				// 01      2              21    12                                    2    23         443    3          3210
+				if ((!empty($_POST['data'])) || ((getConfig('order_multi_page') != "Y") && ((!IS_ADMIN()) && (!EXT_IS_ACTIVE("html_mail"))))) {
 					// Pre-output categories
 					$CAT = "";
 					foreach ($CATS['id'] as $key => $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
@@ -634,7 +634,7 @@ LIMIT 1", array(bigintval($ucat)), __FILE__, __LINE__);
 							// Output option line
 							$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
 
@@ -701,22 +701,22 @@ LIMIT 1", array(bigintval($ucat)), __FILE__, __LINE__);
 				}
 			} else {
 				// No mail types defined
-				LOAD_TEMPLATE("admin_settings_saved", false, "<span class=\"member_failed\">{!MEMBER_NO_PAYMENTS!}</span>");
+				LOAD_TEMPLATE("admin_settings_saved", false, "<span class=\"member_failed\">{--MEMBER_NO_PAYMENTS--}</span>");
 			}
 		} else {
-			// No points left!
-			LOAD_TEMPLATE("admin_settings_saved", false, "<span class=\"member_failed\">{!MEMBER_NO_POINTS!}</span>");
+			// No points left
+			LOAD_TEMPLATE("admin_settings_saved", false, "<span class=\"member_failed\">{--MEMBER_NO_POINTS--}</span>");
 		}
 	} else {
 		// No cateogries are defined yet
-		LOAD_TEMPLATE("admin_settings_saved", false, "<span class=\"member_failed\">{!MEMBER_NO_CATS!}</span>");
+		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!
+	// Please set more than 0 mails per day
 	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);
+	// Please confirm some mails first
+	LOAD_TEMPLATE("admin_settings_saved", false, sprintf(getMessage('MEMBER_LINKS_LEFT'), $links, getConfig('unconfirmed')));
 }
 
 if (!empty($URL)) {