X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Fmysql-connect.php;h=a733ea9abd2440a6c38aa14c0f974e3fcc7b151d;hp=6bcae05430d7de23000b7efa94aa674a3dc0b844;hb=6aa5b6c3d7c49ceb5a41b836657321e9c0b5dea5;hpb=f97a999e0737c0007ae9c3c26dfef49f75a175ac
diff --git a/inc/mysql-connect.php b/inc/mysql-connect.php
index 6bcae05430..a733ea9abd 100644
--- a/inc/mysql-connect.php
+++ b/inc/mysql-connect.php
@@ -17,7 +17,7 @@
* 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 *
+ * Copyright (c) 2003 - 2009 by Roland Haeder *
* For more information visit: http://www.mxchange.org *
* *
* This program is free software; you can redistribute it and/or modify *
@@ -38,143 +38,85 @@
// Some security stuff...
if (!defined('__SECURITY')) {
- $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), '/inc') + 4) . '/security.php';
- require($INC);
-}
-
-// Non-database functions
-require('inc/functions.php');
+ die();
+} // END - if
// 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('functions', 'request-functions', 'session-functions', 'code-functions', 'language-functions', 'sql-functions', 'filter-functions', 'filters', 'mysql-manager', 'extensions-functions', 'handler') 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--}");
-}
+// Disable block-mode by default
+enableBlockMode(false);
-// Set dummy config array
-initConfig();
+// Init error handler
+initErrorHandler();
+
+// Init request
+initRequest();
// Set important header_sent
-$GLOBALS['header_sent'] = 0;
+if (!isset($GLOBALS['header_sent'])) $GLOBALS['header_sent'] = 0;
// Init fatal messages
initFatalMessages();
+// Init message system
+initMessages();
+
// Check if this file is writeable or read-only and warn the user
-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';
+if (!isInstalling()) {
+ // Load configuration file(s) here
+ loadIncludeOnce('inc/load_config.php');
+
+ // Load database layer here
+ loadIncludeOnce('inc/db/lib.php');
// CSS array
- EXT_INIT_CSS_FILES();
+ initExtensionCssFiles();
- 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']);
+ setConfigEntry('__DB_NAME', $GLOBALS['mysql']['dbase']);
// Remove MySQL array from namespace
- unset($MySQL);
-
- // Load configuration stuff
- 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
-
- // Run daily reset
- LOAD_INC_ONCE('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');
- } // END - if
- //* DEBUG: */ ADD_POINTS_REFSYSTEM('test', 36, 1000);
- //* 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'] = GET_WHAT($GLOBALS['module']);
- if (empty($GLOBALS['action'])) $GLOBALS['action'] = GET_ACTION($GLOBALS['module'], $GLOBALS['what']);
- } else {
- // Set action/what to empty
- $GLOBALS['action'] = '';
- $GLOBALS['what'] = '';
- }
+ unset($GLOBALS['mysql']);
+
+ // Load cache
+ loadIncludeOnce('inc/load_cache.php');
+
+ // Init filter system
+ initFilterSystem();
// 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') {
- // Set 'action' value to 'login' in admin menu
- $GLOBALS['action'] = GET_ACTION($GLOBALS['module'], $GLOBALS['what']);
- } elseif (($GLOBALS['module'] == 'index') || ($GLOBALS['module'] == 'login')) {
- // Set 'what' value to 'welcome' in guest and member menu
- $GLOBALS['what'] = 'welcome';
- if (getConfig('index_home') != '') $GLOBALS['what'] = getConfig('index_home');
- } else {
- // Anything else like begging link
- $GLOBALS['what'] = '';
- }
- } // 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
-
- // 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']);
-
- // Shall we activate the exchange?
- if (getConfig('activate_xchange') > 0) activateExchange();
-
- // 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(), ''));
- } else {
- // Generate weak (!!!) code
- define('RAND_NUMBER', mt_rand(1000000, 9999999));
+ // Check module for permissions
+ $checkModule = checkModulePermissions();
+
+ // Admin module should be accessable by guests to login
+ if ((getModule() == 'admin') && ($checkModule == 'admin_only')) {
+ // This is fine and can be ignored
+ } elseif ($checkModule != 'done') {
+ // Not fine!
+ logDebugMessage(__FILE__, __LINE__, sprintf("Check of module %s results in unexpected value: %s",
+ getModule(),
+ $checkModule
+ ));
}
} else {
// Wrong database?
@@ -193,51 +135,45 @@ if ((!isInstalling()) && (isInstalled())) {
// Include neccessary functions for installation //
///////////////////////////////////////////////////
- // Set other missing variables
- if (!isset($GLOBALS['output_mode'])) $GLOBALS['output_mode'] = '0';
+ // 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
- // Include databases.php
- LOAD_INC_ONCE('inc/databases.php');
+ // Set other missing variables
+ if (!isOutputModeSet()) setOutputMode(0);
- // Init session
- LOAD_INC_ONCE('inc/session.php');
+ // Include more
+ foreach (array('inc/databases.php','inc/versions.php','inc/db/lib.php','inc/session.php','inc/install-functions.php','inc/load_config.php') as $inc) {
+ // Load the include
+ loadIncludeOnce($inc);
+ } // END - foreach
- // Load versions
- LOAD_INC_ONCE('inc/versions.php');
+ // Load config
+ loadIncludeOnce('inc/load_config.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');
+ // Are we installation routine?
+ if ((!isInstalling()) && (getOutputMode() != 1) && (getOutputMode() != -1)) {
+ // You have to install first!
+ redirectToUrl('install.php');
} // END - if
- // Double-check installation mode
- if ((!isInstalled()) || (!isAdminRegistered())) {
- // Check for file permissions
- if (!IS_INC_WRITEABLE('config')) {
- addFatalMessage(__FILE__, __LINE__, getMessage('CONFIG_IS_WRITE_PROTECTED'));
- } // END - if
- if (!IS_INC_WRITEABLE('dummy')) {
- addFatalMessage(__FILE__, __LINE__, getMessage('DUMMY_IS_WRITE_PROTECTED'));
- } // END - if
- if (!IS_INC_WRITEABLE('.secret/dummy')) {
- addFatalMessage(__FILE__, __LINE__, getMessage('SECRET_IS_WRITE_PROTECTED'));
- } // END - if
- } // END - if
+ // Init filter system here
+ initFilterSystem();
+
+ // Load cache
+ loadIncludeOnce('inc/load_cache.php');
// Run the init filter chain
runFilterChain('init');
-
- // Load extension 'sql_patches'
- LOAD_EXTENSION('sql_patches');
}
-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');
-} // END - if
+// Handle fatal errors
+runFilterChain('handle_fatal_errors');
-//
+// [EOF]
?>