Update geoip v1

Dolibarr · Aug 21, 2019 · bfbabbf · bfbabbf
1 parent 689aa49
commit bfbabbf
Show file tree

Hide file tree

Showing 7 changed files with 8,840 additions and 5,052 deletions.
diff --git a/htdocs/admin/geoipmaxmind.php b/htdocs/admin/geoipmaxmind.php
@@ -144,6 +144,13 @@
 	if ($result) print $result;
 	else print $langs->trans("Error");
 
+	$ip='2a01:e0a:7e:4a60:429a:23ff:f7b8:dc8a';		// should be France
+	print '<br>'.$ip.' -> ';
+	$result=dol_print_ip($ip, 1);
+	if ($result) print $result;
+	else print $langs->trans("Error");
+
+
 	/* We disable this test because dol_print_ip need an ip as input
 	$ip='www.google.com';
 	print '<br>'.$ip.' -> ';

diff --git a/htdocs/core/class/dolgeoip.class.php b/htdocs/core/class/dolgeoip.class.php
@@ -46,7 +46,10 @@ public function __construct($type, $datfile)
 		if ($type == 'country')
 		{
 		    // geoip may have been already included with PEAR
-		    if (! function_exists('geoip_country_code_by_name')) $res=include_once GEOIP_PATH.'geoip.inc';
+		    if (! function_exists('geoip_country_code_by_name'))
+		    {
+		    	$res=include_once GEOIP_PATH.'geoip.inc';
+		    }
 		}
 		elseif ($type == 'city')
 		{
@@ -101,8 +104,16 @@ public function getCountryCodeFromIP($ip)
 		}
 		else
 		{
-		    if (! function_exists('geoip_country_code_by_addr')) return strtolower(geoip_country_code_by_name($this->gi, $ip));
-		    return strtolower(geoip_country_code_by_addr($this->gi, $ip));
+			if (preg_match('/^[0-9]+.[0-9]+\.[0-9]+\.[0-9]+/', $ip))
+			{
+			    if (! function_exists('geoip_country_code_by_addr')) return strtolower(geoip_country_code_by_name($this->gi, $ip));
+			    return strtolower(geoip_country_code_by_addr($this->gi, $ip));
+			}
+			else
+			{
+				if (! function_exists('geoip_country_code_by_addr_v6')) return strtolower(geoip_country_code_by_name_v6($this->gi, $ip));
+				return strtolower(geoip_country_code_by_addr_v6($this->gi, $ip));
+			}
 		}
 	}
 

diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
@@ -2692,12 +2692,10 @@ function dolGetCountryCodeFromIp($ip)
 	{
 		$datafile=$conf->global->GEOIPMAXMIND_COUNTRY_DATAFILE;
 		//$ip='24.24.24.24';
-		//$datafile='E:\Mes Sites\Web\Admin1\awstats\maxmind\GeoIP.dat';    Note that this must be downloaded datafile (not same than datafile provided with ubuntu packages)
-
+		//$datafile='/usr/share/GeoIP/GeoIP.dat';    Note that this must be downloaded datafile (not same than datafile provided with ubuntu packages)
 		include_once DOL_DOCUMENT_ROOT.'/core/class/dolgeoip.class.php';
 		$geoip=new DolGeoIP('country', $datafile);
 		//print 'ip='.$ip.' databaseType='.$geoip->gi->databaseType." GEOIP_CITY_EDITION_REV1=".GEOIP_CITY_EDITION_REV1."\n";
-		//print "geoip_country_id_by_addr=".geoip_country_id_by_addr($geoip->gi,$ip)."\n";
 		$countrycode=$geoip->getCountryCodeFromIP($ip);
 	}