HTTP status codes added for missing/locked modules, fixed double-logging of debug...

[mailer.git] / inc / functions.php

diff --git a/inc/functions.php b/inc/functions.php
index 305ee3f8aa02f6b18964bd1878aa3fb6aac2c7cb..864e26f9678eda20f32524877b8129e96053070e 100644 (file)
--- a/inc/functions.php
+++ b/inc/functions.php
@@ -126,7 +126,7 @@ function sendHttpHeaders () {
        $now = gmdate('D, d M Y H:i:s') . ' GMT';
 
        // Send HTTP header
-       sendHeader('HTTP/1.1 200 OK');
+       sendHeader('HTTP/1.1 ' . getHttpStatus());
 
        // General headers for no caching
        sendHeader('Expires: ' . $now); // RFC2616 - Section 14.21
@@ -324,9 +324,6 @@ function loadTemplate ($template, $return = false, $content = array()) {
 
                        // Cache the eval() command here
                        $GLOBALS['template_eval'][$template] = $eval;
-
-                       // Eval the code
-                       eval($GLOBALS['template_eval'][$template]);
                } elseif ((isAdmin()) || ((isInstalling()) && (!isInstalled()))) {
                        // Only admins shall see this warning or when installation mode is active
                        $ret = '<br /><span class="guest_failed">{--TEMPLATE_404--}</span><br />
@@ -341,10 +338,13 @@ function loadTemplate ($template, $return = false, $content = array()) {
                        // No file!
                        $GLOBALS['template_eval'][$template] = '404';
                }
-       } else {
+       }
+
+       // Code set?
+       if ((isset($GLOBALS['template_eval'][$template])) && ($GLOBALS['template_eval'][$template] != '404')) {
                // Eval the code
                eval($GLOBALS['template_eval'][$template]);
-       }
+       } // END - if
 
        // Do we have some content to output or return?
        if (!empty($ret)) {
@@ -2364,12 +2364,6 @@ function app_die ($F, $L, $message) {
                // Rewrite message for output
                $message = sprintf(getMessage('MAILER_HAS_DIED'), basename($F), $L, $message);
 
-               // We don't want to log messages from debug_report_bug() itself...
-               if ($F != 'debug_report_bug') {
-                       // Better log this message away
-                       logDebugMessage($F, $L, $message);
-               } // END - if
-
                // Load the message template
                loadTemplate('app_die_message', false, $message);