X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=classes%2Fuserfilter.php;h=63157e568b75eb58bf6027107f5e073454b4df36;hb=fe13bc1d7ba9f72d452ec07baf8538a74b7c67b8;hp=65cd7c9eaacd276b80a6a1fcf9b7d74ef055b26b;hpb=f7ea7450cf41f2bca88de124759c6666412d2484;p=platal.git diff --git a/classes/userfilter.php b/classes/userfilter.php index 65cd7c9..63157e5 100644 --- a/classes/userfilter.php +++ b/classes/userfilter.php @@ -1,6 +1,6 @@ hruids = $val; + } + + public function buildCondition(PlFilter &$uf) + { + $ufc->requireAccounts(); + + return 'a.hruid IN ' . XDB::formatArray($this->hruids); + } +} +// }}} + +// {{{ 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 (>, =, ...) @@ -77,7 +139,7 @@ class UFC_Promo implements UserFilterCondition } } - public function buildCondition(UserFilter &$uf) + public function buildCondition(PlFilter &$uf) { if ($this->grade == UserFilter::DISPLAY) { $sub = $uf->addDisplayFilter(); @@ -91,6 +153,72 @@ class UFC_Promo implements UserFilterCondition } // }}} +// {{{ 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($val) + { + if (!is_array($val)) { + $val = array($val); + } + $this->val = $val; + } + + public function buildCondition(PlFilter &$uf) + { + $sub = $uf->addEducationFilter(); + return 'pe' . $sub . '.eduid IN ' . XDB::formatArray($this->val); + } +} +// }}} + +// {{{ class UFC_EducationDegree +class UFC_EducationDegree implements UserFilterCondition +{ + private $diploma; + + public function __construct($diploma) + { + if (! is_array($diploma)) { + $diploma = array($diploma); + } + $this->diploma = $diploma; + } + + public function buildCondition(PlFilter &$uf) + { + $sub = $uf->addEducationFilter(); + return 'pee' . $sub . '.degreeid IN ' . XDB::formatArray($this->val); + } +} +// }}} + +// {{{ class UFC_EducationField +class UFC_EducationField implements UserFilterCondition +{ + private $val; + + public function __construct($val) + { + if (!is_array($val)) { + $val = array($val); + } + $this->val = $val; + } + + public function buildCondition(PlFilter &$uf) + { + $sub = $uf->addEducationFilter(); + return 'pee' . $sub . '.fieldid IN ' . XDB::formatArray($this->val); + } +} +// }}} + // {{{ class UFC_Name /** Filters users based on name * @param $type Type of name field on which filtering is done (firstname, lastname...) @@ -99,11 +227,11 @@ class UFC_Promo implements UserFilterCondition */ class UFC_Name implements UserFilterCondition { - const PREFIX = 1; - const SUFFIX = 2; - const PARTICLE = 7; - const VARIANTS = 8; - const CONTAINS = 3; + const PREFIX = XDB::WILDCARD_PREFIX; // 0x001 + const SUFFIX = XDB::WILDCARD_SUFFIX; // 0x002 + const CONTAINS = XDB::WILDCARD_CONTAINS; // 0x003 + const PARTICLE = 0x007; // self::CONTAINS | 0x004 + const VARIANTS = 0x008; private $type; private $text; @@ -122,27 +250,18 @@ class UFC_Name implements UserFilterCondition return str_replace('$ME', 'pn' . $sub, $where); } - public function buildCondition(UserFilter &$uf) + 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); } } @@ -165,8 +284,9 @@ class UFC_NameTokens implements UserFilterCondition private $tokens; private $flags; private $soundex; + private $exact; - public function __construct($tokens, $flags = array(), $soundex = false) + public function __construct($tokens, $flags = array(), $soundex = false, $exact = false) { $this->tokens = $tokens; if (is_array($flags)) { @@ -175,18 +295,21 @@ class UFC_NameTokens implements UserFilterCondition $this->flags = array($flags); } $this->soundex = $soundex; + $this->exact = $exact; } - public function buildCondition(UserFilter &$uf) + public function buildCondition(PlFilter &$uf) { - $sub = $uf->addNameTokensFilter(true); + $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); + $tokconds[] = $sub . '.token ' . XDB::formatWildcards(XDB::WILDCARD_CONTAINS, $token); } $conds[] = implode(' OR ', $tokconds); } @@ -200,6 +323,33 @@ class UFC_NameTokens implements UserFilterCondition } // }}} +// {{{ class UFC_Nationality +class UFC_Nationality implements UserFilterCondition +{ + private $val; + + public function __construct($val) + { + if (!is_array($val)) { + $val = array($val); + } + $this->val = $val; + } + + public function buildCondition(PlFilter &$uf) + { + $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); + } +} +// }}} + // {{{ class UFC_Dead /** Filters users based on death date * @param $comparison Comparison operator @@ -216,8 +366,9 @@ class UFC_Dead implements UserFilterCondition $this->date = $date; } - public function buildCondition(UserFilter &$uf) + 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)); @@ -246,8 +397,9 @@ class UFC_Registered implements UserFilterCondition $this->date = $date; } - public function buildCondition(UserFilter &$uf) + public function buildCondition(PlFilter &$uf) { + $uf->requireAccounts(); if ($this->active) { $date = 'a.uid IS NOT NULL AND a.state = \'active\''; } else { @@ -277,8 +429,9 @@ class UFC_ProfileUpdated implements UserFilterCondition $this->date = $date; } - public function buildCondition(UserFilter &$uf) + public function buildCondition(PlFilter &$uf) { + $uf->requireProfiles(); return 'p.last_change ' . $this->comparison . XDB::format(' {?}', date('Y-m-d H:i:s', $this->date)); } } @@ -300,8 +453,9 @@ class UFC_Birthday implements UserFilterCondition $this->date = $date; } - public function buildCondition(UserFilter &$uf) + public function buildCondition(PlFilter &$uf) { + $uf->requireProfiles(); return 'p.next_birthday ' . $this->comparison . XDB::format(' {?}', date('Y-m-d', $this->date)); } } @@ -319,11 +473,12 @@ class UFC_Sex implements UserFilterCondition $this->sex = $sex; } - public function buildCondition(UserFilter &$uf) + public function buildCondition(PlFilter &$uf) { 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'); } } @@ -345,7 +500,7 @@ class UFC_Group implements UserFilterCondition $this->anim = $anim; } - public function buildCondition(UserFilter &$uf) + public function buildCondition(PlFilter &$uf) { $sub = $uf->addGroupFilter($this->group); $where = 'gpm' . $sub . '.perms IS NOT NULL'; @@ -357,6 +512,51 @@ 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 $val; + + public function __construct($val) + { + if (!is_array($val)) { + $val = array($val); + } + $this->val = $val; + } + + public function buildCondition(PlFilter &$uf) + { + $sub = $uf->addBinetsFilter(); + return $sub . '.binet_id IN ' . XDB::formatArray($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) + { + $this->section = $section; + } + + public function buildCondition(PlFilter &$uf) + { + $uf->requireProfiles(); + return 'p.section = ' . XDB::format('{?}', $this->section); + } +} +// }}} + // {{{ class UFC_Email /** Filters users based on email address * @param $email Email whose owner we are looking for @@ -369,7 +569,7 @@ class UFC_Email implements UserFilterCondition $this->email = $email; } - public function buildCondition(UserFilter &$uf) + public function buildCondition(PlFilter &$uf) { if (User::isForeignEmailAddress($this->email)) { $sub = $uf->addEmailRedirectFilter($this->email); @@ -398,7 +598,7 @@ class UFC_EmailList implements UserFilterCondition $this->emails = $emails; } - public function buildCondition(UserFilter &$uf) + public function buildCondition(PlFilter &$uf) { $email = null; $virtual = null; @@ -406,7 +606,7 @@ class UFC_EmailList implements UserFilterCondition $cond = array(); if (count($this->emails) == 0) { - return UserFilterCondition::COND_TRUE; + return PlFilterCondition::COND_TRUE; } foreach ($this->emails as $entry) { @@ -434,29 +634,22 @@ class UFC_EmailList implements UserFilterCondition // }}} // {{{ class UFC_Address -/** Filters users based on their address - * @param $text Text for filter in fulltext search - * @param $textSearchMode Mode for search (PREFIX, SUFFIX, ...) - * @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_Address implements UserFilterCondition +abstract class UFC_Address implements UserFilterCondition { - /** Flags for text search + /** Valid address type ('hq' is reserved for company addresses) */ - const PREFIX = 0x0001; - const SUFFIX = 0x0002; - const CONTAINS = 0x0003; + const TYPE_HOME = 1; + const TYPE_PRO = 2; + const TYPE_ANY = 3; - /** Valid address type ('hq' is reserved for company addresses) + /** Text for these types */ - const TYPE_HOME = 'home'; - const TYPE_PRO = 'job'; + protected static $typetexts = array( + self::TYPE_HOME => 'home', + self::TYPE_PRO => 'pro', + ); + + protected $type; /** Flags for addresses */ @@ -471,7 +664,7 @@ class UFC_Address implements UserFilterCondition /** Text of these flags */ - private static $flagtexts = array( + protected static $flagtexts = array( self::FLAG_CURRENT => 'current', self::FLAG_TEMP => 'temporary', self::FLAG_SECOND => 'secondary', @@ -479,56 +672,25 @@ class UFC_Address implements UserFilterCondition self::FLAG_CEDEX => 'cedex', ); - /** Data of the filter - */ - private $text; - private $type; - private $flags; - private $countryId; - private $administrativeAreaId; - private $subAdministrativeAreaId; - private $localityId; - private $postalCode; + protected $flags; - private $textSearchMode; - - public function __construct($text = null, $textSearchMode = self::CONTAINS, - $type = null, $flags = self::FLAG_ANY, $countryId = null, $administrativeAreaId = null, - $subAdministrativeAreaId = null, $localityId = null, $postalCode = null) + public function __construct($type = null, $flags = null) { - $this->text = $text; - $this->textSearchMode = $textSearchMode; - $this->type = $type; - $this->flags = $flags; - $this->countryId = $countryId; - $this->administrativeAreaId = $administrativeAreaId; - $this->subAdministrativeAreaId = $subAdministrativeAreaId; - $this->localityId = $localityId; - $this->postalCode = $postalCode; + $this->type = $type; + $this->flags = $flags; } - public function buildCondition(UserFilter &$uf) + protected function initConds($sub) { - $sub = $uf->addAddressFilter(); $conds = array(); - if ($this->text != null) { - $left = $sub . '.text '; - $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); + $types = array(); + foreach (self::$typetexts as $flag => $type) { + if ($flag & $this->type) { + $types[] = $type; } - $conds[] = $left . $op . $right; } - - if ($this->type != null) { - $conds[] = $sub . '.type = ' . XDB::format('{?}', $this->type); + if (count($types)) { + $conds[] = $sub . '.type IN ' . XDB::formatArray($types); } if ($this->flags != self::FLAG_ANY) { @@ -538,22 +700,124 @@ class UFC_Address implements UserFilterCondition } } } + return $conds; + } + +} +// }}} - if ($this->countryId != null) { - $conds[] = $sub . '.countryId = ' . XDB::format('{?}', $this->countryId); +// {{{ 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 (one of XDB::WILDCARD_*) + * @param $type Filter on address type + * @param $flags Filter on address flags + * @param $country Filter on address country + * @param $locality Filter on address locality + */ +class UFC_AddressText extends UFC_Address +{ + + private $text; + private $textSearchMode; + + public function __construct($text = null, $textSearchMode = XDB::WILDCARD_CONTAINS, + $type = null, $flags = self::FLAG_ANY, $country = null, $locality = null) + { + parent::__construct($type, $flags); + $this->text = $text; + $this->textSearchMode = $textSearchMode; + $this->country = $country; + $this->locality = $locality; + } + + private function mkMatch($txt) + { + return XDB::formatWildcards($this->textSearchMode, $txt); + } + + public function buildCondition(PlFilter &$uf) + { + $sub = $uf->addAddressFilter(); + $conds = $this->initConds($sub); + if ($this->text != null) { + $conds[] = $sub . '.text' . $this->mkMatch($this->text); } - if ($this->administrativeAreaId != null) { - $conds[] = $sub . '.administrativeAreaId = ' . XDB::format('{?}', $this->administrativeAreaId); + + if ($this->country != null) { + $subc = $uf->addAddressCountryFilter(); + $subconds = array(); + $subconds[] = $subc . '.country' . $this->mkMatch($this->country); + $subconds[] = $subc . '.countryFR' . $this->mkMatch($this->country); + $conds[] = implode(' OR ', $subconds); } - if ($this->subAdministrativeAreaId != null) { - $conds[] = $sub . '.subAdministrativeAreaId = ' . XDB::format('{?}', $this->subAdministrativeAreaId); + + if ($this->locality != null) { + $subl = $uf->addAddressLocalityFilter(); + $conds[] = $subl . '.name' . $this->mkMatch($this->locality); } - if ($this->localityId != null) { - $conds[] = $sub . '.localityId = ' . XDB::format('{?}', $this->localityId); + + return implode(' AND ', $conds); + } +} +// }}} + +// {{{ 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 + */ +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 $val; + private $fieldtype; + + public function __construct($val, $fieldtype, $type = null, $flags = self::FLAG_ANY) + { + parent::__construct($type, $flags); + + if (!is_array($val)) { + $val = array($val); } - if ($this->postalCode != null) { - $conds[] = $sub . '.postalCode = ' . XDB::format('{?}', $this->postalCode); + $this->val = $val; + $this->fieldtype = $fieldtype; + } + + public function buildCondition(PlFilter &$uf) + { + $sub = $uf->addAddressFilter(); + $conds = $this->initConds($sub); + + 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[] = $sub . '.' . $field . ' IN ' . XDB::formatArray($this->val); return implode(' AND ', $conds); } @@ -579,7 +843,7 @@ class UFC_Corps implements UserFilterCondition $this->type = $type; } - public function buildCondition(UserFilter &$uf) + public function buildCondition(PlFilter &$uf) { /** Tables shortcuts: * pc for profile_corps, @@ -605,7 +869,7 @@ class UFC_Corps_Rank implements UserFilterCondition $this->rank = $rank; } - public function buildCondition(UserFilter &$uf) + public function buildCondition(PlFilter &$uf) { /** Tables shortcuts: * pcr for profile_corps_rank @@ -645,7 +909,7 @@ class UFC_Job_Company implements UserFilterCondition } } - public function buildCondition(UserFilter &$uf) + public function buildCondition(PlFilter &$uf) { $sub = $uf->addJobCompanyFilter(); $cond = $sub . '.' . $this->type . ' = ' . XDB::format('{?}', $this->value); @@ -656,41 +920,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($sector = null, $subsector = null, $subsubsector = null) + public function __construct($val, $type = UserFilter::JOB_SECTOR) { - $this->sector = $sector; - $this->subsector = $subsector; - $this->subsubsector = $subsubsector; + self::assertType($type); + if (!is_array($val)) { + $val = array($val); + } + $this->val = $val; + $this->type = $type; } - public function buildCondition(UserFilter &$uf) + private static function assertType($type) { - // 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); + if ($type != UserFilter::JOB_SECTOR && $type != UserFilter::JOB_SUBSECTOR && $type != UserFilter::JOB_SUBSUBSECTOR) { + Platal::page()->killError("Type de secteur non valide."); } - return implode(' AND ', $conds); + } + + public function buildCondition(PlFilter &$uf) + { + $sub = $uf->addJobSectorizationFilter($this->type); + return $sub . '.id = ' . XDB::format('{?}', $this->val); } } // }}} @@ -703,41 +961,39 @@ class UFC_Job_Sectorization implements UserFilterCondition class UFC_Job_Description implements UserFilterCondition { - /** Meta-filters - * Built with binary OR on UserFilter::JOB_* - */ - const ANY = 31; - const SECTORIZATION = 15; - private $description; private $fields; - public function __construct($description) + public function __construct($description, $fields) { $this->fields = $fields; $this->description = $description; } - public function buildCondition(UserFilter &$uf) + public function buildCondition(PlFilter &$uf) { $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 ' . 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); } @@ -760,11 +1016,11 @@ class UFC_Networking implements UserFilterCondition $this->value = $value; } - public function buildCondition(UserFilter &$uf) + public function buildCondition(PlFilter &$uf) { $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); } @@ -803,7 +1059,7 @@ class UFC_Phone implements UserFilterCondition $this->phone_type = format_phone_number($phone_type); } - public function buildCondition(UserFilter &$uf) + public function buildCondition(PlFilter &$uf) { $sub = $uf->addPhoneFilter(); $conds = array(); @@ -835,7 +1091,7 @@ class UFC_Medal implements UserFilterCondition $this->grade = $grade; } - public function buildCondition(UserFilter &$uf) + public function buildCondition(PlFilter &$uf) { $conds = array(); $sub = $uf->addMedalFilter(); @@ -861,10 +1117,10 @@ class UFC_Mentor_Expertise implements UserFilterCondition $this->expertise = $expertise; } - public function buildCondition(UserFilter &$uf) + 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); } } // }}} @@ -882,7 +1138,7 @@ class UFC_Mentor_Country implements UserFilterCondition $this->country = $country; } - public function buildCondition(UserFilter &$uf) + public function buildCondition(PlFilter &$uf) { $sub = $uf->addMentorFilter(UserFilter::MENTOR_COUNTRY); return $sub . '.country = ' . XDB::format('{?}', $this->country); @@ -892,29 +1148,31 @@ class UFC_Mentor_Country implements UserFilterCondition // {{{ 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(UserFilter &$uf) + 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); } } // }}} @@ -938,7 +1196,7 @@ abstract class UFC_UserRelated implements UserFilterCondition */ class UFC_Contact extends UFC_UserRelated { - public function buildCondition(UserFilter &$uf) + public function buildCondition(PlFilter &$uf) { $sub = $uf->addContactFilter($this->user->id()); return 'c' . $sub . '.contact IS NOT NULL'; @@ -951,14 +1209,14 @@ class UFC_Contact extends UFC_UserRelated */ class UFC_WatchRegistration extends UFC_UserRelated { - public function buildCondition(UserFilter &$uf) + public function buildCondition(PlFilter &$uf) { if (!$this->user->watch('registration')) { - return UserFilterCondition::COND_FALSE; + return PlFilterCondition::COND_FALSE; } $uids = $this->user->watchUsers(); if (count($uids) == 0) { - return UserFilterCondition::COND_FALSE; + return PlFilterCondition::COND_FALSE; } else { return '$UID IN ' . XDB::formatArray($uids); } @@ -980,11 +1238,11 @@ class UFC_WatchPromo extends UFC_UserRelated $this->grade = $grade; } - public function buildCondition(UserFilter &$uf) + public function buildCondition(PlFilter &$uf) { $promos = $this->user->watchPromos(); if (count($promos) == 0) { - return UserFilterCondition::COND_FALSE; + return PlFilterCondition::COND_FALSE; } else { $sube = $uf->addEducationFilter(true, $this->grade); $field = 'pe' . $sube . '.' . UserFilter::promoYear($this->grade); @@ -999,10 +1257,10 @@ class UFC_WatchPromo extends UFC_UserRelated */ class UFC_WatchContact extends UFC_Contact { - public function buildCondition(UserFilter &$uf) + public function buildCondition(PlFilter &$uf) { if (!$this->user->watchContacts()) { - return UserFilterCondition::COND_FALSE; + return PlFilterCondition::COND_FALSE; } return parent::buildCondition($uf); } @@ -1026,7 +1284,7 @@ abstract class UserFilterOrder extends PlFilterOrder * @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); +// abstract protected function getSortTokens(UserFilter &$uf); } // }}} @@ -1045,7 +1303,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); @@ -1079,9 +1337,9 @@ 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; } else { @@ -1099,7 +1357,7 @@ class UFO_Name extends UserFilterOrder // {{{ class UFO_Score class UFO_Score extends UserFilterOrder { - protected function getSortTokens(UserFilter &$uf) + protected function getSortTokens(PlFilter &$uf) { $sub = $uf->addNameTokensFilter(); return 'SUM(' . $sub . '.score)'; @@ -1112,7 +1370,7 @@ class UFO_Score extends UserFilterOrder */ class UFO_Registration extends UserFilterOrder { - protected function getSortTokens(UserFilter &$uf) + protected function getSortTokens(PlFilter &$uf) { return 'a.registration_date'; } @@ -1124,7 +1382,7 @@ class UFO_Registration extends UserFilterOrder */ class UFO_Birthday extends UserFilterOrder { - protected function getSortTokens(UserFilter &$uf) + protected function getSortTokens(PlFilter &$uf) { return 'p.next_birthday'; } @@ -1136,7 +1394,7 @@ class UFO_Birthday extends UserFilterOrder */ class UFO_ProfileUpdate extends UserFilterOrder { - protected function getSortTokens(UserFilter &$uf) + protected function getSortTokens(PlFilter &$uf) { return 'p.last_change'; } @@ -1148,7 +1406,7 @@ class UFO_ProfileUpdate extends UserFilterOrder */ class UFO_Death extends UserFilterOrder { - protected function getSortTokens(UserFilter &$uf) + protected function getSortTokens(PlFilter &$uf) { return 'p.deathdate'; } @@ -1186,7 +1444,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 @@ -1207,8 +1465,9 @@ 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; @@ -1294,6 +1553,32 @@ class UserFilter extends PlFilter return $fetched; } + private function getPIDList($pids = null, PlLimit &$limit) + { + $this->requireProfiles(); + $this->buildQuery(); + $lim = $limit->getSql(); + $cond = ''; + if (!is_null($pids)) { + $cond = ' AND p.pid IN ' . XDB::formatArray($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()'); + 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) @@ -1305,10 +1590,29 @@ class UserFilter extends PlFilter return $count == 1; } - /** Filter a list of user to extract the users matching the rule. + /** Check that the profile match the given rule. */ - public function filter(array $users, PlLimit &$limit) + public function checkProfile(Profile &$profile) { + $this->requireProfiles(); + $this->buildQuery(); + $count = (int)XDB::fetchOneCell('SELECT COUNT(*) + ' . $this->query . XDB::format(' AND p.pid = {?}', $profile->id())); + return $count == 1; + } + + /** Default filter is on users + */ + public function filter(array $users, $limit = null) + { + return $this->filterUsers($users, self::defaultLimit($limit)); + } + + /** Filter a list of users to extract the users matching the rule. + */ + public function filterUsers(array $users, $limit = null) + { + $limit = self::defaultLimit($limit); $this->requireAccounts(); $this->buildQuery(); $table = array(); @@ -1330,17 +1634,65 @@ class UserFilter extends PlFilter return $output; } - public function getUIDs(PlLimit &$limit) + /** Filter a list of profiles to extract the users matching the rule. + */ + public function filterProfiles(array $profiles, $limit = null) { + $limit = self::defaultLimit($limit); + $this->requireProfiles(); + $this->buildQuery(); + $table = array(); + $pids = array(); + foreach ($profiles as $profile) { + if ($profile instanceof Profile) { + $pid = $profile->id(); + } else { + $pid = $profile; + } + $pids[] = $pid; + $table[$pid] = $profile; + } + $fetched = $this->getPIDList($pids, $limit); + $output = array(); + foreach ($fetched as $pid) { + $output[] = $table[$pid]; + } + return $output; + } + + public function getUIDs($limit = null) + { + $limit = self::defaultLimit($limit); return $this->getUIDList(null, $limit); } - public function getUsers(PlLimit &$limit) + public function getPIDs($limit = null) + { + $limit = self::defaultLimit($limit); + return $this->getPIDList(null, $limit); + } + + public function getUsers($limit = null) { return User::getBulkUsersWithUIDs($this->getUIDs($limit)); } - public function get(PlLimit &$limit) + public function iterUsers($limit = null) + { + return User::iterOverUIDs($this->getUIDs($limit)); + } + + public function getProfiles($limit = null) + { + return Profile::getBulkProfilesWithPIDs($this->getPIDs($limit)); + } + + public function iterProfiles($limit = null) + { + return Profile::iterOverPIDs($this->getPIDs($limit)); + } + + public function get($limit = null) { return $this->getUsers($limit); } @@ -1349,7 +1701,7 @@ class UserFilter extends PlFilter { if (is_null($this->lastcount)) { $this->buildQuery(); - if ($this->requireAccounts()) { + if ($this->with_accounts) { $field = 'a.uid'; } else { $field = 'p.pid'; @@ -1378,24 +1730,24 @@ 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) @@ -1482,33 +1834,27 @@ class UserFilter extends PlFilter } } + /** LOGGER + */ + + private $with_logger = false; + public function addLoggerFilter() + { + $this->with_logger = true; + $this->requireAccounts(); + return 'ls'; + } + protected function loggerJoins() + { + $joins = array(); + if ($this->with_logger) { + $joins['ls'] = new PlSqlJoin(PlSqlJoin::MODE_LEFT, 'log_sessions', '$ME.uid = $UID'); + } + return $joins; + } + /** NAMES */ - /* 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) { @@ -1517,14 +1863,6 @@ class UserFilter extends PlFilter } } - static public function isDisplayName($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; - } - private $pn = array(); public function addNameFilter($type, $variant = null) { @@ -1577,6 +1915,25 @@ class UserFilter extends PlFilter } } + /** NATIONALITY + */ + + private $with_nat = false; + public function addNationalityFilter() + { + $this->with_nat = true; + return 'ngc'; + } + + protected function nationalityJoins() + { + $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'); + } + return $joins; + } + /** EDUCATION */ const GRADE_ING = 'Ing.'; @@ -1627,11 +1984,11 @@ class UserFilter extends PlFilter } 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['pe' . $sub] = new PlSqlJoin(PlSqlJoin::MODE_LEFT, 'profile_education', '$ME.eduid = pee.id AND $ME.pid = $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)); } else { - $joins['pe' . $sub] = new PlSqlJoin(PlSqlJoin::MODE_LEFT, 'profile_education', '$ME.uid = $PID'); + $joins['pe' . $sub] = new PlSqlJoin(PlSqlJoin::MODE_LEFT, 'profile_education', '$ME.pid = $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'); } @@ -1667,18 +2024,47 @@ 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'); + $joins['gpa' . $sub] = new PlSqlJoin(PlSqlJoin::MODE_INNER, 'groups'); + $joins['gpm' . $sub] = new PlSqlJoin(PlSqlJoin::MODE_LEFT, 'group_members', '$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['gpm' . $sub] = new PlSqlJoin(PlSqlJoin::MODE_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] = new PlSqlJoin(PlSqlJoin::MODE_INNER, 'groups', XDB::format('$ME.diminutif = {?}', $key)); + $joins['gpm' . $sub] = new PlSqlJoin(PlSqlJoin::MODE_LEFT, 'group_members', '$ME.uid = $UID AND $ME.asso_id = gpa' . $sub . '.id'); } } return $joins; } + /** BINETS + */ + + private $with_bi = false; + private $with_bd = false; + public function addBinetsFilter($with_enum = false) + { + $this->requireProfiles(); + $this->with_bi = true; + if ($with_enum) { + $this->with_bd = true; + return 'bd'; + } else { + return 'bi'; + } + } + + protected function binetsJoins() + { + $joins = array(); + if ($this->with_bi) { + $joins['bi'] = new PlSqlJoin(PlSqlJoin::MODE_LEFT, 'profile_binets', '$ME.pid = $PID'); + } + if ($this->with_bd) { + $joins['bd'] = new PlSqlJoin(PlSqlJoin::MODE_LEFT, 'profile_binet_enum', '$ME.id = bi.binet_id'); + } + return $joins; + } + /** EMAILS */ private $e = array(); @@ -1717,13 +2103,13 @@ class UserFilter extends PlFilter } 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] = new PlSqlJoin(PlSqlJoin::MODE_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] = new PlSqlJoin(PlSqlJoin::MODE_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] = new PlSqlJoin(PlSqlJoin::MODE_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)); + $joins['al' . $sub] = new PlSqlJoin(PlSqlJoin::MODE_LEFT, 'aliases', XDB::format('$ME.uid = $UID AND $ME.type IN (\'alias\', \'a_vie\') AND $ME.alias = {?}', $key)); } } foreach ($this->ve as $sub=>$key) { @@ -1752,11 +2138,35 @@ class UserFilter extends PlFilter return 'pa'; } + private $with_pac = false; + public function addAddressCountryFilter() + { + $this->requireProfiles(); + $this->addAddressFilter(); + $this->with_pac = true; + return 'gc'; + } + + private $with_pal = false; + public function addAddressLocalityFilter() + { + $this->requireProfiles(); + $this->addAddressFilter(); + $this->with_pal = true; + return 'gl'; + } + protected function addressJoins() { $joins = array(); if ($this->with_pa) { - $joins['pa'] = new PlSqlJoin(PlSqlJoin::MODE_LEFT, 'profile_address', '$ME.pid = $PID'); + $joins['pa'] = new PlSqlJoin(PlSqlJoin::MODE_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'); + } + if ($this->with_pal) { + $joins['gl'] = new PlSqlJoin(PlSqlJoin::MODE_LEFT, 'geoloc_localities', '$ME.id = pa.localityID'); } return $joins; } @@ -1793,7 +2203,7 @@ class UserFilter extends PlFilter { $joins = array(); if ($this->pc) { - $joins['pc'] = new PlSqlJoin(PlSqlJoin::MODE_LEFT, 'profile_corps', '$ME.uid = $UID'); + $joins['pc'] = new PlSqlJoin(PlSqlJoin::MODE_LEFT, 'profile_corps', '$ME.pid = $PID'); } if ($this->pcr) { $joins['pcr'] = new PlSqlJoin(PlSqlJoin::MODE_LEFT, 'profile_corps_rank_enum', '$ME.id = pc.rankid'); @@ -1807,11 +2217,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_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 @@ -1864,7 +2278,7 @@ class UserFilter extends PlFilter { $joins = array(); if ($this->with_pj) { - $joins['pj'] = new PlSqlJoin(PlSqlJoin::MODE_LEFT, 'profile_job', '$ME.uid = $UID'); + $joins['pj'] = new PlSqlJoin(PlSqlJoin::MODE_LEFT, 'profile_job', '$ME.pid = $PID'); } if ($this->with_pje) { $joins['pje'] = new PlSqlJoin(PlSqlJoin::MODE_LEFT, 'profile_job_enum', '$ME.id = pj.jobid'); @@ -1899,7 +2313,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'] = new PlSqlJoin(PlSqlJoin::MODE_LEFT, 'profile_networking', '$ME.pid = $PID'); } return $joins; } @@ -1920,7 +2334,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'] = new PlSqlJoin(PlSqlJoin::MODE_LEFT, 'profile_phones', '$ME.pid = $PID'); } return $joins; } @@ -1940,7 +2354,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'] = new PlSqlJoin(PlSqlJoin::MODE_LEFT, 'profile_medals', '$ME.pid = $PID'); } return $joins; } @@ -1957,14 +2371,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."); @@ -1975,7 +2389,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] = new PlSqlJoin(PlSqlJoin::MODE_LEFT, $tab, '$ME.pid = $PID'); } return $joins; } @@ -2062,5 +2476,15 @@ class UserFilter extends PlFilter } // }}} +// {{{ class ProfileFilter +class ProfileFilter extends UserFilter +{ + public function get($limit = null) + { + return $this->getProfiles($limit); + } +} +// }}} + // vim:set et sw=4 sts=4 sws=4 foldmethod=marker enc=utf-8: ?>