Reverted of changes in 1704, see ticket #160

[mailer.git] / inc / mysql-connect.php

diff --git a/inc/mysql-connect.php b/inc/mysql-connect.php
index f6c1a1f1264f56d8ae6884cbda82cae2c53da8bf..526741c10c035958a837d20b367285b3e69122c3 100644 (file)
--- a/inc/mysql-connect.php
+++ b/inc/mysql-connect.php
@@ -1,7 +1,7 @@
 <?php
 /************************************************************************
- * MXChange v0.2.1                                    Start: 11/16/2003 *
- * ===============                              Last change: 12/13/2004 *
+ * Mailer v0.2.1-FINAL                                Start: 11/16/2003 *
+ * ===================                          Last change: 12/13/2004 *
  *                                                                      *
  * -------------------------------------------------------------------- *
  * File              : mysql-connect.php                                *
@@ -18,6 +18,7 @@
  * svn:keywords Date Revision" (autoprobset!) at least!!!!!!            *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
+ * Copyright (c) 2009, 2010 by Mailer Developer Team                    *
  * For more information visit: http://www.mxchange.org                  *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
@@ -42,7 +43,7 @@ if (!defined('__SECURITY')) {
 } // END - if
 
 // Load more function libraries or includes
-foreach (array('functions', 'request-functions', 'session-functions', 'code-functions', 'language-functions', 'sql-functions', 'filter-functions', 'filters', 'mysql-manager', 'extensions-functions', 'handler') as $lib) {
+foreach (array('request-functions', 'session-functions', 'code-functions', 'language-functions', 'sql-functions', 'expression-functions', 'filter-functions','revision-functions', 'filters', 'mysql-manager', 'extensions-functions', 'handler') as $lib) {
        // Load special functions
        loadIncludeOnce('inc/' . $lib . '.php');
 } // END - foreach
@@ -59,8 +60,11 @@ initErrorHandler();
 // Init request
 initRequest();
 
+// Init userid
+initMemberId();
+
 // Set important header_sent
-if (!isset($GLOBALS['header_sent'])) $GLOBALS['header_sent'] = 0;
+if (!isset($GLOBALS['header_sent'])) $GLOBALS['header_sent'] = '0';
 
 // Init fatal messages
 initFatalMessages();
@@ -68,18 +72,14 @@ initFatalMessages();
 // Init message system
 initMessages();
 
-// Check if this file is writeable or read-only and warn the user
-if (!isInstalling()) {
-       // Load database layer here
-       loadIncludeOnce('inc/db/lib.php');
-
-       // Set missing module
-       if ((!isModuleSet()) && (isGetRequestElementSet('module'))) setModule(getRequestElement('module'));
-       if (!isModuleSet()) setModule('index');
-
+// Are we in installation phase?
+if ((!isInstalling()) && (!isInstallationPhase())) {
        // Load configuration file(s) here
        loadIncludeOnce('inc/load_config.php');
 
+       // Load database layer here
+       loadIncludeOnce('inc/db/lib.php');
+
        // CSS array
        initExtensionCssFiles();
 
@@ -103,12 +103,6 @@ if (!isInstalling()) {
                                // Load cache
                                loadIncludeOnce('inc/load_cache.php');
 
-                               // Init filter system
-                               initFilterSystem();
-
-                               // Run the init filter chain
-                               runFilterChain('init');
-
                                // Check module for permissions
                                $checkModule = checkModulePermissions();
 
@@ -148,17 +142,17 @@ if (!isInstalling()) {
                setConfigEntry('OUTPUT_MODE', 'render');
        } // END - if
 
-       // Set other missing variables
-       if (!isOutputModeSet()) setOutputMode(0);
+       // CFG: DATABASE-TYPE
+       setConfigEntry('_DB_TYPE', 'mysql3');
 
        // 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) {
+       foreach (array('inc/db/lib.php','inc/databases.php','inc/session.php','inc/versions.php','inc/install-functions.php','inc/load_config.php') as $inc) {
                // Load the include
                loadIncludeOnce($inc);
        } // END - foreach
 
-       // Load config
-       loadIncludeOnce('inc/load_config.php');
+       // Init filter system here
+       initFilterSystem();
 
        // Are we installation routine?
        if ((!isInstalling()) && (getOutputMode() != 1) && (getOutputMode() != -1)) {
@@ -166,9 +160,6 @@ if (!isInstalling()) {
                redirectToUrl('install.php');
        } // END - if
 
-       // Init filter system here
-       initFilterSystem();
-
        // Load cache
        loadIncludeOnce('inc/load_cache.php');