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 57ee9fc67c3d8f992e92aa5aeb949ab1514d3ddd..a31a7879a771721428e0be637e964fa6a8854d27 100644 (file)
--- a/inc/mysql-connect.php
+++ b/inc/mysql-connect.php
@@ -67,7 +67,7 @@ initErrorHandler();
 initRequest();
 
 // Set important header_sent
 initRequest();
 
 // Set important header_sent

-$GLOBALS['header_sent'] = 0;
+if (!isset($GLOBALS['header_sent'])) $GLOBALS['header_sent'] = 0;

 
 // Init fatal messages
 initFatalMessages();
 
 // Init fatal messages
 initFatalMessages();


@@ -160,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
 
                                // 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();
 
                                // Shall we activate the exchange?
                                if (getConfig('activate_xchange') > 0) activateExchange();