From: Florent Bruneau <florent.bruneau@polytechnique.org>
Date: Sun, 30 May 2010 12:50:09 +0000 (+0200)
Subject: s/a\.uid/$UID/ && s/p\.pid/$PID/
X-Git-Tag: xorg/1.0.0~221
X-Git-Url: http://git.polytechnique.org/?a=commitdiff_plain;h=93b0da52bfae596573e07fb4b8fe5a3326326179;p=platal.git

s/a\.uid/$UID/ && s/p\.pid/$PID/

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

diff --git a/classes/userfilter.php b/classes/userfilter.php
index cd4058f..bc106cf 100644
--- a/classes/userfilter.php
+++ b/classes/userfilter.php
@@ -47,7 +47,7 @@ class UFC_HasProfile implements UserFilterCondition
     public function buildCondition(PlFilter &$uf)
     {
         $uf->requireProfiles();
-        return 'p.pid IS NOT NULL';
+        return '$PID IS NOT NULL';
     }
 }
 // }}}
@@ -455,9 +455,9 @@ class UFC_Registered implements UserFilterCondition
     {
         $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 != \'0000-00-00 00:00:00\' AND a.registration_date ' . $this->comparison . ' ' . XDB::format('{?}', $this->date->format('Y-m-d'));
@@ -1257,7 +1257,7 @@ class UFC_WatchRegistration extends UFC_UserRelated
         if (count($uids) == 0) {
             return PlFilterCondition::COND_FALSE;
         } else {
-            return XDB::format('a.uid IN {?}', $uids);
+            return XDB::format('$UID IN {?}', $uids);
         }
     }
 }
@@ -1488,7 +1488,7 @@ class UFO_Uid extends UserFilterOrder
     protected function getSortTokens(PlFilter &$uf)
     {
         $uf->requireAccounts();
-        return 'a.uid';
+        return '$UID';
     }
 }
 // }}}
@@ -1514,7 +1514,7 @@ class UFO_Pid extends UserFilterOrder
     protected function getSortTokens(PlFilter &$uf)
     {
         $uf->requireProfiles();
-        return 'p.pid';
+        return '$PID';
     }
 }
 // }}}