Should avoid 'empty' countries in geoloc.

Signed-off-by: Florent Bruneau <florent.bruneau@polytechnique.org>

diff --git a/include/geoloc.inc.php b/include/geoloc.inc.php
index 28ffe51..e3ee252 100644 (file)
--- a/include/geoloc.inc.php
+++ b/include/geoloc.inc.php
@@ -82,7 +82,7 @@ function get_address_infos($txt)
     if (!($f = @fopen($url, 'r'))) return false;
     $keys = explode('|',fgets($f));
     $vals = explode('|',fgets($f));
-    $infos = array();
+    $infos = empty_address();
     foreach ($keys as $i=>$key) {
         if($vals[$i]) {
             if ($key == 'sql') {
@@ -93,6 +93,9 @@ function get_address_infos($txt)
             }
         }
     }
+    if (empty($infos['country'])) {
+        $infos['country'] = '00';
+    }
     if (isset($infos['sql']) && $infos['sql'])
        XDB::execute("REPLACE INTO  geoloc_city
                            VALUES  ".$infos['sql']);

diff --git a/templates/geoloc/form.address.tpl b/templates/geoloc/form.address.tpl
index 63389f7..2906484 100644 (file)
--- a/templates/geoloc/form.address.tpl
+++ b/templates/geoloc/form.address.tpl
@@ -56,7 +56,7 @@
 <input type="hidden" name="{$name}[adr3]" value="{$adr.adr3}" />
 <input type="hidden" name="{$name}[postcode]" value="{$adr.postcode}"/>
 <input type="hidden" name="{$name}[city]" value="{$adr.city}" />
-<input type="hidden" name="{$name}[country]" value="{$adr.country}" />
+<input type="hidden" name="{$name}[country]" value="{$adr.country|default:'00'}" />
 <input type="hidden" name="{$name}[countrytxt]" value="{$adr.countrytxt}" />
 <input type="hidden" name="{$name}[region]" value="{$adr.region}" />
 <input type="hidden" name="{$name}[regiontxt]" value="{$adr.regiontxt}" />