'what','action','module' and 'output_mode' wrapped into functions (WARNUNG: Code...

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

diff --git a/inc/modules/order.php b/inc/modules/order.php
index c4db5c2f9fd28de59b1dead685d6a483c22ebed1..01ec35f27244911f07e20e3ef868abcf071f2b01 100644 (file)
--- a/inc/modules/order.php
+++ b/inc/modules/order.php
@@ -42,7 +42,7 @@ 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__, sprintf(getMessage('EXTENSION_PROBLEM_EXT_INACTIVE'), 'order'));
+       addFatalMessage(__FILE__, __LINE__, generateExtensionInactiveNotInstalledMessage('order'));
        return;
 } elseif (!IS_MEMBER()) {
        // Sorry, no guest access!
@@ -69,19 +69,19 @@ if (empty($URL)) {
 
        // 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(REQUEST_GET('order')), getUserId()), __FILE__, __LINE__);
+       array($type, bigintval(REQUEST_GET('order')), getUserId()), __FILE__, __LINE__);
 
        // Finally is the entry valid?
        if (SQL_AFFECTEDROWS() == 1) {
                // Load personal data...
                $result = SQL_QUERY_ESC("SELECT gender, surname, family, email FROM `{!_MYSQL_PREFIX!}_user_data` WHERE userid=%s LIMIT 1",
-                       array(getUserId()), __FILE__, __LINE__);
+               array(getUserId()), __FILE__, __LINE__);
                list($gender, $sname, $fname, $email) = SQL_FETCHROW($result);
                SQL_FREERESULT($result);
 
                // 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(REQUEST_GET('order')), getUserId()), __FILE__, __LINE__);
+               array(bigintval(REQUEST_GET('order')), getUserId()), __FILE__, __LINE__);
                $DATA = SQL_FETCHROW($result);
                SQL_FREERESULT($result);
                if (empty($DATA[0])) $DATA[0] = getMessage('DEFAULT_SUBJECT_LINE');