Fix for missing proxy_host if script is not installed yet and requires a HTTP request.

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

diff --git a/inc/http-functions.php b/inc/http-functions.php
index 8932af62882342f0f92a76a06851f3444404b592..9bdf939021f3f0cb7b3f9098d4ecdddd77259d52 100644 (file)
--- a/inc/http-functions.php
+++ b/inc/http-functions.php
@@ -10,11 +10,6 @@
  * -------------------------------------------------------------------- *
  * Kurzbeschreibung  : HTTP-relevante Funktionen                        *
  * -------------------------------------------------------------------- *
- * $Revision::                                                        $ *
- * $Date::                                                            $ *
- * $Tag:: 0.2.1-FINAL                                                 $ *
- * $Author::                                                          $ *
- * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
  * Copyright (c) 2009 - 2013 by Mailer Developer Team                   *
  * For more information visit: http://mxchange.org                      *
@@ -278,7 +273,7 @@ function sendHttpPostRequest ($baseUrl, $requestData = array(), $removeHeader =
        $body = http_build_query($requestData, '', '&');
 
        // Generate POST request header
-       $request  = 'POST ' . (isProxyUsed() === TRUE ? $baseUrl : '') . trim($baseUrl) . ' HTTP/1.0' . getConfig('HTTP_EOL');
+       $request  = 'POST ' . (isProxyUsed() === TRUE ? $getUrl : '') . trim($getUrl) . ' HTTP/1.0' . getConfig('HTTP_EOL');
        $request .= 'Host: ' . $host . getConfig('HTTP_EOL');
        $request .= 'Referer: ' . getUrl() . '/admin.php' . getConfig('HTTP_EOL');
        if (isConfigEntrySet('FULL_VERSION')) {
@@ -343,8 +338,14 @@ function sendRawRequest ($host, $request, $allowOnlyHttpOkay = TRUE) {
        // Get resolver instance
        $resolver = new HostnameResolver();
 
-       // Get proxy host
-       $proxyHost = compileRawCode(getProxyHost());
+       // Default is no proxy
+       $proxyHost = NULL;
+
+       // Is the configuration entry set?
+       if ((!isInstaller()) && (isConfigEntrySet('proxy_host'))) {
+               // Get proxy host
+               $proxyHost = compileRawCode(getProxyHost());
+       } // END - if
 
        // Open connection
        if (isProxyUsed() === TRUE) {
@@ -445,7 +446,7 @@ function sendRawRequest ($host, $request, $allowOnlyHttpOkay = TRUE) {
        //* 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?');
@@ -580,7 +581,7 @@ function mergeHttpHeadersWithBody ($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));
@@ -936,5 +937,17 @@ LIMIT 1",
        } // END - if
 }
 
+// Check if response status OK and array index 'response' is set
+function isHttpResponseStatusOkay ($response) {
+       // Assertion on array
+       assert(is_array($response));
+
+       // Test it
+       $isOkay = ((isset($response['status'])) && ($response['status'] == 'OK') && (!empty($response['response'])));
+
+       // Return result
+       return $isOkay;
+}
+
 // [EOF]
 ?>