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 727211d59b834ca789d0d2b9023f52344dde1a7f..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) {
@@ -545,7 +546,7 @@ function unchunkHttpResponse ($response) {
        //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'isChunked=' . intval($isChunked));
        if ($isChunked === TRUE) {
                // Make sure, that body is an array
-               assert(is_array($body), 'body[]=' . gettype($body) . ' must be an array.');
+               assert(is_array($body));
 
                // Good, we still have the HTTP headers in there, so we need to get rid
                // of them temporarly
@@ -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]
 ?>