Extensions sql_patches<->user now need each other

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

diff --git a/inc/check-reset.php b/inc/check-reset.php
index 7596a8d6d4e06aef72ba740251e119b300bda780..db958c863310efef7efc3459c73bb6ae9b2ff074 100644 (file)
--- a/inc/check-reset.php
+++ b/inc/check-reset.php
@@ -32,24 +32,19 @@
  ************************************************************************/
 
 // 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         10
-if ((date("d", $_CONFIG['last_update']) != date("d", time())) && (!isBooleanConstantAndTrue('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);
+// Shall we run the reset scripts? If a day has changed, maybe also a week/month has changed... Simple! :D
+// 01    2              3             32        2         3321    1             221    1           221    1                 221    1                  23          321    1                            10
+if ((date("d", getConfig('last_update')) != date("d", time())) && (!isInstalling()) && (isInstalled()) && (isAdminRegistered()) && (!REQUEST_ISSET_GET(('register'))) && ($GLOBALS['output_mode'] != 1)) {
+       // Tell every module we are in reset-mode!
+       enableResetMode();
 
-       // Add more includes
-       $INC_POOL = RESET_ADD_INCLUDES();
-
-       // Run the full reset scripts
-       foreach ($INC_POOL as $incFile) {
-               require_once($incFile);
-       } // END - foreach
+       // Run all includes
+       runResetIncludes();
 } // END - if
 
 //