Fix fatal error when GeoIP PHP extension is installed

mailwatch · Nov 25, 2014 · 18a58ce · 18a58ce
1 parent 28a8346
commit 18a58ce
Showing 1 changed file with 16 additions and 12 deletions.
diff --git a/mailscanner/lib/geoip.inc b/mailscanner/lib/geoip.inc
@@ -1583,13 +1583,15 @@ function geoip_country_code_by_name_v6($gi, $name)
     return false;
 }
 
-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];
+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;
     }
-    return false;
 }
 
 function geoip_country_name_by_name_v6($gi, $name)
@@ -1601,13 +1603,15 @@ function geoip_country_name_by_name_v6($gi, $name)
     return false;
 }
 
-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];
+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;
     }
-    return false;
 }
 
 function geoip_country_id_by_addr_v6($gi, $addr)