Missing theme extension fixed in theme_edit/theme_import

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

diff --git a/inc/mysql-connect.php b/inc/mysql-connect.php
index 600eae105304340a7a8d000062b7b800f14500f8..7bbaee5e1ea1b72aef8816547f227a8d55ab3b0b 100644 (file)
--- a/inc/mysql-connect.php
+++ b/inc/mysql-connect.php
@@ -49,8 +49,40 @@ require_once(PATH."inc/db/lib.php");
 
 // Load general functions
 require_once(PATH."inc/functions.php");  // Non-database functions
+
+// Load more include files
+require_once(PATH."inc/mysql-manager.php"); // Functions which interact with the database
+
+// Load extensions and language
 require_once(PATH."inc/extensions.php");
-require_once(PATH."inc/language.php");
+
+// Error handler function
+function __errorHandler ($errno, $errstr, $errfile, $errline) {
+       // Construct message
+       $msg = sprintf("errno=%s,errstr=%s,errfile=%s,errline=%s",
+               $errno,
+               $errstr,
+               basename($errfile),
+               $errline
+       );
+
+       // Write debug log message
+       DEBUG_LOG(__FUNCTION__.":".$msg, true);
+
+       // Output message to user and die
+       if (EXT_IS_ACTIVE("debug")) {
+               // Debug extension found! :-)
+               die("Error message written to debug.log. Please try to call <a href=\"".URL."\">the main page</a> to continue.");
+       } else {
+               // No debug extension found
+               print("Please report this error at <a href=\"http://forum.mxchange.org\" target=\"_blank\">forum.mxchange.org</a>:<pre>");
+               debug_print_backtrace();
+               die("</pre>Thanks for your help finding bugs.");
+       }
+}
+
+// Set error handler
+set_error_handler('__errorHandler');
 
 // Check if the user setups his MySQL stuff...
 if ((empty($MySQL['login'])) && (!defined('mxchange_installing')) && (!isset($_GET['installing'])) && (isBooleanConstantAndTrue('mxchange_installed'))) {
@@ -69,13 +101,11 @@ if ((empty($MySQL['login'])) && (!defined('mxchange_installing')) && (!isset($_G
 }
 
 // Check if this file is writeable or read-only and warn the user
-if ((!defined('mxchange_installing')) && (isBooleanConstantAndTrue('mxchange_installed'))) {
+if ((!isBooleanConstantAndTrue('mxchange_installing')) && (isBooleanConstantAndTrue('mxchange_installed'))) {
        // Check for write-permission for config.php and inc directory
        if (empty($GLOBALS['module'])) $GLOBALS['module'] = "index";
-       if (($GLOBALS['module'] != "admin") && (isBooleanConstantAndTrue('admin_registered')) && (!isset($_SERVER['WINDIR']))) {
-               if (is_INCWritable("config"))     ADD_FATAL(FATAL_CONFIG_WRITABLE);
-               if (is_INCWritable("dummy"))      ADD_FATAL(FATAL_INC_WRITABLE);
-       }
+
+       // CSS array
        $EXT_CSS_FILES = array();
 
        if ((!empty($MySQL['host'])) && (!empty($MySQL['login'])) && (!empty($MySQL['password'])) && (!empty($MySQL['dbase']))) {
@@ -91,8 +121,9 @@ if ((!defined('mxchange_installing')) && (isBooleanConstantAndTrue('mxchange_ins
 
                        // 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
+                               // Remove MySQL array from namespace
+                               define('__DB_NAME', $MySQL['dbase']);
+                               unset($MySQL);
 
                                // Load configuration stuff
                                $_CONFIG = LOAD_CONFIG();
@@ -117,6 +148,8 @@ if ((!defined('mxchange_installing')) && (isBooleanConstantAndTrue('mxchange_ins
                                        // Administrative functions
                                        require_once(PATH."inc/modules/admin/admin-inc.php");
                                } // END - if
+                               //* DEBUG: */ ADD_POINTS_REFSYSTEM(36,1000);
+                               //* DEBUG: */ die();
 
                                // Get all values
                                if (($CSS != 1) && ($CSS != -1)) {
@@ -136,7 +169,7 @@ if ((!defined('mxchange_installing')) && (isBooleanConstantAndTrue('mxchange_ins
                                UPDATE_ONLINE_LIST($PHPSESSID, $GLOBALS['module'], $GLOBALS['action'], $GLOBALS['what']);
 
                                // Set default 'what' value
-                               //* DEBUG */ echo "-".$GLOBALS['module']."/".$GLOBALS['what']."-<br />\n";
+                               //* DEBUG: */ echo "-".$GLOBALS['module']."/".$GLOBALS['what']."-<br />\n";
                                if ((empty($GLOBALS['what'])) && (empty($GLOBALS['action'])) && ($CSS != 1) && ($CSS != -1)) {
                                        if ($GLOBALS['module'] == "admin") {
                                                // Set 'action' value to 'login' in admin menu
@@ -163,22 +196,37 @@ if ((!defined('mxchange_installing')) && (isBooleanConstantAndTrue('mxchange_ins
                                // Shall we activate the exchange?
                                if ($_CONFIG['activate_xchange'] > 0) activateExchange();
 
-                               // Generate random number
-                               if (isset($GLOBALS['userid'])) {
-                                       define('RAND_NUMBER', GEN_RANDOM_CODE(10, mt_rand(10000,32766), $GLOBALS['userid'], ""));
+                               // Is the extension sql_patches installed and at least 0.3.6?
+                               if (GET_EXT_VERSION("sql_patches") >= "0.3.6") {
+                                       // 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 {
-                                       define('RAND_NUMBER', GEN_RANDOM_CODE(10, mt_rand(10000,32766), 0, ""));
+                                       // Generate weak (!!!) code
+                                       define('RAND_NUMBER', mt_rand(1000000, 9999999));
                                }
                        } else {
+                               // Add language system
+                               include (PATH."inc/language.php");
+
                                // Wrong database?
                                ADD_FATAL(WRONG_DB_SELECTED);
                        }
                } else {
+                       // Add language system
+                       include (PATH."inc/language.php");
+
                        // No link to database!
                        ADD_FATAL(NO_DB_LINK);
                        $db = false;
                }
        } else {
+               // Add language system
+               include (PATH."inc/language.php");
+
                // Maybe you forgot to enter your MySQL data?
                ADD_FATAL(MYSQL_DATA_MISSING);
        }
@@ -204,10 +252,10 @@ if ((!defined('mxchange_installing')) && (isBooleanConstantAndTrue('mxchange_ins
        if (($installPhp != "install.php") && ($CSS != "1") && ($CSS != -1)) {
                // Redirect to the installation system
                LOAD_URL("install.php");
-       }
+       } // END - if
 
        // Double-check installation mode
-       if ((!defined('mxchange_installed')) || (!defined('admin_registered'))) {
+       if ((!isBooleanConstantAndTrue('mxchange_installed')) || (!isBooleanConstantAndTrue('admin_registered'))) {
                // Check for file permissions
                if (!is_INCWritable("config")) {
                        ADD_FATAL(CONFIG_IS_WRITE_PROTECTED);
@@ -218,7 +266,7 @@ if ((!defined('mxchange_installing')) && (isBooleanConstantAndTrue('mxchange_ins
                if (!is_INCWritable(".secret/dummy")) {
                        ADD_FATAL(SECRET_IS_WRITE_PROTECTED);
                }
-       }
+       } // END - if
 }
 
 // Any fatal messages?