X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Fmysql-connect.php;h=f9f1457e4d078eefb271a0140d232a654c654a18;hp=fc86b7eb4ab39bdc5602d53be77962b0508f9596;hb=f36ab6ae1503ee54a7c9d0083a8089286d8b37ef;hpb=39172de4ecec2f6ddc597a5ae439e7aef79c75ed diff --git a/inc/mysql-connect.php b/inc/mysql-connect.php index fc86b7eb4a..f9f1457e4d 100644 --- a/inc/mysql-connect.php +++ b/inc/mysql-connect.php @@ -44,7 +44,7 @@ define('DEBUG_SQL', false); require_once(PATH."inc/db/lib.php"); // Non-database functions -require_once(PATH."inc/functions.php"); +require_once(PATH."inc/functions.php"); // Filter functions require_once(PATH."inc/filters.php"); @@ -155,21 +155,12 @@ if ((!isBooleanConstantAndTrue('mxchange_installing')) && (isBooleanConstantAndT // Load configuration stuff $_CONFIG = merge_array($_CONFIG, LOAD_CONFIG()); - // Initialize include-file-pool - $INC_POOL = array(); - // Load "databases" aka static arrays require_once(PATH."inc/databases.php"); // Loading patching system is required here... require_once(PATH."inc/patch-system.php"); // Initialize patch system - // Create missing configuration file - if (!function_exists('GET_CURR_THEME')) { - // Load dummy theme functions - require_once(PATH."inc/theme-dummy.php"); - } // END - if - // Session management require_once(PATH."inc/session.php"); @@ -195,11 +186,8 @@ if ((!isBooleanConstantAndTrue('mxchange_installing')) && (isBooleanConstantAndT $GLOBALS['what'] = ""; } - // Secure and validate user ID from cookie - UPDATE_LOGIN_DATA(); - - // Update online list - UPDATE_ONLINE_LIST($PHPSESSID, $GLOBALS['module'], $GLOBALS['action'], $GLOBALS['what']); + // Run the init filter chain + RUN_FILTER('init'); // Set default 'what' value //* DEBUG: */ echo "-".$GLOBALS['module']."/".$GLOBALS['what']."-
\n"; @@ -269,21 +257,15 @@ if ((!isBooleanConstantAndTrue('mxchange_installing')) && (isBooleanConstantAndT /////////////////////////////////////////////////// // Set other missing variables + if (!isset($CSS)) $CSS = "0"; $link = false; // No database link by default // Include required files require_once(PATH."inc/databases.php"); require_once(PATH."inc/session.php"); - // Create missing configuration file - if (!function_exists('GET_CURR_THEME')) { - // Load dummy theme functions - require_once(PATH."inc/theme-dummy.php"); - } // END - if - // Check if we are in installation routine - $installPhp = basename($_SERVER['PHP_SELF']); - if (($installPhp != "install.php") && ($CSS != "1") && ($CSS != -1)) { + if ((basename($_SERVER['PHP_SELF']) != "install.php") && ($CSS != "1") && ($CSS != -1)) { // Redirect to the installation system LOAD_URL("install.php"); } // END - if @@ -303,9 +285,6 @@ if ((!isBooleanConstantAndTrue('mxchange_installing')) && (isBooleanConstantAndT } // END - if } -// Init filter system -INIT_FILTER_SYSTEM(); - // Any fatal messages? if (!is_array($FATAL)) $FATAL = array(); if (((sizeof($FATAL) > 0) || (!empty($FATAL[0]))) && (isBooleanConstantAndTrue('mxchange_installed')) && (!defined('mxchange_installing')) && ($CSS != "1")) {