X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;ds=sidebyside;f=classes%2Fuserfilter.php;h=2d33bca3f2bc702a9f98b5246f36213d9f01f5f8;hb=4aae4d2caa59e07b2412db6981816193cf41690f;hp=999d65063c7a639a794f8b718328d7c8416e6e74;hpb=46e88fe32059a76766e732578169bace1c6542b9;p=platal.git diff --git a/classes/userfilter.php b/classes/userfilter.php index 999d650..2d33bca 100644 --- a/classes/userfilter.php +++ b/classes/userfilter.php @@ -1,6 +1,6 @@ hruids = $val; + } + + public function buildCondition(PlFilter &$uf) + { + $ufc->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($val) + { + if (!is_array($val)) { + $val = array($val); + } + $this->hrpids = $val; + } + + 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 { @@ -64,7 +134,7 @@ class UFC_Comment implements UserFilterCondition public function buildCondition(PlFilter &$uf) { $uf->requireProfiles(); - return 'p.freetext LIKE ' . XDB::format('CONCAT(\'%\', {?}, \'%\')', $this->text); + return 'p.freetext ' . XDB::formatWildcards(XDB::WILDCARD_CONTAINS, $this->text); } } // }}} @@ -106,11 +176,53 @@ class UFC_Promo implements UserFilterCondition } // }}} -// {{{ class UFC_Formation +// {{{ class UFC_SchoolId +/** Filters users based on their shoold identifier + * @param type Parameter type (Xorg, AX, School) + * @param value School id value + */ +class UFC_SchooldId implements UserFilterCondition +{ + const AX = 'ax'; + const Xorg = 'xorg'; + const School = 'school'; + + private $type; + private $id; + + static public function assertType($type) + { + 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) + { + $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_Formation implements UserFilterCondition +class UFC_EducationSchool implements UserFilterCondition { private $val; @@ -125,13 +237,13 @@ class UFC_Formation implements UserFilterCondition public function buildCondition(PlFilter &$uf) { $sub = $uf->addEducationFilter(); - return 'pe' . $sub . '.eduid IN ' . XDB::formatArray($this->val); + return XDB::format('pe' . $sub . '.eduid IN {?}', $this->val); } } // }}} -// {{{ class UFC_Diploma -class UFC_Diploma implements UserFilterCondition +// {{{ class UFC_EducationDegree +class UFC_EducationDegree implements UserFilterCondition { private $diploma; @@ -146,13 +258,13 @@ class UFC_Diploma implements UserFilterCondition public function buildCondition(PlFilter &$uf) { $sub = $uf->addEducationFilter(); - return 'pee' . $sub . '.degreeid IN ' . XDB::formatArray($this->val); + return XDB::format('pee' . $sub . '.degreeid IN {?}', $this->val); } } // }}} -// {{{ class UFC_StudyField -class UFC_StudyField implements UserFilterCondition +// {{{ class UFC_EducationField +class UFC_EducationField implements UserFilterCondition { private $val; @@ -167,7 +279,7 @@ class UFC_StudyField implements UserFilterCondition public function buildCondition(PlFilter &$uf) { $sub = $uf->addEducationFilter(); - return 'pee' . $sub . '.fieldid IN ' . XDB::formatArray($this->val); + return XDB::format('pee' . $sub . '.fieldid IN {?}', $this->val); } } // }}} @@ -180,11 +292,11 @@ class UFC_StudyField 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; @@ -206,24 +318,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); } } @@ -265,19 +368,19 @@ class UFC_NameTokens implements UserFilterCondition $sub = $uf->addNameTokensFilter(!($this->exact || $this->soundex)); $conds = array(); if ($this->soundex) { - $conds[] = $sub . '.soundex IN ' . XDB::formatArray($this->tokens); + $conds[] = XDB::format($sub . '.soundex IN {?}', $this->tokens); } else if ($this->exact) { - $conds[] = $sub . '.token IN ' . XDB::formatArray($this->tokens); + $conds[] = XDB::format($sub . '.token IN {?}', $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_PREFIX, $token); } $conds[] = implode(' OR ', $tokconds); } if ($this->flags != null) { - $conds[] = $sub . '.flags IN ' . XDB::formatArray($this->flags); + $conds[] = XDB::format($sub . '.flags IN {?}', $this->flags); } return implode(' AND ', $conds); @@ -493,7 +596,7 @@ class UFC_Binet implements UserFilterCondition public function buildCondition(PlFilter &$uf) { $sub = $uf->addBinetsFilter(); - return $sub . '.binet_id IN ' . XDB::formatArray($this->val); + return XDB::format($sub . '.binet_id IN {?}', $this->val); } } // }}} @@ -520,51 +623,22 @@ class UFC_Section implements UserFilterCondition // }}} // {{{ 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 = 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) { @@ -573,23 +647,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) . ')'; } } @@ -652,7 +730,7 @@ abstract class UFC_Address implements UserFilterCondition } } if (count($types)) { - $conds[] = $sub . '.type IN ' . XDB::formatArray($types); + $conds[] = XDB::foramt($sub . '.type IN {?}', $types); } if ($this->flags != self::FLAG_ANY) { @@ -671,7 +749,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 @@ -679,16 +757,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); @@ -700,18 +773,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) @@ -793,9 +855,9 @@ class UFC_AddressField extends UFC_Address $field = 'postalCode'; break; default: - Platal::page()->killError('Invalid address field type : ' . $this->fieldtype); + Platal::page()->killError('Invalid address field type: ' . $this->fieldtype); } - $conds[] = $sub . '.' . $field . ' IN ' . XDB::formatArray($this->val); + $conds[] = XDB::format($sub . '.' . $field . ' IN {?}', $this->val); return implode(' AND ', $conds); } @@ -939,12 +1001,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; @@ -959,25 +1015,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); } @@ -1004,7 +1060,7 @@ 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); } @@ -1104,7 +1160,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); } } // }}} @@ -1132,29 +1188,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(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); } } // }}} @@ -1193,14 +1251,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); } } } @@ -1228,7 +1286,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); } } } @@ -1249,6 +1307,26 @@ class UFC_WatchContact extends UFC_Contact } // }}} +// {{{ class UFC_MarketingHash +/** Filters users using the hash generated + * to send marketing emails to him. + */ +class UFC_MarketingHash implements UserFilterCondition +{ + 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 @@ -1266,7 +1344,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); } // }}} @@ -1285,7 +1363,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); @@ -1319,9 +1397,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 { @@ -1339,7 +1417,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)'; @@ -1352,7 +1430,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'; } @@ -1364,7 +1442,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'; } @@ -1376,7 +1454,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'; } @@ -1388,7 +1466,7 @@ class UFO_ProfileUpdate extends UserFilterOrder */ class UFO_Death extends UserFilterOrder { - protected function getSortTokens(UserFilter &$uf) + protected function getSortTokens(PlFilter &$uf) { return 'p.deathdate'; } @@ -1426,7 +1504,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 @@ -1447,8 +1525,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; @@ -1523,7 +1602,7 @@ class UserFilter extends PlFilter $lim = $limit->getSql(); $cond = ''; if (!is_null($uids)) { - $cond = ' AND a.uid IN ' . XDB::formatArray($uids); + $cond = XDB::format(' AND a.uid IN {?}', $uids); } $fetched = XDB::fetchColumn('SELECT SQL_CALC_FOUND_ROWS a.uid ' . $this->query . $cond . ' @@ -1541,7 +1620,7 @@ 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 . ' @@ -1552,6 +1631,14 @@ class UserFilter extends PlFilter 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) @@ -1576,15 +1663,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(); @@ -1608,8 +1696,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(); @@ -1631,27 +1720,79 @@ 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 PlFilter(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 PlFilter(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 User::iterOverUIDs($this->getUIDs($limit)); + } + + public function getProfiles($limit = null) { return Profile::getBulkProfilesWithPIDs($this->getPIDs($limit)); } - public function get(PlLimit &$limit) + public function getProfile($pos = 0) + { + $pid = $this->getPID($pos); + if ($pid == null) { + return null; + } else { + return Profile::get($pid); + } + } + + public function iterProfiles($limit = null) + { + return Profile::iterOverPIDs($this->getPIDs($limit)); + } + + public function get($limit = null) { return $this->getUsers($limit); } @@ -1689,29 +1830,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); + } } @@ -1761,14 +1909,14 @@ class UserFilter extends PlFilter $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'); + $joins['p'] = PlSqlJoin::left('profiles', '$PID = sn.pid'); 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'); + $joins['ap'] = PlSqlJoin::left('account_profiles', '$ME.pid = $PID'); + $joins['a'] = PlSqlJoin::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'); + $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; } @@ -1787,53 +1935,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(); @@ -1851,7 +1985,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; } @@ -1859,7 +1993,7 @@ 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; } @@ -1881,7 +2015,7 @@ class UserFilter extends PlFilter /* 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') + 'sn' => PlSqlJoin::left('search_name', '$ME.pid = $PID') ); } else { return array(); @@ -1902,7 +2036,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; } @@ -1920,7 +2054,7 @@ class UserFilter extends PlFilter static public function assertGrade($grade) { if (!self::isGrade($grade)) { - Platal::page()->killError("Diplôme non valide"); + Platal::page()->killError("Diplôme non valide: $grade"); } } @@ -1953,17 +2087,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; @@ -1977,7 +2110,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; @@ -1997,13 +2130,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; @@ -2030,10 +2163,10 @@ class UserFilter extends PlFilter { $joins = array(); if ($this->with_bi) { - $joins['bi'] = new PlSqlJoin(PlSqlJoin::MODE_LEFT, 'binets_ins', '$ME.user_id = $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; } @@ -2069,33 +2202,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; } @@ -2133,13 +2278,13 @@ class UserFilter extends PlFilter { $joins = array(); if ($this->with_pa) { - $joins['pa'] = new PlSqlJoin(PlSqlJoin::MODE_LEFT, 'profile_addresses', '$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; } @@ -2176,13 +2321,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; } @@ -2190,12 +2335,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 @@ -2248,22 +2396,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; } @@ -2283,7 +2431,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; } @@ -2304,7 +2452,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; } @@ -2324,7 +2472,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; } @@ -2341,14 +2489,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."); @@ -2359,7 +2507,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; } @@ -2369,7 +2517,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); } @@ -2378,9 +2526,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; @@ -2415,34 +2563,63 @@ 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; } + + + /** 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); + } } // }}}