X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=modules%2Fprofile%2Faddresses.inc.php;h=780ee031555855f0dce9bc626e46eb5bb27ab506;hb=d7610c358d074c78e1e8dc25fe0cf0e5e7e1c55e;hp=c94e1192d67d7daa58c0bda1b7f7cca17b6ee4f8;hpb=c6a7beb27785ec788a90d86124960b1b92d79cf4;p=platal.git diff --git a/modules/profile/addresses.inc.php b/modules/profile/addresses.inc.php index c94e119..780ee03 100644 --- a/modules/profile/addresses.inc.php +++ b/modules/profile/addresses.inc.php @@ -1,6 +1,6 @@ bool = new ProfileBool(); $this->pub = new ProfilePub(); + $this->tel = new ProfileTel(); } - private function geolocAddress(array &$address, &$success) - { - require_once 'geoloc.inc.php'; - $success = true; - if (@$address['parsevalid'] || (@$address['text'] && @$address['changed']) || !@$address['cityid']) { - $address = array_merge($address, empty_address()); - $new = get_address_infos(@$address['text']); - if (compare_addresses_text(@$adress['text'], $geotxt = get_address_text($new)) - || @$address['parsevalid']) { - $address = array_merge($address, $new); - } else { - $success = false; - $address = array_merge($address, cut_address(@$address['text'])); - $address['geoloc'] = $geotxt; - $address['geoloc_cityid'] = $new['cityid']; - } - } - if (@$address['changed']) { - $address['datemaj'] = time(); - } - $address['text'] = get_address_text($address); - } - - private function cleanAddress(ProfilePage &$page, array &$address) + private function cleanAddress(ProfilePage &$page, array &$address, &$success) { if (@$address['changed']) { $address['datemaj'] = time(); } + $success = true; foreach ($address['tel'] as $t=>&$tel) { if (@$tel['removed'] || !trim($tel['tel'])) { unset($address['tel'][$t]); } else { - $tel['pub'] = $this->pub->value($page, 'pub', $tel['pub'], $success); + $tel['pub'] = $this->pub->value($page, 'pub', $tel['pub'], $s); + $tel['tel'] = $this->tel->value($page, 'tel', $tel['tel'], $s); + if (!$s) { + $tel['error'] = true; + $success = false; + } } unset($tel['removed']); } - if (@$address['changed']) { - $address['datemaj'] = time(); - } - $success = true; - $address['secondaire'] = $this->bool->value($page, 'secondaire', $address['secondaire'], $success); - $address['mail'] = $this->bool->value($page, 'mail', $address['mail'], $success); - $address['temporary'] = $this->bool->value($page, 'temporary', $address['temporary'], $success); - $address['current'] = $this->bool->value($page, 'current', @$address['current'], $success); - $address['pub'] = $this->pub->value($page, 'pub', $address['pub'], $success); + $address['checked'] = $this->bool->value($page, 'checked', $address['checked'], $s); + $address['secondaire'] = $this->bool->value($page, 'secondaire', $address['secondaire'], $s); + $address['mail'] = $this->bool->value($page, 'mail', $address['mail'], $s); + $address['temporary'] = $this->bool->value($page, 'temporary', $address['temporary'], $s); + $address['current'] = $this->bool->value($page, 'current', @$address['current'], $s); + $address['pub'] = $this->pub->value($page, 'pub', $address['pub'], $s); unset($address['parsevalid']); unset($address['changed']); unset($address['removed']); @@ -93,15 +75,31 @@ class ProfileAddress unset($value[$key]); } } + $current = 0; $success = true; foreach ($value as $key=>&$adr) { - $this->geolocAddress($adr, $s); - $this->cleanAddress($page, $adr); - if (!$init) { - $success = $success && $s; + if (@$adr['current']) { + $current++; + } + } + if ($current == 0 && count($value) > 0) { + foreach ($value as $key=>&$adr) { + $adr['current'] = true; + break; } + } else if ($current > 1) { + $success = false; + } + foreach ($value as $key=>&$adr) { + $ls = true; + $this->geolocAddress($adr, $s); + $ls = ($ls && $s); + $this->cleanAddress($page, $adr, $s); + $ls = ($ls && $s); if (!trim($adr['text'])) { unset($value[$key]); + } else if (!$init) { + $success = ($success && $ls); } } return $value; @@ -119,35 +117,37 @@ class ProfileAddress private function saveAddress($adrid, array &$address) { - $flags = array(); + $flags = new PlFlagSet(); if ($address['secondaire']) { - $flags[] = 'res-secondaire'; + $flags->addFlag('res-secondaire'); } if ($address['mail']) { - $flags[] = 'courrier'; + $flags->addFlag('courrier'); } if ($address['temporary']) { - $flags[] = 'temporaire'; + $flags->addFlag('temporaire'); } if ($address['current']) { - $flags[] = 'active'; + $flags->addFlag('active'); + } + if ($address['checked']) { + $flags->addFlag('coord-checked'); } - $flags = implode(',', $flags); XDB::execute("INSERT INTO adresses (adr1, adr2, adr3, postcode, city, cityid, country, region, regiontxt, pub, datemaj, statut, - uid, adrid) + uid, adrid, glat, glng) VALUES ({?}, {?}, {?}, {?}, {?}, {?}, {?}, {?}, {?}, {?}, FROM_UNIXTIME({?}), {?}, - {?}, {?})", + {?}, {?}, {?}, {?})", $address['adr1'], $address['adr2'], $address['adr3'], $address['postcode'], $address['city'], $address['cityid'], $address['country'], $address['region'], $address['regiontxt'], $address['pub'], $address['datemaj'], $flags, - S::i('uid'), $adrid); + S::i('uid'), $adrid, $address['precise_lat'], $address['precise_lon']); foreach ($address['tel'] as $telid=>&$tel) { $this->saveTel($adrid, $telid, $tel); } @@ -175,25 +175,24 @@ class ProfileAddresses extends ProfilePage { parent::__construct($wiz); $this->settings['addresses'] = new ProfileAddress(); + $this->watched['addresses'] = true; } - protected function fetchData() + protected function _fetchData() { - if (count($this->orig) > 0) { - $this->values = $this->orig; - return; - } // Build the addresses tree $res = XDB::query("SELECT a.adrid AS id, a.adr1, a.adr2, a.adr3, UNIX_TIMESTAMP(a.datemaj) AS datemaj, a.postcode, a.city, a.cityid, a.region, a.regiontxt, a.pub, a.country, gp.pays AS countrytxt, gp.display, + FIND_IN_SET('coord-checked', a.statut) AS checked, FIND_IN_SET('res-secondaire', a.statut) AS secondaire, FIND_IN_SET('courrier', a.statut) AS mail, FIND_IN_SET('temporaire', a.statut) AS temporary, - FIND_IN_SET('active', a.statut) AS current + FIND_IN_SET('active', a.statut) AS current, + a.glat AS precise_lat, a.glng AS precise_lon FROM adresses AS a - INNER JOIN geoloc_pays AS gp ON(gp.a2 = a.country) + INNER JOIN geoloc_pays AS gp ON(gp.a2 = a.country) WHERE uid = {?} AND NOT FIND_IN_SET('pro', statut) ORDER BY adrid", S::i('uid')); @@ -233,7 +232,6 @@ class ProfileAddresses extends ProfilePage } unset($address['id']); } - parent::fetchData(); } }