More fixes for admin password hashing

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

diff --git a/inc/mysql-connect.php b/inc/mysql-connect.php
index e01516610f9900711d3adc77b499b871496e6fdb..813bcb6762ee73837ba309bf162b1a78d7ce19eb 100644 (file)
--- a/inc/mysql-connect.php
+++ b/inc/mysql-connect.php
@@ -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);
 }
@@ -65,7 +64,6 @@ if ((empty($MySQL['login'])) && (!isBooleanConstantAndTrue('mxchange_installing'
        echo "<STRONG>".LANG_WARNING.":</STRONG> ".WARN_NULL_PASSWORD;
 }
 
-
 // Init configuration arrays
 $_CONFIG = array(
        'code_length' => 0
@@ -97,6 +95,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,7 +106,7 @@ 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;
@@ -117,9 +118,6 @@ 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
-
                                        // 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
@@ -133,7 +131,7 @@ LIMIT 1", __FILE__, __LINE__);
                                        require_once(PATH."inc/load_extensions.php");
 
                                        // Loading patching system is required here...
-                                       require_once(PATH."inc/patch-system.php");      // Initialize patch system
+                                       require_once(PATH."inc/patch-system.php"); // Initialize patch system
 
                                        // Functions which are related to themes
                                        require_once(PATH."inc/theme-manager.php");
@@ -191,12 +189,18 @@ 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