Fixes for installation phase, old lost call of FILTER_COMPILE_CONFIG() removed

[mailer.git] / inc / functions.php

diff --git a/inc/functions.php b/inc/functions.php
index 41789fdc06a81327de61bfeda17cd4ff9d6afa9c..51e21667aac2164e7a38215c9a04b448d9569413 100644 (file)
--- a/inc/functions.php
+++ b/inc/functions.php
@@ -229,7 +229,6 @@ function addFatalMessage ($F, $L, $message, $extra = '') {
        $GLOBALS['fatal_messages'][] = $message;
 
        // Log fatal messages away
-       debug_report_bug($message);
        logDebugMessage($F, $L, 'Fatal error message: ' . $message);
 }
 
@@ -427,12 +426,15 @@ function loadEmailTemplate ($template, $content = array(), $userid = '0') {
        // Is content an array?
        if (is_array($content)) {
                // Add expiration to array
-               if (getConfig('auto_purge') == '0') {
+               if ((isConfigEntrySet('auto_purge')) && (getConfig('auto_purge') == '0')) {
                        // Will never expire!
                        $content['expiration'] = getMessage('MAIL_WILL_NEVER_EXPIRE');
-               } else {
+               } elseif (isConfigEntrySet('auto_purge')) {
                        // Create nice date string
                        $content['expiration'] = createFancyTime(getConfig('auto_purge'));
+               } else {
+                       // Missing entry
+                       $content['expiration'] = getMessage('MAIL_NO_CONFIG_AUTO_PURGE');
                }
        } // END - if
 
@@ -2577,7 +2579,7 @@ function debug_report_bug ($message = '', $sendEmail = true) {
        $debug .= "Thank you for finding bugs.";
 
        // Send an email? (e.g. not wanted for evaluation errors)
-       if ($sendEmail === true) {
+       if (($sendEmail === true) && (!isInstallationPhase())) {
                // Prepare content
                $content = array(
                        'message'     => trim($message),
@@ -3163,7 +3165,8 @@ function shutdown () {
        // Call the filter chain 'shutdown'
        runFilterChain('shutdown', null);
 
-       if (SQL_IS_LINK_UP()) {
+       // Check if not in installation phase and the link is up
+       if ((!isInstallationPhase()) && (SQL_IS_LINK_UP())) {
                // Close link
                SQL_CLOSE(__FILE__, __LINE__);
        } elseif (!isInstallationPhase()) {
@@ -3823,7 +3826,7 @@ function encodeUrl ($url, $outputMode = '0') {
        if (strpos($url, session_name()) !== false) return $url;
 
        // Do we have a valid session?
-       if ((($GLOBALS['valid_session'] === false) || (!isset($_COOKIE[session_name()]))) && (isSpider() === false)) {
+       if (((!isset($GLOBALS['valid_session'])) || ($GLOBALS['valid_session'] === false) || (!isset($_COOKIE[session_name()]))) && (isSpider() === false)) {
                // Invalid session
                // Determine right seperator
                $seperator = '&';