X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fhttp-functions.php;h=8ba4d80654318eaf8510011b429d31e44c715202;hb=ffe68abca0e9c3cffd40a43ded2a134343d588f5;hp=f3843844e3d40d8df169d9290f6a7a5b0c778fcc;hpb=20741b93fd58620af677a7f1039ffd16ea6ec689;p=mailer.git

diff --git a/inc/http-functions.php b/inc/http-functions.php
index f3843844e3..8ba4d80654 100644
--- a/inc/http-functions.php
+++ b/inc/http-functions.php
@@ -58,13 +58,13 @@ function sendHttpHeaders () {
 	sendHeader('Content-Language: ' . getLanguage());
 }
 
-// Send a GET request
-function sendGetRequest ($baseUrl, $data = array(), $removeHeader = false) {
-	// Extract hostname and port from script
-	$host = extractHostnameFromUrl($baseUrl);
+// Generates the full GET URL from given base URL and data array
+function generateGetUrlFromBaseUrlData ($baseUrl, $requestData = array()) {
+	// Init URL
+	$getUrl = $baseUrl;
 
 	// Add data
-	$body = http_build_query($data, '', '&');
+	$body = http_build_query($requestData, '', '&');
 
 	// There should be data, else we don't need to extend $baseUrl with $body
 	if (!empty($body)) {
@@ -78,16 +78,58 @@ function sendGetRequest ($baseUrl, $data = array(), $removeHeader = false) {
 		}
 
 		// Add script data
-		$baseUrl .= $body;
+		$getUrl .= $body;
 
 		// Remove trailed & to make it more conform
-		if (substr($baseUrl, -1, 1) == '&') {
-			$baseUrl = substr($baseUrl, 0, -1);
+		if (substr($getUrl, -1, 1) == '&') {
+			$getUrl = substr($getUrl, 0, -1);
 		} // END - if
 	} // END - if
 
+	// Return it
+	return $getUrl;
+}
+
+// Send a HEAD request
+function sendHeadRequest ($baseUrl, $requestData = array()) {
+	// Generate full GET URL
+	$getUrl = generateGetUrlFromBaseUrlData($baseUrl, $requestData);
+
+	// Extract hostname and port from script
+	$host = extractHostnameFromUrl($baseUrl);
+
+	// Generate HEAD request header
+	$request  = 'HEAD /' . trim($getUrl) . ' HTTP/1.1' . getConfig('HTTP_EOL');
+	$request .= 'Host: ' . $host . getConfig('HTTP_EOL');
+	$request .= 'Referer: ' . getUrl() . '/admin.php' . getConfig('HTTP_EOL');
+	if (isConfigEntrySet('FULL_VERSION')) {
+		$request .= 'User-Agent: ' . getTitle() . '/' . getFullVersion() . getConfig('HTTP_EOL');
+	} else {
+		$request .= 'User-Agent: ' . getTitle() . '/' . getConfig('VERSION') . getConfig('HTTP_EOL');
+	}
+	$request .= 'Accept: image/png,image/*;q=0.8,text/plain,text/html,*/*;q=0.5' . getConfig('HTTP_EOL');
+	$request .= 'Accept-Charset: UTF-8,*' . getConfig('HTTP_EOL');
+	$request .= 'Cache-Control: no-store, no-cache, must-revalidate, post-check=0, pre-check=0' . getConfig('HTTP_EOL');
+	$request .= 'Connection: close' . getConfig('HTTP_EOL');
+	$request .= getConfig('HTTP_EOL');
+
+	// Send the raw request
+	$response = sendRawRequest($host, $request);
+
+	// Return the result to the caller function
+	return $response;
+}
+
+// Send a GET request
+function sendGetRequest ($baseUrl, $requestData = array(), $removeHeader = false) {
+	// Generate full GET URL
+	$getUrl = generateGetUrlFromBaseUrlData($baseUrl, $requestData);
+
+	// Extract hostname and port from script
+	$host = extractHostnameFromUrl($baseUrl);
+
 	// Generate GET request header
-	$request  = 'GET /' . trim($baseUrl) . ' HTTP/1.1' . getConfig('HTTP_EOL');
+	$request  = 'GET /' . trim($getUrl) . ' 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,21 +157,25 @@ function sendGetRequest ($baseUrl, $data = array(), $removeHeader = false) {
 }
 
 // Send a POST request
-function sendPostRequest ($baseUrl, $postData, $removeHeader = false) {
+function sendPostRequest ($baseUrl, $requestData, $removeHeader = false) {
 	// Extract host name from script
 	$host = extractHostnameFromUrl($baseUrl);
 
 	// Construct request body
-	$body = http_build_query($postData, '', '&');
+	$body = http_build_query($requestData, '', '&');
 
 	// Generate POST request header
 	$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');
+	if (isConfigEntrySet('FULL_VERSION')) {
+		$request .= 'User-Agent: ' . getTitle() . '/' . getFullVersion() . getConfig('HTTP_EOL');
+	} else {
+		$request .= 'User-Agent: ' . getTitle() . '/' . getConfig('VERSION') . getConfig('HTTP_EOL');
+	}
 	$request .= 'Accept: text/plain;q=0.8' . getConfig('HTTP_EOL');
 	$request .= 'Accept-Charset: UTF-8,*' . getConfig('HTTP_EOL');
-	$request .= 'Cache-Control: no-cache' . getConfig('HTTP_EOL');
+	$request .= 'Cache-Control: no-store, no-cache, must-revalidate, post-check=0, pre-check=0' . getConfig('HTTP_EOL');
 	$request .= 'Content-Type: application/x-www-form-urlencoded' . getConfig('HTTP_EOL');
 	$request .= 'Content-Length: ' . strlen($body) . getConfig('HTTP_EOL');
 	$request .= 'Connection: close' . getConfig('HTTP_EOL');
@@ -453,9 +499,9 @@ function isBrokenHttpServerImplentation () {
 
 if (!function_exists('http_build_query')) {
 	// Taken from documentation on www.php.net, credits to Marco K. (Germany) and some light mods by R.Haeder
-	function http_build_query($data, $prefix = '', $sep = '', $key = '') {
+	function http_build_query($requestData, $prefix = '', $sep = '', $key = '') {
 		$ret = array();
-		foreach ((array) $data as $k => $v) {
+		foreach ((array) $requestData as $k => $v) {
 			if (is_int($k) && $prefix != null) {
 				$k = urlencode($prefix . $k);
 			} // END - if