X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Fmysql-connect.php;h=7bf73db0fbb7e8cce49af4171a5fa9ac3b7bec12;hp=6bcae05430d7de23000b7efa94aa674a3dc0b844;hb=78de893e6a62885f106b8176aece16847c09eea2;hpb=f97a999e0737c0007ae9c3c26dfef49f75a175ac
diff --git a/inc/mysql-connect.php b/inc/mysql-connect.php
index 6bcae05430..7bf73db0fb 100644
--- a/inc/mysql-connect.php
+++ b/inc/mysql-connect.php
@@ -45,34 +45,18 @@ 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
- LOAD_INC_ONCE('inc/' . $lib . '.php');
+ loadIncludeOnce('inc/' . $lib . '.php');
} // END - foreach
// 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--}");
-}
-
-// Set dummy config array
-initConfig();
-
// Set important header_sent
$GLOBALS['header_sent'] = 0;
@@ -81,6 +65,12 @@ 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';
@@ -88,42 +78,39 @@ if ((!isInstalling()) && (isInstalled())) {
// 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()) {
// 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
- LOAD_INC_ONCE('inc/databases.php');
-
// Init session
- LOAD_INC_ONCE('inc/session.php');
+ loadIncludeOnce('inc/session.php');
// Load versions
- LOAD_INC_ONCE('inc/versions.php');
+ loadIncludeOnce('inc/versions.php');
// Loading patching system is required here...
- LOAD_INC_ONCE('inc/patch-system.php'); // Initialize patch system
+ loadIncludeOnce('inc/patch-system.php');
// Run daily reset
- LOAD_INC_ONCE('inc/check-reset.php');
+ loadIncludeOnce('inc/check-reset.php');
// Load admin include file if he is admin
if (IS_ADMIN()) {
// Administrative functions
- LOAD_INC_ONCE('inc/modules/admin/admin-inc.php');
+ loadIncludeOnce('inc/modules/admin/admin-inc.php');
} // END - if
//* DEBUG: */ ADD_POINTS_REFSYSTEM('test', 36, 1000);
//* DEBUG: */ die();
@@ -131,8 +118,8 @@ if ((!isInstalling()) && (isInstalled())) {
// 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'] = GET_WHAT($GLOBALS['module']);
- if (empty($GLOBALS['action'])) $GLOBALS['action'] = GET_ACTION($GLOBALS['module'], $GLOBALS['what']);
+ if (empty($GLOBALS['what'])) $GLOBALS['what'] = getWhatFromModule($GLOBALS['module']);
+ if (empty($GLOBALS['action'])) $GLOBALS['action'] = getModeAction($GLOBALS['module'], $GLOBALS['what']);
} else {
// Set action/what to empty
$GLOBALS['action'] = '';
@@ -143,11 +130,11 @@ if ((!isInstalling()) && (isInstalled())) {
runFilterChain('init');
// Set default 'what' value
- //* DEBUG: */ OUTPUT_HTML("-".$GLOBALS['module']."/".$GLOBALS['what']."-
");
+ //* 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') {
// Set 'action' value to 'login' in admin menu
- $GLOBALS['action'] = GET_ACTION($GLOBALS['module'], $GLOBALS['what']);
+ $GLOBALS['action'] = getModeAction($GLOBALS['module'], $GLOBALS['what']);
} elseif (($GLOBALS['module'] == 'index') || ($GLOBALS['module'] == 'login')) {
// Set 'what' value to 'welcome' in guest and member menu
$GLOBALS['what'] = 'welcome';
@@ -159,7 +146,7 @@ if ((!isInstalling()) && (isInstalled())) {
} // END - if
// Update sending pool
- if (($GLOBALS['output_mode'] != '1') && ($GLOBALS['output_mode'] != '-1')) LOAD_INC_ONCE('inc/pool-update.php'); // Sends out mails in configureable steps
+ 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
@@ -171,7 +158,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,34 +180,43 @@ 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 ($GLOBALS['output_mode'] == '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';
// Include databases.php
- LOAD_INC_ONCE('inc/databases.php');
+ loadIncludeOnce('inc/databases.php');
// Init session
- LOAD_INC_ONCE('inc/session.php');
+ loadIncludeOnce('inc/session.php');
// Load versions
- LOAD_INC_ONCE('inc/versions.php');
+ loadIncludeOnce('inc/versions.php');
// Check if we are in installation routine
if ((!isInstalling()) && ($GLOBALS['output_mode'] != '1') && ($GLOBALS['output_mode'] != -1)) {
// Redirect to the installation system
- LOAD_URL('install.php');
+ redirectToUrl('install.php');
} // END - if
// Double-check installation mode
if ((!isInstalled()) || (!isAdminRegistered())) {
// Check for file permissions
- if (!IS_INC_WRITEABLE('config')) {
+ if (!isIncludeWriteable('config')) {
addFatalMessage(__FILE__, __LINE__, getMessage('CONFIG_IS_WRITE_PROTECTED'));
} // END - if
- if (!IS_INC_WRITEABLE('dummy')) {
+ if (!isIncludeWriteable('dummy')) {
addFatalMessage(__FILE__, __LINE__, getMessage('DUMMY_IS_WRITE_PROTECTED'));
} // END - if
- if (!IS_INC_WRITEABLE('.secret/dummy')) {
+ if (!isIncludeWriteable('.secret/dummy')) {
addFatalMessage(__FILE__, __LINE__, getMessage('SECRET_IS_WRITE_PROTECTED'));
} // END - if
} // END - if
@@ -230,13 +226,22 @@ if ((!isInstalling()) && (isInstalled())) {
// Load extension 'sql_patches'
LOAD_EXTENSION('sql_patches');
+
+ // Load configuration file(s) here
+ loadIncludeOnce('inc/load_config.php');
}
+// Init session
+loadIncludeOnce('inc/session.php');
+
+// Load versions
+loadIncludeOnce('inc/versions.php');
+
if ((getTotalFatalErrors() > 0) && (isInstalled()) && (!isInstalling()) && ($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');
- LOAD_INC_ONCE('inc/footer.php');
+ loadIncludeOnce('inc/header.php');
+ loadIncludeOnce('inc/fatal_errors.php');
+ loadIncludeOnce('inc/footer.php');
} // END - if
//