From 2d76733fbfa2cdb0935210e524f373c18ef47ee9 Mon Sep 17 00:00:00 2001 From: osmiy Date: Wed, 7 Feb 2007 09:27:20 +0000 Subject: - fixed graphs in Oracle system (Eugene) - fixed trigger expressions with ':' (Eugene) - fixed 'Server info' screen componets (Eugene) git-svn-id: svn://svn.zabbix.com/trunk@3804 97f52cf1-0a1b-0410-bd0e-c28be96e8082 --- frontends/php/include/config.inc.php | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'frontends/php/include/config.inc.php') diff --git a/frontends/php/include/config.inc.php b/frontends/php/include/config.inc.php index a2d53239..44d40913 100644 --- a/frontends/php/include/config.inc.php +++ b/frontends/php/include/config.inc.php @@ -850,11 +850,7 @@ else global $ZBX_CURNODEID; // echo "Validating simple:$expression
"; -// Before str() -// if (eregi('^\{([0-9a-zA-Z[.-.]\_\.]+)\:([]\[0-9a-zA-Z\_\/\.\,]+)\.((diff)|(min)|(max)|(last)|(prev))\(([0-9\.]+)\)\}$', $expression, $arr)) -// if (eregi('^\{([0-9a-zA-Z[.-.]\_\.]+)\:([]\[0-9a-zA-Z\_\/\.\,]+)\.((diff)|(min)|(max)|(last)|(prev)|(str))\(([0-9a-zA-Z\.\_\/\,]+)\)\}$', $expression, $arr)) -// if (eregi('^\{([0-9a-zA-Z\_\.-]+)\:([]\[0-9a-zA-Z\_\*\/\.\,\:\(\) -]+)\.([a-z]{3,11})\(([#0-9a-zA-Z\_\/\.\,]+)\)\}$', $expression, $arr)) - if (eregi('^\{([0-9a-zA-Z\_\.-\$]+)\:([]\[0-9a-zA-Z\_\*\/\.\,\:\(\)\+ -\$]+)\.([a-z]{3,11})\(([#0-9a-zA-Z\_\/\.\,[:space:]]+)\)\}$', $expression, $arr)) + if (eregi('^\{([0-9a-zA-Z\_\.[.-.]\$]+)\:([]\[0-9a-zA-Z\_\*\/\.\,\:\(\)\+ [.-.]\$]+)\.([a-z]{3,11})\(([#0-9a-zA-Z\_\/\.\,[:space:]]+)\)\}$', $expression, $arr)) { $host=$arr[1]; $key=$arr[2]; -- cgit