X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmodules%2Fmember%2Fwhat-order.php;h=d6744299fa0bce45bf865432ebe5f3d682ee038c;hb=88011a1b5523b5e5ba9bc6495c3e361fc4a3dc8a;hp=83d8724ff24622ea82a394cd25bacb0cac6e89e6;hpb=14f8d98a50a5474ecbe5e0a7d5e80fad706458fa;p=mailer.git

diff --git a/inc/modules/member/what-order.php b/inc/modules/member/what-order.php
index 83d8724ff2..d6744299fa 100644
--- a/inc/modules/member/what-order.php
+++ b/inc/modules/member/what-order.php
@@ -99,7 +99,7 @@ $total = countSumTotalData(getMemberId(), 'user_points', 'points') - countSumTot
 
 if (($HOLIDAY == 'Y') && (isExtensionInstalledAndNewer('holiday', '0.1.3'))) {
 	// Holiday is active!
-	loadTemplate('admin_settings_saved', false, getMessage('HOLIDAY_ORDER_NOT_POSSIBLE'));
+	loadTemplate('admin_settings_saved', false, '{--HOLIDAY_ORDER_NOT_POSSIBLE--}');
 } elseif ((isPostRequestParameterSet('frametester')) && ($ALLOWED > 0) && (postRequestParameter('receiver') > 0)) {
 	// Continue with the frametester, we first need to store the data temporary in the pool
 	//
@@ -110,12 +110,11 @@ FROM
 WHERE
 	`sender`=%s AND
 	`url`='%s' AND
-	`timestamp` > (UNIX_TIMESTAMP() - %s)
+	`timestamp` > (UNIX_TIMESTAMP() - {?url_tlock?})
 LIMIT 1",
 		array(
 			getMemberId(),
-			postRequestParameter('url'),
-			getConfig('url_tlock')
+			postRequestParameter('url')
 		), __FILE__, __LINE__);
 
 	$type = 'TEMP'; $id = '0';
@@ -154,7 +153,7 @@ LIMIT 1",
 			setPostRequestParameter('subject', str_replace("\\", '[nl]', substr(postRequestParameter('subject'), 0, 200)));
 			if ((strpos(strtolower(postRequestParameter('subject')), 'http://') > -1) || (strpos(strtolower(postRequestParameter('subject')), "www") > -1)) {
 				// URL in subject found
-				$url = 'modules.php?module=login&what=order&code=' . getCode('SUBJ_URL');
+				$url = 'modules.php?module=login&what=order&code=' . getCode('SUBJECT_URL');
 			} // END - if
 		} // END - if
 
@@ -435,7 +434,7 @@ LIMIT 1",
 	$url = 'modules.php?module=login&what=order&code=' . getCode('MORE_RECEIVERS1');
 } elseif (($ALLOWED == '0') && (getConfig('order_max_full') == 'ORDER')) {
 	// No more mail orders allowed
-	loadTemplate('admin_settings_saved', false, getMessage('MEMBER_ORDER_ALLOWED_EXHAUSTED'));
+	loadTemplate('admin_settings_saved', false, '{--MEMBER_ORDER_ALLOWED_EXHAUSTED--}');
 } elseif (($links < getConfig('unconfirmed')) && ($mmails == 1)) {
 	// Display order form
 	$result_cats = SQL_QUERY("SELECT
@@ -558,7 +557,7 @@ LIMIT 1",
 				// Check how many mail orders he has placed today and how many he's allowed to send
 				switch (getConfig('order_max_full')) {
 					case 'MAX': // He is allowed to send as much as possible
-						$content['order_max_full'] = getMessage('MEMBER_ORDER_ALLOWED_MAX');
+						$content['order_max_full'] = '{--MEMBER_ORDER_ALLOWED_MAX--}';
 						break;
 
 					case 'ORDER': // He is allowed to send as much as he setup the receiving value
@@ -567,7 +566,7 @@ LIMIT 1",
 
 					default: // Unknown/invalid
 						logDebugMessage(__FILE__, __LINE__, sprintf("Unknown order_mas_full config detected.", getConfig('order_max_full')));
-						$content['order_max_full'] = getMessage('MEMBER_ORDER_ALLOWED_UNKNOWN');
+						$content['order_max_full'] = '{--MEMBER_ORDER_ALLOWED_UNKNOWN--}';
 						break;
 				} // END - switch
 
@@ -618,9 +617,9 @@ LIMIT 1",
 					// Pre-output categories
 					$content['category_selection'] = '';
 					foreach ($categories['id'] as $key => $value) {
-						$content['category_selection'] .= "      <option value=\"".$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>\n";
+						$content['category_selection'] .= '>' . $categories['name'][$key]." (".$categories['userids'][$key] . ' {--USER_IN_CAT--})</option>';
 					} // END - foreach
 
 					// Mail type
@@ -629,9 +628,9 @@ LIMIT 1",
 						$P = translateComma($types[$key][1]);
 						if (is_array($value)) {
 							// Output option line
-							$content['type_selection'] .= "      <option value=\"".$types[$key][0]."\"";
+							$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'] .= ">".$P." {--PER_MAIL--} - ".$types[$key][3]." - ".round($types[$key][2])." {--PAYMENT--}</option>\n";
+							$content['type_selection'] .= '>' . $P . ' {--PER_MAIL--} - ' . $types[$key][3] . ' - ' . round($types[$key][2]) . ' {--PAYMENT--}</option>';
 						} // END - if
 					} // END - foreach
 
@@ -695,11 +694,11 @@ LIMIT 1",
 		}
 	} else {
 		// No cateogries are defined yet
-		loadTemplate('admin_settings_saved', false, '<span class="member_failed">{--MEMBER_NO_CATS--}</span>');
+		loadTemplate('admin_settings_saved', false, '<span class="member_failed">{--MEMBER_NO_CATEGORIES--}</span>');
 	}
 } elseif ($mmails == '0') {
 	// Please set more than 0 mails per day
-	loadTemplate('admin_settings_saved', false, getMessage('MEMBER_HAS_ZERO_MMAILS'));
+	loadTemplate('admin_settings_saved', false, '{--MEMBER_HAS_ZERO_MMAILS--}');
 } else {
 	// Please confirm some mails first
 	loadTemplate('admin_settings_saved', false, getMaskedMessage('MEMBER_LINKS_LEFT'), $links);