X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=include%2Fprofilefields.inc.php;h=8a3ace079e43e20d4697564a47c43322be7e54a6;hb=d403dec425845818c5e614a14527d4b1779ecace;hp=8d3d59f259bfa66dc8cfeaec51f54c058514e389;hpb=c76545c351fae4e2298624ff9ee5bf854dc5a5b6;p=platal.git diff --git a/include/profilefields.inc.php b/include/profilefields.inc.php index 8d3d59f..8a3ace0 100644 --- a/include/profilefields.inc.php +++ b/include/profilefields.inc.php @@ -1,6 +1,6 @@ 'ProfileMedals', Profile::FETCH_NETWORKING => 'ProfileNetworking', Profile::FETCH_PHONES => 'ProfilePhones', - Profile::FETCH_MENTOR_SECTOR => 'ProfileMentoringSectors', Profile::FETCH_MENTOR_COUNTRY => 'ProfileMentoringCountries', Profile::FETCH_JOB_TERMS => 'ProfileJobTerms', Profile::FETCH_MENTOR_TERMS => 'ProfileMentoringTerms', + Profile::FETCH_SKILL => 'ProfileSkills', + Profile::FETCH_LANGUAGE => 'ProfileLanguages', + Profile::FETCH_PARTNER => 'ProfilePartnerSharing', ); /** The profile to which this field belongs @@ -51,12 +53,12 @@ abstract class ProfileField * * MUST be reimplemented for each kind of ProfileField. */ - public static function fetchData(array $pids, ProfileVisibility $visibility) + public static function fetchData(array $pids, Visibility $visibility) { return PlIteratorUtils::emptyIterator(); } - public static function buildForPID($cls, $pid, ProfileVisibility $visibility) + public static function buildForPID($cls, $pid, Visibility $visibility) { $res = self::buildFromPIDs($cls, array($pid), $visibility); return array_pop($res); @@ -68,7 +70,7 @@ abstract class ProfileField * @param $visibility An array of allowed visibility contexts * @return An array of $pid => ProfileField */ - public static function buildFromPIDs($cls, array $pids, ProfileVisibility $visibility) + public static function buildFromPIDs($cls, array $pids, Visibility $visibility) { $it = new ProfileFieldIterator($cls, $pids, $visibility); $res = array(); @@ -78,7 +80,7 @@ abstract class ProfileField return $res; } - public static function getForPID($cls, $pid, ProfileVisibility $visibility) + public static function getForPID($cls, $pid, Visibility $visibility) { $it = new ProfileFieldIterator($cls, array($pid), $visibility); return $it->next(); @@ -92,7 +94,7 @@ class ProfileFieldIterator implements PlIterator private $data; private $cls; - public function __construct($cls, array $pids, ProfileVisibility $visibility) + public function __construct($cls, array $pids, Visibility $visibility) { if (is_numeric($cls) && isset(ProfileField::$fields[$cls])) { $cls = ProfileField::$fields[$cls]; @@ -149,14 +151,14 @@ class Company } } - public function setPhone(Phone &$phone) + public function setPhone(Phone $phone) { - if ($phone->linkType() == Phone::LINK_COMPANY && $phone->linkId() == $this->id) { + if ($phone->link_type == Phone::LINK_COMPANY && $phone->link_id == $this->id) { $this->phone = $phone; } } - public function setAddress(Address &$address) + public function setAddress(Address $address) { if ($address->type == Address::LINK_COMPANY && $address->jobid == $this->id) { $this->address = $address; @@ -193,9 +195,8 @@ class Job public $user_site; public $user_email; - public $sector; - public $subsector; - public $subsubsector; + public $pub; + public $email_pub; /** Fields are: * pid, id, company_id, description, url, email @@ -207,8 +208,12 @@ class Job } $this->company = CompanyList::get($this->jobid); if (is_null($this->company)) { - $entreprise = ProfileValidate::get_typed_requests($this->pid, 'entreprise'); - $this->company = new Company(array('name' => $entreprise[$this->id]->name)); + $entreprises = ProfileValidate::get_typed_requests($this->pid, 'entreprise'); + foreach ($entreprises as $entreprise) { + if ($entreprise->id == $this->id) { + $this->company = new Company(array('name' => $entreprise->name)); + } + } } } @@ -222,21 +227,21 @@ class Job return $this->address; } - public function addPhone(Phone &$phone) + public function addPhone(Phone $phone) { - if ($phone->linkType() == Phone::LINK_JOB && $phone->linkId() == $this->id && $phone->pid() == $this->pid) { + if ($phone->link_type == Phone::LINK_JOB && $phone->link_id == $this->id && $phone->pid == $this->pid) { $this->phones[$phone->uniqueId()] = $phone; } } public function setAddress(Address $address) { - if ($address->type == Address::LINK_JOB && $address->jobid == $this->id && $address->pid == $this->pid) { + if ($address->type == Address::LINK_JOB && $address->id == $this->id && $address->pid == $this->pid) { $this->address = $address; } } - public function addTerm(JobTerm &$term) + public function addTerm(JobTerm $term) { $this->terms[$term->jtid] = $term; } @@ -334,12 +339,12 @@ class ProfileEducation extends ProfileField return $educations; } - public static function fetchData(array $pids, ProfileVisibility $visibility) + public static function fetchData(array $pids, Visibility $visibility) { $data = XDB::iterator('SELECT pe.id, pe.pid, pe.entry_year, pe.grad_year, pe.program, pe.flags, pee.name AS school, pee.abbreviation AS school_short, - pee.url AS school_url, gc.countryFR AS country, + pee.url AS school_url, gc.country, pede.degree, pede.abbreviation AS degree_short, pede.level AS degree_level, pefe.field FROM profile_education AS pe @@ -369,16 +374,17 @@ class ProfileMedals extends ProfileField } } - public static function fetchData(array $pids, ProfileVisibility $visibility) + public static function fetchData(array $pids, Visibility $visibility) { - $data = XDB::iterator('SELECT pm.pid, pm.mid, pm.gid, pme.text, pme.img, pmge.text AS grade + $data = XDB::iterator('SELECT pm.pid, pm.mid, pm.gid, pme.text, pme.img, pmge.text AS grade, pm.level FROM profile_medals AS pm LEFT JOIN profiles AS p ON (pm.pid = p.pid) LEFT JOIN profile_medal_enum AS pme ON (pme.id = pm.mid) LEFT JOIN profile_medal_grade_enum AS pmge ON (pmge.mid = pm.mid AND pmge.gid = pm.gid) - WHERE pm.pid IN {?} AND p.medals_pub IN {?} + LEFT JOIN profile_visibility_enum AS pve ON (pve.access_level = {?}) + WHERE pm.pid IN {?} AND pve.best_display_level + 0 <= p.medals_pub + 0 ORDER BY ' . XDB::formatCustomOrder('pm.pid', $pids), - $pids, $visibility->levels()); + $visibility->level(), $pids); return PlIteratorUtils::subIterator($data, PlIteratorUtils::arrayValueCallback('pid')); } @@ -398,15 +404,16 @@ class ProfileNetworking extends ProfileField } } - public static function fetchData(array $pids, ProfileVisibility $visibility) + public static function fetchData(array $pids, Visibility $visibility) { $data = XDB::iterator('SELECT pid, id, address, pne.nwid, pne.network_type, pne.link, pne.name FROM profile_networking AS pn LEFT JOIN profile_networking_enum AS pne USING(nwid) - WHERE pid IN {?} AND pub IN {?} + LEFT JOIN profile_visibility_enum AS pve ON (pve.access_level = {?}) + WHERE pn.pid IN {?} AND pve.best_display_level + 0 <= pn.pub + 0 ORDER BY ' . XDB::formatCustomOrder('pid', $pids) . ', pn.nwid, id', - $pids, $visibility->levels()); + $visibility->level(), $pids); return PlIteratorUtils::subIterator($data, PlIteratorUtils::arrayValueCallback('pid')); } @@ -454,7 +461,7 @@ class ProfileCorps extends ProfileField } } - public static function fetchData(array $pids, ProfileVisibility $visibility) + public static function fetchData(array $pids, Visibility $visibility) { $data = XDB::iterator('SELECT pc.pid, pc.original_corpsid AS original, pc.current_corpsid AS current, pceo.name AS original_name, pceo.abbreviation AS original_abbrev, @@ -467,41 +474,15 @@ class ProfileCorps extends ProfileField LEFT JOIN profile_corps_enum AS pceo ON (pceo.id = pc.original_corpsid) LEFT JOIN profile_corps_enum AS pcec ON (pcec.id = pc.current_corpsid) LEFT JOIN profile_corps_rank_enum AS pcrec ON (pcrec.id = pc.rankid) - WHERE pc.pid IN {?} AND pc.corps_pub IN {?} AND pceo.id != 1 + LEFT JOIN profile_visibility_enum AS pve ON (pve.access_level = {?}) + WHERE pc.pid IN {?} AND pve.best_display_level + 0 <= pc.corps_pub + 0 AND pceo.id != 1 ORDER BY ' . XDB::formatCustomOrder('pid', $pids), - $pids, $visibility->levels()); + $visibility->level(), $pids); return $data; } } // }}} -// {{{ class ProfileMentoringSectors [ Field ] -class ProfileMentoringSectors extends ProfileField -{ - public $sectors = array(); - - public function __construct(PlInnerSubIterator $it) - { - $this->pid = $it->value(); - while ($sector = $it->next()) { - $this->sectors[] = $sector; - } - } - - public static function fetchData(array $pids, ProfileVisibility $visibility) - { - $data = XDB::iterator('SELECT pms.pid, pjse.name AS sector, pjsse.name AS subsector - FROM profile_mentor_sector AS pms - LEFT JOIN profile_job_sector_enum AS pjse ON (pjse.id = pms.sectorid) - LEFT JOIN profile_job_subsector_enum AS pjsse ON (pjsse.id = pms.subsectorid) - WHERE pms.pid IN {?} - ORDER BY ' . XDB::formatCustomOrder('pms.pid', $pids), - $pids); - - return PlIteratorUtils::subIterator($data, PlIteratorUtils::arrayValueCallback('pid')); - } -} -// }}} // {{{ class ProfileMentoringCountries [ Field ] class ProfileMentoringCountries extends ProfileField { @@ -515,9 +496,9 @@ class ProfileMentoringCountries extends ProfileField } } - public static function fetchData(array $pids, ProfileVisibility $visibility) + public static function fetchData(array $pids, Visibility $visibility) { - $data = XDB::iterator('SELECT pmc.pid, pmc.country AS id, gc.countryFR AS name + $data = XDB::iterator('SELECT pmc.pid, pmc.country AS id, gc.country AS name FROM profile_mentor_country AS pmc LEFT JOIN geoloc_countries AS gc ON (gc.iso_3166_1_a2 = pmc.country) WHERE pmc.pid IN {?} @@ -561,9 +542,9 @@ class ProfileAddresses extends ProfileField return $addresses; } - public static function fetchData(array $pids, ProfileVisibility $visibility) + public static function fetchData(array $pids, Visibility $visibility) { - $it = Address::iterate($pids, array(), array(), $visibility->levels()); + $it = Address::iterate($pids, array(), array(), $visibility); return PlIteratorUtils::subIterator($it->value(), PlIteratorUtils::arrayValueCallback('pid')); } @@ -571,8 +552,13 @@ class ProfileAddresses extends ProfileField { $p = $phones->get(Profile::PHONE_LINK_ADDRESS | Profile::PHONE_TYPE_ANY); foreach ($p as $phone) { - if ($phone->linkType() == Phone::LINK_ADDRESS && array_key_exists($phone->linkId(), $this->addresses)) { - $this->addresses[$phone->linkId()]->addPhone($phone); + /* We must iterate on the addresses because id is not uniq thus, + * $this->addresse[$phone->link_id] is invalid. + */ + foreach ($this->addresses as $address) { + if ($address->type == Address::LINK_PROFILE && $address->id == $phone->link_id) { + $address->addPhone($phone); + } } } } @@ -607,9 +593,9 @@ class ProfilePhones extends ProfileField return $phones; } - public static function fetchData(array $pids, ProfileVisibility $visibility) + public static function fetchData(array $pids, Visibility $visibility) { - $it = Phone::iterate($pids, array(), array(), $visibility->levels()); + $it = Phone::iterate($pids, array(), array(), $visibility); return PlIteratorUtils::subIterator($it->value(), PlIteratorUtils::arrayValueCallback('pid')); } } @@ -627,21 +613,15 @@ class ProfileJobs extends ProfileField } } - public static function fetchData(array $pids, ProfileVisibility $visibility) + public static function fetchData(array $pids, Visibility $visibility) { CompanyList::preload($pids); - $data = XDB::iterator('SELECT pj.id, pj.pid, pj.description, pj.url as user_site, - IF(pj.email_pub IN {?}, pj.email, NULL) AS user_email, - pj.jobid, pjse.name AS sector, pjsse.name AS subsector, - pjssse.name AS subsubsector - FROM profile_job AS pj - LEFT JOIN profile_job_sector_enum AS pjse ON (pjse.id = pj.sectorid) - LEFT JOIN profile_job_subsector_enum AS pjsse ON (pjsse.id = pj.subsectorid) - LEFT JOIN profile_job_subsubsector_enum AS pjssse ON (pjssse.id = pj.subsubsectorid) - WHERE pj.pid IN {?} AND pj.pub IN {?} - ORDER BY ' . XDB::formatCustomOrder('pid', $pids) . ', - pj.id', - $visibility->levels(), $pids, $visibility->levels()); + $data = XDB::iterator('SELECT id, pid, description, url as user_site, jobid, pub, IF(pve.best_display_level + 0 <= email_pub + 0, email, NULL) AS user_email, email_pub + FROM profile_job + LEFT JOIN profile_visibility_enum AS pve ON (pve.access_level = {?}) + WHERE pid IN {?} AND pve.best_display_level + 0 <= pub + 0 + ORDER BY ' . XDB::formatCustomOrder('pid', $pids) . ', id', + $visibility->level(), $pids); return PlIteratorUtils::subIterator($data, PlIteratorUtils::arrayValueCallback('pid')); } @@ -663,8 +643,8 @@ class ProfileJobs extends ProfileField { $p = $phones->get(Profile::PHONE_LINK_JOB | Profile::PHONE_TYPE_ANY); foreach ($p as $phone) { - if ($phone->linkType() == Phone::LINK_JOB && array_key_exists($phone->linkId(), $this->jobs)) { - $this->jobs[$phone->linkId()]->addPhone($phone); + if ($phone->link_type == Phone::LINK_JOB && array_key_exists($phone->link_id, $this->jobs)) { + $this->jobs[$phone->link_id]->addPhone($phone); } } } @@ -673,8 +653,8 @@ class ProfileJobs extends ProfileField { $a = $addresses->get(Profile::ADDRESS_PRO); foreach ($a as $address) { - if ($address->type == Address::LINK_JOB && array_key_exists($address->jobid, $this->jobs)) { - $this->jobs[$address->jobid]->setAddress($address); + if ($address->type == Address::LINK_JOB && array_key_exists($address->id, $this->jobs)) { + $this->jobs[$address->id]->setAddress($address); } } } @@ -691,7 +671,7 @@ class ProfileJobs extends ProfileField $terms = $jobterms->get(); foreach ($terms as $term) { if ($this->pid == $term->pid && array_key_exists($term->jid, $this->jobs)) { - $this->jobs[$term->jid]->addTerm(&$term); + $this->jobs[$term->jid]->addTerm($term); } } } @@ -715,15 +695,16 @@ class ProfileJobTerms extends ProfileField return $this->jobterms; } - public static function fetchData(array $pids, ProfileVisibility $visibility) + public static function fetchData(array $pids, Visibility $visibility) { $data = XDB::iterator('SELECT jt.jtid, jte.full_name, jt.pid, jt.jid FROM profile_job_term AS jt INNER JOIN profile_job AS j ON (jt.pid = j.pid AND jt.jid = j.id) LEFT JOIN profile_job_term_enum AS jte USING(jtid) - WHERE jt.pid IN {?} AND j.pub IN {?} + LEFT JOIN profile_visibility_enum AS pve ON (pve.access_level = {?}) + WHERE jt.pid IN {?} AND pve.best_display_level + 0 <= j.pub + 0 ORDER BY ' . XDB::formatCustomOrder('jt.pid', $pids), - $pids, $visibility->levels()); + $visibility->level(), $pids); return PlIteratorUtils::subIterator($data, PlIteratorUtils::arrayValueCallback('pid')); } } @@ -731,7 +712,7 @@ class ProfileJobTerms extends ProfileField // {{{ class ProfileMentoringTerms [ Field ] class ProfileMentoringTerms extends ProfileJobTerms { - public static function fetchData(array $pids, ProfileVisibility $visibility) + public static function fetchData(array $pids, Visibility $visibility) { $data = XDB::iterator('SELECT mt.jtid, jte.full_name, mt.pid FROM profile_mentor_term AS mt @@ -743,6 +724,105 @@ class ProfileMentoringTerms extends ProfileJobTerms } } // }}} +// {{{ class ProfileSkills [ Field ] +class ProfileSkills extends ProfileField +{ + public $skills = array(); + + public function __construct(PlInnerSubIterator $it) + { + $this->pid = $it->value(); + while ($skill = $it->next()) { + $this->skills[$skill['cid']] = $skill; + } + } + + public static function fetchData(array $pids, Visibility $visibility) + { + $data = XDB::iterator('SELECT ps.cid, pse.text_fr, ps.level, ps.pid + FROM profile_skills AS ps + INNER JOIN profile_skill_enum AS pse ON (pse.id = ps.cid) + WHERE ps.pid IN {?} + ORDER BY ' . XDB::formatCustomOrder('ps.pid', $pids), + $pids); + return PlIteratorUtils::subIterator($data, PlIteratorUtils::arrayValueCallback('pid')); + } +} +// }}} +// {{{ class ProfileLanguages [ Field ] +class ProfileLanguages extends ProfileField +{ + public $languages = array(); + + public function __construct(PlInnerSubIterator $it) + { + static $levels = array( + 1 => 'connaissance basique', + 2 => 'maîtrise des bases', + 3 => 'maîtrise limitée', + 4 => 'maîtrise générale', + 5 => 'bonne maîtrise', + 6 => 'maîtrise complète' + ); + + $this->pid = $it->value(); + while ($language = $it->next()) { + $this->languages[$language['lid']] = $language; + $this->languages[$language['lid']]['level'] = $levels[$language['level']]; + } + } + + public static function fetchData(array $pids, Visibility $visibility) + { + $data = XDB::iterator('SELECT ps.lid, pse.language, ps.level, ps.pid + FROM profile_langskills AS ps + INNER JOIN profile_langskill_enum AS pse ON (pse.iso_639_2b = ps.lid) + WHERE ps.pid IN {?} + ORDER BY ' . XDB::formatCustomOrder('ps.pid', $pids), + $pids); + return PlIteratorUtils::subIterator($data, PlIteratorUtils::arrayValueCallback('pid')); + } +} +// }}} +// {{{ class ProfilePartnerSharing [ Field ] +class ProfilePartnerSharing extends ProfileField +{ + public function __construct(PlInnerSubIterator $it) + { + require_once 'partnersharing.inc.php'; + + $this->pid = $it->value(); + while ($partner_settings = $it->next()) { + $settings = new PartnerSettings($partner_settings); + $this->partners_settings[$settings->partner->id] = $settings; + } + } + + public static function fetchData(array $pids, Visibility $visibility) + { + $data = XDB::iterator('SELECT ppss.pid, ppss.exposed_uid, ppss.sharing_level, + ppss.allow_email, ppss.partner_id, + ppse.shortname AS partner_shortname, + ppse.name AS partner_name, + ppse.url AS partner_url + FROM profile_partnersharing_settings AS ppss + LEFT JOIN profile_partnersharing_enum AS ppse ON (ppss.partner_id = ppse.id) + WHERE ppss.pid IN {?} + ORDER BY ' . XDB::formatCustomOrder('ppss.pid', $pids), + $pids); + return PlIteratorUtils::subIterator($data, PlIteratorUtils::arrayValueCallback('pid')); + } + + public function get($partner_id) + { + if (isset($this->partners_settings[$partner_id])) { + return $this->partners_settings[$partner_id]; + } else { + return PartnerSettings::getEmpty($partner_id); + } + } +} +// }}} // {{{ class CompanyList class CompanyList { @@ -764,8 +844,7 @@ class CompanyList } $it = XDB::iterator('SELECT pje.id, pje.name, pje.acronym, pje.url, - pa.flags, pa.text, pa.postalCode, pa.countryId, - pa.type, pa.pub + pa.flags, pa.text, pa.type, pa.pub FROM profile_job_enum AS pje LEFT JOIN profile_addresses AS pa ON (pje.id = pa.jobid AND pa.type = \'hq\') ' . $join . ' @@ -783,9 +862,9 @@ class CompanyList // Add phones to hq if (count($newcompanies)) { - $it = Phone::iterate(array(), array(Phone::LINK_COMPANY), $newcompanies); + $it = Phone::iterate(array(), array(Phone::LINK_COMPANY), $newcompanies, Visibility::defaultForRead()); while ($phone = $it->next()) { - self::$companies[$phone->linkId()]->setPhone($phone); + self::$companies[$phone->link_id]->setPhone($phone); } } @@ -796,12 +875,16 @@ class CompanyList static public function get($id) { - if (!array_key_exists($id, self::$companies)) { + if (!is_null($id) && !array_key_exists($id, self::$companies)) { self::preload(); } - return self::$companies[$id]; + if (isset(self::$companies[$id])) { + return self::$companies[$id]; + } + return null; } } +// }}} -// 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: ?>