From 78be0329bc90988f3a2711af3c0513aa1205834d Mon Sep 17 00:00:00 2001 From: Florent Bruneau Date: Mon, 30 Aug 2010 14:15:32 +0200 Subject: [PATCH] Stricter validation of the context of 'mixed' search fields when text version is given. Signed-off-by: Florent Bruneau --- include/ufbuilder.inc.php | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/include/ufbuilder.inc.php b/include/ufbuilder.inc.php index 9689155..b95aff0 100644 --- a/include/ufbuilder.inc.php +++ b/include/ufbuilder.inc.php @@ -140,6 +140,18 @@ class UserFilterBuilder return Env::blank($key, $strict); } + public function hasAlnum($key) + { + $str = $this->s($key); + return preg_match('/[a-z0-9]/i', $str); + } + + public function hasAlpha($key) + { + $str = $this->s($key); + return preg_match('/[a-z]/i', $str); + } + public function isOn($key) { return $this->has($key) && $this->t($key) == 'on'; @@ -436,7 +448,7 @@ abstract class UFBF_Mixed extends UFB_Field protected function check(UserFilterBuilder &$ufb) { - if ($ufb->blank($this->envfieldindex) && $ufb->blank($this->envfield)) { + if ($ufb->blank($this->envfieldindex) && !$ufb->hasAlnum($this->envfield)) { $this->empty = true; return true; } -- 2.1.4