- added availability of using spaces for trigger expressions (Eugene)

git-svn-id: svn://svn.zabbix.com/trunk@4476 97f52cf1-0a1b-0410-bd0e-c28be96e8082

2 files changed, 2 insertions, 1 deletions

diff --git a/frontends/php/include/defines.inc.php b/frontends/php/include/defines.inc.php
index a4fa6abe..c1fe99cb 100644
--- a/frontends/php/include/defines.inc.php
+++ b/frontends/php/include/defines.inc.php
@@ -384,6 +384,7 @@
 	define('SPACE',	' ');
 	define('RARR',	'⇒');
 
+	define('ZBX_EREG_SPACES', '([[:space:]]+){0,1}');
 	define('ZBX_EREG_INTERNAL_NAMES', '([0-9a-zA-Z_.[:space:][.-.]$]+)');
 	define('ZBX_EREG_KEY_NAME', '([0-9a-zA-Z_.,[.:.][:space:][.-.]$]+)');
 	define('ZBX_EREG_PARAMS', '([[:print:]]+){0,1}');
diff --git a/frontends/php/include/triggers.inc.php b/frontends/php/include/triggers.inc.php
index 123b1fff..4eba2c6c 100644
--- a/frontends/php/include/triggers.inc.php
+++ b/frontends/php/include/triggers.inc.php
@@ -640,7 +640,7 @@
 		/* Replace all calculations and numbers with '$ZBX_TR_EXPR_REPLACE_TO' */
 		$expt_number = '('.$ZBX_TR_EXPR_REPLACE_TO.'|'.ZBX_EREG_NUMBER.')';
 		$expt_term = '((\('.$expt_number.'\))|('.$expt_number.'))';
-		$expr_format = '(('.$expt_term.ZBX_EREG_SIGN.$expt_term.')|(\('.$expt_term.'\)))';
+		$expr_format = '(('.$expt_term.ZBX_EREG_SPACES.ZBX_EREG_SIGN.ZBX_EREG_SPACES.$expt_term.')|(\('.$expt_term.'\)))';
 		$expr_full_format = '((\('.$expr_format.'\))|('.$expr_format.'))';
 
 		while($res = ereg($expr_full_format.'([[:print:]]*)$', $expr, $arr))