X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Fclasses%2Fresolver.class.php;h=a6e6732c967d1799eaada5d7c5e8ca3ae3d05762;hp=c133a56aba0e7aa36fe59c218aff901e8a880710;hb=5f70ac9d208ca39e3381705afcad2654a700a850;hpb=f94266632bde6b5eda847aa62ef9c43c61afa60f

diff --git a/inc/classes/resolver.class.php b/inc/classes/resolver.class.php
index c133a56aba..a6e6732c96 100644
--- a/inc/classes/resolver.class.php
+++ b/inc/classes/resolver.class.php
@@ -14,12 +14,10 @@
  * $Date::                                                            $ *
  * $Tag:: 0.2.1-FINAL                                                 $ *
  * $Author::                                                          $ *
- * Needs to be in all Files and every File needs "svn propset           *
- * svn:keywords Date Revision" (autoprobset!) at least!!!!!!            *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
- * Copyright (c) 2009, 2010 by Mailer Developer Team                    *
- * For more information visit: http://www.mxchange.org                  *
+ * Copyright (c) 2009 - 2013 by Mailer Developer Team                   *
+ * For more information visit: http://mxchange.org                      *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
  * it under the terms of the GNU General Public License as published by *
@@ -46,28 +44,38 @@ if (!defined('__SECURITY')) {
 class HostnameResolver {
 	// Resolve hostname -> IP address
 	function resolveHostname ($hostname) {
-		// If sql_patches is not at least 0.7.0, abort here and return the hostname (gethostbyname() may return something unwanted)
+		// If ext-sql_patches is not at least 0.7.0, abort here and return the hostname (gethostbyname() may return something unwanted)
 		if (!isExtensionInstalledAndNewer('sql_patches', '0.7.0')) {
 			// Abort here
 			return $hostname;
 		} // END - if
 
-		// Prepare hostname, look for :port
-		$hostArray = explode(':', strtolower($hostname), 2);
-		$hostname = $hostArray[0];
+		// Prepare hostname, look for the ':port' part
+		$hostArray = explode(':', $hostname, 2);
+		$hostname = strtolower($hostArray[0]);
+
+		// Is the hostname an IP address?
+		if (preg_match('/(25[0-5]|2[0-4][0-9]|[0-1]{1}[0-9]{2}|[1-9]{1}[0-9]{1}|[1-9])\.(25[0-5]|2[0-4][0-9]|[0-1]{1}[0-9]{2}|[1-9]{1}[0-9]{1}|[1-9]|0)\.(25[0-5]|2[0-4][0-9]|[0-1]{1}[0-9]{2}|[1-9]{1}[0-9]{1}|[1-9]|0)\.(25[0-5]|2[0-4][0-9]|[0-1]{1}[0-9]{2}|[1-9]{1}[0-9]{1}|[0-9])/', $hostname, $matches)) {
+			// Then we don't need to look it up
+			//* DEBUG: */ logDebugMessage(__METHOD__, __LINE__, sprintf("Hostname %s is an IP address. No need to lookup.", $hostname));
+			return $hostname;
+		} // END - if
 
 		// Log entry
 		//* DEBUG: */ logDebugMessage(__METHOD__, __LINE__, sprintf("Begin lookup: %s", $hostname));
 		$ret = '0.0.0.0';
 
 		// Search for hostname in cache
-		$result = SQL_QUERY_ESC("SELECT `ip` FROM `{?_MYSQL_PREFIX?}_dns_cache` WHERE `hostname`='%s' LIMIT 1",
-			array(strtolower($hostname)), __METHOD__, __LINE__);
+		$result = sqlQueryEscaped("SELECT `ip` FROM `{?_MYSQL_PREFIX?}_dns_cache` WHERE `hostname`='%s' LIMIT 1",
+			array(
+				$hostname
+			), __METHOD__, __LINE__
+		);
 
 		// Does an entry exist?
-		if (SQL_NUMROWS($result) == 1) {
+		if (sqlNumRows($result) == 1) {
 			// Then load the hostname
-			list($ip) = SQL_FETCHROW($result);
+			list($ip) = sqlFetchRow($result);
 
 			// Count cache hit
 			incrementStatsEntry('dns_cache_hits');
@@ -78,20 +86,26 @@ class HostnameResolver {
 		} else {
 			// Get IP address
 			$ip = gethostbyname($hostname);
+			//* DEBUG: */ logDebugMessage(__METHOD__, __LINE__, 'ip=' . $ip . ',hostname=' . $hostname . ' - RESOLVED!');
 
 			// Count lookup hit
 			incrementStatsEntry('dns_lookup_hits');
 
 			// Is it an IP address?
-			if (preg_match('/(25[0-5]|2[0-4][0-9]|[0-1]{1}[0-9]{2}|[1-9]{1}[0-9]{1}|[1-9])\.(25[0-5]|2[0-4][0-9]|[0-1]{1}[0-9]{2}|[1-9]{1}[0-9]{1}|[1-9]|0)\.(25[0-5]|2[0-4][0-9]|[0-1]{1}[0-9]{2}|[1-9]{1}[0-9]{1}|[1-9]|0)\.(25[0-5]|2[0-4][0-9]|[0-1]{1}[0-9]{2}|[1-9]{1}[0-9]{1}|[0-9])/', $hostname, $matches)) {
+			if (($ip != $hostname) && (preg_match('/(25[0-5]|2[0-4][0-9]|[0-1]{1}[0-9]{2}|[1-9]{1}[0-9]{1}|[1-9])\.(25[0-5]|2[0-4][0-9]|[0-1]{1}[0-9]{2}|[1-9]{1}[0-9]{1}|[1-9]|0)\.(25[0-5]|2[0-4][0-9]|[0-1]{1}[0-9]{2}|[1-9]{1}[0-9]{1}|[1-9]|0)\.(25[0-5]|2[0-4][0-9]|[0-1]{1}[0-9]{2}|[1-9]{1}[0-9]{1}|[0-9])/', $ip, $matches))) {
 				// Seems to be an IP! Now check deeper...
-				if (($matches[0] == $ip) && ($matches[1] >= 0) && ($matches[1] <= 255) && ($matches[2] >= 0) && ($matches[2] <= 255) && ($matches[3] >= 0) && ($matches[3] <= 255) && ($matches[4] >= 0) && ($matches[4] <= 255)) {
+				if (($matches[0] == $ip) && ($matches[1] >= 0) && ($matches[1] <= 255) && ($matches[2] >= 0) && ($matches[2] <= 255) && ($matches[3] >= 0) && ($matches[3] <= 255) && ($matches[4] > 0) && ($matches[4] < 255)) {
 					// We also cache IP addresses
-					SQL_QUERY_ESC("INSERT INTO `{?_MYSQL_PREFIX?}_dns_cache` (`ip`, `hostname`, `added`) VALUES('%s', '%s', NOW())",
-						array($ip, strtolower($hostname)), __METHOD__, __LINE__);
+					sqlQueryEscaped("INSERT INTO `{?_MYSQL_PREFIX?}_dns_cache` (`ip`, `hostname`, `added`) VALUES ('%s', '%s', NOW())",
+						array(
+							$ip,
+							$hostname
+						), __METHOD__, __LINE__
+					);
 
 					// Set return value to $ip
 					//* DEBUG: */ logDebugMessage(__METHOD__, __LINE__, sprintf("IP detected, cache entry written: %s->%s", $hostname, $ip));
+					$ret = $ip;
 				} else {
 					// Network address or broadcast address found
 					//* DEBUG: */ logDebugMessage(__METHOD__, __LINE__, sprintf("IP %s is possibly a network or broadcast address.", $ip));
@@ -101,8 +115,12 @@ class HostnameResolver {
 				//* DEBUG: */ logDebugMessage(__METHOD__, __LINE__, sprintf("Cannot lookup: %s", $hostname));
 			} else {
 				// Put entry in DB
-				SQL_QUERY_ESC("INSERT INTO `{?_MYSQL_PREFIX?}_dns_cache` (`ip`, `hostname`, `added`) VALUES('%s', '%s', NOW())",
-					array($ip, strtolower($hostname)), __METHOD__, __LINE__);
+				sqlQueryEscaped("INSERT INTO `{?_MYSQL_PREFIX?}_dns_cache` (`ip`, `hostname`, `added`) VALUES ('%s', '%s', NOW())",
+					array(
+						$ip,
+						$hostname
+					), __METHOD__, __LINE__
+				);
 
 				// Set return value to $ip
 				$ret = $ip;
@@ -111,16 +129,16 @@ class HostnameResolver {
 		}
 
 		// Free result
-		SQL_FREERESULT($result);
+		sqlFreeResult($result);
 
-		// Return IP number (let's hope it!
+		// Return IP number (let's hope it)
 		return $ret;
 	}
 
 	// Purge old entries
 	function purgeEntries() {
 		// SQL for cleaning up
-		SQL_QUERY("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_dns_cache` WHERE UNIX_TIMESTAMP(`added`) < (UNIX_TIMESTAMP() - {?dns_cache_timeout?})",
+		sqlQuery('DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_dns_cache` WHERE (UNIX_TIMESTAMP() - UNIX_TIMESTAMP(`added`) >= {?dns_cache_timeout?})',
 			__METHOD__, __LINE__);
 	}
 }