X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Fmysql-connect.php;h=23fd43926c133639d01bc736ac5a69797251c457;hp=62885d2e3127aed78c3055c2a7aa7fceede4c583;hb=f18a3b60125c8c65861e3205da40447b227f89c9;hpb=094c07fa19309bf3f90b3d39c1c4238e4a5739d6
diff --git a/inc/mysql-connect.php b/inc/mysql-connect.php
index 62885d2e31..23fd43926c 100644
--- a/inc/mysql-connect.php
+++ b/inc/mysql-connect.php
@@ -40,20 +40,20 @@ if (!defined('__SECURITY')) {
// CFG: DEBUG-SQL (if enabled and DEBUG_MODE is enabled all SQL queries will be logged to debug.log)
define('DEBUG_SQL', false);
-// Load database library
-require_once(PATH."inc/db/lib.php");
-
// Non-database functions
-require_once(PATH."inc/functions.php");
+require("inc/functions.php");
// Filter functions
-require_once(PATH."inc/filters.php");
+LOAD_INC_ONCE("inc/filters.php");
// Functions which interact with the database
-require_once(PATH."inc/mysql-manager.php");
+LOAD_INC_ONCE("inc/mysql-manager.php");
// Load extensions and language
-require_once(PATH."inc/extensions.php");
+LOAD_INC_ONCE("inc/extensions.php");
+
+// Load database library
+LOAD_INC_ONCE("inc/db/lib.php");
// Error handler function
function __errorHandler ($errno, $errstr, $errfile, $errline) {
@@ -70,13 +70,11 @@ function __errorHandler ($errno, $errstr, $errfile, $errline) {
// 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 the main page to continue.");
+ // Debug extension found! So Output a small message
+ mxchange_die("Error message written to debug.log. Please try to call the main page to continue.");
} else {
- // No debug extension found
- print("Please report this error at bugs.mxchange.org:");
- debug_print_backtrace();
- die("Thank you for your help finding bugs.");
+ // No debug extension found, so regular output
+ debug_report_bug($msg);
}
}
@@ -95,7 +93,7 @@ function __SHUTDOWN_HOOK () {
SQL_CLOSE($link, __FILE__, __LINE__);
} else {
// No database link
- ADD_FATAL(NO_DB_LINK);
+ addFatalMessage(getMessage('NO_DB_LINK'));
}
}
@@ -105,17 +103,17 @@ register_shutdown_function('__SHUTDOWN_HOOK');
// Check if the user setups his MySQL stuff...
if ((empty($MySQL['login'])) && (!defined('mxchange_installing')) && (!isset($_GET['installing'])) && (isBooleanConstantAndTrue('mxchange_installed'))) {
// No login entered and outside installation mode
- echo "".LANG_WARNING.": ";
+ OUTPUT_HTML("{--LANG_WARNING--}: ");
if (isBooleanConstantAndTrue('mxchange_installed')) {
// You have changed my configuration file!
- die(DIE_CONFIG_CHANGED_YOU);
+ mxchange_die("{--DIE_CONFIG_CHANGED_YOU--}");
} else {
// Please run the installation script (maybe again)
- die(DIE_RUN_INSTALL_MYSQL);
+ mxchange_die("{--DIE_RUN_INSTALL_MYSQL--}");
}
} elseif ((!isBooleanConstantAndTrue('mxchange_installing')) && (!isset($_GET['installing'])) && (empty($MySQL['password'])) && (isBooleanConstantAndTrue('warn_no_pass'))) {
// No database password entered!!!
- echo "".LANG_WARNING.": ".WARN_NULL_PASSWORD;
+ OUTPUT_HTML("{--LANG_WARNING--}:
{--WARN_NULL_PASSWORD--}");
}
// Set dummy $_CONFIG array
@@ -125,6 +123,14 @@ $_CONFIG = array(
'last_update' => time()
);
+// Init important $header variable
+global $header;
+$header = 0;
+
+// Init fatal messages
+global $FATAL;
+$FATAL = array();
+
// 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
@@ -153,30 +159,24 @@ if ((!isBooleanConstantAndTrue('mxchange_installing')) && (isBooleanConstantAndT
unset($MySQL);
// Load configuration stuff
- $_CONFIG = merge_array($_CONFIG, LOAD_CONFIG());
+ mergeConfig(LOAD_CONFIG());
// Load "databases" aka static arrays
- require_once(PATH."inc/databases.php");
+ LOAD_INC_ONCE("inc/databases.php");
// Loading patching system is required here...
- require_once(PATH."inc/patch-system.php"); // Initialize patch system
+ LOAD_INC_ONCE("inc/patch-system.php"); // Initialize patch system
// Session management
- require_once(PATH."inc/session.php");
+ LOAD_INC_ONCE("inc/session.php");
// Run daily reset
- require_once(PATH."inc/check-reset.php");
-
- // Create missing configuration file
- if (!function_exists('GET_CURR_THEME')) {
- // Load dummy theme functions
- require_once(PATH."inc/theme-dummy.php");
- } // END - if
+ LOAD_INC_ONCE("inc/check-reset.php");
// Load admin include file if he is admin
if (IS_ADMIN()) {
// Administrative functions
- require_once(PATH."inc/modules/admin/admin-inc.php");
+ LOAD_INC_ONCE("inc/modules/admin/admin-inc.php");
} // END - if
//* DEBUG: */ ADD_POINTS_REFSYSTEM("test", 36, 1000);
//* DEBUG: */ die();
@@ -196,7 +196,7 @@ if ((!isBooleanConstantAndTrue('mxchange_installing')) && (isBooleanConstantAndT
RUN_FILTER('init');
// Set default 'what' value
- //* DEBUG: */ echo "-".$GLOBALS['module']."/".$GLOBALS['what']."-
\n";
+ //* DEBUG: */ OUTPUT_HTML("-".$GLOBALS['module']."/".$GLOBALS['what']."-
");
if ((empty($GLOBALS['what'])) && (empty($GLOBALS['action'])) && ($CSS != 1) && ($CSS != -1)) {
if ($GLOBALS['module'] == "admin") {
// Set 'action' value to 'login' in admin menu
@@ -212,7 +212,7 @@ if ((!isBooleanConstantAndTrue('mxchange_installing')) && (isBooleanConstantAndT
} // END - if
// Update sending pool
- if (($CSS != "1") && ($CSS != "-1")) require_once(PATH."inc/pool-update.php"); // Sends out mails in configureable steps
+ if (($CSS != "1") && ($CSS != "-1")) LOAD_INC_ONCE("inc/pool-update.php"); // Sends out mails in configureable steps
// Load all active extension including language files when not upgrading.
// Check module for testing and count one click
@@ -237,25 +237,25 @@ if ((!isBooleanConstantAndTrue('mxchange_installing')) && (isBooleanConstantAndT
}
} else {
// Add language system
- include (PATH."inc/language.php");
+ LOAD_INC_ONCE("inc/language.php");
// Wrong database?
- ADD_FATAL(WRONG_DB_SELECTED);
+ addFatalMessage(getMessage('WRONG_DB_SELECTED'));
}
} else {
// Add language system
- include (PATH."inc/language.php");
+ LOAD_INC_ONCE("inc/language.php");
// No link to database!
- ADD_FATAL(NO_DB_LINK);
+ addFatalMessage(getMessage('NO_DB_LINK'));
$db = false;
}
} else {
// Add language system
- include (PATH."inc/language.php");
+ LOAD_INC_ONCE("inc/language.php");
// Maybe you forgot to enter your MySQL data?
- ADD_FATAL(MYSQL_DATA_MISSING);
+ addFatalMessage(getMessage('MYSQL_DATA_MISSING'));
}
} else {
///////////////////////////////////////////////////
@@ -263,21 +263,15 @@ if ((!isBooleanConstantAndTrue('mxchange_installing')) && (isBooleanConstantAndT
///////////////////////////////////////////////////
// Set other missing variables
+ if (!isset($CSS)) $CSS = "0";
$link = false; // No database link by default
// Include required files
- require_once(PATH."inc/databases.php");
- require_once(PATH."inc/session.php");
-
- // Create missing configuration file
- if (!function_exists('GET_CURR_THEME')) {
- // Load dummy theme functions
- require_once(PATH."inc/theme-dummy.php");
- } // END - if
+ LOAD_INC_ONCE("inc/databases.php");
+ LOAD_INC_ONCE("inc/session.php");
// Check if we are in installation routine
- $installPhp = basename($_SERVER['PHP_SELF']);
- if (($installPhp != "install.php") && ($CSS != "1") && ($CSS != -1)) {
+ if ((basename($_SERVER['PHP_SELF']) != "install.php") && ($CSS != "1") && ($CSS != -1)) {
// Redirect to the installation system
LOAD_URL("install.php");
} // END - if
@@ -286,26 +280,22 @@ if ((!isBooleanConstantAndTrue('mxchange_installing')) && (isBooleanConstantAndT
if ((!isBooleanConstantAndTrue('mxchange_installed')) || (!isBooleanConstantAndTrue('admin_registered'))) {
// Check for file permissions
if (!IS_INC_WRITEABLE("config")) {
- ADD_FATAL(CONFIG_IS_WRITE_PROTECTED);
+ addFatalMessage(getMessage('CONFIG_IS_WRITE_PROTECTED'));
} // END - if
if (!IS_INC_WRITEABLE("dummy")) {
- ADD_FATAL(DUMMY_IS_WRITE_PROTECTED);
+ addFatalMessage(getMessage('DUMMY_IS_WRITE_PROTECTED'));
} // END - if
if (!IS_INC_WRITEABLE(".secret/dummy")) {
- ADD_FATAL(SECRET_IS_WRITE_PROTECTED);
+ addFatalMessage(getMessage('SECRET_IS_WRITE_PROTECTED'));
} // END - if
} // END - if
}
-// Any fatal messages?
-if (!is_array($FATAL)) $FATAL = array();
-if (((sizeof($FATAL) > 0) || (!empty($FATAL[0]))) && (isBooleanConstantAndTrue('mxchange_installed')) && (!defined('mxchange_installing')) && ($CSS != "1")) {
+if ((getTotalFatalErrors() > 0) && (isBooleanConstantAndTrue('mxchange_installed')) && (!defined('mxchange_installing')) && ($CSS != "1")) {
// One or more fatal error(s) occur during connect...
- include (PATH."inc/header.php");
- include (PATH."inc/fatal_errors.php");
- unset($FATAL);
- include (PATH."inc/footer.php");
- exit;
+ LOAD_INC_ONCE("inc/header.php");
+ LOAD_INC_ONCE("inc/fatal_errors.php");
+ LOAD_INC_ONCE("inc/footer.php");
} // END - if
//