X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Fmysql-connect.php;h=326edc5cebe82223b7de24dd11af802d0b5a9d6c;hp=14ff7074fe7f46be755e3a2f3f76cdada506f75e;hb=3af8b17c962e094e3eaffbd6d111290cdb286c92;hpb=4c83f0cc7459cad9ec9c1c68963f5365155ee935
diff --git a/inc/mysql-connect.php b/inc/mysql-connect.php
index 14ff7074fe..326edc5ceb 100644
--- a/inc/mysql-connect.php
+++ b/inc/mysql-connect.php
@@ -10,7 +10,12 @@
* -------------------------------------------------------------------- *
* Kurzbeschreibung : Verbindet zu Ihrer Datenbank *
* -------------------------------------------------------------------- *
- * *
+ * $Revision:: $ *
+ * $Date:: $ *
+ * $Tag:: 0.2.1-FINAL $ *
+ * $Author:: $ *
+ * Needs to be in all Files and every File needs "svn propset *
+ * svn:keywords Date Revision" (autoprobset!) at least!!!!!! *
* -------------------------------------------------------------------- *
* Copyright (c) 2003 - 2008 by Roland Haeder *
* For more information visit: http://www.mxchange.org *
@@ -37,14 +42,11 @@ if (!defined('__SECURITY')) {
require($INC);
}
-// CFG: DEBUG-SQL (if enabled and DEBUG_MODE is enabled all SQL queries will be logged to debug.log)
-define('DEBUG_SQL', false);
-
// Non-database functions
require("inc/functions.php");
// 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) {
+foreach (array('request-functions', 'session-functions', 'config-functions', 'code-functions', 'inc-functions', 'filters', 'mysql-manager', 'extensions', 'db/lib', 'handler', 'hooks') as $lib) {
// Load special functions
LOAD_INC_ONCE(sprintf("inc/%s.php", $lib));
} // END - foreach
@@ -52,31 +54,24 @@ foreach (array('request-functions', 'session-functions', 'config-functions', 'fi
// Set error handler
set_error_handler('__errorHandler');
-// Register shutdown hook
-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'])) && (!isInstalling()) && (!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--}");
+ app_die(__FILE__, __LINE__, "{--DIE_CONFIG_CHANGED_YOU--}");
} else {
// Please run the installation script (maybe again)
- mxchange_die("{--DIE_RUN_INSTALL_MYSQL--}");
+ app_die(__FILE__, __LINE__, "{--DIE_RUN_INSTALL_MYSQL--}");
}
-} elseif ((!isInstalling()) && (!REQUEST_ISSET_GET(('installing'))) && (empty($MySQL['password'])) && (isBooleanConstantAndTrue('warn_no_pass'))) {
+} elseif ((!isInstalling()) && (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 +80,9 @@ $GLOBALS['header_sent'] = 0;
initFatalMessages();
// Check if this file is writeable or read-only and warn the user
-if ((!isInstalling()) && (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,11 +103,17 @@ if ((!isInstalling()) && (isBooleanConstantAndTrue('mxchange_installed'))) {
unset($MySQL);
// Load configuration stuff
- mergeConfig(LOAD_CONFIG());
+ loadConfiguration();
// Load "databases" aka static arrays
LOAD_INC_ONCE("inc/databases.php");
+ // Init session
+ LOAD_INC_ONCE("inc/session.php");
+
+ // Load versions
+ LOAD_INC_ONCE("inc/versions.php");
+
// Loading patching system is required here...
LOAD_INC_ONCE("inc/patch-system.php"); // Initialize patch system
@@ -138,7 +140,7 @@ if ((!isInstalling()) && (isBooleanConstantAndTrue('mxchange_installed'))) {
}
// Run the init filter chain
- RUN_FILTER('init');
+ runFilterChain('init');
// Set default 'what' value
//* DEBUG: */ OUTPUT_HTML("-".$GLOBALS['module']."/".$GLOBALS['what']."-
");
@@ -161,9 +163,7 @@ if ((!isInstalling()) && (isBooleanConstantAndTrue('mxchange_installed'))) {
// 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']);
- unset($dummy);
+ if (checkModulePermissions($GLOBALS['module']) == "done") countModuleHit($GLOBALS['module']);
// Shall we activate the exchange?
if (getConfig('activate_xchange') > 0) activateExchange();
@@ -171,35 +171,22 @@ if ((!isInstalling()) && (isBooleanConstantAndTrue('mxchange_installed'))) {
// Is the extension sql_patches installed and at least 0.3.6?
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'], ""));
- } else {
- define('RAND_NUMBER', GEN_RANDOM_CODE(10, mt_rand(10000,32766), 0, ""));
- }
+ define('RAND_NUMBER', generateRandomCodde(10, mt_rand(10000,32766), getUserId(), ""));
} 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,28 +199,40 @@ if ((!isInstalling()) && (isBooleanConstantAndTrue('mxchange_installed'))) {
// Include databases.php
LOAD_INC_ONCE("inc/databases.php");
+ // Init session
+ LOAD_INC_ONCE("inc/session.php");
+
+ // Load versions
+ LOAD_INC_ONCE("inc/versions.php");
+
// Check if we are in installation routine
- if ((basename($_SERVER['PHP_SELF']) != "install.php") && ($GLOBALS['output_mode'] != "1") && ($GLOBALS['output_mode'] != -1)) {
+ if ((!isInstalling()) && ($GLOBALS['output_mode'] != "1") && ($GLOBALS['output_mode'] != -1)) {
// Redirect to the installation system
LOAD_URL("install.php");
} // 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');
+
+ // Load extension 'sql_patches'
+ LOAD_EXTENSION("sql_patches");
}
-if ((getTotalFatalErrors() > 0) && (isBooleanConstantAndTrue('mxchange_installed')) && (!defined('mxchange_installing')) && ($GLOBALS['output_mode'] != "1")) {
+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");