summaryrefslogtreecommitdiffstats
path: root/frontends/php/include/triggers.inc.php
diff options
context:
space:
mode:
authorosmiy <osmiy@97f52cf1-0a1b-0410-bd0e-c28be96e8082>2007-02-07 09:27:20 +0000
committerosmiy <osmiy@97f52cf1-0a1b-0410-bd0e-c28be96e8082>2007-02-07 09:27:20 +0000
commit2d76733fbfa2cdb0935210e524f373c18ef47ee9 (patch)
treed40cf2e113983d93e2c11af9bb5ad45a54235587 /frontends/php/include/triggers.inc.php
parent4ceb822c9fdd9cb84040e4d104942c6dc565504e (diff)
downloadzabbix-2d76733fbfa2cdb0935210e524f373c18ef47ee9.tar.gz
zabbix-2d76733fbfa2cdb0935210e524f373c18ef47ee9.tar.xz
zabbix-2d76733fbfa2cdb0935210e524f373c18ef47ee9.zip
- 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
Diffstat (limited to 'frontends/php/include/triggers.inc.php')
-rw-r--r--frontends/php/include/triggers.inc.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/frontends/php/include/triggers.inc.php b/frontends/php/include/triggers.inc.php
index c43ef729..14ba987a 100644
--- a/frontends/php/include/triggers.inc.php
+++ b/frontends/php/include/triggers.inc.php
@@ -182,7 +182,7 @@
// echo "Expression:$expression<br>";
$arr="";
// The minus sing '-' must be the last one in the list, otherwise it won't work!
- if (eregi('^((.)*)([0-9\.]+[A-Z]{0,1})[ ]*([\&\|\>\<\=\+\*\/\#-]{1})[ ]*([0-9\.]+[A-Z]{0,1})((.)*)$', $expression, $arr))
+ if (eregi('^((.)*)([0-9\.]+[A-Z]{0,1})[ ]*([\&\|\>\<\=\+\*\/\#[.-.]]{1})[ ]*([0-9\.]+[A-Z]{0,1})((.)*)$', $expression, $arr))
{
// echo "OK<br>";
// for($i=0;$i<50;$i++)