* @param $pids An array of pids
* @param $visibility The level of visibility fetched fields must have
* @return a PlIterator yielding data suitable for a "new ProfileBlah($data)"
- * XXX MUST be reimplemented for each kind of ProfileField
+ *
+ * MUST be reimplemented for each kind of ProfileField.
*/
public static function fetchData(array $pids, ProfileVisibility $visibility)
{
public $display;
public $comment = '';
- const LINK_JOB = 'job';
+ const LINK_JOB = 'pro';
const LINK_ADDRESS = 'address';
const LINK_PROFILE = 'user';
const LINK_COMPANY = 'hq';
public $link_type;
public $link_id;
+ public $id;
+
/** Fields are :
* $type, $search, $display, $link_type, $link_id, $comment, $pid, $id
*/
$this->$key = $val;
}
}
+
+ /** Returns the unique ID of a phone
+ * This ID will allow to link it to an address, a user or a job
+ * The format is address_addressId_phoneId (where phoneId is the id
+ * of the phone in the list of those associated with the address)
+ */
+ public function uid() {
+ return $this->link_type . '_' . $this->link_id . '_' . $this->id;
+ }
+
+ 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)
+ );
+ }
+
+ /** User accessible version of the type
+ */
+ public function displayType($short = false)
+ {
+ switch ($this->type) {
+ case Phone::TYPE_FIXED:
+ return $short ? 'Tél' : 'Fixe';
+ case Phone::TYPE_FAX:
+ return 'Fax';
+ case Phone::TYPE_MOBILE:
+ return $short ? 'Mob' : 'Mobile';
+ default:
+ return $this->type;
+ }
+ }
+
+ /** 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
public $id;
public $company = null;
- private $phones = array();
- private $address = null;
+ public $phones = array();
+ public $address = null;
public $jobid;
$this->$key = $val;
}
$this->company = CompanyList::get($this->jobid);
+ if (is_null($this->company)) {
+ require_once 'validations.inc.php';
+ $entreprise = ProfileValidate::get_typed_requests($this->pid, 'entreprise');
+ $this->company = new Company(array('name' => $entreprise[$this->id]->name));
+ }
}
public function phones()
public function addPhone(Phone &$phone)
{
if ($phone->link_type == Phone::LINK_JOB && $phone->link_id == $this->id && $phone->pid == $this->pid) {
- $this->phones[] = $phone;
+ $this->phones[$phone->uid()] = $phone;
}
}
public function setAddress(Address $address)
{
- if ($address->link_id == Address::LINK_JOB && $address->link_id == $this->id && $address->pid == $this->pid) {
+ if ($address->link_type == Address::LINK_JOB && $address->link_id == $this->id && $address->pid == $this->pid) {
$this->address = $address;
}
}
const LINK_PROFILE = 'home';
public $flags;
- public $link_id;
+ public $id; // The ID of the address among those associated with its link
+ public $link_id; // The ID of the object to which the address is linked (profile, job, company)
public $link_type;
public $text;
$this->flags = new PlFlagSet($this->flags);
}
+ public function uid() {
+ $uid = $this->link_type . '_';
+ if ($this->link_type != self::LINK_COMPANY) {
+ $uid .= $this->pid . '_';
+ }
+ $uid .= $this->link_id . '_' . $this->id;
+ }
+
public function addPhone(Phone &$phone)
{
- if ($phone->link_type == Phone::LINK_ADDRESS && $phone->link_id == $this->id && $phone->pid == $this->pid) {
- $this->phones[] = $phone;
+ if (
+ $phone->link_type == Phone::LINK_ADDRESS && $phone->link_id == $this->id &&
+ ($this->link_type == self::LINK_COMPANY || $phone->pid == $this->pid) ) {
+ $this->phones[$phone->uid()] = $phone;
}
}
public function hasFlag($flag)
{
+ if (!$this->flags instanceof PlFlagSet) {
+ $this->flags = new PlFlagSet($this->flags);
+ }
return $this->flags->hasFlag($flag);
}
}
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->levels());
{
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, 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',
+ pn.nwid, id',
$pids, $visibility->levels());
return PlIteratorUtils::subIterator($data, PlIteratorUtils::arrayValueCallback('pid'));
$nws = array();
$nb = 0;
foreach ($this->networks as $id => $nw) {
- // XXX hardcoded reference to web site index
- if (
- (($flags & Profile::NETWORKING_WEB) && $nw['network_type'] == 0)
- ||
- (! ($flags & Profile::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;
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->levels());
* 3) attach addresses to jobs and profiles
*/
+// {{{ Database schema (profile_address, profile_phones, profile_jobs)
+/** The database for this is very unclear, so here is a little schema :
+ * profile_job describes a Job, links to:
+ * - a Profile, through `pid`
+ * - a Company, through `jobid`
+ * The `id` field is the id of this job in the list of the jobs of its profile
+ *
+ * profile_addresses describes an Address, which
+ * related to either a Profile, a Job or a Company:
+ * - for a Profile:
+ * - `type` is set to 'home'
+ * - `pid` is set to the related profile pid
+ * - `id` is the id of the address in the list of those related to that profile
+ * - `jobid` is empty
+ *
+ * - for a Company:
+ * - `type` is set to 'hq'
+ * - `pid` is set to 0
+ * - `jobid` is set to the id of the company
+ * - `id` is set to 0 (only one address per Company)
+ *
+ * - for a Job:
+ * - `type` is set to 'job'
+ * - `pid` is set to the pid of the Profile of the related Job
+ * - `jobid` is set to the Company of the job (this information is redundant
+ * with that of the row of profile_job for the related job)
+ * - `id` is the id of the job to which we refer (i.e `profile_job.id`)
+ *
+ * profile_phone describes a Phone, which can be related to an Address,
+ * a Job, a Profile or a Company:
+ * - for a Profile:
+ * - `link_type` is set to 'user'
+ * - `link_id` is set to 0
+ * - `pid` is set to the id of the related Profile
+ *
+ * - for a Company:
+ * - `link_type` is set to 'hq'
+ * - `link_id` is set to the id of the related Company
+ * - `pid` is set to 0
+ *
+ * - for an Address (this is only possible for a *personal* address)
+ * - `link_type` is set to 'address'
+ * - `link_id` is set to the related Address `id`
+ * - `pid` is set to the related Address `pid`
+ *
+ * - for a Job:
+ * - `link_type` is set to 'pro'
+ * - `link_id` is set to the related Job `id` (not `jobid`)
+ * - `pid` is set to the related Job `pid`
+ *
+ *
+ * The possible relations are as follow:
+ * An Address can be linked to a Company, a Profile, a Job
+ * A Job is linked to a Company and a Profile
+ * A Phone can be linked to a Company, a Profile, a Job, or a Profile-related Address
+ */
+// }}}
+
// {{{ class ProfileAddresses [ Field ]
class ProfileAddresses extends ProfileField
{
$nb = 0;
foreach ($this->addresses as $addr) {
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_PERSO) && $addr->link_type == Address::LINK_PROFILE)
||
- (($flags & Profile::ADDRESS_PRO) && $addr->link_type == 'job')
+ (($flags & Profile::ADDRESS_PRO) && $addr->link_type == Address::LINK_JOB)
) {
$res[] = $addr;
$nb++;
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,
+ IF(pa.type = \'home\', pid, IF(pa.type = \'job\', pa.id, jobid)) AS link_id,
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
public function addPhones(ProfilePhones $phones)
{
- $p = $phones->get(0);
+ $p = $phones->get(Profile::PHONE_LINK_ADDRESS | Profile::PHONE_TYPE_ANY);
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);
$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, ProfileVisibility $visibility)
{
- $data = XDB::iterator('SELECT tel_type AS type, search_tel AS search, display_tel AS display, link_type, comment, pid
+ $data = XDB::iterator('SELECT tel_type AS type, search_tel AS search, display_tel AS display, link_type, comment, pid, link_id, tel_id AS id
FROM profile_phones
WHERE pid IN {?} AND pub IN {?}
ORDER BY ' . XDB::formatCustomOrder('pid', $pids),
public function addPhones(ProfilePhones $phones)
{
- $p = $phones->get(0);
+ $p = $phones->get(Profile::PHONE_LINK_JOB | Profile::PHONE_TYPE_ANY);
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);
+ $this->jobs[$phone->link_id]->addPhone($phone);
}
}
}
- public static function addAddresses(ProfileAddresses $addresses)
+ public function addAddresses(ProfileAddresses $addresses)
{
$a = $addresses->get(Profile::ADDRESS_PRO);
foreach ($a as $address) {
}
}
- 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];
}
}
}
LEFT JOIN profile_addresses AS pa ON (pje.id = pa.jobid AND pa.type = \'hq\')
' . $join . '
' . $where);
+ $newcompanies = array();
while ($row = $it->next()) {
$cp = new Company($row);
$addr = new Address($row);
$cp->setAddress($addr);
+ if (!array_key_exists($row['id'], self::$companies)) {
+ $newcompanies[] = $row['id'];
+ }
self::$companies[$row['id']] = $cp;
}
- // TODO: add phones to addresses
+ // Add phones to hq
+ if (count($newcompanies)) {
+ $it = XDB::iterator('SELECT search_tel AS search, display_tel AS display, comment, link_id, tel_type AS type, link_type, tel_id AS id
+ FROM profile_phones
+ WHERE link_id IN {?} AND link_type = \'hq\'',
+ $newcompanies);
+ while ($row = $it->next()) {
+ $p = new Phone($row);
+ self::$companies[$row['link_id']]->setPhone($p);
+ }
+ }
+
if (count($pids) == 0) {
self::$fullload = true;
}
projects / platal.git / blobdiff