X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=include%2Fprofilefields.inc.php;h=c91403d763344ac620ca0512577a2ebd9ed1d7b3;hb=a19178e9a93c4eb3eb750845e85f87f2294ed1e4;hp=815b4388f8ef969ea7af58d188b3b852cbd626ea;hpb=f35e9630313970bb7124b4b466ef562a26522c76;p=platal.git diff --git a/include/profilefields.inc.php b/include/profilefields.inc.php index 815b438..c91403d 100644 --- a/include/profilefields.inc.php +++ b/include/profilefields.inc.php @@ -25,6 +25,18 @@ */ abstract class ProfileField { + public static $fields = array( + Profile::FETCH_ADDRESSES => 'ProfileAddresses', + Profile::FETCH_CORPS => 'ProfileCorps', + Profile::FETCH_EDU => 'ProfileEducation', + Profile::FETCH_JOBS => 'ProfileJobs', + Profile::FETCH_MEDALS => 'ProfileMedals', + Profile::FETCH_NETWORKING => 'ProfileNetworking', + Profile::FETCH_PHONES => 'ProfilePhones', + Profile::FETCH_MENTOR_SECTOR => 'ProfileMentoringSectors', + Profile::FETCH_MENTOR_COUNTRY => 'ProfileMentoringCountries', + ); + /** The profile to which this field belongs */ public $pid; @@ -36,12 +48,12 @@ abstract class ProfileField * @return a PlIterator yielding data suitable for a "new ProfileBlah($data)" * XXX MUST be reimplemented for each kind of ProfileField */ - public static function fetchData(array $pids, $visibility) + public static function fetchData(array $pids, ProfileVisibility $visibility) { return PlIteratorUtils::emptyIterator(); } - public static function buildForPID($cls, $pid, $visibility) + public static function buildForPID($cls, $pid, ProfileVisibility $visibility) { $res = self::buildFromPIDs($cls, array($pid), $visibility); return array_pop($res); @@ -53,7 +65,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, $visibility) + public static function buildFromPIDs($cls, array $pids, ProfileVisibility $visibility) { $it = new ProfileFieldIterator($cls, $pids, $visibility); $res = array(); @@ -63,7 +75,7 @@ abstract class ProfileField return $res; } - public static function getForPID($cls, $pid, $visibility) + public static function getForPID($cls, $pid, ProfileVisibility $visibility) { $it = new ProfileFieldIterator($cls, array($pid), $visibility); return $it->next(); @@ -77,7 +89,7 @@ class ProfileFieldIterator implements PlIterator private $data; private $cls; - public function __construct($cls, array $pids, $visibility) + public function __construct($cls, array $pids, ProfileVisibility $visibility) { $this->data = call_user_func(array($cls, 'fetchData'), $pids, $visibility); $this->cls = $cls; @@ -213,6 +225,11 @@ class Job return $this->phones; } + public function address() + { + return $this->address; + } + public function addPhone(Phone &$phone) { if ($phone->link_type == Phone::LINK_JOB && $phone->link_id == $this->id && $phone->pid == $this->pid) { @@ -249,6 +266,8 @@ class Address public $administrativeArea; public $country; + public $comment; + private $phones = array(); /** Fields are: @@ -259,6 +278,7 @@ class Address foreach ($data as $key => $val) { $this->$key = $val; } + $this->flags = new PlFlagSet($this->flags); } public function addPhone(Phone &$phone) @@ -273,9 +293,9 @@ class Address return $this->phones; } - public function hasFlags($flags) + public function hasFlag($flag) { - return $flags & $this->flags; + return $this->flags->hasFlag($flag); } } // }}} @@ -299,6 +319,8 @@ class Education public $degree_short; public $degree_level; + public $field; + public function __construct(array $data) { foreach ($data as $key => $val) { @@ -317,7 +339,6 @@ class ProfileEducation extends ProfileField public function __construct(PlInnerSubIterator $it) { $this->pid = $it->value(); - $this->visibility = Profile::VISIBILITY_PUBLIC; while ($edu = $it->next()) { $this->educations[$edu['id']] = new Education($edu); } @@ -338,6 +359,8 @@ class ProfileEducation extends ProfileField (($flags & Profile::EDUCATION_FINISHED) && $edu->grad_year <= $year) || (($flags & Profile::EDUCATION_CURRENT) && $edu->grad_year > $year) + || + ($flags & Profile::EDUCATION_ALL) ) { $educations[$id] = $edu; ++$nb; @@ -346,10 +369,10 @@ class ProfileEducation extends ProfileField break; } } - return PlIteratorUtils::fromArray($educations, 1, true); + return $educations; } - public static function fetchData(array $pids, $visibility) + public static function fetchData(array $pids, ProfileVisibility $visibility) { $data = XDB::iterator('SELECT pe.id, pe.pid, pe.entry_year, pe.grad_year, pe.program, pe.flags, @@ -380,18 +403,19 @@ class ProfileMedals extends ProfileField { $this->pid = $it->value(); while ($medal = $it->next()) { - $this->medals[$medal['mid']] = $medal['gid']; + $this->medals[$medal['mid']] = $medal; } } - public static function fetchData(array $pids, $visibility) + public static function fetchData(array $pids, ProfileVisibility $visibility) { - $data = XDB::iterator('SELECT pm.pid, pm.mid, pm.gid + $data = XDB::iterator('SELECT pm.pid, pm.mid, pm.gid, pme.text, pme.img 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) WHERE pm.pid IN {?} AND p.medals_pub IN {?} ORDER BY ' . XDB::formatCustomOrder('pm.pid', $pids), - $pids, $visibility); + $pids, $visibility->levels()); return PlIteratorUtils::subIterator($data, PlIteratorUtils::arrayValueCallback('pid')); } @@ -409,14 +433,14 @@ class ProfileNetworking extends ProfileField } } - public static function fetchData(array $pids, $visibility) + public static function fetchData(array $pids, ProfileVisibility $visibility) { $data = XDB::iterator('SELECT pid, nwid, address, network_type FROM profile_networking WHERE pid IN {?} AND pub IN {?} ORDER BY ' . XDB::formatCustomOrder('pid', $pids) . ', network_type, nwid', - $pids, $visibility); + $pids, $visibility->levels()); return PlIteratorUtils::subIterator($data, PlIteratorUtils::arrayValueCallback('pid')); } @@ -428,9 +452,9 @@ class ProfileNetworking extends ProfileField foreach ($this->networks as $id => $nw) { // XXX hardcoded reference to web site index if ( - (($flags & self::NETWORKING_WEB) && $nw['network_type'] == 0) + (($flags & Profile::NETWORKING_WEB) && $nw['network_type'] == 0) || - (! ($flags & self::NETWORKING_WEB)) + (! ($flags & Profile::NETWORKING_WEB)) ) { $nws[$id] = $nw; ++$nb; @@ -439,65 +463,104 @@ class ProfileNetworking extends ProfileField break; } } - return PlIteratorUtils::fromArray($nws, 1, true); + return $nws; } } // }}} -// {{{ class ProfilePhoto [ Field ] -class ProfilePhoto extends ProfileField +// {{{ class ProfileCorps [ Field ] +class ProfileCorps extends ProfileField { - public $pic; + public $original; + public $current; + + public $original_name; + public $original_abbrev; + public $original_still_exists; + + public $current_name; + public $current_abbrev; + public $current_still_exists; + public $current_rank; + public $current_rank_abbrev; public function __construct(array $data) { - if ($data == null || count($data) == 0) { - $this->pic = null; - } else { - $this->pid = $data['pid']; - $this->pic = PlImage::fromDATA($data['attach'], - $data['attachmime'], - $data['x'], - $data['y']); + foreach ($data as $key => $val) { + $this->$key = $val; } } - public static function fetchData(array $pids, $visibility) + public static function fetchData(array $pids, ProfileVisibility $visibility) { - $data = XDB::iterator('SELECT * - FROM profile_photos - WHERE pid IN {?} AND attachmime IN (\'jpeg\', \'png\') AND pub IN {?} + $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, + pceo.still_exists AS original_still_exists, + pcec.name AS current_name, pcec.abbreviation AS current_abbrev, + pcec.still_exists AS current_still_exists, + pcrec.name AS current_rank, pcrec.abbreviation AS current_rank_abbrev, + rankid + FROM profile_corps AS pc + 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 {?} ORDER BY ' . XDB::formatCustomOrder('pid', $pids), - $pids, $visibility); + $pids, $visibility->levels()); return $data; } } // }}} -// {{{ class ProfileCorps [ Field ] -class ProfileCorps extends ProfileField +// {{{ class ProfileMentoringSectors [ Field ] +class ProfileMentoringSectors extends ProfileField { - public $original; - public $current; - public $rank; + public $sectors = array(); - public function __construct(array $data) + public function __construct(PlInnerSubIterator $it) { - $this->original = $data['original_corpsid']; - $this->current = $data['current_corpsid']; - $this->rank = $data['rankid']; - $this->visibility = $data['corps_pub']; + $this->pid = $it->value(); + while ($sector = $it->next()) { + $this->sectors[] = $sector; + } } - public static function fetchData(array $pids, $visibility) + public static function fetchData(array $pids, ProfileVisibility $visibility) { - $data = XDB::iterator('SELECT pid, original_corpsid, current_corpsid, - rankid - FROM profile_corps - WHERE pid IN {?} AND corps_pub IN {?} - ORDER BY ' . XDB::formatCustomOrder('pid', $pids), - $pids, $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 $data; + return PlIteratorUtils::subIterator($data, PlIteratorUtils::arrayValueCallback('pid')); + } +} +// }}} +// {{{ class ProfileMentoringCountries [ Field ] +class ProfileMentoringCountries extends ProfileField +{ + public $countries = array(); + + public function __construct(PlInnerSubIterator $it) + { + $this->pid = $it->value(); + while ($country = $it->next()) { + $this->countries[$country['id']] = $country['name']; + } + } + + public static function fetchData(array $pids, ProfileVisibility $visibility) + { + $data = XDB::iterator('SELECT pmc.pid, pmc.country AS id, gc.countryFR 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 {?} + ORDER BY ' . XDB::formatCustomOrder('pmc.pid', $pids), + $pids); + + return PlIteratorUtils::subIterator($data, PlIteratorUtils::arrayValueCallback('pid')); } } // }}} @@ -529,7 +592,17 @@ class ProfileAddresses extends ProfileField $res = array(); $nb = 0; foreach ($this->addresses as $addr) { - if ($addr->hasFlags($flags)) { + if ( + ($flags & Profile::ADDRESS_ALL) + || + (($flags & Profile::ADDRESS_MAIN) && $addr->hasFlag('current')) + || + (($flags & Profile::ADDRESS_POSTAL) && $addr->hasFlag('mail')) + || + (($flags & Profile::ADDRESS_PERSO) && $addr->link_type == 'home') + || + (($flags & Profile::ADDRESS_PRO) && $addr->link_type == 'job') + ) { $res[] = $addr; $nb++; } @@ -537,14 +610,14 @@ class ProfileAddresses extends ProfileField break; } } - return PlIteratorUtils::fromArray($res, 1, true); + return $res; } - public static function fetchData(array $pids, $visibility) + public static function fetchData(array $pids, ProfileVisibility $visibility) { $data = XDB::iterator('SELECT pa.id, pa.pid, pa.flags, pa.type AS link_type, IF(pa.type = \'home\', pid, jobid) AS link_id, - pa.text, pa.postalCode, pa.latitude, pa.longitude, + pa.text, pa.postalCode, pa.latitude, pa.longitude, pa.comment, gl.name AS locality, gas.name AS subAdministrativeArea, ga.name AS administrativeArea, gc.countryFR AS country FROM profile_addresses AS pa @@ -554,7 +627,7 @@ class ProfileAddresses extends ProfileField LEFT JOIN geoloc_countries AS gc ON (gc.iso_3166_1_a2 = pa.countryId) WHERE pa.pid in {?} AND pa.pub IN {?} ORDER BY ' . XDB::formatCustomOrder('pid', $pids), - $pids, $visibility); + $pids, $visibility->levels()); return PlIteratorUtils::subIterator($data, PlIteratorUtils::arrayValueCallback('pid')); } @@ -562,7 +635,7 @@ class ProfileAddresses extends ProfileField public function addPhones(ProfilePhones $phones) { $p = $phones->get(0); - while ($phone = $p->next()) { + foreach ($p as $phone) { if ($phone->link_type == Phone::LINK_ADDRESS && array_key_exists($phone->link_id, $this->addresses)) { $this->addresses[$phone->link_id]->addPhone($phone); } @@ -594,16 +667,16 @@ class ProfilePhones extends ProfileField break; } } - return PlIteratorUtils::fromArray($phones, 1, true); + return $phones; } - public static function fetchData(array $pids, $visibility) + public static function fetchData(array $pids, ProfileVisibility $visibility) { $data = XDB::iterator('SELECT tel_type AS type, search_tel AS search, display_tel AS display, link_type, comment FROM profile_phones WHERE pid IN {?} AND pub IN {?} ORDER BY ' . XDB::formatCustomOrder('pid', $pids), - $pids, $visibility); + $pids, $visibility->levels()); return PlIteratorUtils::subIterator($data, PlIteratorUtils::arrayValueCallback('pid')); } } @@ -621,7 +694,7 @@ class ProfileJobs extends ProfileField } } - public static function fetchData(array $pids, $visibility) + public static function fetchData(array $pids, ProfileVisibility $visibility) { CompanyList::preload($pids); $data = XDB::iterator('SELECT pj.id, pj.pid, pj.description, pj.url as user_site, @@ -635,7 +708,7 @@ class ProfileJobs extends ProfileField WHERE pj.pid IN {?} AND pj.pub IN {?} ORDER BY ' . XDB::formatCustomOrder('pid', $pids) . ', pj.id', - $visibility, $pids, $visibility); + $visibility->levels(), $pids, $visibility->levels()); return PlIteratorUtils::subIterator($data, PlIteratorUtils::arrayValueCallback('pid')); } @@ -650,13 +723,13 @@ class ProfileJobs extends ProfileField break; } } - return PlIteratorUtils::fromArray($jobs, 1, true); + return $jobs; } public function addPhones(ProfilePhones $phones) { $p = $phones->get(0); - while ($phone = $p->next()) { + foreach ($p as $phone) { if ($phone->link_type == Phone::LINK_JOB && array_key_exists($phone->link_id, $this->jobs)) { $this->jobs[$phone->link_id]->addPhones($phone); } @@ -666,7 +739,7 @@ class ProfileJobs extends ProfileField public static function addAddresses(ProfileAddresses $addresses) { $a = $addresses->get(Profile::ADDRESS_PRO); - while ($address = $a->next()) { + foreach ($a as $address) { if ($address->link_type == Address::LINK_JOB && array_key_exists($address->link_id, $this->jobs)) { $this->jobs[$address->link_id]->setAddress($address); }