X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=inc%2Fmysql-connect.php;h=3eac524730132966fe8dfc0741aa5cbe5c91daa7;hb=66b91ce490ab549425619c95fc12086e126d541b;hp=5ad12fcb5d8f163413c9f72ee902cc89cf5fe141;hpb=7297440d795390abd70ddc339b1a81d34f76c953;p=mailer.git
diff --git a/inc/mysql-connect.php b/inc/mysql-connect.php
index 5ad12fcb5d..3eac524730 100644
--- a/inc/mysql-connect.php
+++ b/inc/mysql-connect.php
@@ -42,14 +42,8 @@ if (!defined('__SECURITY')) {
require($INC);
}
-// 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', 'language-functions', 'filters', 'mysql-manager', 'extensions', 'db/lib', 'handler', 'hooks') as $lib) {
+foreach (array('functions', 'request-functions', 'session-functions', 'code-functions', 'inc-functions', 'language-functions', 'filters', 'mysql-manager', 'extensions', 'handler', 'hooks') as $lib) {
// Load special functions
loadIncludeOnce('inc/' . $lib . '.php');
} // END - foreach
@@ -57,6 +51,9 @@ foreach (array('request-functions', 'session-functions', 'config-functions', 'co
// Set error handler
set_error_handler('__errorHandler');
+// Disable block-mode by default
+enableBlockMode(false);
+
// Init error handler
initErrorHandler();
@@ -64,7 +61,7 @@ initErrorHandler();
initRequest();
// Set important header_sent
-$GLOBALS['header_sent'] = 0;
+if (!isset($GLOBALS['header_sent'])) $GLOBALS['header_sent'] = 0;
// Init fatal messages
initFatalMessages();
@@ -77,9 +74,12 @@ if ((!isInstalling()) && (isInstalled())) {
// Load configuration file(s) here
loadIncludeOnce('inc/load_config.php');
+ // Load database layer here
+ loadIncludeOnce('inc/db/lib.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();
@@ -125,41 +125,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();
@@ -167,10 +173,10 @@ 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', generateRandomCode(10, mt_rand(10000,32766), getUserId(), ''));
+ setConfigEntry('RAND_NUMBER', generateRandomCode(10, mt_rand(10000, 32766), getUserId(), ''));
} else {
// Generate weak (!!!) code
- define('RAND_NUMBER', mt_rand(1000000, 9999999));
+ setConfigEntry('RAND_NUMBER', mt_rand(1000000, 9999999));
}
} else {
// Wrong database?
@@ -193,13 +199,13 @@ if ((!isInstalling()) && (isInstalled())) {
setConfigEntry('OUTPUT_MODE', 'direct');
// This hack prevents a backtrace in CSS output
- if ($GLOBALS['output_mode'] == '1') {
+ 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');
@@ -211,7 +217,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
@@ -246,7 +252,7 @@ loadIncludeOnce('inc/session.php');
// Load versions
loadIncludeOnce('inc/versions.php');
-if ((getTotalFatalErrors() > 0) && (isInstalled()) && (!isInstalling()) && ($GLOBALS['output_mode'] != '1')) {
+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');