Rewrote handling of 'menu adverts' to a filter. This allows e.g. ext-clickbanner...

[mailer.git] / inc / http-functions.php

diff --git a/inc/http-functions.php b/inc/http-functions.php
index 4085f73176083f64efbbb4d123720ef57ba91ec2..67a70435983f725096b859e352b7750c8fbbdb88 100644 (file)
--- a/inc/http-functions.php
+++ b/inc/http-functions.php
@@ -551,7 +551,7 @@ function unchunkHttpResponse ($response) {
                //* DEBUG: */ die('tempResponse['.strlen($tempResponse).']=<pre>'.replaceReturnNewLine(htmlentities($tempResponse)).'</pre>');
 
                // Re-add the headers
-               $response = merge_array($GLOBALS['http_headers'], stringToArray(chr(10), $tempResponse));
+               $response = merge_array($GLOBALS['http_headers'], stringToArray(PHP_EOL, $tempResponse));
        } // END - if
 
        // Return the unchunked array
@@ -862,7 +862,7 @@ function logWrongServerNameRedirect () {
        // Is ext-sql_patches at least version 0.9.2?
        if (isExtensionInstalledAndNewer('sql_patches', '0.9.2')) {
                // Is there an entry?
-               if (countSumTotalData(detectServerName(), 'server_name_log', 'server_name_id', 'server_name', TRUE, sprintf(" AND `server_name_remote_addr`='%s' AND `server_name_ua`='%s' AND `server_name_referrer`='%s'", SQL_ESCAPE(detectRemoteAddr(TRUE)), SQL_ESCAPE(detectUserAgent(TRUE)), SQL_ESCAPE(detectReferer(TRUE)))) == 1) {
+               if (countSumTotalData(detectServerName(), 'server_name_log', 'server_name_id', 'server_name', TRUE, str_replace('%', '{PER}', sprintf(" AND `server_name_remote_addr`='%s' AND `server_name_ua`='%s' AND `server_name_referrer`='%s'", SQL_ESCAPE(detectRemoteAddr(TRUE)), SQL_ESCAPE(detectUserAgent(TRUE)), SQL_ESCAPE(detectReferer(TRUE))))) == 1) {
                        // Update counter, as all are the same
                        SQL_QUERY_ESC("UPDATE
        `{?_MYSQL_PREFIX?}_server_name_log`
@@ -882,7 +882,7 @@ LIMIT 1",
                                ), __FUNCTION__, __LINE__);
                } else {
                        // Then log it away
-                       SQL_QUERY_ESC("INSERT INTO `{?_MYSQL_PREFIX?}_server_name_log` (`server_name`, `server_name_remote_addr`, `server_name_ua`, `server_name_referral`) VALUES('%s','%s', '%s', '%s')",
+                       SQL_QUERY_ESC("INSERT INTO `{?_MYSQL_PREFIX?}_server_name_log` (`server_name`, `server_name_remote_addr`, `server_name_ua`, `server_name_referrer`) VALUES('%s','%s', '%s', '%s')",
                                array(
                                        detectServerName(),
                                        detectRemoteAddr(TRUE),