More misc fixes and rewrites (sorry, lame description)

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

diff --git a/inc/mysql-connect.php b/inc/mysql-connect.php
index 91dc03e9e2bd6163f8f5c75467f20daae2b39560..a31a7879a771721428e0be637e964fa6a8854d27 100644 (file)
--- a/inc/mysql-connect.php
+++ b/inc/mysql-connect.php
@@ -57,6 +57,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,7 +67,7 @@ initErrorHandler();
 initRequest();
 
 // Set important header_sent
-$GLOBALS['header_sent'] = 0;
+if (!isset($GLOBALS['header_sent'])) $GLOBALS['header_sent'] = 0;
 
 // Init fatal messages
 initFatalMessages();
@@ -157,9 +160,15 @@ if ((!isInstalling()) && (isInstalled())) {
                                // 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());
+                               // Check module for permissions
+                               $checkModule = checkModulePermissions(getModule());
+                               if ($checkModule != 'done') {
+                                       // Not fine!
+                                       DEBUG_LOG(__FILE__, __LINE__, sprintf("Check of module %s results in unpexted value: %s",
+                                               getModule(),
+                                               $checkModule
+                                       ));
+                               } // END - if
 
                                // Shall we activate the exchange?
                                if (getConfig('activate_xchange') > 0) activateExchange();