Should fix the "Trombinoscope" (at least for search and MLs).

[platal.git] / classes / userfilter.php

diff --git a/classes/userfilter.php b/classes/userfilter.php
index b6c2dd1..24e1e9a 100644 (file)
--- a/classes/userfilter.php
+++ b/classes/userfilter.php
@@ -69,8 +69,8 @@ class UFC_Hruid implements UserFilterCondition
 
     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);
     }
 }
 // }}}
@@ -94,7 +94,7 @@ class UFC_Hrpid implements UserFilterCondition
     public function buildCondition(PlFilter &$uf)
     {
         $uf->requireProfiles();
-        return 'p.hrpid IN ' . XDB::formatArray($this->hrpids);
+        return XDB::format('p.hrpid IN {?}', $this->hrpids);
     }
 }
 // }}}
@@ -237,7 +237,7 @@ class UFC_EducationSchool 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);
     }
 }
 // }}}
@@ -258,7 +258,7 @@ class UFC_EducationDegree 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);
     }
 }
 // }}}
@@ -279,7 +279,7 @@ class UFC_EducationField 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);
     }
 }
 // }}}
@@ -368,9 +368,9 @@ 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) {
@@ -380,7 +380,7 @@ class UFC_NameTokens implements UserFilterCondition
         }
 
         if ($this->flags != null) {
-            $conds[] = $sub . '.flags IN ' . XDB::formatArray($this->flags);
+            $conds[] = XDB::format($sub . '.flags IN {?}', $this->flags);
         }
 
         return implode(' AND ', $conds);
@@ -596,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);
     }
 }
 // }}}
@@ -658,7 +658,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 +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) {
@@ -857,7 +857,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 +1144,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
@@ -1258,7 +1271,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 +1299,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);
         }
     }
 }
@@ -1602,7 +1615,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 . '
@@ -1620,7 +1633,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 . '
@@ -1772,24 +1785,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)
@@ -1965,7 +1978,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 +1998,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;
     }
 
@@ -2110,7 +2123,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 +2145,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 +2220,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 +2235,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 +2246,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
@@ -2591,6 +2606,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;