X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmysql-connect.php;h=697481ec2e48674f0d6af19a757eb61591047296;hb=09f120bc3ab97a58ba6abbb519fbe124cebbbaed;hp=2caef50a738ec7f305d413af27360f33f14bdac3;hpb=56156f6c4392510cdbe0eb4f2ccefc23b43e2672;p=mailer.git
diff --git a/inc/mysql-connect.php b/inc/mysql-connect.php
index 2caef50a73..697481ec2e 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");
+LOAD_INC_ONCE("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) {
@@ -70,9 +70,8 @@ function __errorHandler ($errno, $errstr, $errfile, $errline) {
// Output message to user and die
if (EXT_IS_ACTIVE("debug")) {
- // Debug extension found! :-)
- // @TODO Can this be rewritten to mxchange_die() ?
- 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
// @TODO Find a way to rewrite debug_print_backtrace() so we can maybe
@@ -108,17 +107,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
@@ -128,6 +127,10 @@ $_CONFIG = array(
'last_update' => time()
);
+// Init important $header variable
+global $header;
+$header = 0;
+
// Init fatal messages
global $FATAL;
$FATAL = array();
@@ -163,21 +166,21 @@ if ((!isBooleanConstantAndTrue('mxchange_installing')) && (isBooleanConstantAndT
$_CONFIG = merge_array($_CONFIG, 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();
@@ -197,7 +200,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
@@ -213,7 +216,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
@@ -238,25 +241,25 @@ if ((!isBooleanConstantAndTrue('mxchange_installing')) && (isBooleanConstantAndT
}
} else {
// Add language system
- include (PATH."inc/language.php");
+ LOAD_INC_ONCE("inc/language.php");
// Wrong database?
- addFatalMessage(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!
- addFatalMessage(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?
- addFatalMessage(MYSQL_DATA_MISSING);
+ addFatalMessage(getMessage('MYSQL_DATA_MISSING'));
}
} else {
///////////////////////////////////////////////////
@@ -268,8 +271,8 @@ if ((!isBooleanConstantAndTrue('mxchange_installing')) && (isBooleanConstantAndT
$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)) {
@@ -281,22 +284,22 @@ if ((!isBooleanConstantAndTrue('mxchange_installing')) && (isBooleanConstantAndT
if ((!isBooleanConstantAndTrue('mxchange_installed')) || (!isBooleanConstantAndTrue('admin_registered'))) {
// Check for file permissions
if (!IS_INC_WRITEABLE("config")) {
- addFatalMessage(CONFIG_IS_WRITE_PROTECTED);
+ addFatalMessage(getMessage('CONFIG_IS_WRITE_PROTECTED'));
} // END - if
if (!IS_INC_WRITEABLE("dummy")) {
- addFatalMessage(DUMMY_IS_WRITE_PROTECTED);
+ addFatalMessage(getMessage('DUMMY_IS_WRITE_PROTECTED'));
} // END - if
if (!IS_INC_WRITEABLE(".secret/dummy")) {
- addFatalMessage(SECRET_IS_WRITE_PROTECTED);
+ addFatalMessage(getMessage('SECRET_IS_WRITE_PROTECTED'));
} // END - if
} // END - if
}
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");
- include (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
//