Extension ext-user for sub id tracking continued:

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

diff --git a/inc/http-functions.php b/inc/http-functions.php
index c8cdf7acf37d476c7529655a904a6f4c276b569b..5715c6edd0a5c48967b7ccd9abb6c0402f55c1aa 100644 (file)
--- a/inc/http-functions.php
+++ b/inc/http-functions.php
@@ -73,7 +73,7 @@ function sendHttpHeaders () {
 
 // Checks whether the URL is full-qualified (http[s]:// + hostname [+ request data])
 function isFullQualifiedUrl ($url) {
-       // Do we have cache?
+       // Is there cache?
        if (!isset($GLOBALS[__FUNCTION__][$url])) {
                // Determine it
                $GLOBALS[__FUNCTION__][$url] = ((substr($url, 0, 7) == 'http://') || (substr($url, 0, 8) == 'https://'));
@@ -105,7 +105,7 @@ function generateGetUrlFromBaseUrlData ($baseUrl, $requestData = array()) {
 
        // There should be data, else we don't need to extend $baseUrl with $body
        if (!empty($body)) {
-               // Do we have a question-mark in the script?
+               // Is there a question-mark in the script?
                if (!isInString('?', $baseUrl)) {
                        // No, so first char must be question mark
                        $body = '?' . $body;
@@ -176,7 +176,7 @@ function sendHeadRequest ($baseUrl, $requestData = array()) {
        // Generate full GET URL
        $getUrl = generateGetUrlFromBaseUrlData($baseUrl, $requestData);
 
-       // Do we have http[s]:// in front of the URL?
+       // Is there http[s]:// in front of the URL?
        if (isFullQualifiedUrl($getUrl)) {
                // Remove http[s]://<hostname> from URL
                $getUrl = removeHttpHostNameFromUrl($getUrl);
@@ -215,7 +215,7 @@ function sendGetRequest ($baseUrl, $requestData = array(), $removeHeader = false
        // Generate full GET URL
        $getUrl = generateGetUrlFromBaseUrlData($baseUrl, $requestData);
 
-       // Do we have http[s]:// in front of the URL?
+       // Is there http[s]:// in front of the URL?
        if (isFullQualifiedUrl($getUrl)) {
                // Remove http[s]://<hostname> from url
                $getUrl = removeHttpHostNameFromUrl($getUrl);
@@ -260,7 +260,7 @@ function sendPostRequest ($baseUrl, $requestData = array(), $removeHeader = fals
        // Copy baseUrl to getUrl
        $getUrl = $baseUrl;
 
-       // Do we have http[s]:// in front of the URL?
+       // Is there http[s]:// in front of the URL?
        if (isFullQualifiedUrl($getUrl)) {
                // Remove http[s]://<hostname> from url
                $getUrl = removeHttpHostNameFromUrl($getUrl);
@@ -371,7 +371,7 @@ function sendRawRequest ($host, $request) {
                return $response;
        }
 
-       // Do we use proxy?
+       // Shall proxy be used?
        if (isProxyUsed() === true) {
                // Setup proxy tunnel
                $response = setupProxyTunnel($host, $proxyHost, $port, $resource);