Renamed function so it might be more understandable

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

diff --git a/inc/modules/order.php b/inc/modules/order.php
index e70a2b03f15e02aadcdfc3e05186b239111b4b86..fda6bbc7d1612270e661fd8949c485dc1879d19a 100644 (file)
--- a/inc/modules/order.php
+++ b/inc/modules/order.php
@@ -14,8 +14,6 @@
  * $Date::                                                            $ *
  * $Tag:: 0.2.1-FINAL                                                 $ *
  * $Author::                                                          $ *
- * Needs to be in all Files and every File needs "svn propset           *
- * svn:keywords Date Revision" (autoprobset!) at least!!!!!!            *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
  * Copyright (c) 2009, 2010 by Mailer Developer Team                    *
@@ -54,25 +52,25 @@ if (!defined('__SECURITY')) {
 
 // When URL is empty nothing bad happend here
 if (empty($url)) {
+       // Auto-send is inactive
+       $content['admin_autosend']  = '{--ADMIN_AUTOSEND_INACTIVE--}';
+       $content['member_autosend'] = '{--MEMBER_AUTOSEND_INACTIVE--}';
+       $type = 'ADMIN';
+
        // Is the auto-send mechanism active or inactive?
        if (getConfig('autosend_active') == 'Y') {
                // Auto-send is active
-               $content['admin_autosend']  = getMessage('ADMIN_AUTOSEND_ACTIVE');
-               $content['member_autosend'] = getMessage('MEMBER_AUTOSEND_ACTIVE');
+               $content['admin_autosend']  = '{--ADMIN_AUTOSEND_ACTIVE--}';
+               $content['member_autosend'] = '{--MEMBER_AUTOSEND_ACTIVE--}';
                $type = 'NEW';
-       } else {
-               // Auto-send is inactive
-               $content['admin_autosend']  = getMessage('ADMIN_AUTOSEND_INACTIVE');
-               $content['member_autosend'] = getMessage('MEMBER_AUTOSEND_INACTIVE');
-               $type = 'ADMIN';
-       }
+       } // END - if
 
        // 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(getRequestParameter('order')), getMemberId()), __FILE__, __LINE__);
 
        // Finally is the entry valid?
-       if (SQL_AFFECTEDROWS() == 1) {
+       if (!SQL_HASZEROAFFECTED()) {
                // @TODO Unused: 2,4
                // 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",
@@ -85,7 +83,7 @@ if (empty($url)) {
                SQL_FREERESULT($result);
 
                // Fix empty subject line
-               if (empty($content['subject'])) $content['subject'] = getMessage('DEFAULT_SUBJECT_LINE');
+               if (empty($content['subject'])) $content['subject'] = '{--DEFAULT_SUBJECT_LINE--}';
 
                // Calculate used points
                $usedPoints = $content['target_send'] * getPaymentPoints($content['payment_id']);
@@ -95,18 +93,14 @@ if (empty($url)) {
                if (getConfig('order_max_full') == 'ORDER') $add = ', mail_orders=mail_orders+1';
                subtractPoints('order', getMemberId(), $usedPoints);
 
-               // Compile content
-               $content['payment']  = getPaymentTitlePrice($content['payment_id']);
-               $content['category'] = getCategory($content['cat_id']);
-
                // Send an email to the user
                $message_mem = loadEmailTemplate('order-member', $content, getMemberId());
-               sendEmail(getMemberId(), getMessage('MEMBER_NEW_QUEUE'), $message_mem);
+               sendEmail(getMemberId(), '{--MEMBER_NEW_QUEUE--}', $message_mem);
 
                // Notify admins about this
-               sendAdminNotification(getMessage('ADMIN_NEW_QUEUE'), 'order-admin', $content, getMemberId());
+               sendAdminNotification('{--ADMIN_NEW_QUEUE--}', 'order-admin', $content, getMemberId());
 
-               // Create new task
+               // Create new task (we ignore the task id here)
                createNewTask(
                        '{--ADMIN_NEW_QUEUE--}',
                        '<pre>'.loadEmailTemplate('order-admin', $content, getMemberId()).'</pre>',