More improved SQL queries

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

diff --git a/inc/modules/order.php b/inc/modules/order.php
index d320cbddae7fea9a354d87acc752d1518011de1b..9082cb50ecd58a5d1ca1e6613099004c0ea7525d 100644 (file)
--- a/inc/modules/order.php
+++ b/inc/modules/order.php
@@ -37,20 +37,20 @@ if (!defined('__SECURITY')) {
        $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4) . "/security.php";
        require($INC);
 } elseif ((!EXT_IS_ACTIVE("order")) && (!IS_ADMIN())) {
-       ADD_FATAL(EXTENSION_PROBLEM_EXT_INACTIVE, "order");
+       addFatalMessage(EXTENSION_PROBLEM_EXT_INACTIVE, "order");
        return;
 } elseif (!IS_MEMBER()) {
        // Sorry, no guest access!
-       $URL = URL."/modules.php?module=index";
+       $URL = "modules.php?module=index";
 } elseif (empty($_GET['order'])) {
        // You cannot call this module directly!
-       $URL = URL."/modules.php?module=login&what=order";
+       $URL = "modules.php?module=login&what=order";
 }
 
 // When URL is empty nothing bad happend here
 if (empty($URL)) {
        // Is the auto-send mechanism active or inactive?
-       if ($_CONFIG['autosend_active'] == "Y") {
+       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));
@@ -63,20 +63,20 @@ if (empty($URL)) {
        }
 
        // Update sending pool
-       $result = 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__);
+       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__);
 
        // 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($GLOBALS['userid']), __FILE__, __LINE__);
+               $result = SQL_QUERY_ESC("SELECT gender, surname, family, email FROM `{!_MYSQL_PREFIX!}_user_data` WHERE userid=%s LIMIT 1",
+                       array($GLOBALS['userid']), __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($_GET['order']), $GLOBALS['userid']), __FILE__, __LINE__);
+               $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__);
                $DATA = SQL_FETCHROW($result);
                SQL_FREERESULT($result);
                if (empty($DATA[0])) $DATA[0] = DEFAULT_SUBJECT_LINE;
@@ -86,12 +86,12 @@ if (empty($URL)) {
 
                // Update used points
                $ADD = "";
-               if ($_CONFIG['order_max_full'] == "ORDER") $ADD = ", mail_orders=mail_orders+1";
-               SUB_POINTS($GLOBALS['userid'], $USED);
+               if (getConfig('order_max_full') == "ORDER") $ADD = ", mail_orders=mail_orders+1";
+               SUB_POINTS("order", $GLOBALS['userid'], $USED);
 
                // Prepare content
                $content = array(
-                       'blocks'   => $_CONFIG['max_send'],
+                       'blocks'   => getConfig('max_send'),
                        'subject'  => $DATA[0],
                        'text'     => $DATA[1],
                        'payment'  => GET_PAYMENT($DATA[3]),
@@ -110,8 +110,7 @@ if (empty($URL)) {
                LOAD_TEMPLATE("member_order-back", false);
        } else {
                // Matching line not found or already "placed" in send queue
-               $URL = URL."/modules.php?module=login";
-               LOAD_URL($URL);
+               LOAD_URL("modules.php?module=login");
        }
 } else {
        // Redirect...