X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fhttp-functions.php;h=4fc66c95a5a94a4850f1af9106d3a284b9e34ace;hb=082398d5872064d3911c62b085e8a134569f626b;hp=16d8b80dce61e4f4e0f9016b69ec8733cf310c4b;hpb=cd7d344ea7007cfa20413acd3e03e50f0ab86d86;p=mailer.git

diff --git a/inc/http-functions.php b/inc/http-functions.php
index 16d8b80dce..4fc66c95a5 100644
--- a/inc/http-functions.php
+++ b/inc/http-functions.php
@@ -445,7 +445,7 @@ function sendRawRequest ($host, $request, $allowOnlyHttpOkay = TRUE) {
 	//* DEBUG: */ debugOutput('<strong>Response:</strong><pre>'.print_r($response, TRUE).'</pre>');
 
 	// Proxy agent found or something went wrong?
-	if (count($response) == 0) {
+	if (!isFilledArray($response)) {
 		// No response, maybe timeout
 		$response = array('', '', '');
 		logDebugMessage(__FUNCTION__, __LINE__, 'Invalid empty response array, maybe timed out?');
@@ -580,7 +580,7 @@ function mergeHttpHeadersWithBody ($body) {
 	$GLOBALS['http_headers'][] = getConfig('HTTP_EOL');
 
 	// Make sure at least one header is there (which is still not valid but okay here)
-	assert((is_array($GLOBALS['http_headers'])) && (count($GLOBALS['http_headers']) > 0));
+	assert(isFilledArray($GLOBALS['http_headers']));
 
 	// Merge both together
 	return merge_array($GLOBALS['http_headers'], array(count($GLOBALS['http_headers']) => $body));
@@ -650,11 +650,20 @@ function extractHostnameFromUrl (&$script) {
 	} // END - if
 
 	// Extract host name
-	$host = str_replace('http://', '', $url);
+	$host = str_replace(array('http://', 'https://'), array('', ''), $url);
+
+	// Is there a slash at the end?
 	if (isInString('/', $host)) {
 		$host = substr($host, 0, strpos($host, '/'));
 	} // END - if
 
+	// Is there a double-dot in? (Means port number)
+	if (strpos($host, ':') !== FALSE) {
+		// Detected a double-dot
+		$hostArray = explode(':', $host);
+		$host = $hostArray[0];
+	} // END - if
+
 	// Generate relative URL
 	//* DEBUG: */ debugOutput('SCRIPT=' . $script);
 	if (substr(strtolower($script), 0, 7) == 'http://') {
@@ -896,9 +905,9 @@ function logWrongServerNameRedirect () {
 	// Is ext-sql_patches at least version 0.9.2?
 	if (isExtensionInstalledAndNewer('sql_patches', '0.9.2')) {
 		// Is there an entry?
-		if (countSumTotalData(detectServerName(), 'server_name_log', 'server_name_id', 'server_name', TRUE, str_replace('%', '{PER}', sprintf(" AND `server_name_remote_addr`='%s' AND `server_name_ua`='%s' AND `server_name_referrer`='%s'", SQL_ESCAPE(detectRemoteAddr(TRUE)), SQL_ESCAPE(detectUserAgent(TRUE)), SQL_ESCAPE(detectReferer(TRUE))))) == 1) {
+		if (countSumTotalData(detectServerName(), 'server_name_log', 'server_name_id', 'server_name', TRUE, str_replace('%', '{PER}', sprintf(" AND `server_name_remote_addr`='%s' AND `server_name_ua`='%s' AND `server_name_referrer`='%s'", sqlEscapeString(detectRemoteAddr(TRUE)), sqlEscapeString(detectUserAgent(TRUE)), sqlEscapeString(detectReferer(TRUE))))) == 1) {
 			// Update counter, as all are the same
-			SQL_QUERY_ESC("UPDATE
+			sqlQueryEscaped("UPDATE
 	`{?_MYSQL_PREFIX?}_server_name_log`
 SET
 	`server_name_counter`=`server_name_counter`+1
@@ -916,7 +925,7 @@ LIMIT 1",
 				), __FUNCTION__, __LINE__);
 		} else {
 			// Then log it away
-			SQL_QUERY_ESC("INSERT INTO `{?_MYSQL_PREFIX?}_server_name_log` (`server_name`, `server_name_remote_addr`, `server_name_ua`, `server_name_referrer`) VALUES('%s','%s', '%s', '%s')",
+			sqlQueryEscaped("INSERT INTO `{?_MYSQL_PREFIX?}_server_name_log` (`server_name`, `server_name_remote_addr`, `server_name_ua`, `server_name_referrer`) VALUES('%s','%s', '%s', '%s')",
 				array(
 					detectServerName(),
 					detectRemoteAddr(TRUE),