More constant rewrites

[mailer.git] / inc / modules / order.php

diff --git a/inc/modules/order.php b/inc/modules/order.php
index 9082cb50ecd58a5d1ca1e6613099004c0ea7525d..aa64300976e008a12151e599fbafc51eecfac52b 100644 (file)
--- a/inc/modules/order.php
+++ b/inc/modules/order.php
@@ -37,12 +37,12 @@ if (!defined('__SECURITY')) {
        $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4) . "/security.php";
        require($INC);
 } elseif ((!EXT_IS_ACTIVE("order")) && (!IS_ADMIN())) {
-       addFatalMessage(EXTENSION_PROBLEM_EXT_INACTIVE, "order");
+       addFatalMessage(__FILE__, __LINE__, getMessage('EXTENSION_PROBLEM_EXT_INACTIVE'), "order");
        return;
 } elseif (!IS_MEMBER()) {
        // Sorry, no guest access!
        $URL = "modules.php?module=index";
-} elseif (empty($_GET['order'])) {
+} elseif (!REQUEST_ISSET_GET(('order'))) {
        // You cannot call this module directly!
        $URL = "modules.php?module=login&what=order";
 }
@@ -52,19 +52,19 @@ if (empty($URL)) {
        // Is the auto-send mechanism active or inactive?
        if (getConfig('autosend_active') == "Y") {
                // Auto-send is active
-               define('ADMIN_AUTOSEND',  COMPILE_CODE(ADMIN_AUTOSEND_ACTIVE));
-               define('MEMBER_AUTOSEND', COMPILE_CODE(MEMBER_AUTOSEND_ACTIVE));
+               define('ADMIN_AUTOSEND',  getMessage('ADMIN_AUTOSEND_ACTIVE'));
+               define('MEMBER_AUTOSEND', getMessage('MEMBER_AUTOSEND_ACTIVE'));
                $type = "NEW";
        } else {
                // Auto-send is inactive
-               define('ADMIN_AUTOSEND',  COMPILE_CODE(ADMIN_AUTOSEND_INACTIVE));
-               define('MEMBER_AUTOSEND', COMPILE_CODE(MEMBER_AUTOSEND_INACTIVE));
+               define('ADMIN_AUTOSEND',  getMessage('ADMIN_AUTOSEND_INACTIVE'));
+               define('MEMBER_AUTOSEND', getMessage('MEMBER_AUTOSEND_INACTIVE'));
                $type = "ADMIN";
        }
 
        // Update sending pool
        SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_pool` SET data_type='%s' WHERE id=%s AND sender=%s AND data_type='TEMP' LIMIT 1",
-               array($type, bigintval($_GET['order']), $GLOBALS['userid']), __FILE__, __LINE__);
+               array($type, bigintval(REQUEST_GET('order')), $GLOBALS['userid']), __FILE__, __LINE__);
 
        // Finally is the entry valid?
        if (SQL_AFFECTEDROWS() == 1) {
@@ -76,10 +76,10 @@ if (empty($URL)) {
 
                // Load mail again...              0       1        2           3          4      5      6         7
                $result = SQL_QUERY_ESC("SELECT subject, text, receivers, payment_id, timestamp, url, cat_id, target_send FROM `{!_MYSQL_PREFIX!}_pool` WHERE id=%s AND sender=%s LIMIT 1",
-                       array(bigintval($_GET['order']), $GLOBALS['userid']), __FILE__, __LINE__);
+                       array(bigintval(REQUEST_GET('order')), $GLOBALS['userid']), __FILE__, __LINE__);
                $DATA = SQL_FETCHROW($result);
                SQL_FREERESULT($result);
-               if (empty($DATA[0])) $DATA[0] = DEFAULT_SUBJECT_LINE;
+               if (empty($DATA[0])) $DATA[0] = getMessage('DEFAULT_SUBJECT_LINE');
 
                // Calculate used points
                $USED = $DATA[7] * GET_PAY_POINTS($DATA[3]);
@@ -101,10 +101,10 @@ if (empty($URL)) {
 
                // Send an email to the user
                $msg_mem = LOAD_EMAIL_TEMPLATE("order-member", $content, $GLOBALS['userid']);
-               SEND_EMAIL($email, MEMBER_NEW_QUEUE, $msg_mem);
+               SEND_EMAIL($email, getMessage('MEMBER_NEW_QUEUE'), $msg_mem);
 
                // Notify admins about this
-               SEND_ADMIN_NOTIFICATION(ADMIN_NEW_QUEUE, "order-admin", $content, $GLOBALS['userid']);
+               SEND_ADMIN_NOTIFICATION(getMessage('ADMIN_NEW_QUEUE'), "order-admin", $content, $GLOBALS['userid']);
 
                // Output back bottom
                LOAD_TEMPLATE("member_order-back", false);
@@ -116,5 +116,6 @@ if (empty($URL)) {
        // Redirect...
        LOAD_URL($URL);
 }
+
 //
 ?>