X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Fmysql-connect.php;h=a733ea9abd2440a6c38aa14c0f974e3fcc7b151d;hp=91dc03e9e2bd6163f8f5c75467f20daae2b39560;hb=6aa5b6c3d7c49ceb5a41b836657321e9c0b5dea5;hpb=03f62d0b89aa9276ac37f4d616d940fae184d850 diff --git a/inc/mysql-connect.php b/inc/mysql-connect.php index 91dc03e9e2..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,18 +38,11 @@ // 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'); - -// Wrapper functions -require('inc/wrapper-functions.php'); + die(); +} // END - if // 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', 'language-functions', 'sql-functions', 'filter-functions', 'filters', 'mysql-manager', 'extensions-functions', 'handler') as $lib) { // Load special functions loadIncludeOnce('inc/' . $lib . '.php'); } // END - foreach @@ -57,6 +50,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,25 +60,24 @@ initErrorHandler(); initRequest(); // Set important header_sent -$GLOBALS['header_sent'] = 0; +if (!isset($GLOBALS['header_sent'])) $GLOBALS['header_sent'] = 0; // Init fatal messages 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'); +// Init message system +initMessages(); +// Check if this file is writeable or read-only and warn the user +if (!isInstalling()) { // Load configuration file(s) here loadIncludeOnce('inc/load_config.php'); - // Check for write-permission for config.php and inc directory - if (!isModuleSet()) setModule(REQUEST_GET('module')); - if (!isModuleSet()) setModule('index'); + // Load database layer here + loadIncludeOnce('inc/db/lib.php'); // CSS array - EXT_INIT_CSS_FILES(); + initExtensionCssFiles(); if ((!empty($GLOBALS['mysql']['host'])) && (!empty($GLOBALS['mysql']['login'])) && (!empty($GLOBALS['mysql']['password'])) && (!empty($GLOBALS['mysql']['dbase']))) { // Connect to DB @@ -96,81 +91,32 @@ if ((!isInstalling()) && (isInstalled())) { // Is it a valid resource? if (SQL_SELECT_DB($GLOBALS['mysql']['dbase'], __FILE__, __LINE__) === true) { // This is required for extension 'optimize' to work - define('__DB_NAME', $GLOBALS['mysql']['dbase']); + setConfigEntry('__DB_NAME', $GLOBALS['mysql']['dbase']); // Remove MySQL array from namespace unset($GLOBALS['mysql']); - // Load configuration stuff - loadConfiguration(); - - // Init session - loadIncludeOnce('inc/session.php'); - - // Load versions - loadIncludeOnce('inc/versions.php'); - - // Loading patching system is required here... - loadIncludeOnce('inc/patch-system.php'); - - // Run daily reset - loadIncludeOnce('inc/check-reset.php'); - - // Load admin include file if he is admin - if (IS_ADMIN()) { - // Administrative functions - loadIncludeOnce('inc/modules/admin/admin-inc.php'); - } // END - if - //* DEBUG: */ ADD_POINTS_REFSYSTEM('test', 36, 1000); - //* DEBUG: */ die(); - - // Get all values - 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 - setAction(''); - setWhat(''); - } + // 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('-'.getModule().'/'.getWhat()."-
"); - if ((!isWhatSet()) && (!isActionSet()) && (getOutputMode() != 1) && (getOutputMode() != -1)) { - if (getModule() == 'admin') { - // Set 'action' value to 'login' in admin menu - setAction(getModeAction(getModule(), getWhat())); - } elseif ((getModule() == 'index') || (getModule() == 'login')) { - // Set 'what' value to 'welcome' in guest and member menu - setWhat('welcome'); - if (getConfig('index_home') != '') setWhatFromConfig('index_home'); - } else { - // Anything else like begging link - setWhat(''); - } - } // END - if - - // Update sending pool - if ((getOutputMode() != '1') && (getOutputMode() != '-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(getModule()) == 'done') countModuleHit(getModule()); - - // 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', generateRandomCode(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,65 +139,41 @@ if ((!isInstalling()) && (isInstalled())) { setConfigEntry('OUTPUT_MODE', 'direct'); // This hack prevents a backtrace in CSS output - if (getOutputMode() == '1') { + if (getOutputMode() == 1) { // Problem with config so set output mode setConfigEntry('OUTPUT_MODE', 'render'); } // END - if // Set other missing variables - if (!isOutputModeSet()) setOutputMode('0'); - - // Include databases.php - loadIncludeOnce('inc/databases.php'); + if (!isOutputModeSet()) setOutputMode(0); - // Init session - loadIncludeOnce('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 - loadIncludeOnce('inc/versions.php'); + // Load config + loadIncludeOnce('inc/load_config.php'); - // Check if we are in installation routine - if ((!isInstalling()) && (getOutputMode() != '1') && (getOutputMode() != -1)) { - // Redirect to the installation system + // 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 (!isIncludeWriteable('config')) { - addFatalMessage(__FILE__, __LINE__, getMessage('CONFIG_IS_WRITE_PROTECTED')); - } // END - if - if (!isIncludeWriteable('dummy')) { - addFatalMessage(__FILE__, __LINE__, getMessage('DUMMY_IS_WRITE_PROTECTED')); - } // END - if - if (!isIncludeWriteable('.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'); - - // 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()) && (getOutputMode() != '1')) { - // One or more fatal error(s) occur during connect... - loadIncludeOnce('inc/header.php'); - loadIncludeOnce('inc/fatal_errors.php'); - loadIncludeOnce('inc/footer.php'); -} // END - if +// Handle fatal errors +runFilterChain('handle_fatal_errors'); -// +// [EOF] ?>