- added frontend-side support of quotes and triger expression validation (Eugene)

 - merged rev. 4305:4307 [improved trigger expression syntax and validation]
 - merged rev. 4329:4331 [more support for quotes in key parameters]
 - merged rev. 4344:4346 [minor improovments]
 - merged rev. 4431:4432 [added availability of using ":," character for key]



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

1 files changed, 41 insertions, 19 deletions

diff --git a/frontends/php/include/defines.inc.php b/frontends/php/include/defines.inc.php
index 59043c76..37ed61ab 100644
--- a/frontends/php/include/defines.inc.php
+++ b/frontends/php/include/defines.inc.php
@@ -217,14 +217,14 @@
 	define('ACTION_STATUS_ENABLED',0);
 	define('ACTION_STATUS_DISABLED',1);
 
-	define('OPERATION_TYPE_MESSAGE',	0); /* !!!!! */
-	define('OPERATION_TYPE_COMMAND',	1); /* !!!!! */
-	define('OPERATION_TYPE_HOST_ADD',	2); /* TODO!!! */
-	define('OPERATION_TYPE_HOST_REMOVE',	3); /* TODO!!! */
-	define('OPERATION_TYPE_GROUP_ADD',	4); /* TODO!!! */
-	define('OPERATION_TYPE_GROUP_REMOVE',	5); /* TODO!!! */
-	define('OPERATION_TYPE_TEMPLATE_ADD',	6); /* TODO!!! */
-	define('OPERATION_TYPE_TEMPLATE_REMOVE',7); /* TODO!!! */
+	define('OPERATION_TYPE_MESSAGE',	0);
+	define('OPERATION_TYPE_COMMAND',	1);
+	define('OPERATION_TYPE_HOST_ADD',	2);
+	define('OPERATION_TYPE_HOST_REMOVE',	3);
+	define('OPERATION_TYPE_GROUP_ADD',	4);
+	define('OPERATION_TYPE_GROUP_REMOVE',	5);
+	define('OPERATION_TYPE_TEMPLATE_ADD',	6);
+	define('OPERATION_TYPE_TEMPLATE_REMOVE',7);
 
 	define('ACTION_EVAL_TYPE_AND_OR',0);
 	define('ACTION_EVAL_TYPE_AND',1);
@@ -383,17 +383,39 @@
 	define('SPACE',	' ');
 	define('RARR',	'⇒');
 
-	define('ZBX_EREG_HOST_FORMAT', '([0-9a-zA-Z\_\.[:space:][.-.]\$]+)');
-       define('ZBX_EREG_NODE_FORMAT', '([0-9a-zA-Z\_\.[:space:][.-.]\$]+)');
-	define('ZBX_EREG_ITEM_KEY_FORMAT', '([]\[\'0-9a-zA-Z!\_\*\&/\.\,\:\(\)\+ [.-.]\$%]+)');
-
-	define('ZBX_EREG_SIMPLE_EXPRESSION_FORMAT',
-		'^\{'.ZBX_EREG_HOST_FORMAT.'\:'.ZBX_EREG_ITEM_KEY_FORMAT.'\.([a-z]{3,11})\(([#0-9a-zA-Z\_\/\.\,[:space:]]+)\)\}$');
-
-	define('ZBX_SIMPLE_EXPRESSION_HOST_ID', 1);
-	define('ZBX_SIMPLE_EXPRESSION_KEY_ID', 2);
-	define('ZBX_SIMPLE_EXPRESSION_FUNCTION_ID', 3);
-	define('ZBX_SIMPLE_EXPRESSION_PARAMETER_ID', 4);
+	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}');
+	define('ZBX_EREG_SIGN', '([&|><=+*/#[.-.]])');
+	define('ZBX_EREG_NUMBER', '([[.-.]+]*[0-9]+[.]{0,1}[0-9]*[A-Z]{0,1})');
+
+	/* Character '-' must be last in the list of symbols, otherwise it won't be accepted */
+	define('ZBX_EREG_DNS_FORMAT', '([0-9a-zA-Z\_\.\$[.-.]]+)');
+	define('ZBX_EREG_HOST_FORMAT', ZBX_EREG_INTERNAL_NAMES);
+	define('ZBX_EREG_NODE_FORMAT', ZBX_EREG_INTERNAL_NAMES);
+	define('ZBX_EREG_ITEM_KEY_FORMAT', '('.ZBX_EREG_KEY_NAME.'(\['.ZBX_EREG_PARAMS.'\]){0,1})');
+	define('ZBX_KEY_ID', 1);
+	define('ZBX_KEY_NAME_ID', 2);
+	define('ZBX_KEY_PARAM_ID', 4);
+	define('ZBX_EREG_FUNCTION_FORMAT', '('.ZBX_EREG_INTERNAL_NAMES.'(\('.ZBX_EREG_PARAMS.'\)))');
+
+	define('ZBX_EREG_SIMPLE_EXPRESSION_FORMAT','(\{'.ZBX_EREG_HOST_FORMAT.'\:'.ZBX_EREG_ITEM_KEY_FORMAT.'\.'.ZBX_EREG_FUNCTION_FORMAT.'\})');
+	define('ZBX_EREG_MACRO_NAME_FORMAT', '(\{[A-Z\.]+\})');
+
+	define('ZBX_SIMPLE_EXPRESSION_HOST_ID', 2);
+	define('ZBX_SIMPLE_EXPRESSION_KEY_ID', 2 + ZBX_KEY_ID);
+	define('ZBX_SIMPLE_EXPRESSION_KEY_NAME_ID', 2 + ZBX_KEY_NAME_ID);
+	define('ZBX_SIMPLE_EXPRESSION_KEY_PARAM_ID', 2 + ZBX_KEY_PARAM_ID);
+	define('ZBX_SIMPLE_EXPRESSION_FUNCTION_ID', 7);
+	define('ZBX_SIMPLE_EXPRESSION_FUNCTION_NAME_ID', 8);
+	define('ZBX_SIMPLE_EXPRESSION_FUNCTION_PARAM_ID', 10);
+
+	define('ZBX_EREG_EXPRESSION_TOKEN_FORMAT', '^([[:print:]]*)('.ZBX_EREG_SIMPLE_EXPRESSION_FORMAT.'|'.ZBX_EREG_MACRO_NAME_FORMAT.')([[:print:]]*)$');
+
+	define('ZBX_EXPRESSION_LEFT_ID', 1);
+	define('ZBX_EXPRESSION_SIMPLE_EXPRESSION_ID', 2);
+	define('ZBX_EXPRESSION_MACRO_ID', 13);
+	define('ZBX_EXPRESSION_RIGHT_ID', 14);
 
 	define('ZBX_MIN_PERIOD', 3600);
 	define('ZBX_MAX_PERIOD', 12*31*24*3600);