X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=include%2Fprofilefields.inc.php;h=d2de1326d5d7671b3425e93725b26633f63ca91a;hb=1f5cd0048509cf752b1a95106367ca0b1a75683c;hp=dda573d9abd33ebbf9f35a5264d871de24d9fa8d;hpb=790c52a896487802d204135b9c0fb5f9cd43f9ea;p=platal.git diff --git a/include/profilefields.inc.php b/include/profilefields.inc.php index dda573d..d2de132 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; @@ -139,6 +151,42 @@ class Phone $this->$key = $val; } } + + public function hasFlags($flags) { + return $this->hasType($flags) && $this->hasLink($flags); + } + + /** Returns true if this phone's type matches the flags + */ + public function hasType($flags) { + $flags = $flags & Profile::PHONE_TYPE_ANY; + return ( + ($flags == Profile::PHONE_TYPE_ANY) + || + (($flags & Profile::PHONE_TYPE_FAX) && $this->type == self::TYPE_FAX) + || + (($flags & Profile::PHONE_TYPE_FIXED) && $this->type == self::TYPE_FIXED) + || + (($flags & Profile::PHONE_TYPE_MOBILE) && $this->type == self::TYPE_MOBILE) + ); + } + + /** Returns true if this phone's link matches the flags + */ + public function hasLink($flags) { + $flags = $flags & Profile::PHONE_LINK_ANY; + return ( + ($flags == Profile::PHONE_LINK_ANY) + || + (($flags & Profile::PHONE_LINK_COMPANY) && $this->link_type == self::LINK_COMPANY) + || + (($flags & Profile::PHONE_LINK_JOB) && $this->link_type == self::LINK_JOB) + || + (($flags & Profile::PHONE_LINK_ADDRESS) && $this->link_type == self::LINK_ADDRESS) + || + (($flags & Profile::PHONE_LINK_PROFILE) && $this->link_type == self::LINK_PROFILE) + ); + } } // }}} // {{{ class Company @@ -213,6 +261,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) { @@ -278,6 +331,9 @@ class Address public function hasFlag($flag) { + if (!$this->flags instanceof PlFlagSet) { + $this->flags = new PlFlagSet($this->flags); + } return $this->flags->hasFlag($flag); } } @@ -302,6 +358,8 @@ class Education public $degree_short; public $degree_level; + public $field; + public function __construct(array $data) { foreach ($data as $key => $val) { @@ -320,7 +378,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); } @@ -354,7 +411,7 @@ class ProfileEducation extends ProfileField 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, @@ -389,15 +446,16 @@ class ProfileMedals extends ProfileField } } - 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, pme.text, pme.img + $data = XDB::iterator('SELECT pm.pid, pm.mid, pm.gid, pme.text, pme.img, pmge.text AS grade 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 {?} ORDER BY ' . XDB::formatCustomOrder('pm.pid', $pids), - $pids, $visibility); + $pids, $visibility->levels()); return PlIteratorUtils::subIterator($data, PlIteratorUtils::arrayValueCallback('pid')); } @@ -408,77 +466,51 @@ class ProfileNetworking extends ProfileField { private $networks = array(); - public function __construct(PlIterator $it) + public function __construct(PlInnerSubIterator $it) { + $this->pid = $it->value(); while ($network = $it->next()) { - $this->networks[$network['nwid']] = $network['address']; + $network['network_type'] = new PlFlagSet($network['network_type']); + $this->networks[$network['id']] = $network; } } - 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 + $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 {?} ORDER BY ' . XDB::formatCustomOrder('pid', $pids) . ', - network_type, nwid', - $pids, $visibility); + pn.nwid, id', + $pids, $visibility->levels()); return PlIteratorUtils::subIterator($data, PlIteratorUtils::arrayValueCallback('pid')); } public function get($flags, $limit = null) { + if (!$flags) { + $flags = Profile::NETWORKING_ALL; + } $nws = array(); $nb = 0; foreach ($this->networks as $id => $nw) { - // XXX hardcoded reference to web site index - if ( - (($flags & self::NETWORKING_WEB) && $nw['network_type'] == 0) - || - (! ($flags & self::NETWORKING_WEB)) - ) { + if (($flags & Profile::NETWORKING_WEB) && $nw['network_type']->hasFlag('web') || + ($flags & Profile::NETWORKING_IM) && $nw['network_type']->hasFlag('im') || + ($flags & Profile::NETWORKING_SOCIAL) && $nw['network_type']->hasFlag('social') || + ($flags & Profile::NETWORKING_ALL)) { $nws[$id] = $nw; ++$nb; - } - if ($nb >= $limit) { - break; + if (isset($limit) && $nb >= $limit) { + break; + } } } return $nws; } } // }}} -// {{{ class ProfilePhoto [ Field ] -class ProfilePhoto extends ProfileField -{ - public $pic; - - 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']); - } - } - - public static function fetchData(array $pids, $visibility) - { - $data = XDB::iterator('SELECT * - FROM profile_photos - WHERE pid IN {?} AND attachmime IN (\'jpeg\', \'png\') AND pub IN {?} - ORDER BY ' . XDB::formatCustomOrder('pid', $pids), - $pids, $visibility); - - return $data; - } -} -// }}} // {{{ class ProfileCorps [ Field ] class ProfileCorps extends ProfileField { @@ -502,7 +534,7 @@ class ProfileCorps extends ProfileField } } - public static function fetchData(array $pids, $visibility) + public static function fetchData(array $pids, ProfileVisibility $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, @@ -515,14 +547,67 @@ 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 {?} + WHERE pc.pid IN {?} AND pc.corps_pub IN {?} AND pceo.id != 1 ORDER BY ' . XDB::formatCustomOrder('pid', $pids), - $pids, $visibility); + $pids, $visibility->levels()); 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 +{ + 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')); + } +} +// }}} /** Loading of data for a Profile : * 1) load jobs, addresses, phones @@ -572,7 +657,7 @@ class ProfileAddresses extends ProfileField 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, @@ -586,7 +671,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')); } @@ -620,22 +705,24 @@ class ProfilePhones extends ProfileField $phones = array(); $nb = 0; foreach ($this->phones as $id => $phone) { - $phones[$id] = $phone; - ++$nb; - if ($limit != null && $nb == $limit) { - break; + if ($phone->hasFlags($flags)) { + $phones[$id] = $phone; + ++$nb; + if ($limit != null && $nb == $limit) { + break; + } } } 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 + $data = XDB::iterator('SELECT tel_type AS type, search_tel AS search, display_tel AS display, link_type, comment, pid 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')); } } @@ -653,7 +740,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, @@ -667,7 +754,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')); } @@ -695,7 +782,7 @@ class ProfileJobs extends ProfileField } } - public static function addAddresses(ProfileAddresses $addresses) + public function addAddresses(ProfileAddresses $addresses) { $a = $addresses->get(Profile::ADDRESS_PRO); foreach ($a as $address) { @@ -705,11 +792,10 @@ class ProfileJobs extends ProfileField } } - public static function addCompanies(array $companies) + public function addCompanies(array $companies) { - foreach ($this->jobs as $job) - { - $job->company = $companies[$job->jobid]; + foreach ($this->jobs as $job) { + $this->company = $companies[$job->jobid]; } } }