X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=classes%2Fuserfilter.php;h=bc106cf9c1370adc04b6624416f9a823ae4d8d96;hb=7996ae8cd41fbb3ccd748eaed71a50f866269c6e;hp=aed33ae21ee89be7d3e25fd9a3e2c1fc73e46f44;hpb=05fa89a5c7e37e60d877dbbc19cca0539fda7b19;p=platal.git diff --git a/classes/userfilter.php b/classes/userfilter.php index aed33ae..bc106cf 100644 --- a/classes/userfilter.php +++ b/classes/userfilter.php @@ -46,6 +46,7 @@ class UFC_HasProfile implements UserFilterCondition { public function buildCondition(PlFilter &$uf) { + $uf->requireProfiles(); return '$PID IS NOT NULL'; } } @@ -59,18 +60,15 @@ class UFC_Hruid implements UserFilterCondition { private $hruids; - public function __construct($val) + public function __construct() { - if (!is_array($val)) { - $val = array($val); - } - $this->hruids = $val; + $this->hruids = pl_flatten(func_get_args()); } public function buildCondition(PlFilter &$uf) { - $ufc->requireAccounts(); - return 'a.hruid IN ' . XDB::formatArray($this->hruids); + $uf->requireAccounts(); + return XDB::format('a.hruid IN {?}', $this->hruids); } } // }}} @@ -83,18 +81,15 @@ class UFC_Hrpid implements UserFilterCondition { private $hrpids; - public function __construct($val) + public function __construct() { - if (!is_array($val)) { - $val = array($val); - } - $this->hrpids = $val; + $this->hrpids = pl_flatten(func_get_args()); } public function buildCondition(PlFilter &$uf) { $uf->requireProfiles(); - return 'p.hrpid IN ' . XDB::formatArray($this->hrpids); + return XDB::format('p.hrpid IN {?}', $this->hrpids); } } // }}} @@ -160,6 +155,9 @@ class UFC_Promo implements UserFilterCondition if ($this->grade != UserFilter::DISPLAY) { UserFilter::assertGrade($this->grade); } + if ($this->grade == UserFilter::DISPLAY && $this->comparison != '=') { + Platal::page()->killError('Comparison ' . $this->comparison . ' not allowed on displaid promo'); + } } public function buildCondition(PlFilter &$uf) @@ -181,7 +179,7 @@ class UFC_Promo implements UserFilterCondition * @param type Parameter type (Xorg, AX, School) * @param value School id value */ -class UFC_SchooldId implements UserFilterCondition +class UFC_SchoolId implements UserFilterCondition { const AX = 'ax'; const Xorg = 'xorg'; @@ -226,18 +224,15 @@ class UFC_EducationSchool implements UserFilterCondition { private $val; - public function __construct($val) + public function __construct() { - if (!is_array($val)) { - $val = array($val); - } - $this->val = $val; + $this->val = pl_flatten(func_get_args()); } 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); } } // }}} @@ -247,18 +242,15 @@ class UFC_EducationDegree implements UserFilterCondition { private $diploma; - public function __construct($diploma) + public function __construct() { - if (! is_array($diploma)) { - $diploma = array($diploma); - } - $this->diploma = $diploma; + $this->diploma = pl_flatten(func_get_args()); } public function buildCondition(PlFilter &$uf) { $sub = $uf->addEducationFilter(); - return 'pee' . $sub . '.degreeid IN ' . XDB::formatArray($this->val); + return XDB::format('pe' . $sub . '.degreeid IN {?}', $this->diploma); } } // }}} @@ -268,18 +260,15 @@ class UFC_EducationField implements UserFilterCondition { private $val; - public function __construct($val) + public function __construct() { - if (!is_array($val)) { - $val = array($val); - } - $this->val = $val; + $this->val = pl_flatten(func_get_args()); } public function buildCondition(PlFilter &$uf) { $sub = $uf->addEducationFilter(); - return 'pee' . $sub . '.fieldid IN ' . XDB::formatArray($this->val); + return XDB::format('pe' . $sub . '.fieldid IN {?}', $this->val); } } // }}} @@ -292,10 +281,11 @@ class UFC_EducationField implements UserFilterCondition */ class UFC_Name implements UserFilterCondition { - const PREFIX = XDB::WILDCARD_PREFIX; // 0x001 - const SUFFIX = XDB::WILDCARD_SUFFIX; // 0x002 + const EXACT = XDB::WILDCARD_EXACT; // 0x000 + const PREFIX = XDB::WILDCARD_PREFIX; // 0x001 + const SUFFIX = XDB::WILDCARD_SUFFIX; // 0x002 const CONTAINS = XDB::WILDCARD_CONTAINS; // 0x003 - const PARTICLE = 0x007; // self::CONTAINS | 0x004 + const PARTICLE = 0x004; const VARIANTS = 0x008; private $type; @@ -353,7 +343,11 @@ class UFC_NameTokens implements UserFilterCondition public function __construct($tokens, $flags = array(), $soundex = false, $exact = false) { - $this->tokens = $tokens; + if (is_array($tokens)) { + $this->tokens = $tokens; + } else { + $this->tokens = array($tokens); + } if (is_array($flags)) { $this->flags = $flags; } else { @@ -365,22 +359,20 @@ class UFC_NameTokens implements UserFilterCondition public function buildCondition(PlFilter &$uf) { - $sub = $uf->addNameTokensFilter(!($this->exact || $this->soundex)); $conds = array(); - if ($this->soundex) { - $conds[] = $sub . '.soundex IN ' . XDB::formatArray($this->tokens); - } else if ($this->exact) { - $conds[] = $sub . '.token IN ' . XDB::formatArray($this->tokens); - } else { - $tokconds = array(); - foreach ($this->tokens as $token) { - $tokconds[] = $sub . '.token ' . XDB::formatWildcards(XDB::WILDCARD_PREFIX, $token); + foreach ($this->tokens as $i => $token) { + $sub = $uf->addNameTokensFilter($token); + if ($this->soundex) { + $c = XDB::format($sub . '.soundex = {?}', $token); + } else if ($this->exact) { + $c = XDB::format($sub . '.token = {?}', $token); + } else { + $c = $sub . '.token ' . XDB::formatWildcards(XDB::WILDCARD_PREFIX, $token); } - $conds[] = implode(' OR ', $tokconds); - } - - if ($this->flags != null) { - $conds[] = $sub . '.flags IN ' . XDB::formatArray($this->flags); + if ($this->flags != null) { + $c .= XDB::format(' AND ' . $sub . '.flags IN {?}', $this->flags); + } + $conds[] = $c; } return implode(' AND ', $conds); @@ -393,12 +385,9 @@ class UFC_Nationality implements UserFilterCondition { private $val; - public function __construct($val) + public function __construct() { - if (!is_array($val)) { - $val = array($val); - } - $this->val = $val; + $this->val = pl_flatten(func_get_args()); } public function buildCondition(PlFilter &$uf) @@ -418,7 +407,7 @@ class UFC_Nationality implements UserFilterCondition // {{{ class UFC_Dead /** Filters users based on death date * @param $comparison Comparison operator - * @param $date Date to which death date should be compared + * @param $date Date to which death date should be compared (DateTime object, string or timestamp) */ class UFC_Dead implements UserFilterCondition { @@ -428,7 +417,7 @@ class UFC_Dead implements UserFilterCondition public function __construct($comparison = null, $date = null) { $this->comparison = $comparison; - $this->date = $date; + $this->date = make_datetime($date); } public function buildCondition(PlFilter &$uf) @@ -436,7 +425,7 @@ class UFC_Dead implements UserFilterCondition $uf->requireProfiles(); $str = 'p.deathdate IS NOT NULL'; if (!is_null($this->comparison)) { - $str .= ' AND p.deathdate ' . $this->comparison . ' ' . XDB::format('{?}', date('Y-m-d', $this->date)); + $str .= ' AND p.deathdate ' . $this->comparison . ' ' . XDB::format('{?}', $this->date->format('Y-m-d')); } return $str; } @@ -459,19 +448,19 @@ class UFC_Registered implements UserFilterCondition { $this->active = $active; $this->comparison = $comparison; - $this->date = $date; + $this->date = make_datetime($date); } public function buildCondition(PlFilter &$uf) { $uf->requireAccounts(); if ($this->active) { - $date = 'a.uid IS NOT NULL AND a.state = \'active\''; + $date = '$UID IS NOT NULL AND a.state = \'active\''; } else { - $date = 'a.uid IS NOT NULL AND a.state != \'pending\''; + $date = '$UID IS NOT NULL AND a.state != \'pending\''; } if (!is_null($this->comparison)) { - $date .= ' AND a.registration_date ' . $this->comparison . ' ' . XDB::format('{?}', date('Y-m-d', $this->date)); + $date .= ' AND a.registration_date != \'0000-00-00 00:00:00\' AND a.registration_date ' . $this->comparison . ' ' . XDB::format('{?}', $this->date->format('Y-m-d')); } return $date; } @@ -585,18 +574,15 @@ class UFC_Binet implements UserFilterCondition { private $val; - public function __construct($val) + public function __construct() { - if (!is_array($val)) { - $val = array($val); - } - $this->val = $val; + $this->val = pl_flatten(func_get_args()); } 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); } } // }}} @@ -609,15 +595,15 @@ class UFC_Section implements UserFilterCondition { private $section; - public function __construct($section) + public function __construct() { - $this->section = $section; + $this->section = pl_flatten(func_get_args()); } public function buildCondition(PlFilter &$uf) { $uf->requireProfiles(); - return 'p.section = ' . XDB::format('{?}', $this->section); + return XDB::format('p.section IN {?}', $this->section); } } // }}} @@ -631,7 +617,7 @@ class UFC_Email implements UserFilterCondition private $emails; public function __construct() { - $this->emails = func_get_args(); + $this->emails = pl_flatten(func_get_args()); } public function buildCondition(PlFilter &$uf) @@ -658,7 +644,7 @@ class UFC_Email implements UserFilterCondition if (count($foreign) > 0) { $sub = $uf->addEmailRedirectFilter($foreign); - $cond[] = 'e' . $sub . '.email IS NOT NULL OR a.email IN ' . XDB::formatArray($foreign); + $cond[] = XDB::format('e' . $sub . '.email IS NOT NULL OR a.email IN {?}', $foreign); } if (count($virtual) > 0) { $sub = $uf->addVirtualEmailFilter($virtual); @@ -730,7 +716,7 @@ abstract class UFC_Address implements UserFilterCondition } } if (count($types)) { - $conds[] = $sub . '.type IN ' . XDB::formatArray($types); + $conds[] = XDB::format($sub . '.type IN {?}', $types); } if ($this->flags != self::FLAG_ANY) { @@ -857,7 +843,7 @@ class UFC_AddressField extends UFC_Address default: 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); } @@ -1144,6 +1130,19 @@ class UFC_Medal implements UserFilterCondition } // }}} +// {{{ class UFC_Photo +/** Filters profiles with photo + */ +class UFC_Photo implements UserFilterCondition +{ + public function buildCondition(PlFilter &$uf) + { + $uf->addPhotoFilter(); + return 'photo.attach IS NOT NULL'; + } +} +// }}} + // {{{ class UFC_Mentor_Expertise /** Filters users by mentoring expertise * @param $expertise Domain of expertise @@ -1173,15 +1172,15 @@ class UFC_Mentor_Country implements UserFilterCondition { private $country; - public function __construct($country) + public function __construct() { - $this->country = $country; + $this->country = pl_flatten(func_get_args()); } public function buildCondition(PlFilter &$uf) { $sub = $uf->addMentorFilter(UserFilter::MENTOR_COUNTRY); - return $sub . '.country = ' . XDB::format('{?}', $this->country); + return $sub . '.country IN ' . XDB::format('{?}', $this->country); } } // }}} @@ -1258,7 +1257,7 @@ class UFC_WatchRegistration extends UFC_UserRelated if (count($uids) == 0) { return PlFilterCondition::COND_FALSE; } else { - return '$UID IN ' . XDB::formatArray($uids); + return XDB::format('$UID IN {?}', $uids); } } } @@ -1286,7 +1285,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); } } } @@ -1419,8 +1418,12 @@ class UFO_Score extends UserFilterOrder { protected function getSortTokens(PlFilter &$uf) { - $sub = $uf->addNameTokensFilter(); - return 'SUM(' . $sub . '.score)'; + $toks = $uf->getNameTokens(); + $scores = array(); + foreach ($toks as $sub => $token) { + $scores[] = XDB::format('SUM(' . $sub . '.score + IF (' . $sub . '.token = {?}, 5, 0) )', $token); + } + return implode(' + ', $scores); } } // }}} @@ -1432,6 +1435,7 @@ class UFO_Registration extends UserFilterOrder { protected function getSortTokens(PlFilter &$uf) { + $uf->requireAccounts(); return 'a.registration_date'; } } @@ -1444,6 +1448,7 @@ class UFO_Birthday extends UserFilterOrder { protected function getSortTokens(PlFilter &$uf) { + $uf->requireProfiles(); return 'p.next_birthday'; } } @@ -1456,6 +1461,7 @@ class UFO_ProfileUpdate extends UserFilterOrder { protected function getSortTokens(PlFilter &$uf) { + $uf->requireProfiles(); return 'p.last_change'; } } @@ -1468,11 +1474,64 @@ class UFO_Death extends UserFilterOrder { protected function getSortTokens(PlFilter &$uf) { + $uf->requireProfiles(); return 'p.deathdate'; } } // }}} +// {{{ class UFO_Uid +/** Sorts users based on their uid + */ +class UFO_Uid extends UserFilterOrder +{ + protected function getSortTokens(PlFilter &$uf) + { + $uf->requireAccounts(); + return '$UID'; + } +} +// }}} + +// {{{ class UFO_Hruid +/** Sorts users based on their hruid + */ +class UFO_Hruid extends UserFilterOrder +{ + protected function getSortTokens(PlFilter &$uf) + { + $uf->requireAccounts(); + return 'a.hruid'; + } +} +// }}} + +// {{{ class UFO_Pid +/** Sorts users based on their pid + */ +class UFO_Pid extends UserFilterOrder +{ + protected function getSortTokens(PlFilter &$uf) + { + $uf->requireProfiles(); + return '$PID'; + } +} +// }}} + +// {{{ class UFO_Hrpid +/** Sorts users based on their hrpid + */ +class UFO_Hrpid extends UserFilterOrder +{ + protected function getSortTokens(PlFilter &$uf) + { + $uf->requireProfiles(); + return 'p.hrpid'; + } +} +// }}} + /*********************************** ********************************* @@ -1535,7 +1594,8 @@ class UserFilter extends PlFilter private $query = null; private $orderby = null; - private $lastcount = null; + private $lastusercount = null; + private $lastprofilecount = null; public function __construct($cond = null, $sort = null) { @@ -1566,6 +1626,14 @@ class UserFilter extends PlFilter private function buildQuery() { + // The root condition is built first because some orders need info + // available only once all UFC have set their conditions (UFO_Score) + if (is_null($this->query)) { + $where = $this->root->buildCondition($this); + $where = str_replace(array_keys($this->joinMetas), + $this->joinMetas, + $where); + } if (is_null($this->orderby)) { $orders = array(); foreach ($this->sort as $sort) { @@ -1576,13 +1644,12 @@ class UserFilter extends PlFilter } else { $this->orderby = 'ORDER BY ' . implode(', ', $orders); } + $this->orderby = str_replace(array_keys($this->joinMetas), + $this->joinMetas, + $this->orderby); } if (is_null($this->query)) { - $where = $this->root->buildCondition($this); - if ($this->with_forced_sn) { - $this->requireProfiles(); - $from = 'search_name AS sn'; - } else if ($this->with_accounts) { + if ($this->with_accounts) { $from = 'accounts AS a'; } else { $this->requireProfiles(); @@ -1602,14 +1669,14 @@ 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 . ' GROUP BY a.uid ' . $this->orderby . ' ' . $lim); - $this->lastcount = (int)XDB::fetchOneCell('SELECT FOUND_ROWS()'); + $this->lastusercount = (int)XDB::fetchOneCell('SELECT FOUND_ROWS()'); return $fetched; } @@ -1620,14 +1687,14 @@ class UserFilter extends PlFilter $lim = $limit->getSql(); $cond = ''; if (!is_null($pids)) { - $cond = ' AND p.pid IN ' . XDB::formatArray($pids); + $cond = XDB::format(' AND p.pid IN {?}', $pids); } $fetched = XDB::fetchColumn('SELECT SQL_CALC_FOUND_ROWS p.pid ' . $this->query . $cond . ' GROUP BY p.pid ' . $this->orderby . ' ' . $lim); - $this->lastcount = (int)XDB::fetchOneCell('SELECT FOUND_ROWS()'); + $this->lastprofilecount = (int)XDB::fetchOneCell('SELECT FOUND_ROWS()'); return $fetched; } @@ -1772,24 +1839,24 @@ class UserFilter extends PlFilter return User::iterOverUIDs($this->getUIDs($limit)); } - public function getProfiles($limit = null) + public function getProfiles($limit = null, $fields = 0x0000, $visibility = null) { - return Profile::getBulkProfilesWithPIDs($this->getPIDs($limit)); + return Profile::getBulkProfilesWithPIDs($this->getPIDs($limit), $fields, $visibility); } - public function getProfile($pos = 0) + public function getProfile($pos = 0, $fields = 0x0000, $visibility = null) { $pid = $this->getPID($pos); if ($pid == null) { return null; } else { - return Profile::get($pid); + return Profile::get($pid, $fields, $visibility); } } - public function iterProfiles($limit = null) + public function iterProfiles($limit = null, $fields = 0x0000, $visibility = null) { - return Profile::iterOverPIDs($this->getPIDs($limit)); + return Profile::iterOverPIDs($this->getPIDs($limit), true, $fields, $visibility); } public function get($limit = null) @@ -1797,19 +1864,33 @@ class UserFilter extends PlFilter return $this->getUsers($limit); } + public function getTotalCount() { - if (is_null($this->lastcount)) { + return $this->getTotalUserCount(); + } + + public function getTotalUserCount() + { + if (is_null($this->lastusercount)) { + $this->requireAccounts(); $this->buildQuery(); - if ($this->with_accounts) { - $field = 'a.uid'; - } else { - $field = 'p.pid'; - } - return (int)XDB::fetchOneCell('SELECT COUNT(DISTINCT ' . $field . ') + return (int)XDB::fetchOneCell('SELECT COUNT(DISTINCT a.uid) + ' . $this->query); + } else { + return $this->lastusercount; + } + } + + public function getTotalProfileCount() + { + if (is_null($this->lastprofilecount)) { + $this->requireProfiles(); + $this->buildQuery(); + return (int)XDB::fetchOneCell('SELECT COUNT(DISTINCT p.pid) ' . $this->query); } else { - return $this->lastcount; + return $this->lastprofilecount; } } @@ -1887,7 +1968,6 @@ class UserFilter extends PlFilter */ private $with_profiles = false; private $with_accounts = false; - private $with_forced_sn = false; public function requireAccounts() { $this->with_accounts = true; @@ -1898,23 +1978,10 @@ class UserFilter extends PlFilter $this->with_profiles = true; } - /** Forces the "FROM" to use search_name instead of accounts or profiles */ - public function forceSearchName() - { - $this->with_forced_sn = true; - } - protected function accountJoins() { $joins = array(); - /** Quick search is much more efficient with sn first and PID second */ - if ($this->with_forced_sn) { - $joins['p'] = PlSqlJoin::left('profiles', '$PID = sn.pid'); - if ($this->with_accounts) { - $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) { + if ($this->with_profiles && $this->with_accounts) { $joins['ap'] = PlSqlJoin::left('account_profiles', '$ME.uid = $UID AND FIND_IN_SET(\'owner\', ap.perms)'); $joins['p'] = PlSqlJoin::left('profiles', '$PID = ap.pid'); } @@ -1965,7 +2032,7 @@ class UserFilter extends PlFilter static public function assertName($name) { - if (!Profile::getNameTypeId($name)) { + if (!DirEnum::getID(DirEnum::NAMETYPES, $name)) { Platal::page()->kill('Invalid name type: ' . $name); } } @@ -1985,7 +2052,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; } @@ -2000,26 +2067,31 @@ class UserFilter extends PlFilter /** NAMETOKENS */ - private $with_sn = false; - // Set $doingQuickSearch to true if you wish to optimize the query - public function addNameTokensFilter($doingQuickSearch = false) + private $name_tokens = array(); + private $nb_tokens = 0; + + public function addNameTokensFilter($token) { $this->requireProfiles(); - $this->with_forced_sn = ($this->with_forced_sn || $doingQuickSearch); - $this->with_sn = true; - return 'sn'; + $sub = 'sn' . (1 + $this->nb_tokens); + $this->nb_tokens++; + $this->name_tokens[$sub] = $token; + return $sub; } protected function nameTokensJoins() { /* We don't return joins, since with_sn forces the SELECT to run on search_name first */ - if ($this->with_sn && !$this->with_forced_sn) { - return array( - 'sn' => PlSqlJoin::left('search_name', '$ME.pid = $PID') - ); - } else { - return array(); + $joins = array(); + foreach ($this->name_tokens as $sub => $token) { + $joins[$sub] = PlSqlJoin::left('search_name', '$ME.pid = $PID'); } + return $joins; + } + + public function getNameTokens() + { + return $this->name_tokens; } /** NATIONALITY @@ -2048,7 +2120,7 @@ class UserFilter extends PlFilter const GRADE_MST = 'M%'; static public function isGrade($grade) { - return $grade == self::GRADE_ING || $grade == self::GRADE_PHD || $grade == self::GRADE_MST; + return ($grade !== 0) && ($grade == self::GRADE_ING || $grade == self::GRADE_PHD || $grade == self::GRADE_MST); } static public function assertGrade($grade) @@ -2110,7 +2182,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; @@ -2132,7 +2204,7 @@ class UserFilter extends PlFilter if (is_null($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 (ctype_digit($key)) { + } 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] = PlSqlJoin::inner('groups', '$ME.diminutif = {?}', $key); @@ -2207,7 +2279,8 @@ class UserFilter extends PlFilter if (!is_array($key)) { $key = array($key); } - $joins['e' . $sub] = PlSqlJoin::left('emails', '$ME.uid = $UID AND $ME.flags != \'filter\' AND $ME.email IN ' . XDB::formatArray($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) { @@ -2221,7 +2294,8 @@ class UserFilter extends PlFilter 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 ' . XDB::formatArray($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) { @@ -2231,7 +2305,7 @@ class UserFilter extends PlFilter if (!is_array($key)) { $key = array($key); } - $joins['v' . $sub] = PlSqlJoin::left('virtual', '$ME.type = \'user\' AND $ME.alias IN ' . XDB::formatArray($key)); + $joins['v' . $sub] = PlSqlJoin::left('virtual', '$ME.type = \'user\' AND $ME.alias IN {?}', $key); } $joins['vr' . $sub] = PlSqlJoin::left('virtual_redirect', '$ME.vid = v' . $sub . '.vid @@ -2515,7 +2589,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); } @@ -2591,6 +2665,25 @@ class UserFilter extends PlFilter } + /** PHOTOS + */ + private $with_photo; + public function addPhotoFilter() + { + $this->requireProfiles(); + $this->with_photo = true; + } + + protected function photoJoins() + { + if ($this->with_photo) { + return array('photo' => PlSqlJoin::left('profile_photos', '$ME.pid = $PID')); + } else { + return array(); + } + } + + /** MARKETING */ private $with_rm; @@ -2618,6 +2711,16 @@ class ProfileFilter extends UserFilter { return $this->getProfiles($limit); } + + public function filter(array $profiles, $limit = null) + { + return $this->filterProfiles($profiles, self::defaultLimit($limit)); + } + + public function getTotalCount() + { + return $this->getTotalProfileCount(); + } } // }}}