diff --git a/tools/geoip/geoip.inc b/tools/geoip/geoip.inc
index af9f04000..f04686374 100755
--- a/tools/geoip/geoip.inc
+++ b/tools/geoip/geoip.inc
@@ -19,44 +19,86 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
+ 
+/* PrestaShop
+	Test if functions and defines are already defined
+	END
+*/
 
-define("GEOIP_COUNTRY_BEGIN", 16776960);
-define("GEOIP_STATE_BEGIN_REV0", 16700000);
-define("GEOIP_STATE_BEGIN_REV1", 16000000);
-define("GEOIP_STANDARD", 0);
-define("GEOIP_MEMORY_CACHE", 1);
-define("GEOIP_SHARED_MEMORY", 2);
-define("STRUCTURE_INFO_MAX_SIZE", 20);
-define("DATABASE_INFO_MAX_SIZE", 100);
-define("GEOIP_COUNTRY_EDITION", 106);
-define("GEOIP_PROXY_EDITION", 8);
-define("GEOIP_ASNUM_EDITION", 9);
-define("GEOIP_NETSPEED_EDITION", 10);
-define("GEOIP_REGION_EDITION_REV0", 112);
-define("GEOIP_REGION_EDITION_REV1", 3);
-define("GEOIP_CITY_EDITION_REV0", 111);
-define("GEOIP_CITY_EDITION_REV1", 2);
-define("GEOIP_ORG_EDITION", 110);
-define("GEOIP_ISP_EDITION", 4);
-define("SEGMENT_RECORD_LENGTH", 3);
-define("STANDARD_RECORD_LENGTH", 3);
-define("ORG_RECORD_LENGTH", 4);
-define("MAX_RECORD_LENGTH", 4);
-define("MAX_ORG_RECORD_LENGTH", 300);
-define("GEOIP_SHM_KEY", 0x4f415401);
-define("US_OFFSET", 1);
-define("CANADA_OFFSET", 677);
-define("WORLD_OFFSET", 1353);
-define("FIPS_RANGE", 360);
-define("GEOIP_UNKNOWN_SPEED", 0);
-define("GEOIP_DIALUP_SPEED", 1);
-define("GEOIP_CABLEDSL_SPEED", 2);
-define("GEOIP_CORPORATE_SPEED", 3);
-define("GEOIP_DOMAIN_EDITION", 11);
-define("GEOIP_LOCATIONA_EDITION", 13);
-define("GEOIP_ACCURACYRADIUS_EDITION", 14);
-define("GEOIP_CITYCOMBINED_EDITION", 15);
-define("CITYCOMBINED_FIXED_RECORD", 7 );
+if (!defined('GEOIP_COUNTRY_BEGIN'))
+	define("GEOIP_COUNTRY_BEGIN", 16776960);
+if (!defined('GEOIP_STATE_BEGIN_REV0'))
+	define("GEOIP_STATE_BEGIN_REV0", 16700000);
+if (!defined('GEOIP_STATE_BEGIN_REV1'))
+	define("GEOIP_STATE_BEGIN_REV1", 16000000);
+if (!defined('GEOIP_STANDARD'))
+	define("GEOIP_STANDARD", 0);
+if (!defined('GEOIP_MEMORY_CACHE'))
+	define("GEOIP_MEMORY_CACHE", 1);
+if (!defined('GEOIP_SHARED_MEMORY'))
+	define("GEOIP_SHARED_MEMORY", 2);
+if (!defined('STRUCTURE_INFO_MAX_SIZE'))
+	define("STRUCTURE_INFO_MAX_SIZE", 20);
+if (!defined('DATABASE_INFO_MAX_SIZE'))
+	define("DATABASE_INFO_MAX_SIZE", 100);
+if (!defined('GEOIP_COUNTRY_EDITION'))
+	define("GEOIP_COUNTRY_EDITION", 106);
+if (!defined('GEOIP_PROXY_EDITION'))
+	define("GEOIP_PROXY_EDITION", 8);
+if (!defined('GEOIP_ASNUM_EDITION'))
+	define("GEOIP_ASNUM_EDITION", 9);
+if (!defined('GEOIP_NETSPEED_EDITION'))
+	define("GEOIP_NETSPEED_EDITION", 10);
+if (!defined('GEOIP_REGION_EDITION_REV0'))
+	define("GEOIP_REGION_EDITION_REV0", 112);
+if (!defined('GEOIP_REGION_EDITION_REV1'))
+	define("GEOIP_REGION_EDITION_REV1", 3);
+if (!defined('GEOIP_CITY_EDITION_REV0'))
+	define("GEOIP_CITY_EDITION_REV0", 111);
+if (!defined('GEOIP_CITY_EDITION_REV1'))
+	define("GEOIP_CITY_EDITION_REV1", 2);
+if (!defined('GEOIP_ORG_EDITION'))
+	define("GEOIP_ORG_EDITION", 110);
+if (!defined('GEOIP_ISP_EDITION'))
+	define("GEOIP_ISP_EDITION", 4);
+if (!defined('SEGMENT_RECORD_LENGTH'))
+	define("SEGMENT_RECORD_LENGTH", 3);
+if (!defined('STANDARD_RECORD_LENGTH'))
+	define("STANDARD_RECORD_LENGTH", 3);
+if (!defined('ORG_RECORD_LENGTH'))
+	define("ORG_RECORD_LENGTH", 4);
+if (!defined('MAX_RECORD_LENGTH'))
+	define("MAX_RECORD_LENGTH", 4);
+if (!defined('MAX_ORG_RECORD_LENGTH'))
+	define("MAX_ORG_RECORD_LENGTH", 300);
+if (!defined('GEOIP_SHM_KEY'))
+	define("GEOIP_SHM_KEY", 0x4f415401);
+if (!defined('US_OFFSET'))
+	define("US_OFFSET", 1);
+if (!defined('CANADA_OFFSET'))
+	define("CANADA_OFFSET", 677);
+if (!defined('WORLD_OFFSET'))
+	define("WORLD_OFFSET", 1353);
+if (!defined('FIPS_RANGE'))
+	define("FIPS_RANGE", 360);
+if (!defined('GEOIP_UNKNOWN_SPEED'))
+	define("GEOIP_UNKNOWN_SPEED", 0);
+if (!defined('GEOIP_DIALUP_SPEED'))
+	define("GEOIP_DIALUP_SPEED", 1);
+if (!defined('GEOIP_CABLEDSL_SPEED'))
+	define("GEOIP_CABLEDSL_SPEED", 2);
+if (!defined('GEOIP_CORPORATE_SPEED'))
+	define("GEOIP_CORPORATE_SPEED", 3);
+if (!defined('GEOIP_DOMAIN_EDITION'))
+	define("GEOIP_DOMAIN_EDITION", 11);
+if (!defined('GEOIP_LOCATIONA_EDITION'))
+	define("GEOIP_LOCATIONA_EDITION", 13);
+if (!defined('GEOIP_ACCURACYRADIUS_EDITION'))
+	define("GEOIP_ACCURACYRADIUS_EDITION", 14);
+if (!defined('GEOIP_CITYCOMBINED_EDITION'))
+	define("GEOIP_CITYCOMBINED_EDITION", 15);
+if (!defined('CITYCOMBINED_FIXED_RECORD'))
+	define("CITYCOMBINED_FIXED_RECORD", 7 );
 
 class GeoIP {
     var $flags;
@@ -239,318 +281,357 @@ class GeoIP {
 );
     
 }
-function geoip_load_shared_mem ($file) {
+if (!function_exists('geoip_load_shared_mem'))
+{
+	function geoip_load_shared_mem ($file) {
 
-  $fp = fopen($file, "rb");
-  if (!$fp) {
-    print "error opening $file: $php_errormsg\n";
-    exit;
-  }
-  $s_array = fstat($fp);
-  $size = $s_array['size'];
-  if ($shmid = @shmop_open (GEOIP_SHM_KEY, "w", 0, 0)) {
-    shmop_delete ($shmid);
-    shmop_close ($shmid);
-  }
-  $shmid = shmop_open (GEOIP_SHM_KEY, "c", 0644, $size);
-  shmop_write ($shmid, fread($fp, $size), 0);
-  shmop_close ($shmid);
+	  $fp = fopen($file, "rb");
+	  if (!$fp) {
+		 print "error opening $file: $php_errormsg\n";
+		 exit;
+	  }
+	  $s_array = fstat($fp);
+	  $size = $s_array['size'];
+	  if ($shmid = @shmop_open (GEOIP_SHM_KEY, "w", 0, 0)) {
+		 shmop_delete ($shmid);
+		 shmop_close ($shmid);
+	  }
+	  $shmid = shmop_open (GEOIP_SHM_KEY, "c", 0644, $size);
+	  shmop_write ($shmid, fread($fp, $size), 0);
+	  shmop_close ($shmid);
+	}
+}
+if (!function_exists('_setup_segments'))
+{
+	function _setup_segments($gi){
+	  $gi->databaseType = GEOIP_COUNTRY_EDITION;
+	  $gi->record_length = STANDARD_RECORD_LENGTH;
+	  if ($gi->flags & GEOIP_SHARED_MEMORY) {
+		 $offset = @shmop_size ($gi->shmid) - 3;
+		 for ($i = 0; $i < STRUCTURE_INFO_MAX_SIZE; $i++) {
+		     $delim = @shmop_read ($gi->shmid, $offset, 3);
+		     $offset += 3;
+		     if ($delim == (chr(255).chr(255).chr(255))) {
+		         $gi->databaseType = ord(@shmop_read ($gi->shmid, $offset, 1));
+		         $offset++;
+
+		         if ($gi->databaseType == GEOIP_REGION_EDITION_REV0){
+		             $gi->databaseSegments = GEOIP_STATE_BEGIN_REV0;
+		         } else if ($gi->databaseType == GEOIP_REGION_EDITION_REV1){
+		             $gi->databaseSegments = GEOIP_STATE_BEGIN_REV1;
+			 } else if (($gi->databaseType == GEOIP_CITY_EDITION_REV0)||
+		                  ($gi->databaseType == GEOIP_CITY_EDITION_REV1) 
+		                 || ($gi->databaseType == GEOIP_ORG_EDITION)
+		                 || ($gi->databaseType == GEOIP_DOMAIN_EDITION)
+				 || ($gi->databaseType == GEOIP_ISP_EDITION)
+				 || ($gi->databaseType == GEOIP_LOCATIONA_EDITION)
+				 || ($gi->databaseType == GEOIP_ACCURACYRADIUS_EDITION)
+				 || ($gi->databaseType == GEOIP_ASNUM_EDITION)){
+		             $gi->databaseSegments = 0;
+		             $buf = @shmop_read ($gi->shmid, $offset, SEGMENT_RECORD_LENGTH);
+		             for ($j = 0;$j < SEGMENT_RECORD_LENGTH;$j++){
+		                 $gi->databaseSegments += (ord($buf[$j]) << ($j * 8));
+		             }
+			         if (($gi->databaseType == GEOIP_ORG_EDITION)
+		                     || ($gi->databaseType == GEOIP_DOMAIN_EDITION)
+				|| ($gi->databaseType == GEOIP_ISP_EDITION)) {
+			             $gi->record_length = ORG_RECORD_LENGTH;
+		             }
+		         }
+		         break;
+		     } else {
+		         $offset -= 4;
+		     }
+		 }
+		 if (($gi->databaseType == GEOIP_COUNTRY_EDITION)||
+		     ($gi->databaseType == GEOIP_PROXY_EDITION)||
+		     ($gi->databaseType == GEOIP_NETSPEED_EDITION)){
+		     $gi->databaseSegments = GEOIP_COUNTRY_BEGIN;
+		 }
+	  } else {
+		 $filepos = ftell($gi->filehandle);
+		 fseek($gi->filehandle, -3, SEEK_END);
+		 for ($i = 0; $i < STRUCTURE_INFO_MAX_SIZE; $i++) {
+		     $delim = fread($gi->filehandle,3);
+		     if ($delim == (chr(255).chr(255).chr(255))){
+		     $gi->databaseType = ord(fread($gi->filehandle,1));
+		     if ($gi->databaseType == GEOIP_REGION_EDITION_REV0){
+		         $gi->databaseSegments = GEOIP_STATE_BEGIN_REV0;
+		     }
+		     else if ($gi->databaseType == GEOIP_REGION_EDITION_REV1){
+			 $gi->databaseSegments = GEOIP_STATE_BEGIN_REV1;
+		             }  else if (($gi->databaseType == GEOIP_CITY_EDITION_REV0)
+		                 || ($gi->databaseType == GEOIP_CITY_EDITION_REV1) 
+		                 || ($gi->databaseType == GEOIP_ORG_EDITION) 
+		                 || ($gi->databaseType == GEOIP_DOMAIN_EDITION)
+				 || ($gi->databaseType == GEOIP_ISP_EDITION)
+				 || ($gi->databaseType == GEOIP_LOCATIONA_EDITION)
+				 || ($gi->databaseType == GEOIP_ACCURACYRADIUS_EDITION)
+		                 || ($gi->databaseType == GEOIP_ASNUM_EDITION)){
+		         $gi->databaseSegments = 0;
+		         $buf = fread($gi->filehandle,SEGMENT_RECORD_LENGTH);
+		         for ($j = 0;$j < SEGMENT_RECORD_LENGTH;$j++){
+		         $gi->databaseSegments += (ord($buf[$j]) << ($j * 8));
+		         }
+			 if (   ( $gi->databaseType == GEOIP_ORG_EDITION )
+		             || ( $gi->databaseType == GEOIP_DOMAIN_EDITION )
+		             || ( $gi->databaseType == GEOIP_ISP_EDITION ) ) {
+			 $gi->record_length = ORG_RECORD_LENGTH;
+		         }
+		     }
+		     break;
+		     } else {
+		     fseek($gi->filehandle, -4, SEEK_CUR);
+		     }
+		 }
+		 if (($gi->databaseType == GEOIP_COUNTRY_EDITION)||
+		     ($gi->databaseType == GEOIP_PROXY_EDITION)||
+		     ($gi->databaseType == GEOIP_NETSPEED_EDITION)){
+		      $gi->databaseSegments = GEOIP_COUNTRY_BEGIN;
+		 }
+		 fseek($gi->filehandle,$filepos,SEEK_SET);
+	  }
+	  return $gi;
+	}
 }
 
-function _setup_segments($gi){
-  $gi->databaseType = GEOIP_COUNTRY_EDITION;
-  $gi->record_length = STANDARD_RECORD_LENGTH;
-  if ($gi->flags & GEOIP_SHARED_MEMORY) {
-    $offset = @shmop_size ($gi->shmid) - 3;
-    for ($i = 0; $i < STRUCTURE_INFO_MAX_SIZE; $i++) {
-        $delim = @shmop_read ($gi->shmid, $offset, 3);
-        $offset += 3;
-        if ($delim == (chr(255).chr(255).chr(255))) {
-            $gi->databaseType = ord(@shmop_read ($gi->shmid, $offset, 1));
-            $offset++;
+if (!function_exists('geoip_open'))
+{
+	function geoip_open($filename, $flags) {
+	  $gi = new GeoIP;
+	  $gi->flags = $flags;
+	  if ($gi->flags & GEOIP_SHARED_MEMORY) {
+		 $gi->shmid = @shmop_open (GEOIP_SHM_KEY, "a", 0, 0);
+		 } else {
+		 $gi->filehandle = fopen($filename,"rb") or die( "Can not open $filename\n" );
+		 if ($gi->flags & GEOIP_MEMORY_CACHE) {
+		     $s_array = fstat($gi->filehandle);
+		     $gi->memory_buffer = fread($gi->filehandle, $s_array['size']);
+		 }
+	  }
 
-            if ($gi->databaseType == GEOIP_REGION_EDITION_REV0){
-                $gi->databaseSegments = GEOIP_STATE_BEGIN_REV0;
-            } else if ($gi->databaseType == GEOIP_REGION_EDITION_REV1){
-                $gi->databaseSegments = GEOIP_STATE_BEGIN_REV1;
-	    } else if (($gi->databaseType == GEOIP_CITY_EDITION_REV0)||
-                     ($gi->databaseType == GEOIP_CITY_EDITION_REV1) 
-                    || ($gi->databaseType == GEOIP_ORG_EDITION)
-                    || ($gi->databaseType == GEOIP_DOMAIN_EDITION)
-		    || ($gi->databaseType == GEOIP_ISP_EDITION)
-		    || ($gi->databaseType == GEOIP_LOCATIONA_EDITION)
-		    || ($gi->databaseType == GEOIP_ACCURACYRADIUS_EDITION)
-		    || ($gi->databaseType == GEOIP_ASNUM_EDITION)){
-                $gi->databaseSegments = 0;
-                $buf = @shmop_read ($gi->shmid, $offset, SEGMENT_RECORD_LENGTH);
-                for ($j = 0;$j < SEGMENT_RECORD_LENGTH;$j++){
-                    $gi->databaseSegments += (ord($buf[$j]) << ($j * 8));
-                }
-	            if (($gi->databaseType == GEOIP_ORG_EDITION)
-                        || ($gi->databaseType == GEOIP_DOMAIN_EDITION)
-			|| ($gi->databaseType == GEOIP_ISP_EDITION)) {
-	                $gi->record_length = ORG_RECORD_LENGTH;
-                }
-            }
-            break;
-        } else {
-            $offset -= 4;
-        }
-    }
-    if (($gi->databaseType == GEOIP_COUNTRY_EDITION)||
-        ($gi->databaseType == GEOIP_PROXY_EDITION)||
-        ($gi->databaseType == GEOIP_NETSPEED_EDITION)){
-        $gi->databaseSegments = GEOIP_COUNTRY_BEGIN;
-    }
-  } else {
-    $filepos = ftell($gi->filehandle);
-    fseek($gi->filehandle, -3, SEEK_END);
-    for ($i = 0; $i < STRUCTURE_INFO_MAX_SIZE; $i++) {
-        $delim = fread($gi->filehandle,3);
-        if ($delim == (chr(255).chr(255).chr(255))){
-        $gi->databaseType = ord(fread($gi->filehandle,1));
-        if ($gi->databaseType == GEOIP_REGION_EDITION_REV0){
-            $gi->databaseSegments = GEOIP_STATE_BEGIN_REV0;
-        }
-        else if ($gi->databaseType == GEOIP_REGION_EDITION_REV1){
-	    $gi->databaseSegments = GEOIP_STATE_BEGIN_REV1;
-                }  else if (($gi->databaseType == GEOIP_CITY_EDITION_REV0)
-                    || ($gi->databaseType == GEOIP_CITY_EDITION_REV1) 
-                    || ($gi->databaseType == GEOIP_ORG_EDITION) 
-                    || ($gi->databaseType == GEOIP_DOMAIN_EDITION)
-		    || ($gi->databaseType == GEOIP_ISP_EDITION)
-		    || ($gi->databaseType == GEOIP_LOCATIONA_EDITION)
-		    || ($gi->databaseType == GEOIP_ACCURACYRADIUS_EDITION)
-                    || ($gi->databaseType == GEOIP_ASNUM_EDITION)){
-            $gi->databaseSegments = 0;
-            $buf = fread($gi->filehandle,SEGMENT_RECORD_LENGTH);
-            for ($j = 0;$j < SEGMENT_RECORD_LENGTH;$j++){
-            $gi->databaseSegments += (ord($buf[$j]) << ($j * 8));
-            }
-	    if (   ( $gi->databaseType == GEOIP_ORG_EDITION )
-                || ( $gi->databaseType == GEOIP_DOMAIN_EDITION )
-                || ( $gi->databaseType == GEOIP_ISP_EDITION ) ) {
-	    $gi->record_length = ORG_RECORD_LENGTH;
-            }
-        }
-        break;
-        } else {
-        fseek($gi->filehandle, -4, SEEK_CUR);
-        }
-    }
-    if (($gi->databaseType == GEOIP_COUNTRY_EDITION)||
-        ($gi->databaseType == GEOIP_PROXY_EDITION)||
-        ($gi->databaseType == GEOIP_NETSPEED_EDITION)){
-         $gi->databaseSegments = GEOIP_COUNTRY_BEGIN;
-    }
-    fseek($gi->filehandle,$filepos,SEEK_SET);
-  }
-  return $gi;
+	  $gi = _setup_segments($gi);
+	  return $gi;
+	}
+}
+if (!function_exists('geoip_close'))
+{
+	function geoip_close($gi) {
+	  if ($gi->flags & GEOIP_SHARED_MEMORY) {
+		 return true;
+	  }
+
+	  return fclose($gi->filehandle);
+	}
+}
+if (!function_exists('geoip_country_id_by_name'))
+{
+	function geoip_country_id_by_name($gi, $name) {
+	  $addr = gethostbyname($name);
+	  if (!$addr || $addr == $name) {
+		 return false;
+	  }
+	  return geoip_country_id_by_addr($gi, $addr);
+	}
+}
+if (!function_exists('geoip_country_code_by_name'))
+{
+	function geoip_country_code_by_name($gi, $name) {
+	  $country_id = geoip_country_id_by_name($gi,$name);
+	  if ($country_id !== false) {
+		     return $gi->GEOIP_COUNTRY_CODES[$country_id];
+	  }
+	  return false;
+	}
 }
 
-function geoip_open($filename, $flags) {
-  $gi = new GeoIP;
-  $gi->flags = $flags;
-  if ($gi->flags & GEOIP_SHARED_MEMORY) {
-    $gi->shmid = @shmop_open (GEOIP_SHM_KEY, "a", 0, 0);
-    } else {
-    $gi->filehandle = fopen($filename,"rb") or die( "Can not open $filename\n" );
-    if ($gi->flags & GEOIP_MEMORY_CACHE) {
-        $s_array = fstat($gi->filehandle);
-        $gi->memory_buffer = fread($gi->filehandle, $s_array['size']);
-    }
-  }
-
-  $gi = _setup_segments($gi);
-  return $gi;
+if (!function_exists('geoip_country_name_by_name'))
+{
+	function geoip_country_name_by_name($gi, $name) {
+	  $country_id = geoip_country_id_by_name($gi,$name);
+	  if ($country_id !== false) {
+		     return $gi->GEOIP_COUNTRY_NAMES[$country_id];
+	  }
+	  return false;
+	}
+}
+if (!function_exists('geoip_country_id_by_addr'))
+{
+	function geoip_country_id_by_addr($gi, $addr) {
+	  $ipnum = ip2long($addr);
+	  return _geoip_seek_country($gi, $ipnum) - GEOIP_COUNTRY_BEGIN;
+	}
 }
 
-function geoip_close($gi) {
-  if ($gi->flags & GEOIP_SHARED_MEMORY) {
-    return true;
-  }
+if (!function_exists('geoip_country_code_by_addr'))
+{
+	function geoip_country_code_by_addr($gi, $addr) {
+	  if ($gi->databaseType == GEOIP_CITY_EDITION_REV1) {
+		 $record = geoip_record_by_addr($gi,$addr);
+		 if ( $record !== false ) {
+		   return $record->country_code;
+		 }
+	  } else {
+		 $country_id = geoip_country_id_by_addr($gi,$addr);
+		 if ($country_id !== false) {
+		   return $gi->GEOIP_COUNTRY_CODES[$country_id];
+		 }
+	  }
+	  return false;
+	}
+}
+if (!function_exists('geoip_country_name_by_addr'))
+{
+	function geoip_country_name_by_addr($gi, $addr) {
+	  if ($gi->databaseType == GEOIP_CITY_EDITION_REV1) {
+		 $record = geoip_record_by_addr($gi,$addr);
+		 return $record->country_name;
+	  } else {
+		 $country_id = geoip_country_id_by_addr($gi,$addr);
+		 if ($country_id !== false) {
+		   return $gi->GEOIP_COUNTRY_NAMES[$country_id];
+		 }
+	  }
+	  return false;
+	}
+}
+if (!function_exists('_geoip_seek_country'))
+{
+	function _geoip_seek_country($gi, $ipnum) {
+	  $offset = 0;
+	  for ($depth = 31; $depth >= 0; --$depth) {
+		 if ($gi->flags & GEOIP_MEMORY_CACHE) {
+		   // workaround php's broken substr, strpos, etc handling with
+		   // mbstring.func_overload and mbstring.internal_encoding
+		   $enc = mb_internal_encoding();
+		    mb_internal_encoding('ISO-8859-1'); 
 
-  return fclose($gi->filehandle);
+		   $buf = substr($gi->memory_buffer,
+		                         2 * $gi->record_length * $offset,
+		                         2 * $gi->record_length);
+
+		   mb_internal_encoding($enc);
+		 } elseif ($gi->flags & GEOIP_SHARED_MEMORY) {
+		   $buf = @shmop_read ($gi->shmid, 
+		                         2 * $gi->record_length * $offset,
+		                         2 * $gi->record_length );
+		     } else {
+		   fseek($gi->filehandle, 2 * $gi->record_length * $offset, SEEK_SET) == 0
+		     or die("fseek failed");
+		   $buf = fread($gi->filehandle, 2 * $gi->record_length);
+		 }
+		 $x = array(0,0);
+		 for ($i = 0; $i < 2; ++$i) {
+		   for ($j = 0; $j < $gi->record_length; ++$j) {
+		     $x[$i] += ord($buf[$gi->record_length * $i + $j]) << ($j * 8);
+		   }
+		 }
+		 if ($ipnum & (1 << $depth)) {
+		   if ($x[1] >= $gi->databaseSegments) {
+		     return $x[1];
+		   }
+		   $offset = $x[1];
+		     } else {
+		   if ($x[0] >= $gi->databaseSegments) {
+		     return $x[0];
+		   }
+		   $offset = $x[0];
+		 }
+	  }
+	  trigger_error("error traversing database - perhaps it is corrupt?", E_USER_ERROR);
+	  return false;
+	}
+}
+if (!function_exists('_get_org'))
+{
+	function _get_org($gi,$ipnum){
+	  $seek_org = _geoip_seek_country($gi,$ipnum);
+	  if ($seek_org == $gi->databaseSegments) {
+		 return NULL;
+	  }
+	  $record_pointer = $seek_org + (2 * $gi->record_length - 1) * $gi->databaseSegments;
+	  if ($gi->flags & GEOIP_SHARED_MEMORY) {
+		 $org_buf = @shmop_read ($gi->shmid, $record_pointer, MAX_ORG_RECORD_LENGTH);
+		 } else {
+		 fseek($gi->filehandle, $record_pointer, SEEK_SET);
+		 $org_buf = fread($gi->filehandle,MAX_ORG_RECORD_LENGTH);
+	  }
+	  // workaround php's broken substr, strpos, etc handling with
+	  // mbstring.func_overload and mbstring.internal_encoding
+	  $enc = mb_internal_encoding();
+	  mb_internal_encoding('ISO-8859-1'); 
+	  $org_buf = substr($org_buf, 0, strpos($org_buf, "\0"));
+	  mb_internal_encoding($enc);
+	  return $org_buf;
+	}
 }
 
-function geoip_country_id_by_name($gi, $name) {
-  $addr = gethostbyname($name);
-  if (!$addr || $addr == $name) {
-    return false;
-  }
-  return geoip_country_id_by_addr($gi, $addr);
+if (!function_exists('geoip_org_by_addr'))
+{
+	function geoip_org_by_addr ($gi,$addr) {
+	  if ($addr == NULL) {
+		 return 0;
+	  }
+	  $ipnum = ip2long($addr);
+	  return _get_org($gi, $ipnum);
+	}
 }
 
-function geoip_country_code_by_name($gi, $name) {
-  $country_id = geoip_country_id_by_name($gi,$name);
-  if ($country_id !== false) {
-        return $gi->GEOIP_COUNTRY_CODES[$country_id];
-  }
-  return false;
+if (!function_exists('_get_region'))
+{
+	function _get_region($gi,$ipnum){
+	  if ($gi->databaseType == GEOIP_REGION_EDITION_REV0){
+		 $seek_region = _geoip_seek_country($gi,$ipnum) - GEOIP_STATE_BEGIN_REV0;
+		 if ($seek_region >= 1000){
+		   $country_code = "US";
+		   $region = chr(($seek_region - 1000)/26 + 65) . chr(($seek_region - 1000)%26 + 65);
+		 } else {
+		         $country_code = $gi->GEOIP_COUNTRY_CODES[$seek_region];
+		   $region = "";
+		 }
+	  return array ($country_code,$region);
+		 }  else if ($gi->databaseType == GEOIP_REGION_EDITION_REV1) {
+		 $seek_region = _geoip_seek_country($gi,$ipnum) - GEOIP_STATE_BEGIN_REV1;
+		 //print $seek_region;
+		 if ($seek_region < US_OFFSET){
+		   $country_code = "";
+		   $region = "";  
+		     } else if ($seek_region < CANADA_OFFSET) {
+		   $country_code = "US";
+		   $region = chr(($seek_region - US_OFFSET)/26 + 65) . chr(($seek_region - US_OFFSET)%26 + 65);
+		     } else if ($seek_region < WORLD_OFFSET) {
+		   $country_code = "CA";
+		   $region = chr(($seek_region - CANADA_OFFSET)/26 + 65) . chr(($seek_region - CANADA_OFFSET)%26 + 65);
+		 } else {
+		         $country_code = $gi->GEOIP_COUNTRY_CODES[($seek_region - WORLD_OFFSET) / FIPS_RANGE];
+		   $region = "";
+		 }
+	  return array ($country_code,$region);
+	  }
+	}
 }
 
-function geoip_country_name_by_name($gi, $name) {
-  $country_id = geoip_country_id_by_name($gi,$name);
-  if ($country_id !== false) {
-        return $gi->GEOIP_COUNTRY_NAMES[$country_id];
-  }
-  return false;
+if (!function_exists('geoip_region_by_addr'))
+{
+	function geoip_region_by_addr ($gi,$addr) {
+	  if ($addr == NULL) {
+		 return 0;
+	  }
+	  $ipnum = ip2long($addr);
+	  return _get_region($gi, $ipnum);
+	}
 }
 
-function geoip_country_id_by_addr($gi, $addr) {
-  $ipnum = ip2long($addr);
-  return _geoip_seek_country($gi, $ipnum) - GEOIP_COUNTRY_BEGIN;
+if (!function_exists('getdnsattributes'))
+{
+	function getdnsattributes ($l,$ip){
+	  $r = new Net_DNS_Resolver();
+	  $r->nameservers = array("ws1.maxmind.com");
+	  $p = $r->search($l."." . $ip .".s.maxmind.com","TXT","IN");
+	  $str = is_object($p->answer[0])?$p->answer[0]->string():'';
+	  ereg("\"(.*)\"",$str,$regs);
+	  $str = $regs[1];
+	  return $str;
+	}
 }
-
-function geoip_country_code_by_addr($gi, $addr) {
-  if ($gi->databaseType == GEOIP_CITY_EDITION_REV1) {
-    $record = geoip_record_by_addr($gi,$addr);
-    if ( $record !== false ) {
-      return $record->country_code;
-    }
-  } else {
-    $country_id = geoip_country_id_by_addr($gi,$addr);
-    if ($country_id !== false) {
-      return $gi->GEOIP_COUNTRY_CODES[$country_id];
-    }
-  }
-  return false;
-}
-
-function geoip_country_name_by_addr($gi, $addr) {
-  if ($gi->databaseType == GEOIP_CITY_EDITION_REV1) {
-    $record = geoip_record_by_addr($gi,$addr);
-    return $record->country_name;
-  } else {
-    $country_id = geoip_country_id_by_addr($gi,$addr);
-    if ($country_id !== false) {
-      return $gi->GEOIP_COUNTRY_NAMES[$country_id];
-    }
-  }
-  return false;
-}
-
-function _geoip_seek_country($gi, $ipnum) {
-  $offset = 0;
-  for ($depth = 31; $depth >= 0; --$depth) {
-    if ($gi->flags & GEOIP_MEMORY_CACHE) {
-      // workaround php's broken substr, strpos, etc handling with
-      // mbstring.func_overload and mbstring.internal_encoding
-      $enc = mb_internal_encoding();
-       mb_internal_encoding('ISO-8859-1'); 
-
-      $buf = substr($gi->memory_buffer,
-                            2 * $gi->record_length * $offset,
-                            2 * $gi->record_length);
-
-      mb_internal_encoding($enc);
-    } elseif ($gi->flags & GEOIP_SHARED_MEMORY) {
-      $buf = @shmop_read ($gi->shmid, 
-                            2 * $gi->record_length * $offset,
-                            2 * $gi->record_length );
-        } else {
-      fseek($gi->filehandle, 2 * $gi->record_length * $offset, SEEK_SET) == 0
-        or die("fseek failed");
-      $buf = fread($gi->filehandle, 2 * $gi->record_length);
-    }
-    $x = array(0,0);
-    for ($i = 0; $i < 2; ++$i) {
-      for ($j = 0; $j < $gi->record_length; ++$j) {
-        $x[$i] += ord($buf[$gi->record_length * $i + $j]) << ($j * 8);
-      }
-    }
-    if ($ipnum & (1 << $depth)) {
-      if ($x[1] >= $gi->databaseSegments) {
-        return $x[1];
-      }
-      $offset = $x[1];
-        } else {
-      if ($x[0] >= $gi->databaseSegments) {
-        return $x[0];
-      }
-      $offset = $x[0];
-    }
-  }
-  trigger_error("error traversing database - perhaps it is corrupt?", E_USER_ERROR);
-  return false;
-}
-
-function _get_org($gi,$ipnum){
-  $seek_org = _geoip_seek_country($gi,$ipnum);
-  if ($seek_org == $gi->databaseSegments) {
-    return NULL;
-  }
-  $record_pointer = $seek_org + (2 * $gi->record_length - 1) * $gi->databaseSegments;
-  if ($gi->flags & GEOIP_SHARED_MEMORY) {
-    $org_buf = @shmop_read ($gi->shmid, $record_pointer, MAX_ORG_RECORD_LENGTH);
-    } else {
-    fseek($gi->filehandle, $record_pointer, SEEK_SET);
-    $org_buf = fread($gi->filehandle,MAX_ORG_RECORD_LENGTH);
-  }
-  // workaround php's broken substr, strpos, etc handling with
-  // mbstring.func_overload and mbstring.internal_encoding
-  $enc = mb_internal_encoding();
-  mb_internal_encoding('ISO-8859-1'); 
-  $org_buf = substr($org_buf, 0, strpos($org_buf, "\0"));
-  mb_internal_encoding($enc);
-  return $org_buf;
-}
-
-function geoip_org_by_addr ($gi,$addr) {
-  if ($addr == NULL) {
-    return 0;
-  }
-  $ipnum = ip2long($addr);
-  return _get_org($gi, $ipnum);
-}
-
-function _get_region($gi,$ipnum){
-  if ($gi->databaseType == GEOIP_REGION_EDITION_REV0){
-    $seek_region = _geoip_seek_country($gi,$ipnum) - GEOIP_STATE_BEGIN_REV0;
-    if ($seek_region >= 1000){
-      $country_code = "US";
-      $region = chr(($seek_region - 1000)/26 + 65) . chr(($seek_region - 1000)%26 + 65);
-    } else {
-            $country_code = $gi->GEOIP_COUNTRY_CODES[$seek_region];
-      $region = "";
-    }
-  return array ($country_code,$region);
-    }  else if ($gi->databaseType == GEOIP_REGION_EDITION_REV1) {
-    $seek_region = _geoip_seek_country($gi,$ipnum) - GEOIP_STATE_BEGIN_REV1;
-    //print $seek_region;
-    if ($seek_region < US_OFFSET){
-      $country_code = "";
-      $region = "";  
-        } else if ($seek_region < CANADA_OFFSET) {
-      $country_code = "US";
-      $region = chr(($seek_region - US_OFFSET)/26 + 65) . chr(($seek_region - US_OFFSET)%26 + 65);
-        } else if ($seek_region < WORLD_OFFSET) {
-      $country_code = "CA";
-      $region = chr(($seek_region - CANADA_OFFSET)/26 + 65) . chr(($seek_region - CANADA_OFFSET)%26 + 65);
-    } else {
-            $country_code = $gi->GEOIP_COUNTRY_CODES[($seek_region - WORLD_OFFSET) / FIPS_RANGE];
-      $region = "";
-    }
-  return array ($country_code,$region);
-  }
-}
-
-function geoip_region_by_addr ($gi,$addr) {
-  if ($addr == NULL) {
-    return 0;
-  }
-  $ipnum = ip2long($addr);
-  return _get_region($gi, $ipnum);
-}
-
-function getdnsattributes ($l,$ip){
-  $r = new Net_DNS_Resolver();
-  $r->nameservers = array("ws1.maxmind.com");
-  $p = $r->search($l."." . $ip .".s.maxmind.com","TXT","IN");
-  $str = is_object($p->answer[0])?$p->answer[0]->string():'';
-  ereg("\"(.*)\"",$str,$regs);
-  $str = $regs[1];
-  return $str;
-}
-
 ?>