Add filter on contacts, fix $globals->asso() on X.org.

Signed-off-by: Florent Bruneau <florent.bruneau@polytechnique.org>

diff --git a/classes/platalglobals.php.in b/classes/platalglobals.php.in
index 697c297..5d8493e 100644 (file)
--- a/classes/platalglobals.php.in
+++ b/classes/platalglobals.php.in
@@ -53,7 +53,7 @@ class PlatalGlobals extends PlGlobals
     {
         static $aid = null;
 
-        if (is_null($aid)) {
+        if (isset($GLOBALS['IS_XNET_SITE']) && is_null($aid)) {
             $gp = Get::v('n');
             if ($p = strpos($gp, '/')) {
                 $gp = substr($gp, 0, $p);

diff --git a/classes/userfilter.php b/classes/userfilter.php
index 0940faa..0f592c9 100644 (file)
--- a/classes/userfilter.php
+++ b/classes/userfilter.php
@@ -397,6 +397,29 @@ class UFC_EmailList implements UserFilterCondition
     }
 }
 
+class UFC_Contact implements UserFilterCondition
+{
+    private $uid;
+    public function __construct($uid = null)
+    {
+        if (is_null($uid)) {
+            $this->uid = S::i('uid');
+        } else if ($uid instanceof PlUser) {
+            $this->uid = $uid->id();
+        } else if (ctype_digit($uid)) {
+            $this->uid = (int)$uid;
+        } else {
+            Platal::page()->kill("Invalid contact type");
+        }
+    }
+
+    public function buildCondition(UserFilter &$uf)
+    {
+        $sub = $uf->addContactFilter($this->uid);
+        return 'c' . $sub . '.contact IS NOT NULL';
+    }
+}
+
 /******************
  * ORDERS
  ******************/
@@ -958,7 +981,30 @@ class UserFilter
         }
         return $joins;
     }
+
+
+    /** CONTACTS
+     */
+    private $cts = array();
+    public function addContactFilter($uid = null)
+    {
+        return $this->register_optional($this->cts, is_null($uid) ? null : 'user_' . $uid);
+    }
+
+    private function contactJoins()
+    {
+        $joins = array();
+        foreach ($this->cts as $sub=>$key) {
+            if (is_null($key)) {
+                $joins['c' . $sub] = array('left', 'contacts', '$ME.contact = $UID');
+            } else {
+                $joins['c' . $sub] = array('left', 'contacts', XDB::format('$ME.uid = {?} AND $ME.contact = $UID', substr($key, 5)));
+            }
+        }
+        return $joins;
+    }
 }
 
+
 // vim:set et sw=4 sts=4 sws=4 foldmethod=marker enc=utf-8:
 ?>