Fixes for filter 'load_includes'

[mailer.git] / inc / check-reset.php

diff --git a/inc/check-reset.php b/inc/check-reset.php
index 0f13b5ff845109b8e6c8db2677055db896ffa4b2..88335c12cce072a487cc0d14249df36b98cf7ac4 100644 (file)
--- a/inc/check-reset.php
+++ b/inc/check-reset.php
@@ -32,13 +32,13 @@
  ************************************************************************/
 
 // Some security stuff...
-if (ereg(basename(__FILE__), $_SERVER['PHP_SELF'])) {
+if (!defined('__SECURITY')) {
        $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4) . "/security.php";
        require($INC);
 }
 
-// 01    2                            2        2         3321    1                         2                     21    1                        2                    21    1                        2                  21    1      2                 21    1         1    1                         2            210
-if ((date("d", $_CONFIG['last_update']) != date("d", time())) && (!isBooleanConstantAndTrue('mxchange_installing')) && (isBooleanConstantAndTrue('mxchange_installed')) && (isBooleanConstantAndTrue('admin_registered')) && (!isset($_GET['register'])) && ($CSS != 1) && (!isBooleanConstantAndTrue('DEBUG_MODE'))) {
+// 01    2              3             32        2         3321    12        3                     32    2                    21    1                        2                    21    1                        2                  21    1      2                 21    1         10
+if ((date("d", getConfig('last_update')) != date("d", time())) && ((!defined('mxchange_installing')) || (!mxchange_installing)) && (isBooleanConstantAndTrue('mxchange_installed')) && (isBooleanConstantAndTrue('admin_registered')) && (!isset($_GET['register'])) && ($CSS != 1)) {
        // Do daily things in external PHP file but only when script is completely setup
        // Daily reset was run!
        define('__DAILY_RESET', true);
@@ -46,10 +46,8 @@ if ((date("d", $_CONFIG['last_update']) != date("d", time())) && (!isBooleanCons
        // Add more includes
        $INC_POOL = RESET_ADD_INCLUDES();
 
-       // Run the full reset scripts
-       foreach ($INC_POOL as $incFile) {
-               require_once($incFile);
-       } // END - foreach
+       // Run the filter
+       RUN_FILTER('load_includes', $INC_POOL);
 } // END - if
 
 //