X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=modules%2Fprofile%2Faddresses.inc.php;h=24bc995239000eee2720dd3852e7ab71d36b2369;hb=48dba8feba7c3653a925aab5273fc30a6c257240;hp=97224767a74e7b5599b3e94cfb3aacfa34d62457;hpb=0b6c8b36e62b950d1b24088e98c4026a54efe9d0;p=platal.git diff --git a/modules/profile/addresses.inc.php b/modules/profile/addresses.inc.php index 9722476..24bc995 100644 --- a/modules/profile/addresses.inc.php +++ b/modules/profile/addresses.inc.php @@ -1,6 +1,6 @@ bool = new ProfileSettingBool(); - $this->pub = new ProfileSettingPub(); - } - - private function cleanAddress(ProfilePage &$page, $addrid, array &$address) + public function value(ProfilePage $page, $field, $value, &$success) { - $address['tel'] = Phone::formatFormArray($address['tel'], $s); - $address['current'] = $this->bool->value($page, 'current', $address['current'], $s); - $address['temporary'] = $this->bool->value($page, 'temporary', $address['temporary'], $s); - $address['secondary'] = $this->bool->value($page, 'secondary', $address['secondary'], $s); - $address['mail'] = $this->bool->value($page, 'mail', $address['mail'], $s); - $address['pub'] = $this->pub->value($page, 'pub', $address['pub'], $s); - } + $success = true; + $addresses = array(); - public function value(ProfilePage &$page, $field, $value, &$success) - { - $init = false; if (is_null($value)) { - $value = $page->values['addresses']; - $init = true; - } - foreach ($value as $key => &$address) { - if (isset($address['removed']) && $address['removed']) { - array_splice($value, $key, 1); - } - } - $current = 0; - $success = true; - foreach ($value as $key => &$address) { - if (isset($address['current']) && $address['current']) { - $current++; + $it = Address::iterate(array($page->pid()), array(Address::LINK_PROFILE), array(0), Visibility::get(Visibility::VIEW_ADMIN)); + while ($address = $it->next()) { + $addresses[] = $address->toFormArray(); } - } - if ($current == 0 && count($value) > 0) { - foreach ($value as &$address) { - $address['current'] = true; - break; - } - } elseif ($current > 1) { - $success = false; - } - foreach ($value as $key => &$address) { - if (!trim($address['text'])) { - unset($value[$key]); - } elseif (!$init) { - $this->geocodeAddress($address, $s); - $success = $success && $s; + if (count($addresses) == 0) { + $address = new Address(); + $addresses[] = $address->toFormArray(); } - $this->cleanAddress($page, $key, $address); + return $addresses; } - return $value; - } - public function saveAddress($pid, $addrid, array &$address, $type) - { - require_once 'geocoding.inc.php'; - - $flags = new PlFlagSet(); - $flags->addFlag('current', $address['current']); - $flags->addFlag('temporary', $address['temporary']); - $flags->addFlag('secondary', $address['secondary']); - $flags->addFlag('mail', $address['mail']); - $flags->addFlag('cedex', $address['cedex'] = - (strpos(strtoupper(preg_replace(array("/[0-9,\"'#~:;_\- ]/", "/\r\n/"), - array("", "\n"), $address['text'])), 'CEDEX')) !== false); - Geocoder::getAreaId($address, "administrativeArea"); - Geocoder::getAreaId($address, "subAdministrativeArea"); - Geocoder::getAreaId($address, "locality"); - XDB::execute("INSERT INTO profile_addresses (pid, type, id, flags, accuracy, - text, postalText, postalCode, localityId, - subAdministrativeAreaId, administrativeAreaId, - countryId, latitude, longitude, updateTime, pub, comment, - north, south, east, west) - VALUES ({?}, {?}, {?}, {?}, {?}, {?}, {?}, {?}, {?}, {?}, {?}, {?}, - {?}, {?}, FROM_UNIXTIME({?}), {?}, {?}, {?}, {?}, {?}, {?})", - $pid, $type, $addrid, $flags, $address['accuracy'], - $address['text'], $address['postalText'], $address['postalCode'], $address['localityId'], - $address['subAdministrativeAreaId'], $address['administrativeAreaId'], - $address['countryId'], $address['latitude'], $address['longitude'], - $address['updateTime'], $address['pub'], $address['comment'], - $address['north'], $address['south'], $address['east'], $address['west']); + return Address::formatFormArray($value, $success); } - public function save(ProfilePage &$page, $field, $value) + public function save(ProfilePage $page, $field, $value) { - XDB::execute("DELETE FROM profile_addresses - WHERE pid = {?} AND type = 'home'", - $page->pid()); - Phone::deletePhones($page->pid(), Phone::LINK_ADDRESS); - foreach ($value as $addrid => &$address) { - $this->saveAddress($page->pid(), $addrid, $address, 'home'); - Phone::savePhones($address['tel'], $page->pid(), Phone::LINK_ADDRESS, $addrid); + $deletePrivate = S::user()->isMe($page->owner) || S::admin(); + + Phone::deletePhones($page->pid(), Phone::LINK_ADDRESS, null, $deletePrivate); + Address::deleteAddresses($page->pid(), Address::LINK_PROFILE, null, null, $deletePrivate); + AddressReq::purge_requests($page->pid(), 0, 0, Address::LINK_PROFILE); + Address::saveFromArray($value, $page->pid(), Address::LINK_PROFILE, null, $deletePrivate); + if (S::user()->isMe($page->owner) && count($value) > 1) { + Platal::page()->trigWarning('Attention, tu as plusieurs adresses sur ton profil. Pense à supprimer celles qui sont obsolètes.'); } } - public function getText($value) { - $addresses = array(); - foreach ($value as $addrid => $address) { - $phones = Phone::formArrayToString($address['tel']); - $addresses[] = 'Adresse : ' . $address['text'] . ', affichage : ' . $address['pub'] - . ', commentaire : ' . $address['comment'] . ', actuelle : ' . ($address['current'] ? 'oui' : 'non') - . ', temporaire : ' . ($address['temporary'] ? 'oui' : 'non') . ', secondaire : ' - . ($address['secondary'] ? 'oui' : 'non') . ', conctactable par courier : ' - . ($address['mail'] ? 'oui' : 'non') . ($phones ? ', ' . $phones : ''); - } - return implode(' ; ' , $addresses); + public function getText($value) + { + return Address::formArrayToString($value); } } -class ProfileSettingAddresses extends ProfilePage +class ProfilePageAddresses extends ProfilePage { protected $pg_template = 'profile/adresses.tpl'; - public function __construct(PlWizard &$wiz) + public function __construct(PlWizard $wiz) { parent::__construct($wiz); - $this->settings['addresses'] = new ProfileSettingAddress(); + $this->settings['addresses'] = new ProfileSettingAddresses(); $this->watched['addresses'] = true; - } - - protected function _fetchData() - { - $res = XDB::query("SELECT id, accuracy, text, postalText, - postalCode, localityId, subAdministrativeAreaId, administrativeAreaId, - countryId, latitude, longitude, pub, comment, UNIX_TIMESTAMP(updateTime) AS updateTime, - north, south, east, west, - FIND_IN_SET('current', flags) AS current, - FIND_IN_SET('temporary', flags) AS temporary, - FIND_IN_SET('secondary', flags) AS secondary, - FIND_IN_SET('mail', flags) AS mail, - FIND_IN_SET('cedex', flags) AS cedex - FROM profile_addresses - WHERE pid = {?} AND type = 'home' - ORDER BY id", - $this->pid()); - if ($res->numRows() == 0) { - $this->values['addresses'] = array(); - } else { - $this->values['addresses'] = $res->fetchAllAssoc(); - } - - // Adds phones to addresses. - $it = Phone::iterate(array($this->pid()), array(Phone::LINK_ADDRESS)); - while ($phone = $it->next()) { - $this->values['addresses'][$phone->linkId()]['tel'][$phone->id()] = $phone->toFormArray(); - } - - // Properly formats addresses. - foreach ($this->values['addresses'] as $id => &$address) { - $phone = new Phone(); - if (!isset($address['tel'])) { - $address['tel'] = array(0 => $phone->toFormArray()); - } - unset($address['id']); - $address['changed'] = 0; - $address['removed'] = 0; - } - //var_dump($this->values['addresses']['tel']); + Platal::page()->assign('geocoding_removal', true); } } -// vim:set et sw=4 sts=4 sws=4 foldmethod=marker enc=utf-8: +// vim:set et sw=4 sts=4 sws=4 foldmethod=marker fenc=utf-8: ?>