support IP2Location v8 BIN format

Author: chrislim2888

ChangeLog

@@ -1,4 +1,9 @@
 Revision History for PHP Module for IP2Location
+8.0.0 Tue Jul 5 10:00:00 2016
+	* Fixes
+	
+	- Add code to lookup for index section which available in new BIN format 
+	
 7.2.5 Fri Jun 10 15:40:23 2016
 	* Fixes:
 

IP2Location.php

@@ -32,7 +32,7 @@ class Database {
    *
    * @var string
    */
-  const VERSION = '7.2.5';
+  const VERSION = '8.0.0';
 
   //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
   //  Error field constants  ///////////////////////////////////////////////////////////////////////////////////////////////////////////////
@@ -609,7 +609,11 @@ class Database {
    * @var array
    */
   private $ipBase = [];
-
+  
+  
+  //hjlim
+  private $indexBaseAddr = [];
+  
   //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
   //  Default fields  //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
   //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
@@ -741,9 +745,11 @@ public function __construct($file = null, $mode = self::FILE_IO, $defaultFields
     $this->date           = date('Y-m-d', strtotime("{$year}-{$month}-{$day}"));
     //
     $this->ipCount[4]     = $this->readWord(6);
-    $this->ipBase[4]      = $this->readWord(10);
+    $this->ipBase[4]      = $this->readWord(10);		//hjlim readword
     $this->ipCount[6]     = $this->readWord(14);
     $this->ipBase[6]      = $this->readWord(18);
+	$this->indexBaseAddr[4] = $this->readWord(22);		//hjlim
+	$this->indexBaseAddr[6] = $this->readWord(26);		//hjlim
   }
 
   /**
@@ -1473,18 +1479,43 @@ private function binSearch($version, $ipNumber) {
     $high   = $this->ipCount[$version];
     $low    = 0;
 
+	//hjlim
+	$indexBaseStart = $this->indexBaseAddr[$version];
+	if ($indexBaseStart > 0){
+		$indexPos = 0;
+		switch($version){
+			case 4:
+				$ipNum1_2 = intval($ipNumber >> 16);
+				$indexPos = $indexBaseStart + ($ipNum1_2 << 3);
+				
+				break;
+			
+			case 6:
+				$ipNum1 = intval(bcdiv($ipNumber, bcpow('2', '112')));
+				$indexPos = $indexBaseStart + ($ipNum1 << 3);
+
+				break;
+				
+			default:
+				return false;
+		}
+		
+		$low = $this->readWord($indexPos);
+		$high = $this->readWord($indexPos + 4);
+	}
+	
     // as long as we can narrow down the search...
-    while ($low <= $high) {
-      $mid     = (int) ($low + (($high - $low) / 2));
-
+	while ($low <= $high) {
+      $mid     = (int) ($low + (($high - $low) >> 1));
+		
 	  // Read IP ranges to get boundaries
       $ip_from = $this->readIp($version, $base + $width * $mid);
       $ip_to   = $this->readIp($version, $base + $width * ($mid + 1));
-
+    
       // determine whether to return, repeat on the lower half, or repeat on the upper half
       switch (self::ipBetween($version, $ipNumber, $ip_from, $ip_to)) {
         case 0:
-          return $base + $offset + $mid * $width;
+		  return $base + $offset + $mid * $width;
         case -1:
           $high = $mid - 1;
           break;