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();
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");
}
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);
}
}
// }}}
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);