X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=classes%2Faddress.php;h=2ebe8b562f70cec3e63bf899074ca63611065b61;hb=fda78a6777a5f385537fc9f291afb310e12525e5;hp=a532c8d6791cfd476f93b062e93899d16e9e6d6a;hpb=e22ff176d83e1f4ffd866e6ad928ee247906c6a5;p=platal.git diff --git a/classes/address.php b/classes/address.php index a532c8d..2ebe8b5 100644 --- a/classes/address.php +++ b/classes/address.php @@ -1,6 +1,6 @@ $line) { @@ -499,7 +501,8 @@ class Address $formattedLine = $this->getStreetNumberFR($line) . ' '; $limit = 32; } elseif ($this->isLocalityFR($line)) { - $formattedLine = $this->getPostalCodeFR($line) . ' '; + $postal_code = $this->getPostalCodeFR($line); + $formattedLine = $postal_code . ' '; $limit = 32; } else { $formattedLine = ''; @@ -536,6 +539,7 @@ class Address $arrayText[$lineNumber] = trim($formattedLine); } + $this->postal_code_fr = $postal_code; return implode("\n", $arrayText); } @@ -575,7 +579,7 @@ class Address public function format() { $this->text = trim($this->text); - $this->phones = Phone::formatFormArray($this->phones, $this->error, new ProfileVisibility($this->pub)); + $this->phones = Phone::formatFormArray($this->phones, $this->error, $this->pub); if ($this->removed == 1) { if (!S::user()->checkPerms('directory_private') && Phone::hasPrivate($this->phones)) { Platal::page()->trigWarning("L'adresse ne peut être supprimée car elle contient des informations pour lesquelles vous n'avez le droit d'édition."); @@ -625,14 +629,16 @@ class Address 'request' => $this->request ); - if ($this->type == self::LINK_PROFILE || $this->type == self::LINK_JOB) { - $address['pub'] = $this->pub; + if ($this->type == self::LINK_JOB) { + $address['pub'] = $this->pub; + $address['mail'] = $this->flags->hasFlag('mail'); } if ($this->type == self::LINK_PROFILE) { static $flags = array('current', 'temporary', 'secondary', 'mail', 'cedex', 'deliveryIssue'); foreach ($flags as $flag) { $address[$flag] = $this->flags->hasFlag($flag); } + $address['pub'] = $this->pub; $address['comment'] = $this->comment; $address['phones'] = Phone::formatFormArray($this->phones); } @@ -685,18 +691,18 @@ class Address return (!$this->text || $this->text == ''); } - public function save() + public function save($notify_ungeocoded = true) { if (!$this->isEmpty()) { XDB::execute('INSERT IGNORE INTO profile_addresses (pid, jobid, groupid, type, id, flags, text, postalText, pub, comment, types, formatted_address, location_type, partial_match, latitude, longitude, southwest_latitude, southwest_longitude, northeast_latitude, northeast_longitude, - geocoding_date, geocoding_calls) + geocoding_date, geocoding_calls, postal_code_fr) VALUES ({?}, {?}, {?}, {?}, {?}, {?}, {?}, {?}, {?}, {?}, - {?}, {?}, {?}, {?}, {?}, {?}, {?}, {?}, {?}, {?}, NOW(), {?})', + {?}, {?}, {?}, {?}, {?}, {?}, {?}, {?}, {?}, {?}, NOW(), {?}, {?})', $this->pid, $this->jobid, $this->groupid, $this->type, $this->id, $this->flags, $this->text, $this->postalText, $this->pub, $this->comment, $this->types, $this->formatted_address, $this->location_type, $this->partial_match, $this->latitude, $this->longitude, - $this->southwest_latitude, $this->southwest_longitude, $this->northeast_latitude, $this->northeast_longitude, $this->geocoding_calls); + $this->southwest_latitude, $this->southwest_longitude, $this->northeast_latitude, $this->northeast_longitude, $this->geocoding_calls, $this->postal_code_fr); if ($this->componentsIds) { foreach (explode(',', $this->componentsIds) as $component_id) { @@ -704,7 +710,7 @@ class Address VALUES ({?}, {?}, {?}, {?}, {?}, {?})', $this->pid, $this->jobid, $this->groupid, $this->type, $this->id, $component_id); } - } else { + } elseif ($notify_ungeocoded) { // If the address was not geocoded, notifies it to the appropriate ML. $mailer = new PlMailer('profile/no_geocoding.mail.tpl'); $mailer->assign('text', $this->text); @@ -720,7 +726,54 @@ class Address $req = new AddressReq(S::user(), $this->toFormArray(), $this->pid, $this->jobid, $this->groupid, $this->type, $this->id); $req->submit(); } + + if ($this->pid != 0) { + self::updateBestMail($this->pid); + } + } + } + + /** + * Upate the denormalized flag which is used to mark the best mail to use + * when sending postal mail + * + * Call with $fake to true to only get which address would be selected, + * without updating anything in the database. + * Returns an array describing the selected profile address + */ + static public function updateBestMail($pid, $fake=false) + { + if (!$fake) { + XDB::execute("UPDATE profile_addresses + SET flags = REPLACE(flags, 'dn_best_mail', '') + WHERE pid = {?}", + $pid); } + + /* Following order is selected to find the best mail: + * * Use addresses without the deliveryIssue flag if possible. + * * Among these, use addresses flagged as "current". + * * If there is no such addresses or several ones, prefer those + * without "secondary" flag. + * * If there are still several addresses in the selection, try not + * to select the ones with "job" type. + */ + $best_mail = XDB::fetchOneAssoc("SELECT pid, jobid, groupid, type, id, flags + FROM profile_addresses + WHERE FIND_IN_SET('mail', flags) AND pid = {?} + ORDER BY FIND_IN_SET('deliveryIssue', flags), + NOT FIND_IN_SET('current', flags), + FIND_IN_SET('secondary', flags), type = 'job' + LIMIT 1", + $pid); + + if (!$fake && $best_mail) { + XDB::execute("UPDATE profile_addresses + SET flags = CONCAT(flags, ',dn_best_mail') + WHERE pid = {?} AND jobid = {?} AND groupid = {?} AND type = {?} AND id = {?}", + $best_mail['pid'], $best_mail['jobid'], $best_mail['groupid'], $best_mail['type'], $best_mail['id']); + } + return $best_mail; } public function updateGeocoding($text) @@ -826,7 +879,7 @@ class Address // addresses before secondary addresses. static private function compare(array $a, array $b) { - $value = ProfileVisibility::comparePublicity($a, $b); + $value = Visibility::comparePublicity($a, $b); if ($value == 0) { if ($a['secondary'] != $b['secondary']) { $value = $a['secondary'] ? 1 : -1; @@ -878,26 +931,30 @@ class Address } static public function iterate(array $pids = array(), array $types = array(), - array $jobids = array(), array $pubs = array()) + array $jobids = array(), $visibility = null, $where = null) { - return new AddressIterator($pids, $types, $jobids, $pubs); + return new AddressIterator($pids, $types, $jobids, $visibility, $where); } } -/** Iterator over a set of Phones +/** Iterator over a set of Addresses * * @param $pid, $type, $jobid, $pub * - * The iterator contains the phones that correspond to the value stored in the - * parameters' arrays. + * The iterator contains the addresses that correspond to the value stored in + * the parameters' arrays. */ class AddressIterator implements PlIterator { private $dbiter; + private $visibility; - public function __construct(array $pids, array $types, array $jobids, array $pubs) + public function __construct(array $pids, array $types, array $jobids, $visibility, $_where) { $where = array(); + if (!is_null($_where)) { + $where[] = $_where; + } if (count($pids) != 0) { $where[] = XDB::format('(pa.pid IN {?})', $pids); } @@ -907,9 +964,11 @@ class AddressIterator implements PlIterator if (count($jobids) != 0) { $where[] = XDB::format('(pa.jobid IN {?})', $jobids); } - if (count($pubs) != 0) { - $where[] = XDB::format('(pa.pub IN {?})', $pubs); + if ($visibility == null || !($visibility instanceof Visibility)) { + $visibility = Visibility::defaultForRead(); } + $where[] = 'pve.best_display_level+0 <= pa.pub+0'; + $sql = 'SELECT pa.pid, pa.jobid, pa.groupid, pa.type, pa.id, pa.flags, pa.text, pa.postalText, pa.pub, pa.comment, pa.types, pa.formatted_address, pa.location_type, pa.partial_match, pa.latitude, pa.longitude, pa.southwest_latitude, pa.southwest_longitude, pa.northeast_latitude, pa.northeast_longitude, @@ -924,10 +983,12 @@ class AddressIterator implements PlIterator LEFT JOIN profile_addresses_components_enum AS pace2 ON (FIND_IN_SET(\'locality\', pace2.types) AND pace2.id = pc.component_id) LEFT JOIN profile_addresses_components_enum AS pace3 ON (FIND_IN_SET(\'administrative_area_level_1\', pace3.types) AND pace3.id = pc.component_id) LEFT JOIN profile_addresses_components_enum AS pace4 ON (FIND_IN_SET(\'country\', pace4.types) AND pace4.id = pc.component_id) - ' . ((count($where) > 0) ? 'WHERE ' . implode(' AND ', $where) : '') . ' + LEFT JOIN profile_visibility_enum AS pve ON (pve.access_level = {?}) + WHERE ' . implode(' AND ', $where) . ' GROUP BY pa.pid, pa.jobid, pa.groupid, pa.type, pa.id ORDER BY pa.pid, pa.jobid, pa.id'; - $this->dbiter = XDB::iterator($sql); + $this->dbiter = XDB::iterator($sql, $visibility->level()); + $this->visibility = $visibility; } public function next() @@ -940,7 +1001,7 @@ class AddressIterator implements PlIterator return null; } // Adds phones to addresses. - $it = Phone::iterate(array($data['pid']), array(Phone::LINK_ADDRESS), array($data['id'])); + $it = Phone::iterate(array($data['pid']), array(Phone::LINK_ADDRESS), array($data['id']), $this->visibility); while ($phone = $it->next()) { $data['phones'][$phone->id] = $phone->toFormArray(); } @@ -968,5 +1029,5 @@ class AddressIterator implements PlIterator } } -// 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: ?>