Next stage of HTML rewriting, lesser br-tags

[mailer.git] / inc / functions.php

diff --git a/inc/functions.php b/inc/functions.php
index 6aedaf61bf7035fc788aab0b4f89739475093129..6ce5dc651f70e4c31d3ea0286cb3f5b0d4f67f7a 100644 (file)
--- a/inc/functions.php
+++ b/inc/functions.php
@@ -108,12 +108,12 @@ function outputHtml ($htmlCode, $newLine = true) {
                        $GLOBALS['output'] = rewriteLinksInCode($GLOBALS['output']);
                } // END - if
 
-               // Compile and run finished rendered HTML code
-               compileFinalOutput();
-
                // Send all HTTP headers
                sendHttpHeaders();
 
+               // Compile and run finished rendered HTML code
+               compileFinalOutput();
+
                // Output code here, DO NOT REMOVE! ;-)
                outputRawCode($GLOBALS['output']);
        } elseif ((getConfig('OUTPUT_MODE') == 'render') && (!empty($GLOBALS['output']))) {
@@ -122,12 +122,12 @@ function outputHtml ($htmlCode, $newLine = true) {
                        $GLOBALS['output'] = rewriteLinksInCode($GLOBALS['output']);
                } // END - if
 
-               // Compile and run finished rendered HTML code
-               compileFinalOutput();
-
                // Send all HTTP headers
                sendHttpHeaders();
 
+               // Compile and run finished rendered HTML code
+               compileFinalOutput();
+
                // Output code here, DO NOT REMOVE! ;-)
                outputRawCode($GLOBALS['output']);
        }
@@ -932,14 +932,13 @@ function redirectToUrl ($URL) {
        //* DEBUG: */ die($URL);
 
        // Simple probe for bots/spiders from search engines
-       if ((strpos(detectUserAgent(), 'spider') !== false) || (strpos(detectUserAgent(), 'bot') !== false)) {
+       if (isSpider()) {
                // Secure the URL against bad things such als HTML insertions and so on...
                $URL = secureString($URL);
 
                // Output new location link as anchor
                outputHtml('<a href="' . $URL . '"' . $rel . '>' . $URL . '</a>');
        } elseif (!headers_sent()) {
-               //* DEBUG: */ debug_report_bug("URL={$URL}");
                // Clear own output buffer
                $GLOBALS['output'] = '';