X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Fmysql-connect.php;h=a31a7879a771721428e0be637e964fa6a8854d27;hp=6e257ae8042df648001cd7537f94dedb6b0c2880;hb=f928ad2bed60fa256d0641eaf6d2c027a2944688;hpb=7b0f17cd637e388049d2167811e4332cec1e979b
diff --git a/inc/mysql-connect.php b/inc/mysql-connect.php
index 6e257ae804..a31a7879a7 100644
--- a/inc/mysql-connect.php
+++ b/inc/mysql-connect.php
@@ -45,8 +45,11 @@ if (!defined('__SECURITY')) {
// Non-database functions
require('inc/functions.php');
+// Wrapper functions
+require('inc/wrapper-functions.php');
+
// Load more function libraries or includes
-foreach (array('request-functions', 'session-functions', 'config-functions', 'code-functions', 'inc-functions', 'filters', 'mysql-manager', 'extensions', 'db/lib', 'handler', 'hooks') as $lib) {
+foreach (array('request-functions', 'session-functions', 'config-functions', 'code-functions', 'inc-functions', 'language-functions', 'filters', 'mysql-manager', 'extensions', 'db/lib', 'handler', 'hooks') as $lib) {
// Load special functions
loadIncludeOnce('inc/' . $lib . '.php');
} // END - foreach
@@ -54,60 +57,56 @@ foreach (array('request-functions', 'session-functions', 'config-functions', 'co
// Set error handler
set_error_handler('__errorHandler');
-// Check if the user setups his MySQL stuff...
-if ((empty($MySQL['login'])) && (!isInstalling()) && (!REQUEST_ISSET_GET('installing')) && (isInstalled())) {
- // No login entered and outside installation mode
- OUTPUT_HTML("{--LANG_WARNING--}: ");
- if (isInstalled()) {
- // You have changed my configuration file!
- app_die(__FILE__, __LINE__, "{--DIE_CONFIG_CHANGED_YOU--}");
- } else {
- // Please run the installation script (maybe again)
- app_die(__FILE__, __LINE__, "{--DIE_RUN_INSTALL_MYSQL--}");
- }
-} elseif ((!isInstalling()) && (empty($MySQL['password'])) && (isBooleanConstantAndTrue('warn_no_pass'))) {
- // No database password entered!!!
- OUTPUT_HTML("{--LANG_WARNING--}:
{--WARN_NULL_PASSWORD--}");
-}
+// Disable block-mode by default
+enableBlockMode(false);
+
+// Init error handler
+initErrorHandler();
-// Set dummy config array
-initConfig();
+// Init request
+initRequest();
// Set important header_sent
-$GLOBALS['header_sent'] = 0;
+if (!isset($GLOBALS['header_sent'])) $GLOBALS['header_sent'] = 0;
// Init fatal messages
initFatalMessages();
// Check if this file is writeable or read-only and warn the user
if ((!isInstalling()) && (isInstalled())) {
+ // Load "databases" aka static arrays
+ loadIncludeOnce('inc/databases.php');
+
+ // Load configuration file(s) here
+ loadIncludeOnce('inc/load_config.php');
+
// 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';
+ if (!isModuleSet()) setModule(REQUEST_GET('module'));
+ if (!isModuleSet()) setModule('index');
// CSS array
EXT_INIT_CSS_FILES();
- if ((!empty($MySQL['host'])) && (!empty($MySQL['login'])) && (!empty($MySQL['password'])) && (!empty($MySQL['dbase']))) {
+ if ((!empty($GLOBALS['mysql']['host'])) && (!empty($GLOBALS['mysql']['login'])) && (!empty($GLOBALS['mysql']['password'])) && (!empty($GLOBALS['mysql']['dbase']))) {
// Connect to DB
- SQL_CONNECT($MySQL['host'], $MySQL['login'], $MySQL['password'], __FILE__, __LINE__);
+ SQL_CONNECT($GLOBALS['mysql']['host'], $GLOBALS['mysql']['login'], $GLOBALS['mysql']['password'], __FILE__, __LINE__);
// Is the link valid?
if (SQL_IS_LINK_UP()) {
+ // Enable exit on error
+ enableExitOnError();
+
// Is it a valid resource?
- if (SQL_SELECT_DB($MySQL['dbase'], __FILE__, __LINE__) === true) {
+ if (SQL_SELECT_DB($GLOBALS['mysql']['dbase'], __FILE__, __LINE__) === true) {
// This is required for extension 'optimize' to work
- define('__DB_NAME', $MySQL['dbase']);
+ define('__DB_NAME', $GLOBALS['mysql']['dbase']);
// Remove MySQL array from namespace
- unset($MySQL);
+ unset($GLOBALS['mysql']);
// Load configuration stuff
loadConfiguration();
- // Load "databases" aka static arrays
- loadIncludeOnce('inc/databases.php');
-
// Init session
loadIncludeOnce('inc/session.php');
@@ -115,7 +114,7 @@ if ((!isInstalling()) && (isInstalled())) {
loadIncludeOnce('inc/versions.php');
// Loading patching system is required here...
- loadIncludeOnce('inc/patch-system.php'); // Initialize patch system
+ loadIncludeOnce('inc/patch-system.php');
// Run daily reset
loadIncludeOnce('inc/check-reset.php');
@@ -129,41 +128,47 @@ if ((!isInstalling()) && (isInstalled())) {
//* DEBUG: */ die();
// Get all values
- if (($GLOBALS['output_mode'] != 1) && ($GLOBALS['output_mode'] != -1)) {
- if (empty($GLOBALS['module'])) $GLOBALS['module'] = 'empty';
- if (empty($GLOBALS['what'])) $GLOBALS['what'] = getWhatFromModule($GLOBALS['module']);
- if (empty($GLOBALS['action'])) $GLOBALS['action'] = getModeAction($GLOBALS['module'], $GLOBALS['what']);
+ if ((getOutputMode() != 1) && (getOutputMode() != -1)) {
+ if (!isModuleSet()) setModule('empty');
+ if (!isWhatSet()) setWhat(getWhatFromModule(getModule()));
+ if (!isActionSet()) setAction(getModeAction(getModule(), getWhat()));
} else {
// Set action/what to empty
- $GLOBALS['action'] = '';
- $GLOBALS['what'] = '';
+ setAction('');
+ setWhat('');
}
// Run the init filter chain
runFilterChain('init');
// Set default 'what' value
- //* DEBUG: */ OUTPUT_HTML('-'.$GLOBALS['module'].'/'.$GLOBALS['what']."-
");
- if ((empty($GLOBALS['what'])) && (empty($GLOBALS['action'])) && ($GLOBALS['output_mode'] != 1) && ($GLOBALS['output_mode'] != -1)) {
- if ($GLOBALS['module'] == 'admin') {
+ //* DEBUG: */ OUTPUT_HTML('-'.getModule().'/'.getWhat()."-
");
+ if ((!isWhatSet()) && (!isActionSet()) && (getOutputMode() != 1) && (getOutputMode() != -1)) {
+ if (getModule() == 'admin') {
// Set 'action' value to 'login' in admin menu
- $GLOBALS['action'] = getModeAction($GLOBALS['module'], $GLOBALS['what']);
- } elseif (($GLOBALS['module'] == 'index') || ($GLOBALS['module'] == 'login')) {
+ setAction(getModeAction(getModule(), getWhat()));
+ } elseif ((getModule() == 'index') || (getModule() == 'login')) {
// Set 'what' value to 'welcome' in guest and member menu
- $GLOBALS['what'] = 'welcome';
- if (getConfig('index_home') != '') $GLOBALS['what'] = getConfig('index_home');
+ setWhat('welcome');
+ if (getConfig('index_home') != '') setWhatFromConfig('index_home');
} else {
// Anything else like begging link
- $GLOBALS['what'] = '';
+ setWhat('');
}
} // END - if
// Update sending pool
- if (($GLOBALS['output_mode'] != '1') && ($GLOBALS['output_mode'] != '-1')) loadIncludeOnce('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
- if (checkModulePermissions($GLOBALS['module']) == 'done') countModuleHit($GLOBALS['module']);
+ if ((getOutputMode() != '1') && (getOutputMode() != '-1')) loadIncludeOnce('inc/pool-update.php'); // Sends out mails in configureable steps
+
+ // Check module for permissions
+ $checkModule = checkModulePermissions(getModule());
+ if ($checkModule != 'done') {
+ // Not fine!
+ DEBUG_LOG(__FILE__, __LINE__, sprintf("Check of module %s results in unpexted value: %s",
+ getModule(),
+ $checkModule
+ ));
+ } // END - if
// Shall we activate the exchange?
if (getConfig('activate_xchange') > 0) activateExchange();
@@ -171,7 +176,7 @@ if ((!isInstalling()) && (isInstalled())) {
// Is the extension sql_patches installed and at least 0.3.6?
if (GET_EXT_VERSION('sql_patches') >= '0.3.6') {
// Generate random number
- define('RAND_NUMBER', generateRandomCodde(10, mt_rand(10000,32766), getUserId(), ''));
+ define('RAND_NUMBER', generateRandomCode(10, mt_rand(10000,32766), getUserId(), ''));
} else {
// Generate weak (!!!) code
define('RAND_NUMBER', mt_rand(1000000, 9999999));
@@ -193,8 +198,17 @@ if ((!isInstalling()) && (isInstalled())) {
// Include neccessary functions for installation //
///////////////////////////////////////////////////
+ // Default output is 'direct' for HTML output
+ setConfigEntry('OUTPUT_MODE', 'direct');
+
+ // This hack prevents a backtrace in CSS output
+ if (getOutputMode() == '1') {
+ // Problem with config so set output mode
+ setConfigEntry('OUTPUT_MODE', 'render');
+ } // END - if
+
// Set other missing variables
- if (!isset($GLOBALS['output_mode'])) $GLOBALS['output_mode'] = '0';
+ if (!isOutputModeSet()) setOutputMode('0');
// Include databases.php
loadIncludeOnce('inc/databases.php');
@@ -206,7 +220,7 @@ if ((!isInstalling()) && (isInstalled())) {
loadIncludeOnce('inc/versions.php');
// Check if we are in installation routine
- if ((!isInstalling()) && ($GLOBALS['output_mode'] != '1') && ($GLOBALS['output_mode'] != -1)) {
+ if ((!isInstalling()) && (getOutputMode() != '1') && (getOutputMode() != -1)) {
// Redirect to the installation system
redirectToUrl('install.php');
} // END - if
@@ -230,9 +244,18 @@ if ((!isInstalling()) && (isInstalled())) {
// Load extension 'sql_patches'
LOAD_EXTENSION('sql_patches');
+
+ // Load configuration file(s) here
+ loadIncludeOnce('inc/load_config.php');
}
-if ((getTotalFatalErrors() > 0) && (isInstalled()) && (!isInstalling()) && ($GLOBALS['output_mode'] != '1')) {
+// Init session
+loadIncludeOnce('inc/session.php');
+
+// Load versions
+loadIncludeOnce('inc/versions.php');
+
+if ((getTotalFatalErrors() > 0) && (isInstalled()) && (!isInstalling()) && (getOutputMode() != '1')) {
// One or more fatal error(s) occur during connect...
loadIncludeOnce('inc/header.php');
loadIncludeOnce('inc/fatal_errors.php');