Debug mode removed from reset
[mailer.git] / inc / mysql-connect.php
index e01516610f9900711d3adc77b499b871496e6fdb..59921655d456eb81294f022e6db0667f7e444fe2 100644 (file)
@@ -32,8 +32,7 @@
  ************************************************************************/
 
 // Some security stuff...
-if (ereg(basename(__FILE__), $_SERVER['PHP_SELF']))
-{
+if (ereg(basename(__FILE__), $_SERVER['PHP_SELF'])) {
        $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4) . "/security.php";
        require($INC);
 }
@@ -41,6 +40,10 @@ if (ereg(basename(__FILE__), $_SERVER['PHP_SELF']))
 // CFG: DEBUG-SQL (if enabled and DEBUG_MODE is enabled all SQL queries will be logged to debug.log)
 define('DEBUG_SQL', false);
 
+// Default is not a frameset
+global $isFrameset;
+$isFrameset = false;
+
 // Load library
 require_once(PATH."inc/db/lib.php");
 
@@ -65,12 +68,6 @@ if ((empty($MySQL['login'])) && (!isBooleanConstantAndTrue('mxchange_installing'
        echo "<STRONG>".LANG_WARNING.":</STRONG> ".WARN_NULL_PASSWORD;
 }
 
-
-// Init configuration arrays
-$_CONFIG = array(
-       'code_length' => 0
-);
-
 // Check if this file is writeable or read-only and warn the user
 if ((!isBooleanConstantAndTrue('mxchange_installing')) && (isBooleanConstantAndTrue('mxchange_installed'))) {
        // Check for write-permission for config.php and inc directory
@@ -81,9 +78,6 @@ if ((!isBooleanConstantAndTrue('mxchange_installing')) && (isBooleanConstantAndT
        }
        $EXT_CSS_FILES = array();
 
-       // Load "databases" aka static arrays
-       require_once(PATH."inc/databases.php");     // Several hard-coded databases (arrays, constants)
-
        if ((!empty($MySQL['host'])) && (!empty($MySQL['login'])) && (!empty($MySQL['password'])) && (!empty($MySQL['dbase']))) {
                // Connect to DB
                global $link;
@@ -97,6 +91,9 @@ if ((!isBooleanConstantAndTrue('mxchange_installing')) && (isBooleanConstantAndT
 
                        // Is it a valid resource?
                        if ($db === true) {
+                               // Load more include files
+                               require_once(PATH."inc/mysql-manager.php"); // Functions which interact with the database
+
                                // Load configuration stuff
                                $result = SQL_QUERY("SELECT pass_len, points_register, points_ref, least_cats, check_double_email, check_double_pass, admin_notify, url_tlock, test_text, max_tlength, test_subj, autosend_active, max_send, url_blacklist, auto_purge, auto_purge_active, last_update, unconfirmed, profile_lock, online_timeout, mad_timestamp, mad_count, profile_update, send_prof_update, resend_profile_update, code_length, patch_level, patch_ctime, guest_stats, ref_payout, activate_xchange, order_multi_page, display_refid, ip_timeout, allow_direct_pay, config
 FROM "._MYSQL_PREFIX."_config
@@ -105,11 +102,11 @@ LIMIT 1", __FILE__, __LINE__);
 
                                if (SQL_NUMROWS($result) == 1) {
                                        // Load data when previous SQL query did not fail
-                                       if (!$result) {
+                                       if (!is_resource($result)) {
                                                // Something went wrong
                                                ADD_FATAL(FATAL_CANNOT_LOAD_CONFIG);
                                                return;
-                                       }
+                                       } // END - if
 
                                        // Load the configuration
                                        $_CONFIG = array_merge($_CONFIG, SQL_FETCHARRAY($result));
@@ -117,35 +114,39 @@ LIMIT 1", __FILE__, __LINE__);
                                        // Initialize include-file-pool
                                        $INC_POOL = array();
 
-                                       // Load more include files
-                                       require_once(PATH."inc/mysql-manager.php"); // Functions which interact with the database
+                                       // Load "databases" aka static arrays
+                                       require_once(PATH."inc/databases.php");
+
+                                       // Loading patching system is required here...
+                                       require_once(PATH."inc/patch-system.php"); // Initialize patch system
+
+                                       // Functions which are related to themes
+                                       require_once(PATH."inc/theme-manager.php");
 
                                        // 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)) {
+                                       // 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[] = PATH."inc/reset/reset_daily.php";
+                                               $INC_POOL = array();
+                                               $INC_POOL[] = sprintf("%sinc/reset/reset_daily.php", PATH);
 
                                                // Daily reset was run!
-                                               define('__DAILY_RESET', "1");
-                                       }
-
-                                       // Load all extensions
-                                       require_once(PATH."inc/load_extensions.php");
-
-                                       // Loading patching system is required here...
-                                       require_once(PATH."inc/patch-system.php");      // Initialize patch system
+                                               define('__DAILY_RESET', true);
 
-                                       // Functions which are related to themes
-                                       require_once(PATH."inc/theme-manager.php");
+                                               // Add more includes
+                                               RESET_ADD_INCLUDES();
 
-                                       // Initialize session management
-                                       require_once(PATH."inc/session.php");
+                                               // 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)) {
@@ -165,7 +166,7 @@ LIMIT 1", __FILE__, __LINE__);
                                        UPDATE_ONLINE_LIST(get_session('PHPSESSID'), $GLOBALS['module'], $GLOBALS['action'], $GLOBALS['what']);
 
                                        // Load theme name
-                                       $CurrTheme = GET_CURR_THEME();
+                                       $currTheme = GET_CURR_THEME();
 
                                        // Set default 'what' value
                                        //* DEBUG */ echo "-".$GLOBALS['module']."/".$GLOBALS['what']."-<br />\n";
@@ -191,16 +192,29 @@ LIMIT 1", __FILE__, __LINE__);
                                        $dummy = CHECK_MODULE($GLOBALS['module']);
                                        if ($dummy == "done") COUNT_MODULE($GLOBALS['module']);
                                        unset($dummy);
+
+                                       // Shall we activate the exchange?
                                        if ($_CONFIG['activate_xchange'] > 0) activateExchange();
                                } else {
                                        // If you will read following error message you probably need to contact me (webmaster@mxchange.org)
                                        // and download the sql-upgrades extension from my server. Please ask me which SQL file(s) you need to
                                        // import *BEFORE* you import them!
                                        ADD_FATAL(FATAL_CANNOT_LOAD_CONFIG);
+
+                                       // Reset link and db here, close database first
+                                       SQL_CLOSE($link, __FILE__, __LINE__);
+                                       $link = false; $db = false;
                                }
 
                                // Free memory
                                SQL_FREERESULT($result);
+
+                               // Generate random number
+                               if (isset($GLOBALS['userid'])) {
+                                       define('RAND_NUMBER', GEN_RANDOM_CODE(10, mt_rand(10000,32766), $GLOBALS['userid'], ""));
+                               } else {
+                                       define('RAND_NUMBER', GEN_RANDOM_CODE(10, mt_rand(10000,32766), 0, ""));
+                               }
                        } else {
                                // Wrong database?
                                ADD_FATAL(WRONG_DB_SELECTED);
@@ -230,8 +244,6 @@ LIMIT 1", __FILE__, __LINE__);
        // Include required files
        require_once(PATH."inc/databases.php");
        require_once(PATH."inc/theme-manager.php");
-       require_once(PATH."inc/load_extensions.php");
-       require_once(PATH."inc/session.php");
 
        // Check if we are in installation routine
        $installPhp = basename($_SERVER['PHP_SELF']);