Updated copyright year.

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

diff --git a/inc/http-functions.php b/inc/http-functions.php
index 823b9e889e2a54c81ffcec33b33b5acee31053da..e82ca2ce198709458fd5bd41d98eb0cac2c7b1ed 100644 (file)
--- a/inc/http-functions.php
+++ b/inc/http-functions.php
@@ -11,7 +11,7 @@
  * Kurzbeschreibung  : HTTP-relevante Funktionen                        *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
- * Copyright (c) 2009 - 2015 by Mailer Developer Team                   *
+ * Copyright (c) 2009 - 2016 by Mailer Developer Team                   *
  * For more information visit: http://mxchange.org                      *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
@@ -644,11 +644,13 @@ function extractHostnameFromUrl (&$script) {
        // Is this URL valid?
        if (substr($script, 0, 7) == 'http://') {
                // Use the hostname from script URL as new hostname
-               $url = substr($script, 7);
-               $extract = explode('/', $url);
+               $extract = explode('/', substr($script, 7));
                $url = $extract[0];
-               // Done extracting the URL :)
-       } // END - if
+       } elseif (substr($script, 0, 8) == 'https://') {
+               // Use the hostname from script URL as new hostname
+               $extract = explode('/', substr($script, 8));
+               $url = $extract[0];
+       }
 
        // Extract host name
        $host = str_replace(array('http://', 'https://'), array('', ''), $url);
@@ -687,7 +689,7 @@ function extractHostnameFromUrl (&$script) {
 // Adds a HTTP header to array
 function addHttpHeader ($header) {
        // Send the header
-       //* DEBUG: */ logDebugMessage(__FUNCTION__ . ': header=' . $header);
+       //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, ': header=' . $header);
        array_push($GLOBALS['http_header'], trim($header));
 }
 
@@ -943,7 +945,7 @@ function isHttpResponseStatusOkay ($response) {
        assert(is_array($response));
 
        // Test it
-       $isOkay = ((isset($response['status'])) && ($response['status'] == 'OK') && (!empty($response['response'])));
+       $isOkay = ((isset($response['status'])) && ($response['status'] == 'OK'));
 
        // Return result
        return $isOkay;