Renamed templates + added some filters for mail order

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

diff --git a/inc/http-functions.php b/inc/http-functions.php
index 6901f38febd998226efc649d46cf1e72674968e1..4fc66c95a5a94a4850f1af9106d3a284b9e34ace 100644 (file)
--- a/inc/http-functions.php
+++ b/inc/http-functions.php
@@ -16,7 +16,7 @@
  * $Author::                                                          $ *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
- * Copyright (c) 2009 - 2012 by Mailer Developer Team                   *
+ * Copyright (c) 2009 - 2013 by Mailer Developer Team                   *
  * For more information visit: http://mxchange.org                      *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
@@ -321,7 +321,7 @@ function sendRawRequest ($host, $request, $allowOnlyHttpOkay = TRUE) {
        $port = 80;
 
        // Initialize array
-       $response = array('', '', '');
+       $response = array();
 
        // Default is non-broken HTTP server implementation
        $GLOBALS['is_http_server_broken'] = FALSE;
@@ -409,8 +409,11 @@ function sendRawRequest ($host, $request, $allowOnlyHttpOkay = TRUE) {
                // Get line from stream
                $line = fgets($resource, 128);
 
-               // Ignore empty lines because of non-blocking mode
-               if (empty($line)) {
+               /*
+                * Ignore empty lines because of non-blocking mode, you cannot use
+                * empty() here as it would also see \r\n as "empty".
+                */
+               if (strlen($line) == 0) {
                        // uslepp a little to avoid 100% CPU load
                        usleep(10);
 
@@ -425,7 +428,7 @@ function sendRawRequest ($host, $request, $allowOnlyHttpOkay = TRUE) {
                } // END - if
 
                // Add it to response
-               //* DEBUG: */ print 'line='.$line.'<br />';
+               //* DEBUG: */ print 'line(' . strlen($line) . ')='.$line.'<br />';
                array_push($response, $line);
        } // END - while
 
@@ -438,27 +441,11 @@ function sendRawRequest ($host, $request, $allowOnlyHttpOkay = TRUE) {
                logDebugMessage(__FUNCTION__, __LINE__, 'Request took ' . (microtime(TRUE) - $start) . ' seconds and returned ' . count($response) . ' line(s).');
        } // END - if
 
-       // Skip first empty lines
-       $resp = $response;
-       foreach ($resp as $idx => $line) {
-               // Trim space away
-               $line = trim($line);
-
-               // Is this line empty?
-               if (empty($line)) {
-                       // Then remove it
-                       array_shift($response);
-               } else {
-                       // Abort on first non-empty line
-                       break;
-               }
-       } // END - foreach
-
        //* DEBUG: */ debugOutput('<strong>Request:</strong><pre>'.print_r($request, TRUE).'</pre>');
        //* DEBUG: */ debugOutput('<strong>Response:</strong><pre>'.print_r($response, TRUE).'</pre>');
 
        // Proxy agent found or something went wrong?
-       if (count($response) == 0) {
+       if (!isFilledArray($response)) {
                // No response, maybe timeout
                $response = array('', '', '');
                logDebugMessage(__FUNCTION__, __LINE__, 'Invalid empty response array, maybe timed out?');
@@ -589,8 +576,11 @@ function unchunkHttpResponse ($response) {
 
 // Merges HTTP header lines with given body (string)
 function mergeHttpHeadersWithBody ($body) {
+       // Add empty entry to mimic header->body
+       $GLOBALS['http_headers'][] = getConfig('HTTP_EOL');
+
        // Make sure at least one header is there (which is still not valid but okay here)
-       assert((is_array($GLOBALS['http_headers'])) && (count($GLOBALS['http_headers']) > 0));
+       assert(isFilledArray($GLOBALS['http_headers']));
 
        // Merge both together
        return merge_array($GLOBALS['http_headers'], array(count($GLOBALS['http_headers']) => $body));
@@ -618,8 +608,14 @@ function removeHttpHeaderFromResponse ($response) {
                                break;
                        } // END - if
 
-                       // Add full line to temporary global array
-                       array_push($GLOBALS['http_headers'], $line);
+                       // Is the last line set and is not ending with \r\n?
+                       if ((isset($GLOBALS['http_headers'][count($GLOBALS['http_headers']) - 1])) && (substr($GLOBALS['http_headers'][count($GLOBALS['http_headers']) - 1], -2, 2) != getConfig('HTTP_EOL'))) {
+                               // Add it to previous one
+                               $GLOBALS['http_headers'][count($GLOBALS['http_headers']) - 1] .= $line;
+                       } else {
+                               // Add full line to temporary global array
+                               array_push($GLOBALS['http_headers'], $line);
+                       }
                } // END - foreach
 
                // Write back the array
@@ -654,11 +650,20 @@ function extractHostnameFromUrl (&$script) {
        } // END - if
 
        // Extract host name
-       $host = str_replace('http://', '', $url);
+       $host = str_replace(array('http://', 'https://'), array('', ''), $url);
+
+       // Is there a slash at the end?
        if (isInString('/', $host)) {
                $host = substr($host, 0, strpos($host, '/'));
        } // END - if
 
+       // Is there a double-dot in? (Means port number)
+       if (strpos($host, ':') !== FALSE) {
+               // Detected a double-dot
+               $hostArray = explode(':', $host);
+               $host = $hostArray[0];
+       } // END - if
+
        // Generate relative URL
        //* DEBUG: */ debugOutput('SCRIPT=' . $script);
        if (substr(strtolower($script), 0, 7) == 'http://') {
@@ -900,9 +905,9 @@ 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, 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) {
+               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'", sqlEscapeString(detectRemoteAddr(TRUE)), sqlEscapeString(detectUserAgent(TRUE)), sqlEscapeString(detectReferer(TRUE))))) == 1) {
                        // Update counter, as all are the same
-                       SQL_QUERY_ESC("UPDATE
+                       sqlQueryEscaped("UPDATE
        `{?_MYSQL_PREFIX?}_server_name_log`
 SET
        `server_name_counter`=`server_name_counter`+1
@@ -920,7 +925,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_referrer`) VALUES('%s','%s', '%s', '%s')",
+                       sqlQueryEscaped("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),