Renamed ifSqlHasZeroNums() to ifSqlHasZeroNumRows() and improved some queries.

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

diff --git a/inc/modules/order.php b/inc/modules/order.php
index cc880e64eda264cd4d1fd067f7e8a44b572bb160..998cb06bb449dacf13529cbae7676355941505be 100644 (file)
--- a/inc/modules/order.php
+++ b/inc/modules/order.php
@@ -16,7 +16,7 @@
  * $Author::                                                          $ *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
- * Copyright (c) 2009 - 2012 by Mailer Developer Team                   *
+ * Copyright (c) 2009 - 2015 by Mailer Developer Team                   *
  * For more information visit: http://mxchange.org                      *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
@@ -58,7 +58,7 @@ if (empty($url)) {
        $type = 'ADMIN';
 
        // Is the auto-send mechanism active or inactive?
-       if (getConfig('autosend_active') == 'Y') {
+       if (isAutosendMemberMailsEnabled()) {
                // Auto-send is active
                $content['admin_autosend']  = '{--ADMIN_AUTOSEND_ACTIVE--}';
                $content['member_autosend'] = '{--MEMBER_AUTOSEND_ACTIVE--}';
@@ -69,7 +69,7 @@ if (empty($url)) {
        if (!updatePoolDataById(getRequestElement('order'), 'data_type', $type, NULL, sprintf(" AND `sender`=%s AND `data_type`='TEMP'", getMemberId()))) {
                // Merge array with pool data
                // @TODO Unused: timestamp
-               $content = merge_array($content, getPoolDataFromId(getRequestElement('order'));
+               $content = merge_array($content, getPoolDataFromId(getRequestElement('order')));
 
                // Fix empty subject line
                if (empty($content['subject'])) {
@@ -84,7 +84,7 @@ if (empty($url)) {
 
                // Update used points
                $add = '';
-               if ((isExtensionInstalledAndNewer('order', '0.1.1')) && (getConfig('order_max_full') == 'ORDER')) {
+               if ((isExtensionInstalledAndNewer('order', '0.1.1')) && (getOrderMaxFull() == 'ORDER')) {
                        $add = ',`mail_orders`=`mail_orders`+1';
                } // END - if