diff options
| author | hugetoad <hugetoad@97f52cf1-0a1b-0410-bd0e-c28be96e8082> | 2003-02-13 19:20:24 +0000 |
|---|---|---|
| committer | hugetoad <hugetoad@97f52cf1-0a1b-0410-bd0e-c28be96e8082> | 2003-02-13 19:20:24 +0000 |
| commit | 040a274246ea3e30d2622fcd5fc2036dafa67941 (patch) | |
| tree | d3c505c35d7e453a146a218f8828e1a24439b6eb | |
| parent | 29e283f4fbe981442c3c385480444e6b29e72961 (diff) | |
- support of '(' and ')' in item keys (Alexei)
git-svn-id: svn://svn.zabbix.com/trunk@694 97f52cf1-0a1b-0410-bd0e-c28be96e8082
| -rw-r--r-- | ChangeLog | 1 | ||||
| -rw-r--r-- | frontends/php/include/config.inc.php | 2 |
2 files changed, 2 insertions, 1 deletions
@@ -1,5 +1,6 @@ Changes for 1.0beta9: + - support of '(' and ')' in item keys (Alexei) - fixed dark blue color for user-defined chart (Alexei) - removed DOS style EOL from RedHat startup scripts (Alexei) - IT service to be hard-linked when added (Alexei) diff --git a/frontends/php/include/config.inc.php b/frontends/php/include/config.inc.php index 896d5376..55962128 100644 --- a/frontends/php/include/config.inc.php +++ b/frontends/php/include/config.inc.php @@ -522,7 +522,7 @@ where h.hostid=i.hostid and i.itemid=f.itemid and f.triggerid=$triggerid"; // 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,6})\(([0-9a-zA-Z\_\/\.\,]+)\)\}$', $expression, &$arr)) + if (eregi('^\{([0-9a-zA-Z\_\.-]+)\:([]\[0-9a-zA-Z\_\/\.\,\:\(\)]+)\.([a-z]{3,6})\(([0-9a-zA-Z\_\/\.\,]+)\)\}$', $expression, &$arr)) { $host=$arr[1]; $key=$arr[2]; |