redirection of invalid or deleted mail orders improved, several code conventions...

[mailer.git] / inc / extensions / ext-order.php

diff --git a/inc/extensions/ext-order.php b/inc/extensions/ext-order.php
index 9efb4e97104ab5f59fe4e7bd8cc03c2d7d0ac975..3244efa020b7786a0b1ef7ebd99f343a286a537a 100644 (file)
--- a/inc/extensions/ext-order.php
+++ b/inc/extensions/ext-order.php
@@ -289,18 +289,18 @@ nicht die vom Mitglied eingegebene. Resultat: Das Script beschwerte sich, der Us
        break;
 
 default: // Do stuff when extension is loaded
-       $DUMMY = LOAD_CONFIG("0");
-       $_CONFIG['order_min']    = $DUMMY['order_min'];      // Order at least X mails
-       $_CONFIG['order_max']    = $DUMMY['order_max_full']; // Ordering mode: as much as possible or as much as the user want's to receive
-       $_CONFIG['order_select'] = $DUMMY['order_select'];   // Sorting mode for selecting users while looking some up for mail delivery
-       $_CONFIG['order_mode']   = $DUMMY['order_mode'];     // Ascending or descending sort order for above
-       unset($DUMMY);
+       $dummy = LOAD_CONFIG();
+       $_CONFIG['order_min']    = $dummy['order_min'];      // Order at least X mails
+       $_CONFIG['order_max']    = $dummy['order_max_full']; // Ordering mode: as much as possible or as much as the user want's to receive
+       $_CONFIG['order_select'] = $dummy['order_select'];   // Sorting mode for selecting users while looking some up for mail delivery
+       $_CONFIG['order_mode']   = $dummy['order_mode'];     // Ascending or descending sort order for above
+       unset($dummy);
 
        // Do daily reset only when installed and extension version is at least 0.1.1
-       if ((defined('__DAILY_RESET')) && (!mxchange_installing) && (mxchange_installed) && (admin_registered) && (GET_EXT_VERSION("order") >= "0.1.1"))
+       if ((defined('__DAILY_RESET')) && (isBooleanConstantAndTrue('mxchange_installed')) && (isBooleanConstantAndTrue('mxchange_installed')) && (isBooleanConstantAndTrue('admin_registered')) && (GET_EXT_VERSION("order") >= "0.1.1"))
        {
                // Reset mail order values
-               $result_ext = SQL_QUERY("UPDATE "._MYSQL_PREFIX."_user_data SET mail_orders='0' WHERE mail_orders > 0", __FILE__, __LINE__);
+               $result_ext = SQL_QUERY("UPDATE "._MYSQL_PREFIX."_user_data SET mail_orders=0 WHERE mail_orders > 0", __FILE__, __LINE__);
        }
        break;
 }