X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fhttp-functions.php;h=3b9a630eefbe48e362a17f109bf5d28c70dec282;hb=2db306a4e4049ab759a10bb1e3c18d925d1583f9;hp=6289d6d2b81170fdbe89c71d5f5d8d9f7436956f;hpb=c7326fa0883c1a45b7364426be58fd0a24fe085c;p=mailer.git

diff --git a/inc/http-functions.php b/inc/http-functions.php
index 6289d6d2b8..3b9a630eef 100644
--- a/inc/http-functions.php
+++ b/inc/http-functions.php
@@ -59,17 +59,17 @@ function sendHttpHeaders () {
 }
 
 // Send a GET request
-function sendGetRequest ($script, $data = array(), $removeHeader = false) {
+function sendGetRequest ($baseUrl, $data = array(), $removeHeader = false) {
 	// Extract hostname and port from script
-	$host = extractHostnameFromUrl($script);
+	$host = extractHostnameFromUrl($baseUrl);
 
 	// Add data
 	$body = http_build_query($data, '', '&');
 
-	// There should be data, else we don't need to extend $script with $body
+	// 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?
-		if (strpos($script, '?') === false) {
+		if (strpos($baseUrl, '?') === false) {
 			// No, so first char must be question mark
 			$body = '?' . $body;
 		} else {
@@ -78,16 +78,16 @@ function sendGetRequest ($script, $data = array(), $removeHeader = false) {
 		}
 
 		// Add script data
-		$script .= $body;
+		$baseUrl .= $body;
 
 		// Remove trailed & to make it more conform
-		if (substr($script, -1, 1) == '&') {
-			$script = substr($script, 0, -1);
+		if (substr($baseUrl, -1, 1) == '&') {
+			$baseUrl = substr($baseUrl, 0, -1);
 		} // END - if
 	} // END - if
 
 	// Generate GET request header
-	$request  = 'GET /' . trim($script) . ' HTTP/1.1' . getConfig('HTTP_EOL');
+	$request  = 'GET /' . trim($baseUrl) . ' HTTP/1.1' . getConfig('HTTP_EOL');
 	$request .= 'Host: ' . $host . getConfig('HTTP_EOL');
 	$request .= 'Referer: ' . getUrl() . '/admin.php' . getConfig('HTTP_EOL');
 	if (isConfigEntrySet('FULL_VERSION')) {
@@ -115,15 +115,15 @@ function sendGetRequest ($script, $data = array(), $removeHeader = false) {
 }
 
 // Send a POST request
-function sendPostRequest ($script, array $postData, $removeHeader = false) {
+function sendPostRequest ($baseUrl, $postData, $removeHeader = false) {
 	// Extract host name from script
-	$host = extractHostnameFromUrl($script);
+	$host = extractHostnameFromUrl($baseUrl);
 
 	// Construct request body
 	$body = http_build_query($postData, '', '&');
 
 	// Generate POST request header
-	$request  = 'POST /' . trim($script) . ' HTTP/1.0' . getConfig('HTTP_EOL');
+	$request  = 'POST /' . trim($baseUrl) . ' HTTP/1.0' . getConfig('HTTP_EOL');
 	$request .= 'Host: ' . $host . getConfig('HTTP_EOL');
 	$request .= 'Referer: ' . getUrl() . '/admin.php' . getConfig('HTTP_EOL');
 	$request .= 'User-Agent: ' . getTitle() . '/' . getFullVersion() . getConfig('HTTP_EOL');
@@ -193,7 +193,7 @@ function sendRawRequest ($host, $request) {
 	$resolver = new HostnameResolver();
 
 	// Open connection
-	//* DEBUG: */ die('SCRIPT=' . $script);
+	//* DEBUG: */ die('baseUrl=' . $baseUrl);
 	if ($useProxy === true) {
 		// Resolve hostname into IP address
 		$ip = $resolver->resolveHostname(compileRawCode(getProxyHost()));
@@ -369,7 +369,7 @@ function setupProxyTunnel ($host, $port, $resource) {
 }
 
 // Check array for chuncked encoding
-function unchunkHttpResponse (array $response) {
+function unchunkHttpResponse ($response) {
 	// Default is not chunked
 	$isChunked = false;
 
@@ -405,7 +405,7 @@ function unchunkHttpResponse (array $response) {
 }
 
 // Removes HTTP header lines from a response array (e.g. output from send<Get|Post>Request() )
-function removeHttpHeaderFromResponse (array $response) {
+function removeHttpHeaderFromResponse ($response) {
 	// Save headers for later usage
 	$GLOBALS['http_headers'] = array();
 
@@ -485,7 +485,8 @@ if (!function_exists('http_chunked_decode')) {
 	 *
 	 * @param	$chunk		The encoded message
 	 * @return	$dechunk	The decoded message. If $chunk wasn't encoded properly debug_report_bug() is being called
-	 * @author	Marques Johansson
+	 * @author	Marques Johansson (initial author)
+	 * @author	Roland Haeder (heavy modifications and simplification)
 	 * @link	http://php.net/manual/en/function.http-chunked-decode.php#89786
 	 */
 	function http_chunked_decode ($chunk) {