More fixes, thanks to Piter01

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

diff --git a/inc/mysql-connect.php b/inc/mysql-connect.php
index 2337fa7ccab316722e8702be568000d7a0bd3018..8f8e5cd41d760e6f51c304ea5c1e4da407626378 100644 (file)
--- a/inc/mysql-connect.php
+++ b/inc/mysql-connect.php
@@ -56,18 +56,29 @@ require_once(PATH."inc/mysql-manager.php"); // Functions which interact with the
 // Load extensions and language
 require_once(PATH."inc/extensions.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
        );
-       DEBUG_LOG(__FUNCTION__.":".$msg, true);
-       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.");
+
+       // Write debug log message
+       DEBUG_LOG(__FUNCTION__, __LINE__, "".$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>Thank you for your help finding bugs.");
+       }
 }
 
 // Set error handler
@@ -137,7 +148,7 @@ 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: */ ADD_POINTS_REFSYSTEM("test", 36, 1000);
                                //* DEBUG: */ die();
 
                                // Get all values
@@ -198,15 +209,24 @@ if ((!isBooleanConstantAndTrue('mxchange_installing')) && (isBooleanConstantAndT
                                        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);
        }