A lot double-quotes rewritten to single-quotes, global fix for getMessage() calls

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

diff --git a/inc/modules/order.php b/inc/modules/order.php
index 1a5ab8f90d1b500d15162dc920150ab3e06a0166..24b51118d277b075fa7ef272d7c1a56e798ccb09 100644 (file)
--- a/inc/modules/order.php
+++ b/inc/modules/order.php
@@ -42,14 +42,14 @@ 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(__FILE__, __LINE__, getMessage('EXTENSION_PROBLEM_EXT_INACTIVE'), 'order');
+       addFatalMessage(__FILE__, __LINE__, sprintf(getMessage('EXTENSION_PROBLEM_EXT_INACTIVE'), 'order'));
        return;
 } elseif (!IS_MEMBER()) {
        // Sorry, no guest access!
        $URL = 'modules.php?module=index';
 } elseif (!REQUEST_ISSET_GET(('order'))) {
        // You cannot call this module directly!
-       $URL = "modules.php?module=login&what=order";
+       $URL = 'modules.php?module=login&what=order';
 }
 
 // When URL is empty nothing bad happend here
@@ -59,12 +59,12 @@ if (empty($URL)) {
                // Auto-send is active
                define('ADMIN_AUTOSEND',  getMessage('ADMIN_AUTOSEND_ACTIVE'));
                define('MEMBER_AUTOSEND', getMessage('MEMBER_AUTOSEND_ACTIVE'));
-               $type = "NEW";
+               $type = 'NEW';
        } else {
                // Auto-send is inactive
                define('ADMIN_AUTOSEND',  getMessage('ADMIN_AUTOSEND_INACTIVE'));
                define('MEMBER_AUTOSEND', getMessage('MEMBER_AUTOSEND_INACTIVE'));
-               $type = "ADMIN";
+               $type = 'ADMIN';
        }
 
        // Update sending pool
@@ -91,7 +91,7 @@ if (empty($URL)) {
 
                // Update used points
                $add = '';
-               if (getConfig('order_max_full') == 'ORDER') $add = ", mail_orders=mail_orders+1";
+               if (getConfig('order_max_full') == 'ORDER') $add = ', mail_orders=mail_orders+1';
                SUB_POINTS('order', getUserId(), $USED);
 
                // Prepare content
@@ -105,17 +105,17 @@ if (empty($URL)) {
                );
 
                // Send an email to the user
-               $msg_mem = LOAD_EMAIL_TEMPLATE("order-member", $content, getUserId());
+               $msg_mem = LOAD_EMAIL_TEMPLATE('order-member', $content, getUserId());
                SEND_EMAIL($email, getMessage('MEMBER_NEW_QUEUE'), $msg_mem);
 
                // Notify admins about this
-               SEND_ADMIN_NOTIFICATION(getMessage('ADMIN_NEW_QUEUE'), "order-admin", $content, getUserId());
+               SEND_ADMIN_NOTIFICATION(getMessage('ADMIN_NEW_QUEUE'), 'order-admin', $content, getUserId());
 
                // Output back bottom
-               LOAD_TEMPLATE("member_order-back", false);
+               LOAD_TEMPLATE('member_order-back', false);
        } else {
-               // Matching line not found or already "placed" in send queue
-               LOAD_URL("modules.php?module=login");
+               // Matching line not found or already 'placed' in send queue
+               LOAD_URL('modules.php?module=login');
        }
 } else {
        // Redirect...