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 f7df593665497ee16ef9bcc6165b1f1240f45c26..7bbaee5e1ea1b72aef8816547f227a8d55ab3b0b 100644 (file)
--- a/inc/mysql-connect.php
+++ b/inc/mysql-connect.php
@@ -55,24 +55,34 @@ require_once(PATH."inc/mysql-manager.php"); // Functions which interact with the
 
 // Load extensions and language
 require_once(PATH."inc/extensions.php");
-require_once(PATH."inc/language.php");
 
-// Init error handler
+// 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);
-       print "Please report this error:<pre>";
-       debug_print_backtrace();
-       die("</pre>");
+
+       // 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');
+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'))) {
@@ -111,6 +121,10 @@ if ((!isBooleanConstantAndTrue('mxchange_installing')) && (isBooleanConstantAndT
 
                        // Is it a valid resource?
                        if ($db === true) {
+                               // Remove MySQL array from namespace
+                               define('__DB_NAME', $MySQL['dbase']);
+                               unset($MySQL);
+
                                // Load configuration stuff
                                $_CONFIG = LOAD_CONFIG();
 
@@ -134,6 +148,8 @@ if ((!isBooleanConstantAndTrue('mxchange_installing')) && (isBooleanConstantAndT
                                        // 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)) {
@@ -153,7 +169,7 @@ if ((!isBooleanConstantAndTrue('mxchange_installing')) && (isBooleanConstantAndT
                                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
@@ -180,22 +196,37 @@ if ((!isBooleanConstantAndTrue('mxchange_installing')) && (isBooleanConstantAndT
                                // 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);
        }