X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=classes%2Fuserfilter.php;h=2a9d077a9f6640d61165c4fe820918c080026d22;hb=ccc951d9ef4b747cf4c5b08d52e6f8938338f6de;hp=85f89b919fa8e56b1ed30807659a0bdbf7e50551;hpb=a7f8e48ad83d360e4f4f4cfd94167f4337e6ae72;p=platal.git diff --git a/classes/userfilter.php b/classes/userfilter.php index 85f89b9..2a9d077 100644 --- a/classes/userfilter.php +++ b/classes/userfilter.php @@ -1,6 +1,6 @@ requireProfiles(); return '$PID IS NOT NULL'; } } // }}} +// {{{ class UFC_Hruid +/** Filters users based on their hruid + * @param $val Either an hruid, or a list of those + */ +class UFC_Hruid implements UserFilterCondition +{ + private $hruids; + + public function __construct() + { + $this->hruids = pl_flatten(func_get_args()); + } + + public function buildCondition(PlFilter &$uf) + { + $uf->requireAccounts(); + return XDB::format('a.hruid IN {?}', $this->hruids); + } +} +// }}} + +// {{{ class UFC_Hrpid +/** Filters users based on the hrpid of their profiles + * @param $val Either an hrpid, or a list of those + */ +class UFC_Hrpid implements UserFilterCondition +{ + private $hrpids; + + public function __construct() + { + $this->hrpids = pl_flatten(func_get_args()); + } + + public function buildCondition(PlFilter &$uf) + { + $uf->requireProfiles(); + return XDB::format('p.hrpid IN {?}', $this->hrpids); + } +} +// }}} + +// {{{ class UFC_Ip +/** Filters users based on one of their last IPs + * @param $ip IP from which connection are checked + */ +class UFC_Ip implements UserFilterCondition +{ + private $ip; + + public function __construct($ip) + { + $this->ip = $ip; + } + + public function buildCondition(PlFilter &$uf) + { + $sub = $uf->addLoggerFilter(); + $ip = ip_to_uint($this->ip); + return XDB::format($sub . '.ip = {?} OR ' . $sub . '.forward_ip = {?}', $ip, $ip); + } +} +// }}} + +// {{{ class UFC_Comment +class UFC_Comment implements UserFilterCondition +{ + private $text; + + public function __construct($text) + { + $this->text = $text; + } + + public function buildCondition(PlFilter &$uf) + { + $uf->requireProfiles(); + return 'p.freetext ' . XDB::formatWildcards(XDB::WILDCARD_CONTAINS, $this->text); + } +} +// }}} + // {{{ class UFC_Promo /** Filters users based on promotion * @param $comparison Comparison operator (>, =, ...) @@ -72,6 +155,10 @@ class UFC_Promo implements UserFilterCondition if ($this->grade != UserFilter::DISPLAY) { UserFilter::assertGrade($this->grade); } + if ($this->grade == UserFilter::DISPLAY && $this->comparison != '=') { + // XXX: we might try to guess the grade from the first char of the promo and forbid only '<= 2004', but allow '<= X2004' + Platal::page()->killError("Il n'est pas possible d'appliquer la comparaison '" . $this->comparison . "' aux promotions sans spécifier de formation (X/M/D)"); + } } public function buildCondition(PlFilter &$uf) @@ -88,26 +175,101 @@ class UFC_Promo implements UserFilterCondition } // }}} -// {{{ class UFC_Formation -class UFC_Formation implements UserFilterCondition +// {{{ class UFC_SchoolId +/** Filters users based on their shoold identifier + * @param type Parameter type (Xorg, AX, School) + * @param value School id value + */ +class UFC_SchoolId implements UserFilterCondition { - private $eduid; - private $edutext; + const AX = 'ax'; + const Xorg = 'xorg'; + const School = 'school'; - public function __construct($eduid = null, $edutext = null) + private $type; + private $id; + + static public function assertType($type) { - $this->eduid = $eduid; - $this->edutext = $edutext; + if ($type != self::AX && $type != self::Xorg && $type != self::School) { + Platal::page()->killError("Type de matricule invalide: $type"); + } + } + + public function __construct($type, $id) + { + $this->type = $type; + $this->id = $id; + self::assertType($type); } public function buildCondition(PlFilter &$uf) { - $sub = $uf->addEducationFilter(); - if ($this->eduid != null) { - return 'pe' . $sub . '.eduid = ' . XDB::format('{?}', $this->eduid); - } else { - return 'pee' . $sub . '.name LIKE ' . XDB::format('CONCAT( \'%\', {?}, \'%\')', $this->edutext); + $uf->requireProfiles(); + $id = $this->id; + $type = $this->type; + if ($type == self::School) { + $type = self::Xorg; + $id = Profile::getXorgId($id); } + return XDB::format('p.' . $type . '_id = {?}', $id); + } +} +// }}} + +// {{{ class UFC_EducationSchool +/** Filters users by formation + * @param $val The formation to search (either ID or array of IDs) + */ +class UFC_EducationSchool implements UserFilterCondition +{ + private $val; + + public function __construct() + { + $this->val = pl_flatten(func_get_args()); + } + + public function buildCondition(PlFilter &$uf) + { + $sub = $uf->addEducationFilter(); + return XDB::format('pe' . $sub . '.eduid IN {?}', $this->val); + } +} +// }}} + +// {{{ class UFC_EducationDegree +class UFC_EducationDegree implements UserFilterCondition +{ + private $diploma; + + public function __construct() + { + $this->diploma = pl_flatten(func_get_args()); + } + + public function buildCondition(PlFilter &$uf) + { + $sub = $uf->addEducationFilter(); + return XDB::format('pe' . $sub . '.degreeid IN {?}', $this->diploma); + } +} +// }}} + +// {{{ class UFC_EducationField +class UFC_EducationField implements UserFilterCondition +{ + private $val; + + public function __construct() + { + $this->val = pl_flatten(func_get_args()); + } + + public function buildCondition(PlFilter &$uf) + { + $sub = $uf->addEducationFilter(); + return XDB::format('pe' . $sub . '.fieldid IN {?}', $this->val); } } // }}} @@ -120,11 +282,12 @@ class UFC_Formation implements UserFilterCondition */ class UFC_Name implements UserFilterCondition { - const PREFIX = 1; - const SUFFIX = 2; - const PARTICLE = 7; - const VARIANTS = 8; - const CONTAINS = 3; + const EXACT = XDB::WILDCARD_EXACT; // 0x000 + const PREFIX = XDB::WILDCARD_PREFIX; // 0x001 + const SUFFIX = XDB::WILDCARD_SUFFIX; // 0x002 + const CONTAINS = XDB::WILDCARD_CONTAINS; // 0x003 + const PARTICLE = 0x004; + const VARIANTS = 0x008; private $type; private $text; @@ -146,24 +309,15 @@ class UFC_Name implements UserFilterCondition public function buildCondition(PlFilter &$uf) { $left = '$ME.name'; - $op = ' LIKE '; if (($this->mode & self::PARTICLE) == self::PARTICLE) { $left = 'CONCAT($ME.particle, \' \', $ME.name)'; } - if (($this->mode & self::CONTAINS) == 0) { - $right = XDB::format('{?}', $this->text); - $op = ' = '; - } else if (($this->mode & self::CONTAINS) == self::PREFIX) { - $right = XDB::format('CONCAT({?}, \'%\')', $this->text); - } else if (($this->mode & self::CONTAINS) == self::SUFFIX) { - $right = XDB::format('CONCAT(\'%\', {?})', $this->text); - } else { - $right = XDB::format('CONCAT(\'%\', {?}, \'%\')', $this->text); - } - $cond = $left . $op . $right; + $right = XDB::formatWildcards($this->mode & self::CONTAINS, $this->text); + + $cond = $left . $right; $conds = array($this->buildNameQuery($this->type, null, $cond, $uf)); - if (($this->mode & self::VARIANTS) != 0 && isset(UserFilter::$name_variants[$this->type])) { - foreach (UserFilter::$name_variants[$this->type] as $var) { + if (($this->mode & self::VARIANTS) != 0 && isset(Profile::$name_variants[$this->type])) { + foreach (Profile::$name_variants[$this->type] as $var) { $conds[] = $this->buildNameQuery($this->type, $var, $cond, $uf); } } @@ -190,7 +344,11 @@ class UFC_NameTokens implements UserFilterCondition public function __construct($tokens, $flags = array(), $soundex = false, $exact = false) { - $this->tokens = $tokens; + if (is_array($tokens)) { + $this->tokens = $tokens; + } else { + $this->tokens = array($tokens); + } if (is_array($flags)) { $this->flags = $flags; } else { @@ -202,22 +360,20 @@ class UFC_NameTokens implements UserFilterCondition public function buildCondition(PlFilter &$uf) { - $sub = $uf->addNameTokensFilter(!($this->exact || $this->soundex)); $conds = array(); - if ($this->soundex) { - $conds[] = $sub . '.soundex IN ' . XDB::formatArray($this->tokens); - } else if ($this->exact) { - $conds[] = $sub . '.token IN ' . XDB::formatArray($this->tokens); - } else { - $tokconds = array(); - foreach ($this->tokens as $token) { - $tokconds[] = $sub . '.token LIKE ' . XDB::format('CONCAT(\'%\', {?}, \'%\')', $token); + foreach ($this->tokens as $i => $token) { + $sub = $uf->addNameTokensFilter($token); + if ($this->soundex) { + $c = XDB::format($sub . '.soundex = {?}', $token); + } else if ($this->exact) { + $c = XDB::format($sub . '.token = {?}', $token); + } else { + $c = $sub . '.token ' . XDB::formatWildcards(XDB::WILDCARD_PREFIX, $token); } - $conds[] = implode(' OR ', $tokconds); - } - - if ($this->flags != null) { - $conds[] = $sub . '.flags IN ' . XDB::formatArray($this->flags); + if ($this->flags != null) { + $c .= XDB::format(' AND ' . $sub . '.flags IN {?}', $this->flags); + } + $conds[] = $c; } return implode(' AND ', $conds); @@ -228,33 +384,23 @@ class UFC_NameTokens implements UserFilterCondition // {{{ class UFC_Nationality class UFC_Nationality implements UserFilterCondition { - private $nid; - private $ntext; + private $val; - public function __construct($nid = null, $ntext = null) + public function __construct() { - $this->nid = $nid; - $this->ntext = $ntext; + $this->val = pl_flatten(func_get_args()); } public function buildCondition(PlFilter &$uf) { - if ($this->nid != null) { - $uf->requireProfiles(); - $nat = XDB::format('{?}', $this->nid); - $conds = array( - 'p.nationality1 = ' . $nat, - 'p.nationality2 = ' . $nat, - 'p.nationality3 = ' . $nat, - ); - return implode(' OR ', $conds); - } else { - $sub = $uf->addNationalityJoins(); - $nat = XDB::format('CONCAT(\'%\', {?}, \'%\')', $this->ntext); - $cond = $sub . '.nationality LIKE ' . $nat . ' OR ' . - $sub . '.nationalityFR LIKE ' . $nat; - return $cond; - } + $uf->requireProfiles(); + $nat = XDB::formatArray($this->val); + $conds = array( + 'p.nationality1 IN ' . $nat, + 'p.nationality2 IN ' . $nat, + 'p.nationality3 IN ' . $nat, + ); + return implode(' OR ', $conds); } } // }}} @@ -262,7 +408,7 @@ class UFC_Nationality implements UserFilterCondition // {{{ class UFC_Dead /** Filters users based on death date * @param $comparison Comparison operator - * @param $date Date to which death date should be compared + * @param $date Date to which death date should be compared (DateTime object, string or timestamp) */ class UFC_Dead implements UserFilterCondition { @@ -272,14 +418,15 @@ class UFC_Dead implements UserFilterCondition public function __construct($comparison = null, $date = null) { $this->comparison = $comparison; - $this->date = $date; + $this->date = make_datetime($date); } public function buildCondition(PlFilter &$uf) { + $uf->requireProfiles(); $str = 'p.deathdate IS NOT NULL'; if (!is_null($this->comparison)) { - $str .= ' AND p.deathdate ' . $this->comparison . ' ' . XDB::format('{?}', date('Y-m-d', $this->date)); + $str .= ' AND p.deathdate ' . $this->comparison . ' ' . XDB::format('{?}', $this->date->format('Y-m-d')); } return $str; } @@ -302,18 +449,19 @@ class UFC_Registered implements UserFilterCondition { $this->active = $active; $this->comparison = $comparison; - $this->date = $date; + $this->date = make_datetime($date); } public function buildCondition(PlFilter &$uf) { + $uf->requireAccounts(); if ($this->active) { - $date = 'a.uid IS NOT NULL AND a.state = \'active\''; + $date = '$UID IS NOT NULL AND a.state = \'active\''; } else { - $date = 'a.uid IS NOT NULL AND a.state != \'pending\''; + $date = '$UID IS NOT NULL AND a.state != \'pending\''; } if (!is_null($this->comparison)) { - $date .= ' AND a.registration_date ' . $this->comparison . ' ' . XDB::format('{?}', date('Y-m-d', $this->date)); + $date .= ' AND a.registration_date != \'0000-00-00 00:00:00\' AND a.registration_date ' . $this->comparison . ' ' . XDB::format('{?}', $this->date->format('Y-m-d')); } return $date; } @@ -338,6 +486,7 @@ class UFC_ProfileUpdated implements UserFilterCondition public function buildCondition(PlFilter &$uf) { + $uf->requireProfiles(); return 'p.last_change ' . $this->comparison . XDB::format(' {?}', date('Y-m-d H:i:s', $this->date)); } } @@ -361,6 +510,7 @@ class UFC_Birthday implements UserFilterCondition public function buildCondition(PlFilter &$uf) { + $uf->requireProfiles(); return 'p.next_birthday ' . $this->comparison . XDB::format(' {?}', date('Y-m-d', $this->date)); } } @@ -383,6 +533,7 @@ class UFC_Sex implements UserFilterCondition if ($this->sex != User::GENDER_MALE && $this->sex != User::GENDER_FEMALE) { return self::COND_FALSE; } else { + $uf->requireProfiles(); return XDB::format('p.sex = {?}', $this->sex == User::GENDER_FEMALE ? 'female' : 'male'); } } @@ -417,94 +568,64 @@ class UFC_Group implements UserFilterCondition // }}} // {{{ class UFC_Binet +/** Selects users based on their belonging to a given (list of) binet + * @param $binet either a binet_id or an array of binet_ids + */ class UFC_Binet implements UserFilterCondition { - private $binetid; - private $binetname; + private $val; - public function __construct($binetid = null, $binetname = null) + public function __construct() { - $this->binetid = $binetid; - $this->binetname = $binetname; + $this->val = pl_flatten(func_get_args()); } public function buildCondition(PlFilter &$uf) { - if ($this->binetid != null) { - $sub = $uf->addBinetsFilter(); - return $sub . 'binet_id = ' . XDB::format('{?}', $this->binetid); - } else { - $sub = $uf->addBinetsFilter(true); - return $sub . 'test LIKE ' . XDB::format('CONCAT(\'%\', {?}, \'%\')', $this->binetname); - } + $sub = $uf->addBinetsFilter(); + return XDB::format($sub . '.binet_id IN {?}', $this->val); } } // }}} // {{{ class UFC_Section +/** Selects users based on section + * @param $section ID of the section + */ class UFC_Section implements UserFilterCondition { private $section; - public function __construct($section) + public function __construct() { - $this->section = $section; + $this->section = pl_flatten(func_get_args()); } public function buildCondition(PlFilter &$uf) { $uf->requireProfiles(); - return 'p.section = ' . XDB::format('{?}', $this->section); + return XDB::format('p.section IN {?}', $this->section); } } // }}} // {{{ class UFC_Email -/** Filters users based on email address - * @param $email Email whose owner we are looking for - */ -class UFC_Email implements UserFilterCondition -{ - private $email; - public function __construct($email) - { - $this->email = $email; - } - - public function buildCondition(PlFilter &$uf) - { - if (User::isForeignEmailAddress($this->email)) { - $sub = $uf->addEmailRedirectFilter($this->email); - return XDB::format('e' . $sub . '.email IS NOT NULL OR a.email = {?}', $this->email); - } else if (User::isVirtualEmailAddress($this->email)) { - $sub = $uf->addVirtualEmailFilter($this->email); - return 'vr' . $sub . '.redirect IS NOT NULL'; - } else { - @list($user, $domain) = explode('@', $this->email); - $sub = $uf->addAliasFilter($user); - return 'al' . $sub . '.alias IS NOT NULL'; - } - } -} -// }}} - -// {{{ class UFC_EmailList -/** Filters users based on an email list +/** Filters users based on an email or a list of emails * @param $emails List of emails whose owner must be selected */ -class UFC_EmailList implements UserFilterCondition +class UFC_Email implements UserFilterCondition { private $emails; - public function __construct($emails) + public function __construct() { - $this->emails = $emails; + $this->emails = pl_flatten(func_get_args()); } public function buildCondition(PlFilter &$uf) { - $email = null; - $virtual = null; - $alias = null; + $foreign = array(); + $virtual = array(); + $aliases = array(); $cond = array(); if (count($this->emails) == 0) { @@ -513,23 +634,27 @@ class UFC_EmailList implements UserFilterCondition foreach ($this->emails as $entry) { if (User::isForeignEmailAddress($entry)) { - if (is_null($email)) { - $email = $uf->addEmailRedirectFilter(); - } - $cond[] = XDB::format('e' . $email . '.email = {?} OR a.email = {?}', $entry, $entry); + $foreign[] = $entry; } else if (User::isVirtualEmailAddress($entry)) { - if (is_null($virtual)) { - $virtual = $uf->addVirtualEmailFilter(); - } - $cond[] = XDB::format('vr' . $virtual . '.redirect IS NOT NULL AND v' . $virtual . '.alias = {?}', $entry); + $virtual[] = $entry; } else { - if (is_null($alias)) { - $alias = $uf->addAliasFilter(); - } @list($user, $domain) = explode('@', $entry); - $cond[] = XDB::format('al' . $alias . '.alias = {?}', $user); + $aliases[] = $user; } } + + if (count($foreign) > 0) { + $sub = $uf->addEmailRedirectFilter($foreign); + $cond[] = XDB::format('e' . $sub . '.email IS NOT NULL OR a.email IN {?}', $foreign); + } + if (count($virtual) > 0) { + $sub = $uf->addVirtualEmailFilter($virtual); + $cond[] = 'vr' . $sub . '.redirect IS NOT NULL'; + } + if (count($aliases) > 0) { + $sub = $uf->addAliasFilter($aliases); + $cond[] = 'al' . $sub . '.alias IS NOT NULL'; + } return '(' . implode(') OR (', $cond) . ')'; } } @@ -592,7 +717,7 @@ abstract class UFC_Address implements UserFilterCondition } } if (count($types)) { - $conds[] = $sub . '.type IN ' . XDB::formatArray($types); + $conds[] = XDB::format($sub . '.type IN {?}', $types); } if ($this->flags != self::FLAG_ANY) { @@ -611,7 +736,7 @@ abstract class UFC_Address implements UserFilterCondition // {{{ class UFC_AddressText /** Select users based on their address, using full text search * @param $text Text for filter in fulltext search - * @param $textSearchMode Mode for search (PREFIX, SUFFIX, ...) + * @param $textSearchMode Mode for search (one of XDB::WILDCARD_*) * @param $type Filter on address type * @param $flags Filter on address flags * @param $country Filter on address country @@ -619,16 +744,11 @@ abstract class UFC_Address implements UserFilterCondition */ class UFC_AddressText extends UFC_Address { - /** Flags for text search - */ - const PREFIX = 0x0001; - const SUFFIX = 0x0002; - const CONTAINS = 0x0003; private $text; private $textSearchMode; - public function __construct($text = null, $textSearchMode = self::CONTAINS, + public function __construct($text = null, $textSearchMode = XDB::WILDCARD_CONTAINS, $type = null, $flags = self::FLAG_ANY, $country = null, $locality = null) { parent::__construct($type, $flags); @@ -640,18 +760,7 @@ class UFC_AddressText extends UFC_Address private function mkMatch($txt) { - $op = ' LIKE '; - if (($this->textSearchMode & self::CONTAINS) == 0) { - $right = XDB::format('{?}', $this->text); - $op = ' = '; - } else if (($this->mode & self::CONTAINS) == self::PREFIX) { - $right = XDB::format('CONCAT({?}, \'%\')', $this->text); - } else if (($this->mode & self::CONTAINS) == self::SUFFIX) { - $right = XDB::format('CONCAT(\'%\', {?})', $this->text); - } else { - $right = XDB::format('CONCAT(\'%\', {?}, \'%\')', $this->text); - } - return $op . $right; + return XDB::formatWildcards($this->textSearchMode, $txt); } public function buildCondition(PlFilter &$uf) @@ -680,57 +789,62 @@ class UFC_AddressText extends UFC_Address } // }}} -// {{{ class UFC_AddressFields +// {{{ class UFC_AddressField /** Filters users based on their address, + * @param $val Either a code for one of the fields, or an array of such codes + * @param $fieldtype The type of field to look for * @param $type Filter on address type * @param $flags Filter on address flags - * @param $countryId Filter on address countryId - * @param $administrativeAreaId Filter on address administrativeAreaId - * @param $subAdministrativeAreaId Filter on address subAdministrativeAreaId - * @param $localityId Filter on address localityId - * @param $postalCode Filter on address postalCode */ -class UFC_AddressFields extends UFC_Address +class UFC_AddressField extends UFC_Address { + const FIELD_COUNTRY = 1; + const FIELD_ADMAREA = 2; + const FIELD_SUBADMAREA = 3; + const FIELD_LOCALITY = 4; + const FIELD_ZIPCODE = 5; + /** Data of the filter */ - private $countryId; - private $administrativeAreaId; - private $subAdministrativeAreaId; - private $localityId; - private $postalCode; + private $val; + private $fieldtype; - public function __construct($type = null, $flags = self::FLAG_ANY, $countryId = null, $administrativeAreaId = null, - $subAdministrativeAreaId = null, $localityId = null, $postalCode = null) + public function __construct($val, $fieldtype, $type = null, $flags = self::FLAG_ANY) { parent::__construct($type, $flags); - $this->countryId = $countryId; - $this->administrativeAreaId = $administrativeAreaId; - $this->subAdministrativeAreaId = $subAdministrativeAreaId; - $this->localityId = $localityId; - $this->postalCode = $postalCode; + + if (!is_array($val)) { + $val = array($val); + } + $this->val = $val; + $this->fieldtype = $fieldtype; } public function buildCondition(PlFilter &$uf) { $sub = $uf->addAddressFilter(); - $conds = $this->initConds(); + $conds = $this->initConds($sub); - if ($this->countryId != null) { - $conds[] = $sub . '.countryId = ' . XDB::format('{?}', $this->countryId); - } - if ($this->administrativeAreaId != null) { - $conds[] = $sub . '.administrativeAreaId = ' . XDB::format('{?}', $this->administrativeAreaId); - } - if ($this->subAdministrativeAreaId != null) { - $conds[] = $sub . '.subAdministrativeAreaId = ' . XDB::format('{?}', $this->subAdministrativeAreaId); - } - if ($this->localityId != null) { - $conds[] = $sub . '.localityId = ' . XDB::format('{?}', $this->localityId); - } - if ($this->postalCode != null) { - $conds[] = $sub . '.postalCode = ' . XDB::format('{?}', $this->postalCode); + switch ($this->fieldtype) { + case self::FIELD_COUNTRY: + $field = 'countryId'; + break; + case self::FIELD_ADMAREA: + $field = 'administrativeAreaId'; + break; + case self::FIELD_SUBADMAREA: + $field = 'subAdministrativeAreaId'; + break; + case self::FIELD_LOCALITY: + $field = 'localityId'; + break; + case self::FIELD_ZIPCODE: + $field = 'postalCode'; + break; + default: + Platal::page()->killError('Invalid address field type: ' . $this->fieldtype); } + $conds[] = XDB::format($sub . '.' . $field . ' IN {?}', $this->val); return implode(' AND ', $conds); } @@ -825,7 +939,7 @@ class UFC_Job_Company implements UserFilterCondition public function buildCondition(PlFilter &$uf) { $sub = $uf->addJobCompanyFilter(); - $cond = $sub . '.' . $this->type . ' = ' . XDB::format('{?}', $this->value); + $cond = $sub . '.' . $this->type . XDB::formatWildcards(XDB::WILDCARD_CONTAINS, $this->value); return $cond; } } @@ -833,41 +947,35 @@ class UFC_Job_Company implements UserFilterCondition // {{{ class UFC_Job_Sectorization /** Filters users based on the ((sub)sub)sector they work in - * @param $sector The sector searched - * @param $subsector The subsector - * @param $subsubsector The subsubsector + * @param $val The ID of the sector, or an array of such IDs + * @param $type The kind of search (subsubsector/subsector/sector) */ class UFC_Job_Sectorization implements UserFilterCondition { + private $val; + private $type; - private $sector; - private $subsector; - private $subsubsector; + public function __construct($val, $type = UserFilter::JOB_SECTOR) + { + self::assertType($type); + if (!is_array($val)) { + $val = array($val); + } + $this->val = $val; + $this->type = $type; + } - public function __construct($sector = null, $subsector = null, $subsubsector = null) + private static function assertType($type) { - $this->sector = $sector; - $this->subsector = $subsector; - $this->subsubsector = $subsubsector; + if ($type != UserFilter::JOB_SECTOR && $type != UserFilter::JOB_SUBSECTOR && $type != UserFilter::JOB_SUBSUBSECTOR) { + Platal::page()->killError("Type de secteur non valide."); + } } public function buildCondition(PlFilter &$uf) { - // No need to add the JobFilter, it will be done by addJobSectorizationFilter - $conds = array(); - if ($this->sector !== null) { - $sub = $uf->addJobSectorizationFilter(UserFilter::JOB_SECTOR); - $conds[] = $sub . '.id = ' . XDB::format('{?}', $this->sector); - } - if ($this->subsector !== null) { - $sub = $uf->addJobSectorizationFilter(UserFilter::JOB_SUBSECTOR); - $conds[] = $sub . '.id = ' . XDB::format('{?}', $this->subsector); - } - if ($this->subsubsector !== null) { - $sub = $uf->addJobSectorizationFilter(UserFilter::JOB_SUBSUBSECTOR); - $conds[] = $sub . '.id = ' . XDB::format('{?}', $this->subsubsector); - } - return implode(' AND ', $conds); + $sub = $uf->addJobSectorizationFilter($this->type); + return $sub . '.id = ' . XDB::format('{?}', $this->val); } } // }}} @@ -880,12 +988,6 @@ class UFC_Job_Sectorization implements UserFilterCondition class UFC_Job_Description implements UserFilterCondition { - /** Meta-filters - * Built with binary OR on UserFilter::JOB_* - */ - const ANY = 63; - const SECTORIZATION = 15; - private $description; private $fields; @@ -900,25 +1002,25 @@ class UFC_Job_Description implements UserFilterCondition $conds = array(); if ($this->fields & UserFilter::JOB_USERDEFINED) { $sub = $uf->addJobFilter(); - $conds[] = $sub . '.description LIKE ' . XDB::format('CONCAT(\'%\', {?}, \'%\')', $this->description); + $conds[] = $sub . '.description ' . XDB::formatWildcards(XDB::WILDCARD_CONTAINS, $this->description); } if ($this->fields & UserFilter::JOB_CV) { $uf->requireProfiles(); - $conds[] = 'p.cv LIKE ' . XDB::format('CONCAT(\'%\', {?}, \'%\')', $this->description); + $conds[] = 'p.cv ' . XDB::formatWildcards(XDB::WILDCARD_CONTAINS, $this->description); } if ($this->fields & UserFilter::JOB_SECTOR) { $sub = $uf->addJobSectorizationFilter(UserFilter::JOB_SECTOR); - $conds[] = $sub . '.name LIKE ' . XDB::format('CONCAT(\'%\', {?}, \'%\')', $this->description); + $conds[] = $sub . '.name ' . XDB::formatWildcards(XDB::WILDCARD_CONTAINS, $this->description); } if ($this->fields & UserFilter::JOB_SUBSECTOR) { $sub = $uf->addJobSectorizationFilter(UserFilter::JOB_SUBSECTOR); - $conds[] = $sub . '.name LIKE ' . XDB::format('CONCAT(\'%\', {?}, \'%\')', $this->description); + $conds[] = $sub . '.name ' . XDB::formatWildcards(XDB::WILDCARD_CONTAINS, $this->description); } if ($this->fields & UserFilter::JOB_SUBSUBSECTOR) { $sub = $uf->addJobSectorizationFilter(UserFilter::JOB_SUBSUBSECTOR); - $conds[] = $sub . '.name LIKE ' . XDB::format('CONCAT(\'%\', {?}, \'%\')', $this->description); + $conds[] = $sub . '.name ' . XDB::formatWildcards(XDB::WILDCARD_CONTAINS, $this->description); $sub = $uf->addJobSectorizationFilter(UserFilter::JOB_ALTERNATES); - $conds[] = $sub . '.name LIKE ' . XDB::format('CONCAT(\'%\', {?}, \'%\')', $this->description); + $conds[] = $sub . '.name ' . XDB::formatWildcards(XDB::WILDCARD_CONTAINS, $this->description); } return implode(' OR ', $conds); } @@ -945,9 +1047,9 @@ class UFC_Networking implements UserFilterCondition { $sub = $uf->addNetworkingFilter(); $conds = array(); - $conds[] = $sub . '.address = ' . XDB::format('CONCAT(\'%\', {?}, \'%\')', $this->value); + $conds[] = $sub . '.address ' . XDB::formatWildcards(XDB::WILDCARD_CONTAINS, $this->value); if ($this->type != -1) { - $conds[] = $sub . '.network_type = ' . XDB::format('{?}', $this->type); + $conds[] = $sub . '.nwid = ' . XDB::format('{?}', $this->type); } return implode(' AND ', $conds); } @@ -978,10 +1080,11 @@ class UFC_Phone implements UserFilterCondition public function __construct($number, $num_type = self::NUM_ANY, $phone_type = self::PHONE_ANY) { - require_once('profil.func.inc.php'); - $this->number = $number; + $phone = new Phone(array('display' => $number)); + $phone->format(); + $this->number = $phone->search(); $this->num_type = $num_type; - $this->phone_type = format_phone_number($phone_type); + $this->phone_type = $phone_type; } public function buildCondition(PlFilter &$uf) @@ -1029,6 +1132,19 @@ class UFC_Medal implements UserFilterCondition } // }}} +// {{{ class UFC_Photo +/** Filters profiles with photo + */ +class UFC_Photo implements UserFilterCondition +{ + public function buildCondition(PlFilter &$uf) + { + $uf->addPhotoFilter(); + return 'photo.attach IS NOT NULL'; + } +} +// }}} + // {{{ class UFC_Mentor_Expertise /** Filters users by mentoring expertise * @param $expertise Domain of expertise @@ -1045,7 +1161,7 @@ class UFC_Mentor_Expertise implements UserFilterCondition public function buildCondition(PlFilter &$uf) { $sub = $uf->addMentorFilter(UserFilter::MENTOR_EXPERTISE); - return $sub . '.expertise LIKE ' . XDB::format('CONCAT(\'%\', {?}, \'%\'', $this->expertise); + return $sub . '.expertise ' . XDB::formatWildcards(XDB::WILDCARD_CONTAINS, $this->expertise); } } // }}} @@ -1058,44 +1174,46 @@ class UFC_Mentor_Country implements UserFilterCondition { private $country; - public function __construct($country) + public function __construct() { - $this->country = $country; + $this->country = pl_flatten(func_get_args()); } public function buildCondition(PlFilter &$uf) { $sub = $uf->addMentorFilter(UserFilter::MENTOR_COUNTRY); - return $sub . '.country = ' . XDB::format('{?}', $this->country); + return $sub . '.country IN ' . XDB::format('{?}', $this->country); } } // }}} // {{{ class UFC_Mentor_Sectorization /** Filters users based on mentoring (sub|)sector - * @param $sector ID of sector - * @param $subsector Subsector (null for any) + * @param $sector ID of (sub)sector + * @param $type Whether we are looking for a sector or a subsector */ class UFC_Mentor_Sectorization implements UserFilterCondition { + const SECTOR = 1; + const SUBSECTOR = 2; private $sector; - private $subsector; + private $type; - public function __construct($sector, $subsector = null) + public function __construct($sector, $type = self::SECTOR) { $this->sector = $sector; - $this->subsubsector = $subsector; + $this->type = $type; } public function buildCondition(PlFilter &$uf) { $sub = $uf->addMentorFilter(UserFilter::MENTOR_SECTOR); - $conds = array(); - $conds[] = $sub . '.sectorid = ' . XDB::format('{?}', $this->sector); - if ($this->subsector != null) { - $conds[] = $sub . '.subsectorid = ' . XDB::format('{?}', $this->subsector); + if ($this->type == self::SECTOR) { + $field = 'sectorid'; + } else { + $field = 'subsectorid'; } - return implode(' AND ', $conds); + return $sub . '.' . $field . ' = ' . XDB::format('{?}', $this->sector); } } // }}} @@ -1134,14 +1252,14 @@ class UFC_WatchRegistration extends UFC_UserRelated { public function buildCondition(PlFilter &$uf) { - if (!$this->user->watch('registration')) { + if (!$this->user->watchType('registration')) { return PlFilterCondition::COND_FALSE; } $uids = $this->user->watchUsers(); if (count($uids) == 0) { return PlFilterCondition::COND_FALSE; } else { - return '$UID IN ' . XDB::formatArray($uids); + return XDB::format('$UID IN {?}', $uids); } } } @@ -1169,7 +1287,7 @@ class UFC_WatchPromo extends UFC_UserRelated } else { $sube = $uf->addEducationFilter(true, $this->grade); $field = 'pe' . $sube . '.' . UserFilter::promoYear($this->grade); - return $field . ' IN ' . XDB::formatArray($promos); + return XDB::format($field . ' IN {?}', $promos); } } } @@ -1190,33 +1308,37 @@ class UFC_WatchContact extends UFC_Contact } // }}} - -/****************** - * ORDERS - ******************/ - -// {{{ class UserFilterOrder -/** Base class for ordering results of a query. - * Parameters for the ordering must be given to the constructor ($desc for a - * descending order). - * The getSortTokens function is used to get actual ordering part of the query. +// {{{ class UFC_MarketingHash +/** Filters users using the hash generated + * to send marketing emails to him. */ -abstract class UserFilterOrder extends PlFilterOrder +class UFC_MarketingHash implements UserFilterCondition { - /** This function must return the tokens to use for ordering - * @param &$uf The UserFilter whose results must be ordered - * @return The name of the field to use for ordering results - */ - abstract protected function getSortTokens(UserFilter &$uf); + private $hash; + + public function __construct($hash) + { + $this->hash = $hash; + } + + public function buildCondition(PlFilter &$uf) + { + $table = $uf->addMarketingHash(); + return XDB::format('rm.hash = {?}', $this->hash); + } } // }}} +/****************** + * ORDERS + ******************/ + // {{{ class UFO_Promo /** Orders users by promotion * @param $grade Formation whose promotion users should be sorted by (restricts results to users of that formation) * @param $desc Whether sort is descending */ -class UFO_Promo extends UserFilterOrder +class UFO_Promo extends PlFilterGroupableOrder { private $grade; @@ -1226,7 +1348,7 @@ class UFO_Promo extends UserFilterOrder $this->grade = $grade; } - protected function getSortTokens(UserFilter &$uf) + protected function getSortTokens(PlFilter &$uf) { if (UserFilter::isGrade($this->grade)) { $sub = $uf->addEducationFilter($this->grade); @@ -1246,7 +1368,7 @@ class UFO_Promo extends UserFilterOrder * @param $particle Set to true if particles should be included in the sorting order * @param $desc If sort order should be descending */ -class UFO_Name extends UserFilterOrder +class UFO_Name extends PlFilterOrder { private $type; private $variant; @@ -1260,11 +1382,17 @@ class UFO_Name extends UserFilterOrder $this->particle = $particle; } - protected function getSortTokens(UserFilter &$uf) + protected function getSortTokens(PlFilter &$uf) { - if (UserFilter::isDisplayName($this->type)) { + if (Profile::isDisplayName($this->type)) { $sub = $uf->addDisplayFilter(); - return 'pd' . $sub . '.' . $this->type; + $token = 'pd' . $sub . '.' . $this->type; + if ($uf->accountsRequired()) { + $account_token = Profile::getAccountEquivalentName($this->type); + return 'IFNULL(' . $token . ', a.' . $account_token . ')'; + } else { + return $token; + } } else { $sub = $uf->addNameFilter($this->type, $this->variant); if ($this->particle) { @@ -1278,12 +1406,22 @@ class UFO_Name extends UserFilterOrder // }}} // {{{ class UFO_Score -class UFO_Score extends UserFilterOrder +class UFO_Score extends PlFilterOrder { - protected function getSortTokens(UserFilter &$uf) + protected function getSortTokens(PlFilter &$uf) { - $sub = $uf->addNameTokensFilter(); - return 'SUM(' . $sub . '.score)'; + $toks = $uf->getNameTokens(); + $scores = array(); + + // If there weren't any sort tokens, we shouldn't sort by score, sort by NULL instead + if (count($toks) == 0) { + return 'NULL'; + } + + foreach ($toks as $sub => $token) { + $scores[] = XDB::format('SUM(' . $sub . '.score + IF (' . $sub . '.token = {?}, 5, 0) )', $token); + } + return implode(' + ', $scores); } } // }}} @@ -1291,10 +1429,11 @@ class UFO_Score extends UserFilterOrder // {{{ class UFO_Registration /** Sorts users based on registration date */ -class UFO_Registration extends UserFilterOrder +class UFO_Registration extends PlFilterOrder { - protected function getSortTokens(UserFilter &$uf) + protected function getSortTokens(PlFilter &$uf) { + $uf->requireAccounts(); return 'a.registration_date'; } } @@ -1303,10 +1442,11 @@ class UFO_Registration extends UserFilterOrder // {{{ class UFO_Birthday /** Sorts users based on next birthday date */ -class UFO_Birthday extends UserFilterOrder +class UFO_Birthday extends PlFilterOrder { - protected function getSortTokens(UserFilter &$uf) + protected function getSortTokens(PlFilter &$uf) { + $uf->requireProfiles(); return 'p.next_birthday'; } } @@ -1315,10 +1455,11 @@ class UFO_Birthday extends UserFilterOrder // {{{ class UFO_ProfileUpdate /** Sorts users based on last profile update */ -class UFO_ProfileUpdate extends UserFilterOrder +class UFO_ProfileUpdate extends PlFilterOrder { - protected function getSortTokens(UserFilter &$uf) + protected function getSortTokens(PlFilter &$uf) { + $uf->requireProfiles(); return 'p.last_change'; } } @@ -1327,15 +1468,68 @@ class UFO_ProfileUpdate extends UserFilterOrder // {{{ class UFO_Death /** Sorts users based on death date */ -class UFO_Death extends UserFilterOrder +class UFO_Death extends PlFilterOrder { - protected function getSortTokens(UserFilter &$uf) + protected function getSortTokens(PlFilter &$uf) { + $uf->requireProfiles(); return 'p.deathdate'; } } // }}} +// {{{ class UFO_Uid +/** Sorts users based on their uid + */ +class UFO_Uid extends PlFilterOrder +{ + protected function getSortTokens(PlFilter &$uf) + { + $uf->requireAccounts(); + return '$UID'; + } +} +// }}} + +// {{{ class UFO_Hruid +/** Sorts users based on their hruid + */ +class UFO_Hruid extends PlFilterOrder +{ + protected function getSortTokens(PlFilter &$uf) + { + $uf->requireAccounts(); + return 'a.hruid'; + } +} +// }}} + +// {{{ class UFO_Pid +/** Sorts users based on their pid + */ +class UFO_Pid extends PlFilterOrder +{ + protected function getSortTokens(PlFilter &$uf) + { + $uf->requireProfiles(); + return '$PID'; + } +} +// }}} + +// {{{ class UFO_Hrpid +/** Sorts users based on their hrpid + */ +class UFO_Hrpid extends PlFilterOrder +{ + protected function getSortTokens(PlFilter &$uf) + { + $uf->requireProfiles(); + return 'p.hrpid'; + } +} +// }}} + /*********************************** ********************************* @@ -1367,7 +1561,7 @@ class UFO_Death extends UserFilterOrder * in the final query. * * In the join_criter text, $ME is replaced with 'join_tablealias', $PID with - * profile.pid, and $UID with auth_user_md5.user_id. + * profile.pid, and $UID with accounts.uid. * * For each kind of "JOIN" needed, a function named addXXXFilter() should be defined; * its parameter will be used to set various private vars of the UserFilter describing @@ -1375,7 +1569,7 @@ class UFO_Death extends UserFilterOrder * when referring to the joined table. * * For example, if data from profile_job must be available to filter results, - * the UFC object will call $uf-addJobFilter(), which will set the 'with_pj' var and + * the UFC object will call $uf-addJobFilter(), which will set the 'with_pj' var and * return 'pj', the short name to use when referring to profile_job; when building * the query, calling the jobJoins function will return an array containing a single * row: @@ -1388,16 +1582,19 @@ class UserFilter extends PlFilter { protected $joinMethods = array(); - protected $joinMetas = array('$PID' => 'p.pid', - '$UID' => 'a.uid', + protected $joinMetas = array( + '$PID' => 'p.pid', + '$UID' => 'a.uid', ); private $root; private $sort = array(); + private $grouper = null; private $query = null; private $orderby = null; - private $lastcount = null; + private $lastusercount = null; + private $lastprofilecount = null; public function __construct($cond = null, $sort = null) { @@ -1416,7 +1613,7 @@ class UserFilter extends PlFilter } } if (!is_null($sort)) { - if ($sort instanceof UserFilterOrder) { + if ($sort instanceof PlFilterOrder) { $this->addSort($sort); } else if (is_array($sort)) { foreach ($sort as $s) { @@ -1428,6 +1625,14 @@ class UserFilter extends PlFilter private function buildQuery() { + // The root condition is built first because some orders need info + // available only once all UFC have set their conditions (UFO_Score) + if (is_null($this->query)) { + $where = $this->root->buildCondition($this); + $where = str_replace(array_keys($this->joinMetas), + $this->joinMetas, + $where); + } if (is_null($this->orderby)) { $orders = array(); foreach ($this->sort as $sort) { @@ -1438,13 +1643,12 @@ class UserFilter extends PlFilter } else { $this->orderby = 'ORDER BY ' . implode(', ', $orders); } + $this->orderby = str_replace(array_keys($this->joinMetas), + $this->joinMetas, + $this->orderby); } if (is_null($this->query)) { - $where = $this->root->buildCondition($this); - if ($this->with_forced_sn) { - $this->requireProfiles(); - $from = 'search_name AS sn'; - } else if ($this->with_accounts) { + if ($this->with_accounts) { $from = 'accounts AS a'; } else { $this->requireProfiles(); @@ -1457,21 +1661,57 @@ class UserFilter extends PlFilter } } + public function hasGroups() + { + return $this->grouper != null; + } + + public function getGroups() + { + return $this->getUIDGroups(); + } + + public function getUIDGroups() + { + $this->requireAccounts(); + $this->buildQuery(); + $token = $this->grouper->getGroupToken($this); + + $groups = XDB::fetchAllRow('SELECT ' . $token . ', COUNT(a.uid) + ' . $this->query . ' + GROUP BY ' . $token, + 0); + return $groups; + } + + public function getPIDGroups() + { + $this->requireProfiles(); + $this->buildQuery(); + $token = $this->grouper->getGroupToken($this); + + $groups = XDB::fetchAllRow('SELECT ' . $token . ', COUNT(p.pid) + ' . $this->query . ' + GROUP BY ' . $token, + 0); + return $groups; + } + private function getUIDList($uids = null, PlLimit &$limit) { $this->requireAccounts(); $this->buildQuery(); $lim = $limit->getSql(); $cond = ''; - if (!is_null($uids)) { - $cond = ' AND a.uid IN ' . XDB::formatArray($uids); + if (!empty($uids)) { + $cond = XDB::format(' AND a.uid IN {?}', $uids); } $fetched = XDB::fetchColumn('SELECT SQL_CALC_FOUND_ROWS a.uid ' . $this->query . $cond . ' GROUP BY a.uid ' . $this->orderby . ' ' . $lim); - $this->lastcount = (int)XDB::fetchOneCell('SELECT FOUND_ROWS()'); + $this->lastusercount = (int)XDB::fetchOneCell('SELECT FOUND_ROWS()'); return $fetched; } @@ -1482,17 +1722,25 @@ class UserFilter extends PlFilter $lim = $limit->getSql(); $cond = ''; if (!is_null($pids)) { - $cond = ' AND p.pid IN ' . XDB::formatArray($pids); + $cond = XDB::format(' AND p.pid IN {?}', $pids); } $fetched = XDB::fetchColumn('SELECT SQL_CALC_FOUND_ROWS p.pid ' . $this->query . $cond . ' GROUP BY p.pid ' . $this->orderby . ' ' . $lim); - $this->lastcount = (int)XDB::fetchOneCell('SELECT FOUND_ROWS()'); + $this->lastprofilecount = (int)XDB::fetchOneCell('SELECT FOUND_ROWS()'); return $fetched; } + private static function defaultLimit($limit) { + if ($limit == null) { + return new PlLimit(); + } else { + return $limit; + } + } + /** Check that the user match the given rule. */ public function checkUser(PlUser &$user) @@ -1517,15 +1765,16 @@ class UserFilter extends PlFilter /** Default filter is on users */ - public function filter(array $users, PlLimit &$limit) + public function filter(array $users, $limit = null) { - return $this->filterUsers($users, $limit); + return $this->filterUsers($users, self::defaultLimit($limit)); } /** Filter a list of users to extract the users matching the rule. */ - public function filterUsers(array $users, PlLimit &$limit) + public function filterUsers(array $users, $limit = null) { + $limit = self::defaultLimit($limit); $this->requireAccounts(); $this->buildQuery(); $table = array(); @@ -1549,8 +1798,9 @@ class UserFilter extends PlFilter /** Filter a list of profiles to extract the users matching the rule. */ - public function filterProfiles(array $profiles, PlLimit &$limit) + public function filterProfiles(array $profiles, $limit = null) { + $limit = self::defaultLimit($limit); $this->requireProfiles(); $this->buildQuery(); $table = array(); @@ -1572,44 +1822,110 @@ class UserFilter extends PlFilter return $output; } - public function getUIDs(PlLimit &$limit) + public function getUIDs($limit = null) { + $limit = self::defaultLimit($limit); return $this->getUIDList(null, $limit); } - public function getPIDs(PlLimit &$limit) + public function getUID($pos = 0) + { + $uids =$this->getUIDList(null, new PlLimit(1, $pos)); + if (count($uids) == 0) { + return null; + } else { + return $uids[0]; + } + } + + public function getPIDs($limit = null) { + $limit = self::defaultLimit($limit); return $this->getPIDList(null, $limit); } - public function getUsers(PlLimit &$limit) + public function getPID($pos = 0) + { + $pids =$this->getPIDList(null, new PlLimit(1, $pos)); + if (count($pids) == 0) { + return null; + } else { + return $pids[0]; + } + } + + public function getUsers($limit = null) { return User::getBulkUsersWithUIDs($this->getUIDs($limit)); } - public function getProfiles(PlLimit &$limit) + public function getUser($pos = 0) + { + $uid = $this->getUID($pos); + if ($uid == null) { + return null; + } else { + return User::getWithUID($uid); + } + } + + public function iterUsers($limit = null) { - return Profile::getBulkProfilesWithPIDs($this->getPIDs($limit)); + return User::iterOverUIDs($this->getUIDs($limit)); } - public function get(PlLimit &$limit) + public function getProfiles($limit = null, $fields = 0x0000, $visibility = null) + { + return Profile::getBulkProfilesWithPIDs($this->getPIDs($limit), $fields, $visibility); + } + + public function getProfile($pos = 0, $fields = 0x0000, $visibility = null) + { + $pid = $this->getPID($pos); + if ($pid == null) { + return null; + } else { + return Profile::get($pid, $fields, $visibility); + } + } + + public function iterProfiles($limit = null, $fields = 0x0000, $visibility = null) + { + return Profile::iterOverPIDs($this->getPIDs($limit), true, $fields, $visibility); + } + + public function get($limit = null) { return $this->getUsers($limit); } + public function getTotalCount() { - if (is_null($this->lastcount)) { + return $this->getTotalUserCount(); + } + + public function getTotalUserCount() + { + if (is_null($this->lastusercount)) { + $this->requireAccounts(); $this->buildQuery(); - if ($this->with_accounts) { - $field = 'a.uid'; - } else { - $field = 'p.pid'; - } - return (int)XDB::fetchOneCell('SELECT COUNT(DISTINCT ' . $field . ') + return (int)XDB::fetchOneCell('SELECT COUNT(DISTINCT a.uid) ' . $this->query); } else { - return $this->lastcount; + return $this->lastusercount; + } + } + + public function getTotalProfileCount() + { + if (is_null($this->lastprofilecount)) { + $this->requireProfiles(); + $this->buildQuery(); + return (int)XDB::fetchOneCell('SELECT COUNT(DISTINCT p.pid) + ' . $this->query); + } else { + return $this->lastprofilecount; } } @@ -1621,6 +1937,10 @@ class UserFilter extends PlFilter public function addSort(PlFilterOrder &$sort) { + if (count($this->sort) == 0 && $sort instanceof PlFilterGroupableOrder) + { + $this->grouper = $sort; + } $this->sort[] = $sort; $this->orderby = null; } @@ -1630,29 +1950,36 @@ class UserFilter extends PlFilter if ($promo_min != 0) { $min = new UFC_Promo('>=', self::GRADE_ING, intval($promo_min)); } else { - $min = new UFC_True(); + $min = new PFC_True(); } if ($promo_max != 0) { $max = new UFC_Promo('<=', self::GRADE_ING, intval($promo_max)); } else { - $max = new UFC_True(); + $max = new PFC_True(); } return new UserFilter(new PFC_And($min, $max)); } static public function sortByName() { - return array(new UFO_Name(self::LASTNAME), new UFO_Name(self::FIRSTNAME)); + return array(new UFO_Name(Profile::LASTNAME), new UFO_Name(Profile::FIRSTNAME)); } static public function sortByPromo() { - return array(new UFO_Promo(), new UFO_Name(self::LASTNAME), new UFO_Name(self::FIRSTNAME)); + return array(new UFO_Promo(), new UFO_Name(Profile::LASTNAME), new UFO_Name(Profile::FIRSTNAME)); } static private function getDBSuffix($string) { - return preg_replace('/[^a-z0-9]/i', '', $string); + if (is_array($string)) { + if (count($string) == 1) { + return self::getDBSuffix(array_pop($string)); + } + return md5(implode('|', $string)); + } else { + return preg_replace('/[^a-z0-9]/i', '', $string); + } } @@ -1680,36 +2007,32 @@ class UserFilter extends PlFilter */ private $with_profiles = false; private $with_accounts = false; - private $with_forced_sn = false; public function requireAccounts() { $this->with_accounts = true; } + public function accountsRequired() + { + return $this->with_accounts; + } + public function requireProfiles() { $this->with_profiles = true; } - /** Forces the "FROM" to use search_name instead of accounts or profiles */ - public function forceSearchName() + public function profilesRequired() { - $this->with_forced_sn = true; + return $this->with_profiles; } protected function accountJoins() { $joins = array(); - /** Quick search is much more efficient with sn first and PID second */ - if ($this->with_forced_sn) { - $joins['p'] = new PlSqlJoin(PlSqlJoin::MODE_LEFT, 'profiles', '$PID = sn.uid'); - if ($this->with_accounts) { - $joins['ap'] = new PlSqlJoin(PlSqlJoin::MODE_LEFT, 'account_profiles', '$ME.pid = $PID'); - $joins['a'] = new PlSqlJoin(PlSqlJoin::MODE_LEFT, 'accounts', '$UID = ap.uid'); - } - } else if ($this->with_profiles && $this->with_accounts) { - $joins['ap'] = new PlSqlJoin(PlSqlJoin::MODE_LEFT, 'account_profiles', '$ME.uid = $UID AND FIND_IN_SET(\'owner\', ap.perms)'); - $joins['p'] = new PlSqlJoin(PlSqlJoin::MODE_LEFT, 'profiles', '$PID = ap.pid'); + if ($this->with_profiles && $this->with_accounts) { + $joins['ap'] = PlSqlJoin::left('account_profiles', '$ME.uid = $UID AND FIND_IN_SET(\'owner\', ap.perms)'); + $joins['p'] = PlSqlJoin::left('profiles', '$PID = ap.pid'); } return $joins; } @@ -1728,53 +2051,39 @@ class UserFilter extends PlFilter protected function displayJoins() { if ($this->pd) { - return array('pd' => new PlSqlJoin(PlSqlJoin::MODE_LEFT, 'profile_display', '$ME.pid = $PID')); + return array('pd' => PlSqlJoin::left('profile_display', '$ME.pid = $PID')); } else { return array(); } } - /** NAMES + /** LOGGER */ - /* name tokens */ - const LASTNAME = 'lastname'; - const FIRSTNAME = 'firstname'; - const NICKNAME = 'nickname'; - const PSEUDONYM = 'pseudonym'; - const NAME = 'name'; - /* name variants */ - const VN_MARITAL = 'marital'; - const VN_ORDINARY = 'ordinary'; - const VN_OTHER = 'other'; - const VN_INI = 'ini'; - /* display names */ - const DN_FULL = 'directory_name'; - const DN_DISPLAY = 'yourself'; - const DN_YOURSELF = 'yourself'; - const DN_DIRECTORY = 'directory_name'; - const DN_PRIVATE = 'private_name'; - const DN_PUBLIC = 'public_name'; - const DN_SHORT = 'short_name'; - const DN_SORT = 'sort_name'; - - 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) - ); - static public function assertName($name) + private $with_logger = false; + public function addLoggerFilter() { - if (!Profile::getNameTypeId($name)) { - Platal::page()->kill('Invalid name type: ' . $name); + $this->with_logger = true; + $this->requireAccounts(); + return 'ls'; + } + protected function loggerJoins() + { + $joins = array(); + if ($this->with_logger) { + $joins['ls'] = PlSqlJoin::left('log_sessions', '$ME.uid = $UID'); } + return $joins; } - static public function isDisplayName($name) + /** NAMES + */ + + static public function assertName($name) { - return $name == self::DN_FULL || $name == self::DN_DISPLAY - || $name == self::DN_YOURSELF || $name == self::DN_DIRECTORY - || $name == self::DN_PRIVATE || $name == self::DN_PUBLIC - || $name == self::DN_SHORT || $name == self::DN_SORT; + if (!DirEnum::getID(DirEnum::NAMETYPES, $name)) { + Platal::page()->kill('Invalid name type: ' . $name); + } } private $pn = array(); @@ -1792,7 +2101,7 @@ class UserFilter extends PlFilter if (!is_null($variant) && $variant == 'other') { $sub .= $this->option++; } - $this->pn[$sub] = Profile::getNameTypeId($ft); + $this->pn[$sub] = DirEnum::getID(DirEnum::NAMETYPES, $ft); return $sub; } @@ -1800,33 +2109,38 @@ class UserFilter extends PlFilter { $joins = array(); foreach ($this->pn as $sub => $type) { - $joins['pn' . $sub] = new PlSqlJoin(PlSqlJoin::MODE_LEFT, 'profile_name', '$ME.pid = $PID AND $ME.typeid = ' . $type); + $joins['pn' . $sub] = PlSqlJoin::left('profile_name', '$ME.pid = $PID AND $ME.typeid = {?}', $type); } return $joins; } /** NAMETOKENS */ - private $with_sn = false; - // Set $doingQuickSearch to true if you wish to optimize the query - public function addNameTokensFilter($doingQuickSearch = false) + private $name_tokens = array(); + private $nb_tokens = 0; + + public function addNameTokensFilter($token) { $this->requireProfiles(); - $this->with_forced_sn = ($this->with_forced_sn || $doingQuickSearch); - $this->with_sn = true; - return 'sn'; + $sub = 'sn' . (1 + $this->nb_tokens); + $this->nb_tokens++; + $this->name_tokens[$sub] = $token; + return $sub; } protected function nameTokensJoins() { /* We don't return joins, since with_sn forces the SELECT to run on search_name first */ - if ($this->with_sn && !$this->with_forced_sn) { - return array( - 'sn' => new PlSqlJoin(PlSqlJoin::MODE_LEFT, 'search_name', '$ME.uid = $PID') - ); - } else { - return array(); + $joins = array(); + foreach ($this->name_tokens as $sub => $token) { + $joins[$sub] = PlSqlJoin::left('search_name', '$ME.pid = $PID'); } + return $joins; + } + + public function getNameTokens() + { + return $this->name_tokens; } /** NATIONALITY @@ -1843,7 +2157,7 @@ class UserFilter extends PlFilter { $joins = array(); if ($this->with_nat) { - $joins['ngc'] = new PlSqlJoin(PlSqlJoin::MODE_LEFT, 'geoloc_countries', '$ME.iso_3166_1_a2 = p.nationality1 OR $ME.iso_3166_1_a2 = p.nationality2 OR $ME.iso_3166_1_a2 = p.nationality3'); + $joins['ngc'] = PlSqlJoin::left('geoloc_countries', '$ME.iso_3166_1_a2 = p.nationality1 OR $ME.iso_3166_1_a2 = p.nationality2 OR $ME.iso_3166_1_a2 = p.nationality3'); } return $joins; } @@ -1855,13 +2169,13 @@ class UserFilter extends PlFilter const GRADE_MST = 'M%'; static public function isGrade($grade) { - return $grade == self::GRADE_ING || $grade == self::GRADE_PHD || $grade == self::GRADE_MST; + return ($grade !== 0) && ($grade == self::GRADE_ING || $grade == self::GRADE_PHD || $grade == self::GRADE_MST); } static public function assertGrade($grade) { if (!self::isGrade($grade)) { - Platal::page()->killError("Diplôme non valide"); + Platal::page()->killError("Diplôme non valide: $grade"); } } @@ -1894,17 +2208,16 @@ class UserFilter extends PlFilter { $joins = array(); if ($this->with_pee) { - $joins['pee'] = new PlSqlJoin(PlSqlJoin::MODE_INNER, 'profile_education_enum', 'pee.abbreviation = \'X\''); + $joins['pee'] = PlSqlJoin::inner('profile_education_enum', 'pee.abbreviation = \'X\''); } foreach ($this->pepe as $grade => $sub) { if ($this->isGrade($grade)) { - $joins['pe' . $sub] = new PlSqlJoin(PlSqlJoin::MODE_LEFT, 'profile_education', '$ME.eduid = pee.id AND $ME.uid = $PID'); - $joins['pede' . $sub] = new PlSqlJoin(PlSqlJoin::MODE_INNER, 'profile_education_degree_enum', '$ME.id = pe' . $sub . '.degreeid AND $ME.abbreviation LIKE ' . - XDB::format('{?}', $grade)); + $joins['pe' . $sub] = PlSqlJoin::left('profile_education', '$ME.eduid = pee.id AND $ME.pid = $PID'); + $joins['pede' . $sub] = PlSqlJoin::inner('profile_education_degree_enum', '$ME.id = pe' . $sub . '.degreeid AND $ME.abbreviation LIKE {?}', $grade); } else { - $joins['pe' . $sub] = new PlSqlJoin(PlSqlJoin::MODE_LEFT, 'profile_education', '$ME.uid = $PID'); - $joins['pee' . $sub] = new PlSqlJoin(PlSqlJoin::MODE_INNER, 'profile_education_enum', '$ME.id = pe' . $sub . '.eduid'); - $joins['pede' . $sub] = new PlSqlJoin(PlSqlJoin::MODE_INNER, 'profile_education_degree_enum', '$ME.id = pe' . $sub . '.degreeid'); + $joins['pe' . $sub] = PlSqlJoin::left('profile_education', '$ME.pid = $PID'); + $joins['pee' . $sub] = PlSqlJoin::inner('profile_education_enum', '$ME.id = pe' . $sub . '.eduid'); + $joins['pede' . $sub] = PlSqlJoin::inner('profile_education_degree_enum', '$ME.id = pe' . $sub . '.degreeid'); } } return $joins; @@ -1918,7 +2231,7 @@ class UserFilter extends PlFilter { $this->requireAccounts(); if (!is_null($group)) { - if (ctype_digit($group)) { + if (is_int($group) || ctype_digit($group)) { $index = $sub = $group; } else { $index = $group; @@ -1938,13 +2251,13 @@ class UserFilter extends PlFilter $joins = array(); foreach ($this->gpm as $sub => $key) { if (is_null($key)) { - $joins['gpa' . $sub] = new PlSqlJoin(PlSqlJoin::MODE_INNER, 'groupex.asso'); - $joins['gpm' . $sub] = new PlSqlJoin(PlSqlJoin::MODE_LEFT, 'groupex.membres', '$ME.uid = $UID AND $ME.asso_id = gpa' . $sub . '.id'); - } else if (ctype_digit($key)) { - $joins['gpm' . $sub] = new PlSqlJoin(PlSqlJoin::MODE_LEFT, 'groupex.membres', '$ME.uid = $UID AND $ME.asso_id = ' . $key); + $joins['gpa' . $sub] = PlSqlJoin::inner('groups'); + $joins['gpm' . $sub] = PlSqlJoin::left('group_members', '$ME.uid = $UID AND $ME.asso_id = gpa' . $sub . '.id'); + } else if (is_int($key) || ctype_digit($key)) { + $joins['gpm' . $sub] = PlSqlJoin::left('group_members', '$ME.uid = $UID AND $ME.asso_id = ' . $key); } else { - $joins['gpa' . $sub] = new PlSqlJoin(PlSqlJoin::MODE_INNER, 'groupex.asso', XDB::format('$ME.diminutif = {?}', $key)); - $joins['gpm' . $sub] = new PlSqlJoin(PlSqlJoin::MODE_LEFT, 'groupex.membres', '$ME.uid = $UID AND $ME.asso_id = gpa' . $sub . '.id'); + $joins['gpa' . $sub] = PlSqlJoin::inner('groups', '$ME.diminutif = {?}', $key); + $joins['gpm' . $sub] = PlSqlJoin::left('group_members', '$ME.uid = $UID AND $ME.asso_id = gpa' . $sub . '.id'); } } return $joins; @@ -1955,7 +2268,7 @@ class UserFilter extends PlFilter private $with_bi = false; private $with_bd = false; - public function addBinetsFilter($with_enum = false;) + public function addBinetsFilter($with_enum = false) { $this->requireProfiles(); $this->with_bi = true; @@ -1971,10 +2284,10 @@ class UserFilter extends PlFilter { $joins = array(); if ($this->with_bi) { - $joins['bi'] = new PlSqlJoin(PlSqlJoin::MODE_LEFT, 'binets_ins', '$ME.uid = $PID'); + $joins['bi'] = PlSqlJoin::left('profile_binets', '$ME.pid = $PID'); } if ($this->with_bd) { - $joins['bd'] = new PlSqlJoin(PlSqlJoin::MODE_LEFT, 'binets_def', '$ME.id = bi.binet_id'); + $joins['bd'] = PlSqlJoin::left('profile_binet_enum', '$ME.id = bi.binet_id'); } return $joins; } @@ -2010,33 +2323,45 @@ class UserFilter extends PlFilter $joins = array(); foreach ($this->e as $sub=>$key) { if (is_null($key)) { - $joins['e' . $sub] = new PlSqlJoin(PlSqlJoin::MODE_LEFT, 'emails', '$ME.uid = $UID AND $ME.flags != \'filter\''); + $joins['e' . $sub] = PlSqlJoin::left('emails', '$ME.uid = $UID AND $ME.flags != \'filter\''); } else { - $joins['e' . $sub] = new PlSqlJoin(PlSqlJoin::MODE_LEFT, 'emails', XDB::format('$ME.uid = $UID AND $ME.flags != \'filter\' AND $ME.email = {?}', $key)); + if (!is_array($key)) { + $key = array($key); + } + $joins['e' . $sub] = PlSqlJoin::left('emails', '$ME.uid = $UID AND $ME.flags != \'filter\' + AND $ME.email IN {?}', $key); } } foreach ($this->al as $sub=>$key) { if (is_null($key)) { - $joins['al' . $sub] = new PlSqlJoin(PlSqlJoin::MODE_LEFT, 'aliases', '$ME.id = $UID AND $ME.type IN (\'alias\', \'a_vie\')'); + $joins['al' . $sub] = PlSqlJoin::left('aliases', '$ME.uid = $UID AND $ME.type IN (\'alias\', \'a_vie\')'); } else if ($key == self::ALIAS_BEST) { - $joins['al' . $sub] = new PlSqlJoin(PlSqlJoin::MODE_LEFT, 'aliases', '$ME.id = $UID AND $ME.type IN (\'alias\', \'a_vie\') AND FIND_IN_SET(\'bestalias\', $ME.flags)'); + $joins['al' . $sub] = PlSqlJoin::left('aliases', '$ME.uid = $UID AND $ME.type IN (\'alias\', \'a_vie\') AND FIND_IN_SET(\'bestalias\', $ME.flags)'); } else if ($key == self::ALIAS_FORLIFE) { - $joins['al' . $sub] = new PlSqlJoin(PlSqlJoin::MODE_LEFT, 'aliases', '$ME.id = $UID AND $ME.type = \'a_vie\''); + $joins['al' . $sub] = PlSqlJoin::left('aliases', '$ME.uid = $UID AND $ME.type = \'a_vie\''); } else { - $joins['al' . $sub] = new PlSqlJoin(PlSqlJoin::MODE_LEFT, 'aliases', XDB::format('$ME.id = $UID AND $ME.type IN (\'alias\', \'a_vie\') AND $ME.alias = {?}', $key)); + if (!is_array($key)) { + $key = array($key); + } + $joins['al' . $sub] = PlSqlJoin::left('aliases', '$ME.uid = $UID AND $ME.type IN (\'alias\', \'a_vie\') + AND $ME.alias IN {?}', $key); } } foreach ($this->ve as $sub=>$key) { if (is_null($key)) { - $joins['v' . $sub] = new PlSqlJoin(PlSqlJoin::MODE_LEFT, 'virtual', '$ME.type = \'user\''); + $joins['v' . $sub] = PlSqlJoin::left('virtual', '$ME.type = \'user\''); } else { - $joins['v' . $sub] = new PlSqlJoin(PlSqlJoin::MODE_LEFT, 'virtual', XDB::format('$ME.type = \'user\' AND $ME.alias = {?}', $key)); + if (!is_array($key)) { + $key = array($key); + } + $joins['v' . $sub] = PlSqlJoin::left('virtual', '$ME.type = \'user\' AND $ME.alias IN {?}', $key); } - $joins['vr' . $sub] = new PlSqlJoin(PlSqlJoin::MODE_LEFT, 'virtual_redirect', XDB::format('$ME.vid = v' . $sub . '.vid - AND ($ME.redirect IN (CONCAT(al_forlife.alias, \'@\', {?}), - CONCAT(al_forlife.alias, \'@\', {?}), - a.email))', - $globals->mail->domain, $globals->mail->domain2)); + $joins['vr' . $sub] = PlSqlJoin::left('virtual_redirect', + '$ME.vid = v' . $sub . '.vid + AND ($ME.redirect IN (CONCAT(al_forlife.alias, \'@\', {?}), + CONCAT(al_forlife.alias, \'@\', {?}), + a.email))', + $globals->mail->domain, $globals->mail->domain2); } return $joins; } @@ -2061,7 +2386,7 @@ class UserFilter extends PlFilter return 'gc'; } - private $with_pal = true; + private $with_pal = false; public function addAddressLocalityFilter() { $this->requireProfiles(); @@ -2074,13 +2399,13 @@ class UserFilter extends PlFilter { $joins = array(); if ($this->with_pa) { - $joins['pa'] = new PlSqlJoin(PlSqlJoin::MODE_LEFT, 'profile_address', '$ME.pid = $PID'); + $joins['pa'] = PlSqlJoin::left('profile_addresses', '$ME.pid = $PID'); } if ($this->with_pac) { - $joins['gc'] = new PlSqlJoin(PlSqlJoin::MODE_LEFT, 'geoloc_countries', '$ME.iso_3166_1_a2 = pa.countryID'); + $joins['gc'] = PlSqlJoin::left('geoloc_countries', '$ME.iso_3166_1_a2 = pa.countryID'); } if ($this->with_pal) { - $joins['gl'] = new PlSqlJoin(PlSqlJoin::MODE_LEFT, 'geoloc_localities', '$ME.id = pa.localityID'); + $joins['gl'] = PlSqlJoin::left('geoloc_localities', '$ME.id = pa.localityID'); } return $joins; } @@ -2117,13 +2442,13 @@ class UserFilter extends PlFilter { $joins = array(); if ($this->pc) { - $joins['pc'] = new PlSqlJoin(PlSqlJoin::MODE_LEFT, 'profile_corps', '$ME.uid = $UID'); + $joins['pc'] = PlSqlJoin::left('profile_corps', '$ME.pid = $PID'); } if ($this->pcr) { - $joins['pcr'] = new PlSqlJoin(PlSqlJoin::MODE_LEFT, 'profile_corps_rank_enum', '$ME.id = pc.rankid'); + $joins['pcr'] = PlSqlJoin::left('profile_corps_rank_enum', '$ME.id = pc.rankid'); } foreach($this->pce as $sub => $field) { - $joins[$sub] = new PlSqlJoin(PlSqlJoin::MODE_LEFT, 'profile_corps_enum', '$ME.id = pc.' . $field); + $joins[$sub] = PlSqlJoin::left('profile_corps_enum', '$ME.id = pc.' . $field); } return $joins; } @@ -2131,12 +2456,15 @@ class UserFilter extends PlFilter /** JOBS */ - const JOB_SECTOR = 1; - const JOB_SUBSECTOR = 2; - const JOB_SUBSUBSECTOR = 4; - const JOB_ALTERNATES = 8; - const JOB_USERDEFINED = 16; - const JOB_CV = 32; + const JOB_SECTOR = 0x0001; + const JOB_SUBSECTOR = 0x0002; + const JOB_SUBSUBSECTOR = 0x0004; + const JOB_ALTERNATES = 0x0008; + const JOB_USERDEFINED = 0x0010; + const JOB_CV = 0x0020; + + const JOB_SECTORIZATION = 0x000F; + const JOB_ANY = 0x003F; /** Joins : * pj => profile_job @@ -2189,22 +2517,22 @@ class UserFilter extends PlFilter { $joins = array(); if ($this->with_pj) { - $joins['pj'] = new PlSqlJoin(PlSqlJoin::MODE_LEFT, 'profile_job', '$ME.uid = $UID'); + $joins['pj'] = PlSqlJoin::left('profile_job', '$ME.pid = $PID'); } if ($this->with_pje) { - $joins['pje'] = new PlSqlJoin(PlSqlJoin::MODE_LEFT, 'profile_job_enum', '$ME.id = pj.jobid'); + $joins['pje'] = PlSqlJoin::left('profile_job_enum', '$ME.id = pj.jobid'); } if ($this->with_pjse) { - $joins['pjse'] = new PlSqlJoin(PlSqlJoin::MODE_LEFT, 'profile_job_sector_enum', '$ME.id = pj.sectorid'); + $joins['pjse'] = PlSqlJoin::left('profile_job_sector_enum', '$ME.id = pj.sectorid'); } if ($this->with_pjsse) { - $joins['pjsse'] = new PlSqlJoin(PlSqlJoin::MODE_LEFT, 'profile_job_subsector_enum', '$ME.id = pj.subsectorid'); + $joins['pjsse'] = PlSqlJoin::left('profile_job_subsector_enum', '$ME.id = pj.subsectorid'); } if ($this->with_pjssse) { - $joins['pjssse'] = new PlSqlJoin(PlSqlJoin::MODE_LEFT, 'profile_job_subsubsector_enum', '$ME.id = pj.subsubsectorid'); + $joins['pjssse'] = PlSqlJoin::left('profile_job_subsubsector_enum', '$ME.id = pj.subsubsectorid'); } if ($this->with_pja) { - $joins['pja'] = new PlSqlJoin(PlSqlJoin::MODE_LEFT, 'profile_job_alternates', '$ME.subsubsectorid = pj.subsubsectorid'); + $joins['pja'] = PlSqlJoin::left('profile_job_alternates', '$ME.subsubsectorid = pj.subsubsectorid'); } return $joins; } @@ -2224,7 +2552,7 @@ class UserFilter extends PlFilter { $joins = array(); if ($this->with_pnw) { - $joins['pnw'] = new PlSqlJoin(PlSqlJoin::MODE_LEFT, 'profile_networking', '$ME.uid = $UID'); + $joins['pnw'] = PlSqlJoin::left('profile_networking', '$ME.pid = $PID'); } return $joins; } @@ -2245,7 +2573,7 @@ class UserFilter extends PlFilter { $joins = array(); if ($this->with_ptel) { - $joins['ptel'] = new PlSqlJoin(PlSqlJoin::MODE_LEFT, 'profile_phones', '$ME.uid = $UID'); + $joins['ptel'] = PlSqlJoin::left('profile_phones', '$ME.pid = $PID'); } return $joins; } @@ -2265,7 +2593,7 @@ class UserFilter extends PlFilter { $joins = array(); if ($this->with_pmed) { - $joins['pmed'] = new PlSqlJoin(PlSqlJoin::MODE_LEFT, 'profile_medals_sub', '$ME.uid = $UID'); + $joins['pmed'] = PlSqlJoin::left('profile_medals', '$ME.pid = $PID'); } return $joins; } @@ -2282,14 +2610,14 @@ class UserFilter extends PlFilter { $this->requireAccounts(); switch($type) { - case MENTOR_EXPERTISE: - $pms['pme'] = 'profile_mentor'; + case self::MENTOR_EXPERTISE: + $this->pms['pme'] = 'profile_mentor'; return 'pme'; - case MENTOR_COUNTRY: - $pms['pmc'] = 'profile_mentor_country'; + case self::MENTOR_COUNTRY: + $this->pms['pmc'] = 'profile_mentor_country'; return 'pmc'; - case MENTOR_SECTOR: - $pms['pms'] = 'profile_mentor_sector'; + case self::MENTOR_SECTOR: + $this->pms['pms'] = 'profile_mentor_sector'; return 'pms'; default: Platal::page()->killError("Undefined mentor filter."); @@ -2300,7 +2628,7 @@ class UserFilter extends PlFilter { $joins = array(); foreach ($this->pms as $sub => $tab) { - $joins[$sub] = new PlSqlJoin(PlSqlJoin::MODE_LEFT, $tab, '$ME.uid = $UID'); + $joins[$sub] = PlSqlJoin::left($tab, '$ME.pid = $PID'); } return $joins; } @@ -2310,7 +2638,7 @@ class UserFilter extends PlFilter private $cts = array(); public function addContactFilter($uid = null) { - $this->requireAccounts(); + $this->requireProfiles(); return $this->register_optional($this->cts, is_null($uid) ? null : 'user_' . $uid); } @@ -2319,9 +2647,9 @@ class UserFilter extends PlFilter $joins = array(); foreach ($this->cts as $sub=>$key) { if (is_null($key)) { - $joins['c' . $sub] = new PlSqlJoin(PlSqlJoin::MODE_LEFT, 'contacts', '$ME.contact = $UID'); + $joins['c' . $sub] = PlSqlJoin::left('contacts', '$ME.contact = $PID'); } else { - $joins['c' . $sub] = new PlSqlJoin(PlSqlJoin::MODE_LEFT, 'contacts', XDB::format('$ME.uid = {?} AND $ME.contact = $UID', substr($key, 5))); + $joins['c' . $sub] = PlSqlJoin::left('contacts', '$ME.uid = {?} AND $ME.contact = $PID', substr($key, 5)); } } return $joins; @@ -2356,34 +2684,97 @@ class UserFilter extends PlFilter $joins = array(); foreach ($this->w as $sub=>$key) { if (is_null($key)) { - $joins['w' . $sub] = new PlSqlJoin(PlSqlJoin::MODE_LEFT, 'watch'); + $joins['w' . $sub] = PlSqlJoin::left('watch'); } else { - $joins['w' . $sub] = new PlSqlJoin(PlSqlJoin::MODE_LEFT, 'watch', XDB::format('$ME.uid = {?}', substr($key, 5))); + $joins['w' . $sub] = PlSqlJoin::left('watch', '$ME.uid = {?}', substr($key, 5)); } } foreach ($this->wn as $sub=>$key) { if (is_null($key)) { - $joins['wn' . $sub] = new PlSqlJoin(PlSqlJoin::MODE_LEFT, 'watch_nonins', '$ME.ni_id = $UID'); + $joins['wn' . $sub] = PlSqlJoin::left('watch_nonins', '$ME.ni_id = $UID'); } else { - $joins['wn' . $sub] = new PlSqlJoin(PlSqlJoin::MODE_LEFT, 'watch_nonins', XDB::format('$ME.uid = {?} AND $ME.ni_id = $UID', substr($key, 5))); + $joins['wn' . $sub] = PlSqlJoin::left('watch_nonins', '$ME.uid = {?} AND $ME.ni_id = $UID', substr($key, 5)); } } foreach ($this->wn as $sub=>$key) { if (is_null($key)) { - $joins['wn' . $sub] = new PlSqlJoin(PlSqlJoin::MODE_LEFT, 'watch_nonins', '$ME.ni_id = $UID'); + $joins['wn' . $sub] = PlSqlJoin::left('watch_nonins', '$ME.ni_id = $UID'); } else { - $joins['wn' . $sub] = new PlSqlJoin(PlSqlJoin::MODE_LEFT, 'watch_nonins', XDB::format('$ME.uid = {?} AND $ME.ni_id = $UID', substr($key, 5))); + $joins['wn' . $sub] = PlSqlJoin::left('watch_nonins', '$ME.uid = {?} AND $ME.ni_id = $UID', substr($key, 5)); } } foreach ($this->wp as $sub=>$key) { if (is_null($key)) { - $joins['wp' . $sub] = new PlSqlJoin(PlSqlJoin::MODE_LEFT, 'watch_promo'); + $joins['wp' . $sub] = PlSqlJoin::left('watch_promo'); } else { - $joins['wp' . $sub] = new PlSqlJoin(PlSqlJoin::MODE_LEFT, 'watch_promo', XDB::format('$ME.uid = {?}', substr($key, 5))); + $joins['wp' . $sub] = PlSqlJoin::left('watch_promo', '$ME.uid = {?}', substr($key, 5)); } } return $joins; } + + + /** PHOTOS + */ + private $with_photo; + public function addPhotoFilter() + { + $this->requireProfiles(); + $this->with_photo = true; + } + + protected function photoJoins() + { + if ($this->with_photo) { + return array('photo' => PlSqlJoin::left('profile_photos', '$ME.pid = $PID')); + } else { + return array(); + } + } + + + /** MARKETING + */ + private $with_rm; + public function addMarketingHash() + { + $this->requireAccounts(); + $this->with_rm = true; + } + + protected function marketingJoins() + { + if ($this->with_rm) { + return array('rm' => PlSqlJoin::left('register_marketing', '$ME.uid = $UID')); + } else { + return array(); + } + } +} +// }}} + +// {{{ class ProfileFilter +class ProfileFilter extends UserFilter +{ + public function get($limit = null) + { + return $this->getProfiles($limit); + } + + public function filter(array $profiles, $limit = null) + { + return $this->filterProfiles($profiles, self::defaultLimit($limit)); + } + + public function getTotalCount() + { + return $this->getTotalProfileCount(); + } + + public function getGroups() + { + return $this->getPIDGroups(); + } } // }}}