X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmysql-connect.php;h=0b60390d9227f7b19fce04dbb1ac7f3a1d4184b2;hb=b7aada7890a3c7d1c1da4d2b36d8d7683fa61c06;hp=d3418fde37818f0d4680a236cd51a217d5a900f8;hpb=636b7b0fda54f4ab9f2aae66fb8e4e56ca2333ff;p=mailer.git
diff --git a/inc/mysql-connect.php b/inc/mysql-connect.php
index d3418fde37..0b60390d92 100644
--- a/inc/mysql-connect.php
+++ b/inc/mysql-connect.php
@@ -43,7 +43,7 @@ define('DEBUG_SQL', false);
// Non-database functions
require("inc/functions.php");
-// Load more function libraries
+// Load more function libraries or includes
foreach (array('request-functions', 'session-functions', 'config-functions', 'filters', 'mysql-manager', 'extensions', 'db/lib', 'handler', 'hooks') as $lib) {
// Load special functions
LOAD_INC_ONCE(sprintf("inc/%s.php", $lib));
@@ -56,27 +56,23 @@ set_error_handler('__errorHandler');
register_shutdown_function('__SHUTDOWN_HOOK');
// Check if the user setups his MySQL stuff...
-if ((empty($MySQL['login'])) && (!defined('mxchange_installing')) && (!REQUEST_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')) && (!REQUEST_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--}");
}
-// Set dummy $_CONFIG array
-$_CONFIG = array(
- 'code_length' => 0,
- 'patch_level' => 0,
- 'last_update' => time()
-);
+// Set dummy config array
+initConfig();
// Set important header_sent
$GLOBALS['header_sent'] = 0;
@@ -85,8 +81,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
@@ -107,7 +104,10 @@ if ((!isBooleanConstantAndTrue('mxchange_installing')) && (isBooleanConstantAndT
unset($MySQL);
// Load configuration stuff
- mergeConfig(LOAD_CONFIG());
+ loadConfiguration();
+
+ // Init session
+ LOAD_INC_ONCE("inc/session.php");
// Load "databases" aka static arrays
LOAD_INC_ONCE("inc/databases.php");
@@ -115,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");
@@ -141,7 +138,7 @@ if ((!isBooleanConstantAndTrue('mxchange_installing')) && (isBooleanConstantAndT
}
// Run the init filter chain
- RUN_FILTER('init');
+ runFilterChain('init');
// Set default 'what' value
//* DEBUG: */ OUTPUT_HTML("-".$GLOBALS['module']."/".$GLOBALS['what']."-
");
@@ -164,8 +161,8 @@ if ((!isBooleanConstantAndTrue('mxchange_installing')) && (isBooleanConstantAndT
// Load all active extension including language files when not upgrading.
// Check module for testing and count one click
- $dummy = CHECK_MODULE($GLOBALS['module']);
- if ($dummy == "done") COUNT_MODULE($GLOBALS['module']);
+ $dummy = checkModulePermissions($GLOBALS['module']);
+ if ($dummy == "done") countModuleHit($GLOBALS['module']);
unset($dummy);
// Shall we activate the exchange?
@@ -175,34 +172,25 @@ if ((!isBooleanConstantAndTrue('mxchange_installing')) && (isBooleanConstantAndT
if (GET_EXT_VERSION("sql_patches") >= "0.3.6") {
// Generate random number
if (isset($GLOBALS['userid'])) {
- define('RAND_NUMBER', GEN_RANDOM_CODE(10, mt_rand(10000,32766), $GLOBALS['userid'], ""));
+ define('RAND_NUMBER', generateRandomCodde(10, mt_rand(10000,32766), $GLOBALS['userid'], ""));
} else {
- define('RAND_NUMBER', GEN_RANDOM_CODE(10, mt_rand(10000,32766), 0, ""));
+ define('RAND_NUMBER', generateRandomCodde(10, mt_rand(10000,32766), 0, ""));
}
} else {
// Generate weak (!!!) code
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 {
///////////////////////////////////////////////////
@@ -212,10 +200,12 @@ if ((!isBooleanConstantAndTrue('mxchange_installing')) && (isBooleanConstantAndT
// Set other missing variables
if (!isset($GLOBALS['output_mode'])) $GLOBALS['output_mode'] = "0";
- // Include required files
- LOAD_INC_ONCE("inc/databases.php");
+ // Init session
LOAD_INC_ONCE("inc/session.php");
+ // Include databases.php
+ LOAD_INC_ONCE("inc/databases.php");
+
// Check if we are in installation routine
if ((basename($_SERVER['PHP_SELF']) != "install.php") && ($GLOBALS['output_mode'] != "1") && ($GLOBALS['output_mode'] != -1)) {
// Redirect to the installation system
@@ -223,21 +213,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
+ runFilterChain('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");