X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=include%2Fufbuilder.inc.php;h=59a8aec17f5d8c9e2bce98298c65755f858d4071;hb=28c20b86be8b40cecba0d83080879f81c49e07ad;hp=9385cb15d117b0330302993e5541b5cce9a65e01;hpb=93d42b4fcc6f055a428c9b63e386ac62c918d08a;p=platal.git

diff --git a/include/ufbuilder.inc.php b/include/ufbuilder.inc.php
index 9385cb1..59a8aec 100644
--- a/include/ufbuilder.inc.php
+++ b/include/ufbuilder.inc.php
@@ -487,8 +487,7 @@ class UFBF_Quick extends UFB_Field
         if (S::admin() && strpos($s, '@') !== false) {
             return new UFC_Email($s);
         } else if (S::admin() && preg_match('/[0-9]+\.([0-9]+|%)\.([0-9]+|%)\.([0-9]+|%)/', $s)) {
-            $this->conds->addChild(new UFC_Ip($s));
-            return;
+            return new UFC_Ip($s);
         }
 
         $conds = new PFC_And();
@@ -604,8 +603,8 @@ class UFBF_Promo extends UFB_Field
             return true;
         }
 
-        $this->val  = $ubf->i($this->envfield);
-        $this->comp = $ubf->v($this->envfieldcomp);
+        $this->val  = $ufb->i($this->envfield);
+        $this->comp = $ufb->v($this->envfieldcomp);
 
         if (!in_array($this->comp, self::$validcomps)) {
             return $this->raise("Le critère {$this->comp} n'est pas valide pour le champ %s");
@@ -621,7 +620,7 @@ class UFBF_Promo extends UFB_Field
     }
 
     protected function buildUFC(UserFilterBuilder &$ufb) {
-        return new UFC_Promo($this->comp, UserFilter::DISPLAY, 'X' . $this->val);
+        return new UFC_Promo($this->comp, UserFilter::GRADE_ING, $this->val);
     }
 }
 // }}}
@@ -725,7 +724,7 @@ class UFBF_Town extends UFBF_Text
                 return new PFC_False();
             }
         } else {
-            $byname = new UFC_AddressText(null, UFC_Address::CONTAINS, UFC_Address::TYPE_ANY, $flags, null, $this->val);
+            $byname = new UFC_AddressText(null, XDB::WILDCARD_CONTAINS, UFC_Address::TYPE_ANY, $flags, null, $this->val);
             $byzip  = new UFC_AddressField($this->val, UFC_AddressField::FIELD_ZIPCODE, UFC_Address::TYPE_ANY, $flags);
             if ($this->type & self::TYPE_ANY) {
                 return new PFC_Or($byname, $byzip);