From: Florent Bruneau <florent.bruneau@polytechnique.org>
Date: Tue, 12 Oct 2010 11:47:58 +0000 (+0200)
Subject: Fix some invalid references in UserFilter.
X-Git-Tag: xorg/1.0.1~55
X-Git-Url: http://git.polytechnique.org/?a=commitdiff_plain;h=737d5167b5828daed07fe52bc7269e18e100c113;p=platal.git

Fix some invalid references in UserFilter.

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

diff --git a/classes/userfilter.php b/classes/userfilter.php
index d45a08c..14e9557 100644
--- a/classes/userfilter.php
+++ b/classes/userfilter.php
@@ -609,7 +609,7 @@ class UFC_Group implements UserFilterCondition
     {
         // Groups have AX visibility.
         if ($uf->getVisibilityLevel() == ProfileVisibility::VIS_PUBLIC) {
-            return PlFilter::COND_TRUE;
+            return self::COND_TRUE;
         }
         $sub = $uf->addGroupFilter($this->group);
         $where = 'gpm' . $sub . '.perms IS NOT NULL';
@@ -638,7 +638,7 @@ class UFC_Binet implements UserFilterCondition
     {
         // Binets are private.
         if ($uf->getVisibilityLevel() != ProfileVisibility::VIS_PRIVATE) {
-            return PlFilter::COND_TRUE;
+            return self::CONF_TRUE;
         }
         $sub = $uf->addBinetsFilter();
         return XDB::format($sub . '.binet_id IN {?}', $this->val);
@@ -663,7 +663,7 @@ class UFC_Section implements UserFilterCondition
     {
         // Sections are private.
         if ($uf->getVisibilityLevel() != ProfileVisibility::VIS_PRIVATE) {
-            return PlFilter::COND_TRUE;
+            return self::CONF_TRUE;
         }
         $uf->requireProfiles();
         return XDB::format('p.section IN {?}', $this->section);
@@ -1072,7 +1072,7 @@ class UFC_Job_Description implements UserFilterCondition
         // don't do anything. Otherwise restrict to standard job visibility.
         if ($this->fields == UserFilter::JOB_CV) {
            if ($uf->getVisibilityLevel() != ProfileVisibility::VIS_PRIVATE) {
-               return PlFilter::COND_TRUE;
+               return self::CONF_TRUE;
            }
         } else {
             $conds[] = $uf->getVisibilityCondition($jsub . '.pub');
@@ -1081,7 +1081,7 @@ class UFC_Job_Description implements UserFilterCondition
         if ($this->fields & UserFilter::JOB_USERDEFINED) {
             $conds[] = $jsub . '.description ' . XDB::formatWildcards(XDB::WILDCARD_CONTAINS, $this->description);
         }
-        if ($this->fields & UserFilter::JOB_CV && $uf->getVisibilityLevel == ProfileVisibility::VIS_PRIVATE) {
+        if ($this->fields & UserFilter::JOB_CV && $uf->getVisibilityLevel() == ProfileVisibility::VIS_PRIVATE) {
             $uf->requireProfiles();
             $conds[] = 'p.cv ' . XDB::formatWildcards(XDB::WILDCARD_CONTAINS, $this->description);
         }