X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Fmysql-connect.php;h=fdc059a8fb27904640f3cce2499486a0081d2199;hp=c9e95630ec82e0f7b68ea34c882fa7fcae3862de;hb=59bd8a9805c51c895a92cc12825f4cbdfd792597;hpb=5bdeaf8b452206598b6c6cd4f941145b11a0eccc
diff --git a/inc/mysql-connect.php b/inc/mysql-connect.php
index c9e95630ec..fdc059a8fb 100644
--- a/inc/mysql-connect.php
+++ b/inc/mysql-connect.php
@@ -41,19 +41,19 @@ if (!defined('__SECURITY')) {
define('DEBUG_SQL', false);
// 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
-require_once(PATH."inc/db/lib.php");
+LOAD_INC_ONCE("inc/db/lib.php");
// Error handler function
function __errorHandler ($errno, $errstr, $errfile, $errline) {
@@ -71,14 +71,10 @@ function __errorHandler ($errno, $errstr, $errfile, $errline) {
// Output message to user and die
if (EXT_IS_ACTIVE("debug")) {
// 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.");
+ mxchange_die("Error message written to debug.log. Please try to call the main page to continue.");
} else {
- // No debug extension found
- // @TODO Find a way to rewrite debug_print_backtrace() so we can maybe
- // @TODO (?) rewrite this to mxchange_die()
- 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);
}
}
@@ -97,7 +93,7 @@ function __SHUTDOWN_HOOK () {
SQL_CLOSE($link, __FILE__, __LINE__);
} else {
// No database link
- addFatalMessage(NO_DB_LINK);
+ addFatalMessage(getMessage('NO_DB_LINK'));
}
}
@@ -107,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
- OUTPUT_HTML("{!LANG_WARNING!}: ");
+ OUTPUT_HTML("{--LANG_WARNING--}: ");
if (isBooleanConstantAndTrue('mxchange_installed')) {
// You have changed my configuration file!
- mxchange_die("{!DIE_CONFIG_CHANGED_YOU!}");
+ mxchange_die("{--DIE_CONFIG_CHANGED_YOU--}");
} else {
// Please run the installation script (maybe again)
- mxchange_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!!!
- OUTPUT_HTML("{!LANG_WARNING!}:
{!WARN_NULL_PASSWORD!}");
+ OUTPUT_HTML("{--LANG_WARNING--}:
{--WARN_NULL_PASSWORD--}");
}
// Set dummy $_CONFIG array
@@ -127,9 +123,8 @@ $_CONFIG = array(
'last_update' => time()
);
-// Init important $header variable
-global $header;
-$header = 0;
+// Set important header_sent
+$GLOBALS['header_sent'] = 0;
// Init fatal messages
global $FATAL;
@@ -163,30 +158,30 @@ 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");
+ 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();
// Get all values
- if (($CSS != 1) && ($CSS != -1)) {
+ if (($GLOBALS['output_mode'] != 1) && ($GLOBALS['output_mode'] != -1)) {
if (empty($GLOBALS['module'])) $GLOBALS['module'] = "empty";
if (empty($GLOBALS['what'])) $GLOBALS['what'] = GET_WHAT($GLOBALS['module']);
if (empty($GLOBALS['action'])) $GLOBALS['action'] = GET_ACTION($GLOBALS['module'], $GLOBALS['what']);
@@ -201,7 +196,7 @@ if ((!isBooleanConstantAndTrue('mxchange_installing')) && (isBooleanConstantAndT
// Set default 'what' value
//* DEBUG: */ OUTPUT_HTML("-".$GLOBALS['module']."/".$GLOBALS['what']."-
");
- if ((empty($GLOBALS['what'])) && (empty($GLOBALS['action'])) && ($CSS != 1) && ($CSS != -1)) {
+ if ((empty($GLOBALS['what'])) && (empty($GLOBALS['action'])) && ($GLOBALS['output_mode'] != 1) && ($GLOBALS['output_mode'] != -1)) {
if ($GLOBALS['module'] == "admin") {
// Set 'action' value to 'login' in admin menu
$GLOBALS['action'] = GET_ACTION($GLOBALS['module'], $GLOBALS['what']);
@@ -216,7 +211,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 (($GLOBALS['output_mode'] != "1") && ($GLOBALS['output_mode'] != "-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
@@ -241,14 +236,14 @@ if ((!isBooleanConstantAndTrue('mxchange_installing')) && (isBooleanConstantAndT
}
} else {
// Add language system
- require_once(PATH."inc/language.php");
+ LOAD_INC_ONCE("inc/language.php");
// Wrong database?
addFatalMessage(getMessage('WRONG_DB_SELECTED'));
}
} else {
// Add language system
- require_once(PATH."inc/language.php");
+ LOAD_INC_ONCE("inc/language.php");
// No link to database!
addFatalMessage(getMessage('NO_DB_LINK'));
@@ -256,7 +251,7 @@ if ((!isBooleanConstantAndTrue('mxchange_installing')) && (isBooleanConstantAndT
}
} else {
// Add language system
- require_once(PATH."inc/language.php");
+ LOAD_INC_ONCE("inc/language.php");
// Maybe you forgot to enter your MySQL data?
addFatalMessage(getMessage('MYSQL_DATA_MISSING'));
@@ -267,15 +262,15 @@ if ((!isBooleanConstantAndTrue('mxchange_installing')) && (isBooleanConstantAndT
///////////////////////////////////////////////////
// Set other missing variables
- if (!isset($CSS)) $CSS = "0";
+ if (!isset($GLOBALS['output_mode'])) $GLOBALS['output_mode'] = "0";
$link = false; // No database link by default
// Include required files
- require_once(PATH."inc/databases.php");
- require_once(PATH."inc/session.php");
+ LOAD_INC_ONCE("inc/databases.php");
+ LOAD_INC_ONCE("inc/session.php");
// Check if we are in installation routine
- if ((basename($_SERVER['PHP_SELF']) != "install.php") && ($CSS != "1") && ($CSS != -1)) {
+ if ((basename($_SERVER['PHP_SELF']) != "install.php") && ($GLOBALS['output_mode'] != "1") && ($GLOBALS['output_mode'] != -1)) {
// Redirect to the installation system
LOAD_URL("install.php");
} // END - if
@@ -295,11 +290,11 @@ if ((!isBooleanConstantAndTrue('mxchange_installing')) && (isBooleanConstantAndT
} // END - if
}
-if ((getTotalFatalErrors() > 0) && (isBooleanConstantAndTrue('mxchange_installed')) && (!defined('mxchange_installing')) && ($CSS != "1")) {
+if ((getTotalFatalErrors() > 0) && (isBooleanConstantAndTrue('mxchange_installed')) && (!defined('mxchange_installing')) && ($GLOBALS['output_mode'] != "1")) {
// One or more fatal error(s) occur during connect...
- require_once(PATH."inc/header.php");
- require_once(PATH."inc/fatal_errors.php");
- require_once(PATH."inc/footer.php");
+ LOAD_INC_ONCE("inc/header.php");
+ LOAD_INC_ONCE("inc/fatal_errors.php");
+ LOAD_INC_ONCE("inc/footer.php");
} // END - if
//