Double->single rewrites, fixes for email archive

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

diff --git a/inc/mysql-connect.php b/inc/mysql-connect.php
index e0914d2dd293524b5298152799fe49863cecdae6..a4e1a8b739d27abd654419b29cc30cdb932b509f 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                                *
@@ -59,8 +59,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();
@@ -69,20 +72,13 @@ initFatalMessages();
 initMessages();
 
 // Check if this file is writeable or read-only and warn the user
-if ((!isInstalling()) && (!isInstallationPhase())) {
-       // Load "databases" aka static arrays
-       loadIncludeOnce('inc/databases.php');
+if (!isInstalling()) {
+       // Load configuration file(s) here
+       loadIncludeOnce('inc/load_config.php');
 
        // Load database layer here
        loadIncludeOnce('inc/db/lib.php');
 
-       // Set missing module
-       if ((!isModuleSet()) && (isGetRequestElementSet('module'))) setModule(getRequestElement('module'));
-       if (!isModuleSet()) setModule('index');
-
-       // Load configuration file(s) here
-       loadIncludeOnce('inc/load_config.php');
-
        // CSS array
        initExtensionCssFiles();
 
@@ -115,9 +111,6 @@ if ((!isInstalling()) && (!isInstallationPhase())) {
                                // Check module for permissions
                                $checkModule = checkModulePermissions();
 
-                               // Cound module here
-                               countModuleHit(getModule());
-
                                // Admin module should be accessable by guests to login
                                if ((getModule() == 'admin') && ($checkModule == 'admin_only')) {
                                        // This is fine and can be ignored
@@ -154,11 +147,11 @@ if ((!isInstalling()) && (!isInstallationPhase())) {
                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/db/lib.php','inc/session.php','inc/versions.php','inc/install-functions.php','inc/load_config.php') as $inc) {
+       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
@@ -183,7 +176,7 @@ if ((!isInstalling()) && (!isInstallationPhase())) {
 }
 
 // Handle fatal errors
-handleFatalErrors();
+runFilterChain('handle_fatal_errors');
 
 // [EOF]
 ?>