X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=classes%2Fprofile.php;h=b7a190cb49595e74e01047592da3906c1840d618;hb=304cdf32d7c38afbd381909545021fc44c8a0e05;hp=ee23cab246efb3403d27f923bdc0ca3d63bfe27e;hpb=56721636abf0c5eac652b569ce3b2f5b42c89357;p=platal.git diff --git a/classes/profile.php b/classes/profile.php index ee23cab..b7a190c 100644 --- a/classes/profile.php +++ b/classes/profile.php @@ -1,6 +1,6 @@ array(self::VIS_PUBLIC), - self::VIS_AX => array(self::VIS_AX, self::VIS_PUBLIC), - self::VIS_PRIVATE => array(self::VIS_PRIVATE, self::VIS_AX, self::VIS_PUBLIC)); - - const VIS_PUBLIC = 'public'; - const VIS_AX = 'ax'; - const VIS_PRIVATE = 'private'; - - private $level; - - public function __construct($level = null) - { - $this->setLevel($level); - } - - public function setLevel($level = self::VIS_PUBLIC) - { - if ($level != null && $level != self::VIS_PRIVATE && $level != self::VIS_AX && $level != self::VIS_PUBLIC) { - Platal::page()->kill("Invalid visibility: " . $level); - } - - if (!S::logged()) { - $level = self::VIS_PUBLIC; - } else if ($level == null) { - $level = self::VIS_PRIVATE; - } - - if ($this->level == null || $this->level == self::VIS_PRIVATE) { - $this->level = $level; - } else if ($this->level == self::VIS_AX && $level == self::VIS_PRIVATE) { - return; - } else { - $this->level = self::VIS_PUBLIC; - } - } - - public function level() - { - if ($this->level == null) { - return self::VIS_PUBLIC; - } else { - return $this->level; - } - } - - public function levels() - { - return self::$v_values[$this->level()]; - } - - public function isVisible($visibility) - { - return in_array($visibility, $this->levels()); - } -} - -class Profile +class Profile implements PlExportable { /* name tokens */ @@ -106,6 +48,17 @@ class Profile const DEGREE_M = 'Master'; const DEGREE_D = 'Doctorat'; + static public $cycles = array( + self::DEGREE_X => 'polytechnicien', + self::DEGREE_M => 'master', + self::DEGREE_D => 'docteur' + ); + static public $cycle_prefixes = array( + self::DEGREE_X => 'X', + self::DEGREE_M => 'M', + self::DEGREE_D => 'D' + ); + static public $name_variants = array( self::LASTNAME => array(self::VN_MARITAL, self::VN_ORDINARY), self::FIRSTNAME => array(self::VN_ORDINARY, self::VN_INI, self::VN_OTHER) @@ -152,13 +105,49 @@ class Profile const FETCH_JOBS = 0x000008; const FETCH_MEDALS = 0x000010; const FETCH_NETWORKING = 0x000020; - const FETCH_MENTOR_SECTOR = 0x000040; const FETCH_MENTOR_COUNTRY = 0x000080; const FETCH_PHONES = 0x000100; + const FETCH_JOB_TERMS = 0x000200; + const FETCH_MENTOR_TERMS = 0x000400; + const FETCH_DELTATEN = 0x000800; const FETCH_MINIFICHES = 0x00012D; // FETCH_ADDRESSES | FETCH_EDU | FETCH_JOBS | FETCH_NETWORKING | FETCH_PHONES - const FETCH_ALL = 0x0001FF; // OR of FETCH_* + const FETCH_ALL = 0x000FFF; // OR of FETCH_* + + static public $descriptions = array( + 'search_names' => 'Noms', + 'nationality1' => 'Nationalité', + 'nationality2' => '2e nationalité', + 'nationality3' => '3e nationalité', + 'promo_display' => 'Promotion affichée', + 'email_directory' => 'Email annuaire papier', + 'networking' => 'Messageries…', + 'tels' => 'Téléphones', + 'edus' => 'Formations', + 'main_edus' => 'Formations à l\'X', + 'promo' => 'Promotion de sortie', + 'birthdate' => 'Date de naissance', + 'yourself' => 'Nom affiché', + 'freetext' => 'Commentaire', + 'freetext_pub' => 'Affichage du commentaire', + 'photo' => 'Photographie', + 'photo_pub' => 'Affichage de la photographie', + 'addresses' => 'Adresses', + 'corps' => 'Corps', + 'cv' => 'CV', + 'jobs' => 'Emplois', + 'section' => 'Section', + 'binets' => 'Binets', + 'medals' => 'Décorations', + 'medals_pub' => 'Affichage des décorations', + 'competences' => 'Compétences', + 'langues' => 'Langues', + 'expertise' => 'Expertises (mentoring)', + 'terms' => 'Compétences (mentoring)', + 'countries' => 'Pays (mentoring)', + 'deltaten' => 'Opération N N-10', + ); private $fetched_fields = 0x000000; @@ -198,14 +187,34 @@ class Profile return $this->owner; } - public function promo() + public function isActive() + { + if ($this->owner()) { + return $this->owner->isActive(); + } + return false; + } + + public function promo($details = false) { + if ($details && ($this->program || $this->fieldid)) { + $text = array(); + if ($this->program) { + $text[] = $this->program; + } + if ($this->fieldid) { + $fieldsList = DirEnum::getOptions(DirEnum::EDUFIELDS); + $text[] = $fieldsList[$this->fieldid]; + } + return $this->promo . ' (' . implode(', ', $text) . ')'; + } + return $this->promo; } public function yearpromo() { - return intval(substr($this->promo, 1, 4)); + return $this->promo_year; } /** Check if user is an orange (associated with several promos) @@ -264,6 +273,20 @@ class Profile } } + public static function educationDuration($education) + { + switch ($education) { + case self::DEGREE_X: + return 3; + case self::DEGREE_M: + return 2; + case self::DEGREE_D: + return 3; + default: + return 0; + } + } + /** Number of years between the promotion year until the * graduation year. In standard schools it's 0, but for * Polytechnique the promo year is the entry year. @@ -276,6 +299,25 @@ class Profile return 0; } + // Returns the profile's color. + public function promoColor() + { + switch ($this->mainEducation()) { + case 'X': + if (($this->yearpromo() % 2) === 0) { + return 'red'; + } else { + return 'yellow'; + } + case 'M': + return 'green'; + case 'D': + return 'blue'; + default: + return 'gray'; + } + } + /** Print a name with the given formatting: * %s = • for women * %f = firstname @@ -371,14 +413,15 @@ class Profile public function nationalities() { $nats = array(); + $nationalities = DirEnum::getOptions(DirEnum::NATIONALITIES); if ($this->nationality1) { - $nats[] = $this->nationality1; + $nats[$this->nationality1] = $nationalities[$this->nationality1]; } if ($this->nationality2) { - $nats[] = $this->nationality2; + $nats[$this->nationality2] = $nationalities[$this->nationality2]; } if ($this->nationality3) { - $nats[] = $this->nationality3; + $nats[$this->nationality3] = $nationalities[$this->nationality3]; } return $nats; } @@ -413,11 +456,11 @@ class Profile /** * Clears a profile. - * *always deletes in: profile_addresses, profile_binets, profile_job, - * profile_langskills, profile_mentor, profile_networking, + * *always deletes in: profile_addresses, profile_binets, profile_deltaten, + * profile_job, profile_langskills, profile_mentor, profile_networking, * profile_phones, profile_skills, watch_profile * *always keeps in: profile_corps, profile_display, profile_education, - * profile_medals, profile_name, profile_photos, search_name + * profile_medals, profile_*_names, profile_photos, search_name * *modifies: profiles */ public function clear() @@ -425,7 +468,8 @@ class Profile $tables = array( 'profile_job', 'profile_langskills', 'profile_mentor', 'profile_networking', 'profile_skills', 'watch_profile', - 'profile_phones', 'profile_addresses', 'profile_binets'); + 'profile_phones', 'profile_addresses', 'profile_binets', + 'profile_deltaten'); foreach ($tables as $t) { XDB::execute('DELETE FROM ' . $t . ' @@ -470,6 +514,8 @@ class Profile $this->fetched_fields = $fields; } + /** Have we already fetched this field ? + */ private function fetched($field) { if (!array_key_exists($field, ProfileField::$fields)) { @@ -485,6 +531,9 @@ class Profile */ private function getProfileField($field) { + if (!array_key_exists($field, ProfileField::$fields)) { + Platal::page()->kill("Invalid field: $field"); + } if ($this->fetched($field)) { return null; } else { @@ -500,6 +549,7 @@ class Profile */ private function consolidateFields() { + // Link phones to addresses if ($this->phones != null) { if ($this->addresses != null) { $this->addresses->addPhones($this->phones); @@ -510,9 +560,15 @@ class Profile } } + // Link addresses to jobs if ($this->addresses != null && $this->jobs != null) { $this->jobs->addAddresses($this->addresses); } + + // Link jobterms to jobs + if ($this->jobs != null && $this->jobterms != null) { + $this->jobs->addJobTerms($this->jobterms); + } } /* Photo @@ -522,17 +578,19 @@ class Profile { if ($this->has_photo) { if ($data && ($this->photo == null || $this->photo->mimeType == null)) { - $res = XDB::fetchOneAssoc('SELECT attach, attachmime, x, y + $res = XDB::fetchOneAssoc('SELECT attach, attachmime, x, y, last_update FROM profile_photos WHERE pid = {?}', $this->pid); - $this->photo = PlImage::fromData($res['attach'], $res['attachmime'], $res['x'], $res['y']); + $this->photo = PlImage::fromData($res['attach'], 'image/' .$res['attachmime'], $res['x'], $res['y'], $res['last_update']); } else if ($this->photo == null) { $this->photo = PlImage::fromData(null, null, $this->photo_width, $this->photo_height); } return $this->photo; } else if ($fallback) { - return PlImage::fromFile(dirname(__FILE__).'/../htdocs/images/none.png', - 'image/png'); + if ($this->mainEducation() == 'X') { + return PlImage::fromFile(dirname(__FILE__) . '/../htdocs/images/none_x.png', 'image/png'); + } + return PlImage::fromFile(dirname(__FILE__) . '/../htdocs/images/none_md.png', 'image/png'); } return null; } @@ -574,11 +632,15 @@ class Profile public function getMainAddress() { - $addr = $this->getAddresses(self::ADDRESS_PERSO | self::ADDRESS_MAIN); - if (count($addr) == 0) { - return null; + $main = $this->getAddresses(self::ADDRESS_MAIN); + $perso = $this->getAddresses(self::ADDRESS_PERSO); + + if (count($main)) { + return array_pop($main); + } else if (count($perso)) { + return array_pop($perso); } else { - return array_pop($addr); + return null; } } @@ -723,25 +785,13 @@ class Profile return array_pop($job); } - /* Mentoring + /** JobTerms */ - private $mentor_sectors = null; - public function setMentoringSectors(ProfileMentoringSectors $sectors) - { - $this->mentor_sectors = $sectors; - } - - public function getMentoringSectors() + private $jobterms = null; + public function setJobTerms(ProfileJobTerms $jobterms) { - if ($this->mentor_sectors == null && !$this->fetched(self::FETCH_MENTOR_SECTOR)) { - $this->setMentoringSectors($this->getProfileField(self::FETCH_MENTOR_SECTOR)); - } - - if ($this->mentor_sectors == null) { - return array(); - } else { - return $this->mentor_sectors->sectors; - } + $this->jobterms = $jobterms; + $this->consolidateFields(); } private $mentor_countries = null; @@ -763,6 +813,72 @@ class Profile } } + /** List of job terms to specify mentoring */ + private $mentor_terms = null; + /** + * set job terms to specify mentoring + * @param $terms a ProfileMentoringTerms object listing terms only for this profile + */ + public function setMentoringTerms(ProfileMentoringTerms $terms) + { + $this->mentor_terms = $terms; + } + /** + * get all job terms that specify mentoring + * @return an array of JobTerms objects + */ + public function getMentoringTerms() + { + if ($this->mentor_terms == null && !$this->fetched(self::FETCH_MENTOR_TERMS)) { + $this->setMentoringTerms($this->getProfileField(self::FETCH_MENTOR_TERMS)); + } + + if ($this->mentor_terms == null) { + return array(); + } else { + return $this->mentor_terms->get(); + } + } + + /** DeltaTen + */ + + /** Find out whether this profile may take part to the "DeltaTen" operation. + * @param $role Which role to select ('young' or 'old') + * @return Boolean: whether it is enabled. + */ + const DELTATEN_YOUNG = 'young'; + const DELTATEN_OLD = 'old'; + public function isDeltaTenEnabled($role) + { + global $globals; + switch ($role) { + case self::DELTATEN_YOUNG: + return ($this->mainGrade() == UserFilter::GRADE_ING && $this->yearpromo() >= $globals->deltaten->first_promo_young); + case self::DELTATEN_OLD: + // Roughly compute the current promo in second year on the campus: + // Promo 2010 is in second year between 09/2011 and 08/2012 => use 2012. + // DeltaTen program begins around January of the second year. + $promo_on_platal = ((int) date('Y')) - 2; + return ($this->mainGrade() == UserFilter::GRADE_ING && $this->yearpromo() >= $globals->deltaten->first_promo_young - 10 && $this->yearpromo() <= $promo_on_platal - 10); + default: + Platal::assert(false, "Invalid DeltaTen role $role"); + } + } + + /** Retrieve the "Deltaten" message of the user. + * Returns "null" if the message is empty or the user is not taking part to the + * DeltaTen operation. + */ + public function getDeltatenMessage() + { + if ($this->isDeltaTenEnabled(self::DELTATEN_OLD)) { + return $this->deltaten_message; + } else { + return null; + } + } + /* Binets */ public function getBinets() @@ -825,6 +941,24 @@ class Profile return ($isOk && ($maxlen > 2 || $maxlen == strlen($_lastname))); } + /* Export to JSON + */ + public function export() + { + return array( + 'hrpid' => $this->hrid(), + 'display_name' => $this->shortName(), + 'full_name' => $this->fullName(), + 'directory_name' => $this->directory_name, + 'promo' => $this->promo(), + 'year_promo' => $this->yearpromo(), + 'is_active' => $this->isActive(), + 'first_name' => $this->firstName(), + 'last_name' => $this->lastName(), + 'is_female' => $this->isFemale(), + ); + } + private static function fetchProfileData(array $pids, $respect_order = true, $fields = 0x0000, $visibility = null) { if (count($pids) == 0) { @@ -841,48 +975,44 @@ class Profile $it = XDB::Iterator('SELECT p.pid, p.hrpid, p.xorg_id, p.ax_id, p.birthdate, p.birthdate_ref, p.next_birthday, p.deathdate, p.deathdate_rec, p.sex = \'female\' AS sex, - p.cv, p.medals_pub, p.alias_pub, p.email_directory, p.last_change, - p.nationality1, p.nationality2, p.nationality3, + IF ({?}, p.cv, NULL) AS cv, p.medals_pub, p.alias_pub, p.email_directory, + p.last_change, p.nationality1, p.nationality2, p.nationality3, IF (p.freetext_pub IN {?}, p.freetext, NULL) AS freetext, - pe.entry_year, pe.grad_year, + pe.entry_year, pe.grad_year, pe.promo_year, pe.program, pe.fieldid, IF ({?}, pse.text, NULL) AS section, - pn_f.name AS firstname, pn_l.name AS lastname, - IF( {?}, pn_n.name, NULL) AS nickname, - IF(pn_uf.name IS NULL, pn_f.name, pn_uf.name) AS firstname_ordinary, - IF(pn_ul.name IS NULL, pn_l.name, pn_ul.name) AS lastname_ordinary, - pd.yourself, pd.promo, pd.short_name, pd.directory_name AS full_name, - pd.directory_name, IF(pp.pub IN {?}, pp.display_tel, NULL) AS mobile, + ppn.firstname_main AS firstname, ppn.lastname_main AS lastname, IF ({?}, pn.name, NULL) AS nickname, + IF (ppn.firstname_ordinary = \'\', ppn.firstname_main, ppn.firstname_ordinary) AS firstname_ordinary, + IF (ppn.lastname_ordinary = \'\', ppn.firstname_main, ppn.lastname_ordinary) AS lastname_ordinary, + pd.yourself, pd.promo, pd.short_name, pd.public_name AS full_name, + pd.directory_name, pd.public_name, pd.private_name, + IF (pp.pub IN {?}, pp.display_tel, NULL) AS mobile, (ph.pub IN {?} AND ph.attach IS NOT NULL) AS has_photo, ph.x AS photo_width, ph.y AS photo_height, p.last_change < DATE_SUB(NOW(), INTERVAL 365 DAY) AS is_old, pm.expertise AS mentor_expertise, + IF ({?}, pdt.message, NULL) AS deltaten_message, ap.uid AS owner_id FROM profiles AS p INNER JOIN profile_display AS pd ON (pd.pid = p.pid) INNER JOIN profile_education AS pe ON (pe.pid = p.pid AND FIND_IN_SET(\'primary\', pe.flags)) LEFT JOIN profile_section_enum AS pse ON (pse.id = p.section) - INNER JOIN profile_name AS pn_f ON (pn_f.pid = p.pid - AND pn_f.typeid = ' . self::getNameTypeId('firstname', true) . ') - INNER JOIN profile_name AS pn_l ON (pn_l.pid = p.pid - AND pn_l.typeid = ' . self::getNameTypeId('lastname', true) . ') - LEFT JOIN profile_name AS pn_uf ON (pn_uf.pid = p.pid - AND pn_uf.typeid = ' . self::getNameTypeId('firstname_ordinary', true) . ') - LEFT JOIN profile_name AS pn_ul ON (pn_ul.pid = p.pid - AND pn_ul.typeid = ' . self::getNameTypeId('lastname_ordinary', true) . ') - LEFT JOIN profile_name AS pn_n ON (pn_n.pid = p.pid - AND pn_n.typeid = ' . self::getNameTypeId('nickname', true) . ') + INNER JOIN profile_public_names AS ppn ON (ppn.pid = p.pid) + LEFT JOIN profile_private_names AS pn ON (pn.pid = p.pid AND type = \'nickname\') LEFT JOIN profile_phones AS pp ON (pp.pid = p.pid AND pp.link_type = \'user\' AND tel_type = \'mobile\') LEFT JOIN profile_photos AS ph ON (ph.pid = p.pid) LEFT JOIN profile_mentor AS pm ON (pm.pid = p.pid) + LEFT JOIN profile_deltaten AS pdt ON (pdt.pid = p.pid) LEFT JOIN account_profiles AS ap ON (ap.pid = p.pid AND FIND_IN_SET(\'owner\', ap.perms)) WHERE p.pid IN {?} GROUP BY p.pid ' . $order, - $visibility->levels(), - $visibility->isVisible(ProfileVisibility::VIS_PRIVATE), - $visibility->isVisible(ProfileVisibility::VIS_PRIVATE), - $visibility->levels(), - $visibility->levels(), + $visibility->isVisible(ProfileVisibility::VIS_PRIVATE), // CV + $visibility->levels(), // freetext + $visibility->isVisible(ProfileVisibility::VIS_PRIVATE), // section + $visibility->isVisible(ProfileVisibility::VIS_PRIVATE), // nickname + $visibility->levels(), // mobile + $visibility->levels(), // photo + $visibility->isVisible(ProfileVisibility::VIS_PRIVATE), // deltaten_message $pids ); return new ProfileIterator($it, $pids, $fields, $visibility); @@ -989,55 +1119,101 @@ class Profile || $name == self::DN_SHORT || $name == self::DN_SORT; } - public static function getNameTypeId($type, $for_sql = false) - { - if (!S::has('name_types')) { - $table = XDB::fetchAllAssoc('type', 'SELECT id, type - FROM profile_name_enum'); - S::set('name_types', $table); - } else { - $table = S::v('name_types'); - } - if ($for_sql) { - return XDB::escape($table[$type]); - } else { - return $table[$type]; - } - } - - public static function rebuildSearchTokens($pid) - { - XDB::execute('DELETE FROM search_name - WHERE pid = {?}', - $pid); - $keys = XDB::iterator("SELECT CONCAT(n.particle, n.name) AS name, e.score, - FIND_IN_SET('public', e.flags) AS public - FROM profile_name AS n - INNER JOIN profile_name_enum AS e ON (n.typeid = e.id) - WHERE n.pid = {?}", - $pid); - + /** Returns the closest "accounts only" name type for $name + */ + public static function getAccountEquivalentName($name) + { + switch ($name) + { + case self::DN_DIRECTORY: + case self::DN_SORT: + return 'directory_name'; + case self::DN_FULL: + case self::DN_PUBLIC: + return 'full_name'; + case self::DN_PRIVATE: + case self::DN_SHORT: + case self::DN_YOURSELF: + default: + return 'display_name'; + } + } + + public static function rebuildSearchTokens($pids, $transaction = true) + { + require_once 'name.func.inc.php'; + if (!is_array($pids)) { + $pids = array($pids); + } + $keys = XDB::iterator("(SELECT pid, name, type, IF(type = 'nickname', 2, 1) AS score, '' AS public + FROM profile_private_names + WHERE pid IN {?}) + UNION + (SELECT pid, lastname_main, 'lastname' AS type, 10 AS score, 'public' AS public + FROM profile_public_names + WHERE lastname_main != '' AND pid IN {?}) + UNION + (SELECT pid, lastname_marital, 'lastname' AS type, 10 AS score, 'public' AS public + FROM profile_public_names + WHERE lastname_marital != '' AND pid IN {?}) + UNION + (SELECT pid, lastname_ordinary, 'lastname' AS type, 10 AS score, 'public' AS public + FROM profile_public_names + WHERE lastname_ordinary != '' AND pid IN {?}) + UNION + (SELECT pid, firstname_main, 'firstname' AS type, 10 AS score, 'public' AS public + FROM profile_public_names + WHERE firstname_main != '' AND pid IN {?}) + UNION + (SELECT pid, firstname_ordinary, 'firstname' AS type, 10 AS score, 'public' AS public + FROM profile_public_names + WHERE firstname_ordinary != '' AND pid IN {?}) + UNION + (SELECT pid, pseudonym, 'nickname' AS type, 10 AS score, 'public' AS public + FROM profile_public_names + WHERE pseudonym != '' AND pid IN {?})", + $pids, $pids, $pids, $pids, $pids, $pids, $pids); + $names = array(); while ($key = $keys->next()) { if ($key['name'] == '') { continue; } - $toks = preg_split('/[ \'\-]+/', $key['name']); + $pid = $key['pid']; + $toks = split_name_for_search($key['name']); + $toks = array_reverse($toks); + + /* Split the score between the tokens to avoid the user to be over-rated. + * Let says my user name is "Machin-Truc Bidule" and I also have a user named + * 'Machin Truc'. Distributing the score force "Machin Truc" to be displayed + * before "Machin-Truc" for both "Machin Truc" and "Machin" searches. + */ + $eltScore = ceil(((float)$key['score'])/((float)count($toks))); $token = ''; - $first = 5; - while ($toks) { - $token = strtolower(replace_accent(array_pop($toks) . $token)); - $score = ($toks ? 0 : 10 + $first) * ($key['score'] / 10); - XDB::execute('REPLACE INTO search_name (token, pid, soundex, score, flags) - VALUES ({?}, {?}, {?}, {?}, {?})', - $token, $pid, soundex_fr($token), $score, $key['public']); - $first = 0; + foreach ($toks as $tok) { + $token = $tok . $token; + $names["$pid-$token"] = XDB::format('({?}, {?}, {?}, {?}, {?}, {?})', + $token, $pid, soundex_fr($token), + $eltScore, $key['public'], $key['type']); } } + if ($transaction) { + XDB::startTransaction(); + } + XDB::execute('DELETE FROM search_name + WHERE pid IN {?}', + $pids); + if (count($names) > 0) { + XDB::rawExecute('INSERT INTO search_name (token, pid, soundex, score, flags, general_type) + VALUES ' . implode(', ', $names)); + } + if ($transaction) { + XDB::commit(); + } } /** The school identifier consists of 6 digits. The first 3 represent the * promotion entry year. The last 3 indicate the student's rank. - * + * * Our identifier consists of 8 digits and both half have the same role. * This enables us to deal with bigger promotions and with a wider range * of promotions. @@ -1093,6 +1269,8 @@ class ProfileIterator implements PlIterator private $fields; private $visibility; + const FETCH_ALL = 0x000033F; // FETCH_ADDRESSES | FETCH_CORPS | FETCH_EDU | FETCH_JOBS | FETCH_MEDALS | FETCH_NETWORKING | FETCH_PHONES | FETCH_JOB_TERMS + public function __construct(PlIterator $it, array $pids, $fields = 0x0000, ProfileVisibility $visibility = null) { require_once 'profilefields.inc.php'; @@ -1111,39 +1289,12 @@ class ProfileIterator implements PlIterator $callbacks[0] = PlIteratorUtils::arrayValueCallback('pid'); $cb = PlIteratorUtils::objectPropertyCallback('pid'); - if ($fields & Profile::FETCH_ADDRESSES) { - $callbacks[Profile::FETCH_ADDRESSES] = $cb; - $subits[Profile::FETCH_ADDRESSES] = new ProfileFieldIterator('ProfileAddresses', $pids, $visibility); - } - - if ($fields & Profile::FETCH_CORPS) { - $callbacks[Profile::FETCH_CORPS] = $cb; - $subits[Profile::FETCH_CORPS] = new ProfileFieldIterator('ProfileCorps', $pids, $visibility); - } - - if ($fields & Profile::FETCH_EDU) { - $callbacks[Profile::FETCH_EDU] = $cb; - $subits[Profile::FETCH_EDU] = new ProfileFieldIterator('ProfileEducation', $pids, $visibility); - } - - if ($fields & Profile::FETCH_JOBS) { - $callbacks[Profile::FETCH_JOBS] = $cb; - $subits[Profile::FETCH_JOBS] = new ProfileFieldIterator('ProfileJobs', $pids, $visibility); - } - - if ($fields & Profile::FETCH_MEDALS) { - $callbacks[Profile::FETCH_MEDALS] = $cb; - $subits[Profile::FETCH_MEDALS] = new ProfileFieldIterator('ProfileMedals', $pids, $visibility); - } - - if ($fields & Profile::FETCH_NETWORKING) { - $callbacks[Profile::FETCH_NETWORKING] = $cb; - $subits[Profile::FETCH_NETWORKING] = new ProfileFieldIterator('ProfileNetworking', $pids, $visibility); - } - - if ($fields & Profile::FETCH_PHONES) { - $callbacks[Profile::FETCH_PHONES] = $cb; - $subits[Profile::FETCH_PHONES] = new ProfileFieldIterator('ProfilePhones', $pids, $visibility); + $fields = $fields & self::FETCH_ALL; + for ($field = 1; $field < $fields; $field *= 2) { + if (($fields & $field) ) { + $callbacks[$field] = $cb; + $subits[$field] = new ProfileFieldIterator($field, $pids, $visibility); + } } $this->iterator = PlIteratorUtils::parallelIterator($subits, $callbacks, 0); @@ -1169,6 +1320,9 @@ class ProfileIterator implements PlIterator if ($this->hasData(Profile::FETCH_JOBS, $vals)) { $pf->setJobs($vals[Profile::FETCH_JOBS]); } + if ($this->hasData(Profile::FETCH_JOB_TERMS, $vals)) { + $pf->setJobTerms($vals[Profile::FETCH_JOB_TERMS]); + } if ($this->hasData(Profile::FETCH_CORPS, $vals)) { $pf->setCorps($vals[Profile::FETCH_CORPS]);