diff options
| author | alex <alex@97f52cf1-0a1b-0410-bd0e-c28be96e8082> | 2007-07-10 10:11:42 +0000 |
|---|---|---|
| committer | alex <alex@97f52cf1-0a1b-0410-bd0e-c28be96e8082> | 2007-07-10 10:11:42 +0000 |
| commit | 09606f5c0b83c06e78e089cd1a7fd327b3af346a (patch) | |
| tree | 6b9746ac59219cc685dcda0fb0eed6a62c5573c4 /frontends/php/include/items.inc.php | |
| parent | 97cda9ad0979e3362caefb099aff0c470205c1a0 (diff) | |
- changed syntax of keys for aggregate items (Alexei)
[svn merge -r4451:4453 svn://svn.zabbix.com/branches/1.4.2]
git-svn-id: svn://svn.zabbix.com/trunk@4454 97f52cf1-0a1b-0410-bd0e-c28be96e8082
Diffstat (limited to 'frontends/php/include/items.inc.php')
| -rw-r--r-- | frontends/php/include/items.inc.php | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/frontends/php/include/items.inc.php b/frontends/php/include/items.inc.php index 495056ed..3232d384 100644 --- a/frontends/php/include/items.inc.php +++ b/frontends/php/include/items.inc.php @@ -228,7 +228,8 @@ if($type == ITEM_TYPE_AGGREGATE) { /* grpfunc('group','key','itemfunc','numeric param') */ - if(eregi('^((.)*)(\(\'((.)*)\'\,\'((.)*)\'\,\'((.)*)\'\,\'([0-9]+)\'\))$', $key, $arr)) +// if(eregi('^((.)*)(\(\'((.)*)\'\,\'((.)*)\'\,\'((.)*)\'\,\'([0-9]+)\'\))$', $key, $arr)) + if(eregi('^((.)*)(\[\"((.)*)\"\,\"((.)*)\"\,\"((.)*)\"\,\"([0-9]+)\"\])$', $key, $arr)) { $g=$arr[1]; if(!in_array($g,array("grpmax","grpmin","grpsum","grpavg"))) @@ -252,7 +253,7 @@ } else { - error("Key does not match grpfunc('group','key','itemfunc','numeric param')"); + error("Key does not match grpfunc[\"group\",\"key\",\"itemfunc\",\"numeric param\")"); return FALSE; } } |