Deprecated variables for templates removed, mor EL-rewrites, getMessage() rewritten:

[mailer.git] / inc / modules / member / what-order.php

diff --git a/inc/modules/member/what-order.php b/inc/modules/member/what-order.php
index 83d8724ff24622ea82a394cd25bacb0cac6e89e6..77b8206c67f4883ad06e8137130a8147f5afc9bc 100644 (file)
--- 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';
@@ -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
@@ -699,7 +698,7 @@ LIMIT 1",
        }
 } 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);