X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Fmysql-connect.php;h=84c9a6a1e31a354de1c029e4f4894eadb497d186;hp=23fd43926c133639d01bc736ac5a69797251c457;hb=a7b0c182c660809dc95c8dd1205809006ae2f9c7;hpb=f18a3b60125c8c65861e3205da40447b227f89c9
diff --git a/inc/mysql-connect.php b/inc/mysql-connect.php
index 23fd43926c..84c9a6a1e3 100644
--- a/inc/mysql-connect.php
+++ b/inc/mysql-connect.php
@@ -43,65 +43,20 @@ 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 () {
- global $link;
-
- // Call the filter chain 'shutdown'
- RUN_FILTER('shutdown', null, false);
-
- if (is_resource($link)) {
- // Close link
- SQL_CLOSE($link, __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'))) && (isBooleanConstantAndTrue('mxchange_installed'))) {
// No login entered and outside installation mode
OUTPUT_HTML("{--LANG_WARNING--}: ");
if (isBooleanConstantAndTrue('mxchange_installed')) {
@@ -111,7 +66,7 @@ if ((empty($MySQL['login'])) && (!defined('mxchange_installing')) && (!isset($_G
// 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 ((!isBooleanConstantAndTrue('mxchange_installing')) && (!REQUEST_ISSET_GET(('installing'))) && (empty($MySQL['password'])) && (isBooleanConstantAndTrue('warn_no_pass'))) {
// No database password entered!!!
OUTPUT_HTML("{--LANG_WARNING--}:
{--WARN_NULL_PASSWORD--}");
}
@@ -123,13 +78,11 @@ $_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;
-$FATAL = array();
+initFatalMessages();
// Check if this file is writeable or read-only and warn the user
if ((!isBooleanConstantAndTrue('mxchange_installing')) && (isBooleanConstantAndTrue('mxchange_installed'))) {
@@ -137,21 +90,16 @@ if ((!isBooleanConstantAndTrue('mxchange_installing')) && (isBooleanConstantAndT
if (empty($GLOBALS['module'])) $GLOBALS['module'] = "index";
// CSS array
- $EXT_CSS_FILES = array();
+ EXT_INIT_CSS_FILES();
if ((!empty($MySQL['host'])) && (!empty($MySQL['login'])) && (!empty($MySQL['password'])) && (!empty($MySQL['dbase']))) {
// Connect to DB
- global $link;
- $link = SQL_CONNECT($MySQL['host'], $MySQL['login'], $MySQL['password'], __FILE__, __LINE__);
+ SQL_CONNECT($MySQL['host'], $MySQL['login'], $MySQL['password'], __FILE__, __LINE__);
// Is the link valid?
- if (is_resource($link)) {
- // Choose the database
- global $db;
- $db = SQL_SELECT_DB($MySQL['dbase'], $link, __FILE__, __LINE__);
-
+ if (SQL_IS_LINK_UP()) {
// Is it a valid resource?
- if ($db === true) {
+ if (SQL_SELECT_DB($MySQL['dbase'], __FILE__, __LINE__) === true) {
// This is required for extension 'optimize' to work
define('__DB_NAME', $MySQL['dbase']);
@@ -167,9 +115,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");
@@ -182,7 +127,7 @@ if ((!isBooleanConstantAndTrue('mxchange_installing')) && (isBooleanConstantAndT
//* 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']);
@@ -197,7 +142,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']);
@@ -212,7 +157,7 @@ if ((!isBooleanConstantAndTrue('mxchange_installing')) && (isBooleanConstantAndT
} // END - if
// Update sending pool
- if (($CSS != "1") && ($CSS != "-1")) LOAD_INC_ONCE("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
@@ -248,7 +193,6 @@ if ((!isBooleanConstantAndTrue('mxchange_installing')) && (isBooleanConstantAndT
// No link to database!
addFatalMessage(getMessage('NO_DB_LINK'));
- $db = false;
}
} else {
// Add language system
@@ -263,15 +207,13 @@ if ((!isBooleanConstantAndTrue('mxchange_installing')) && (isBooleanConstantAndT
///////////////////////////////////////////////////
// Set other missing variables
- if (!isset($CSS)) $CSS = "0";
- $link = false; // No database link by default
+ 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") && ($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
@@ -291,7 +233,7 @@ 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...
LOAD_INC_ONCE("inc/header.php");
LOAD_INC_ONCE("inc/fatal_errors.php");