Debug mode removed from reset

[mailer.git] / inc / mysql-connect.php

diff --git a/inc/mysql-connect.php b/inc/mysql-connect.php
index 9cd96c8fa492f27b5bdde675b4488abe42986120..59921655d456eb81294f022e6db0667f7e444fe2 100644 (file)
--- a/inc/mysql-connect.php
+++ b/inc/mysql-connect.php
@@ -106,7 +106,7 @@ LIMIT 1", __FILE__, __LINE__);
                                                // Something went wrong
                                                ADD_FATAL(FATAL_CANNOT_LOAD_CONFIG);
                                                return;
-                                       }
+                                       } // END - if
 
                                        // Load the configuration
                                        $_CONFIG = array_merge($_CONFIG, SQL_FETCHARRAY($result));
@@ -114,15 +114,6 @@ LIMIT 1", __FILE__, __LINE__);
                                        // Initialize include-file-pool
                                        $INC_POOL = array();
 
-                                       // Run daily reset
-                                       if ((date("d", $_CONFIG['last_update']) != date("d", time()) || ((isBooleanConstantAndTrue('DEBUG_MODE')))) && (!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
-                                               $INC_POOL[] = sprintf("%sinc/reset/reset_daily.php", PATH);
-
-                                               // Daily reset was run!
-                                               define('__DAILY_RESET', "1");
-                                       }
-
                                        // Load "databases" aka static arrays
                                        require_once(PATH."inc/databases.php");
 
@@ -132,11 +123,30 @@ LIMIT 1", __FILE__, __LINE__);
                                        // Functions which are related to themes
                                        require_once(PATH."inc/theme-manager.php");
 
+                                       // Run daily reset
+                                       // 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
+                                               $INC_POOL = array();
+                                               $INC_POOL[] = sprintf("%sinc/reset/reset_daily.php", PATH);
+
+                                               // Daily reset was run!
+                                               define('__DAILY_RESET', true);
+
+                                               // Add more includes
+                                               RESET_ADD_INCLUDES();
+
+                                               // Run the full reset scripts
+                                               foreach ($INC_POOL as $incFile) {
+                                                       require_once($incFile);
+                                               } // END - foreach
+                                       } // END - if
+
                                        // Load admin include file if he is admin
                                        if (IS_ADMIN()) {
                                                // Administrative functions
                                                require_once(PATH."inc/modules/admin/admin-inc.php");
-                                       }
+                                       } // END - if
 
                                        // Get all values
                                        if (($CSS != 1) && ($CSS != -1)) {