X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=modules%2Fprofile%2Fpage.inc.php;h=628a9498a85e98b8df646ec50e823a6c5a9bbdfd;hb=0bcc8717002a2ab1b8531e1a78aa403132b0ecbc;hp=8408c1520fa24cd8acaf6668e4576ff0e6d7a8a4;hpb=89cd26b1e8222b44bab3e1294fdd49015cbdb02e;p=platal.git

diff --git a/modules/profile/page.inc.php b/modules/profile/page.inc.php
index 8408c15..628a949 100644
--- a/modules/profile/page.inc.php
+++ b/modules/profile/page.inc.php
@@ -254,29 +254,26 @@ class ProfileDate extends ProfileNoSave
     }
 }
 
-abstract class ProfileGeoloc implements ProfileSetting
+abstract class ProfileGeocoding implements ProfileSetting
 {
-    protected function geolocAddress(array &$address, &$success)
+    protected function geocodeAddress(array &$address, &$success)
     {
-        require_once 'geoloc.inc.php';
+        require_once 'geocoding.inc.php';
         $success = true;
         if ($address['changed'] == 1) {
-            cleanText($address['text']);
-            geolocGoogle($address);
-            $address['updateTime'] = time();
-            // postalAddress
+            $gmapsGeocoder = new GMapsGeocoder();
+            $address = $gmapsGeocoder->getGeocodedAddress($address);
             if (isset($address['geoloc'])) {
                 $success = false;
             }
-            unset($address['changed']);
         }
-        if (isset($address['geoloc_choice']) && $address['geoloc_choice'] == 0) {
+        if (isset($address['geoloc_choice']) && ($address['geoloc_choice'] == 0)) {
             $mailer = new PlMailer('geoloc/geoloc.mail.tpl');
             $mailer->assign('text', $address['text']);
             $mailer->assign('geoloc', $address['geoloc']);
             $mailer->send();
-        } elseif (isset($address['geoloc_choice'])) {
-            unset($address['geoloc'], $address['geoloc_choice']);
+            $gmapsGeocoder = new GMapsGeocoder();
+            $address = $gmapsGeocoder->stripGeocodingFromAddress($address);
         }
     }
 }