X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Fmysql-connect.php;h=87395a3e08d5f7aaf6fe013c6b46acdbb1fb35f4;hp=0d53569e82584100cf0b2705e8f5c45098af3adf;hb=b8c86fa12322603c24a88ea2b0fd3dbeba612752;hpb=d016e24dd4686f613a17733b96bc28fac936a4ac
diff --git a/inc/mysql-connect.php b/inc/mysql-connect.php
index 0d53569e82..87395a3e08 100644
--- a/inc/mysql-connect.php
+++ b/inc/mysql-connect.php
@@ -43,73 +43,30 @@ define('DEBUG_SQL', false);
// Non-database functions
require("inc/functions.php");
-// Filter functions
-LOAD_INC_ONCE("inc/filters.php");
-
-// Functions which interact with the database
-LOAD_INC_ONCE("inc/mysql-manager.php");
-
-// Load extensions and language
-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) {
- // Construct message
- $msg = sprintf("errno=%s,errstr=%s,errfile=%s,errline=%s",
- $errno,
- $errstr,
- basename($errfile),
- $errline
- );
-
- // Write debug log message
- DEBUG_LOG(__FUNCTION__, __LINE__, "".$msg, true);
-
- // 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.");
- } else {
- // No debug extension found, so regular output
- debug_report_bug($msg);
- }
-}
+// Load more function libraries or includes
+foreach (array('request-functions', 'session-functions', 'config-functions', 'filters', 'mysql-manager', 'extensions', 'db/lib', 'handler', 'hooks', 'session') as $lib) {
+ // Load special functions
+ LOAD_INC_ONCE(sprintf("inc/%s.php", $lib));
+} // END - foreach
// Set error handler
set_error_handler('__errorHandler');
-// Call-back function for running shutdown functions and close database connection
-function __SHUTDOWN_HOOK () {
- // Call the filter chain 'shutdown'
- RUN_FILTER('shutdown', null, false);
-
- if (SQL_IS_LINK_UP()) {
- // Close link
- SQL_CLOSE(__FILE__, __LINE__);
- } else {
- // No database link
- addFatalMessage(getMessage('NO_DB_LINK'));
- }
-}
-
// Register shutdown hook
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'))) {
+if ((empty($MySQL['login'])) && (!defined('mxchange_installing')) && (!REQUEST_ISSET_GET(('installing'))) && (isInstalled())) {
// No login entered and outside installation mode
OUTPUT_HTML("{--LANG_WARNING--}: ");
- if (isBooleanConstantAndTrue('mxchange_installed')) {
+ if (isInstalled()) {
// You have changed my configuration file!
mxchange_die("{--DIE_CONFIG_CHANGED_YOU--}");
} else {
// Please run the installation script (maybe again)
mxchange_die("{--DIE_RUN_INSTALL_MYSQL--}");
}
-} elseif ((!isBooleanConstantAndTrue('mxchange_installing')) && (!isset($_GET['installing'])) && (empty($MySQL['password'])) && (isBooleanConstantAndTrue('warn_no_pass'))) {
+} elseif ((!isInstalling()) && (!REQUEST_ISSET_GET(('installing'))) && (empty($MySQL['password'])) && (isBooleanConstantAndTrue('warn_no_pass'))) {
// No database password entered!!!
OUTPUT_HTML("{--LANG_WARNING--}:
{--WARN_NULL_PASSWORD--}");
}
@@ -128,8 +85,9 @@ $GLOBALS['header_sent'] = 0;
initFatalMessages();
// Check if this file is writeable or read-only and warn the user
-if ((!isBooleanConstantAndTrue('mxchange_installing')) && (isBooleanConstantAndTrue('mxchange_installed'))) {
+if ((!isInstalling()) && (isInstalled())) {
// Check for write-permission for config.php and inc directory
+ if (empty($GLOBALS['module'])) $GLOBALS['module'] = REQUEST_GET('module');
if (empty($GLOBALS['module'])) $GLOBALS['module'] = "index";
// CSS array
@@ -158,9 +116,6 @@ if ((!isBooleanConstantAndTrue('mxchange_installing')) && (isBooleanConstantAndT
// Loading patching system is required here...
LOAD_INC_ONCE("inc/patch-system.php"); // Initialize patch system
- // Session management
- LOAD_INC_ONCE("inc/session.php");
-
// Run daily reset
LOAD_INC_ONCE("inc/check-reset.php");
@@ -227,25 +182,16 @@ if ((!isBooleanConstantAndTrue('mxchange_installing')) && (isBooleanConstantAndT
define('RAND_NUMBER', mt_rand(1000000, 9999999));
}
} else {
- // Add language system
- LOAD_INC_ONCE("inc/language.php");
-
// Wrong database?
- addFatalMessage(getMessage('WRONG_DB_SELECTED'));
+ addFatalMessage(__FILE__, __LINE__, getMessage('WRONG_DB_SELECTED'));
}
} else {
- // Add language system
- LOAD_INC_ONCE("inc/language.php");
-
// No link to database!
- addFatalMessage(getMessage('NO_DB_LINK'));
+ addFatalMessage(__FILE__, __LINE__, getMessage('NO_DB_LINK'));
}
} else {
- // Add language system
- LOAD_INC_ONCE("inc/language.php");
-
// Maybe you forgot to enter your MySQL data?
- addFatalMessage(getMessage('MYSQL_DATA_MISSING'));
+ addFatalMessage(__FILE__, __LINE__, getMessage('MYSQL_DATA_MISSING'));
}
} else {
///////////////////////////////////////////////////
@@ -255,9 +201,8 @@ if ((!isBooleanConstantAndTrue('mxchange_installing')) && (isBooleanConstantAndT
// Set other missing variables
if (!isset($GLOBALS['output_mode'])) $GLOBALS['output_mode'] = "0";
- // Include required files
+ // Include databases.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") && ($GLOBALS['output_mode'] != "1") && ($GLOBALS['output_mode'] != -1)) {
@@ -266,21 +211,24 @@ if ((!isBooleanConstantAndTrue('mxchange_installing')) && (isBooleanConstantAndT
} // END - if
// Double-check installation mode
- if ((!isBooleanConstantAndTrue('mxchange_installed')) || (!isBooleanConstantAndTrue('admin_registered'))) {
+ if ((!isInstalled()) || (!isAdminRegistered())) {
// Check for file permissions
if (!IS_INC_WRITEABLE("config")) {
- addFatalMessage(getMessage('CONFIG_IS_WRITE_PROTECTED'));
+ addFatalMessage(__FILE__, __LINE__, getMessage('CONFIG_IS_WRITE_PROTECTED'));
} // END - if
if (!IS_INC_WRITEABLE("dummy")) {
- addFatalMessage(getMessage('DUMMY_IS_WRITE_PROTECTED'));
+ addFatalMessage(__FILE__, __LINE__, getMessage('DUMMY_IS_WRITE_PROTECTED'));
} // END - if
if (!IS_INC_WRITEABLE(".secret/dummy")) {
- addFatalMessage(getMessage('SECRET_IS_WRITE_PROTECTED'));
+ addFatalMessage(__FILE__, __LINE__, getMessage('SECRET_IS_WRITE_PROTECTED'));
} // END - if
} // END - if
+
+ // Run the init filter chain
+ RUN_FILTER('init');
}
-if ((getTotalFatalErrors() > 0) && (isBooleanConstantAndTrue('mxchange_installed')) && (!defined('mxchange_installing')) && ($GLOBALS['output_mode'] != "1")) {
+if ((getTotalFatalErrors() > 0) && (isInstalled()) && (!defined('mxchange_installing')) && ($GLOBALS['output_mode'] != "1")) {
// One or more fatal error(s) occur during connect...
LOAD_INC_ONCE("inc/header.php");
LOAD_INC_ONCE("inc/fatal_errors.php");