diff options
| author | artem <artem@97f52cf1-0a1b-0410-bd0e-c28be96e8082> | 2008-06-18 12:32:02 +0000 |
|---|---|---|
| committer | artem <artem@97f52cf1-0a1b-0410-bd0e-c28be96e8082> | 2008-06-18 12:32:02 +0000 |
| commit | 4f1f420a91e557c2ab4a7ff9605fba260931bbdc (patch) | |
| tree | 48ff179492d1d1ae1d93061ec618392d281fef3a /frontends/php/include/config.inc.php | |
| parent | 01e94d67317be183b74fa97bd3d15ee99ab27d69 (diff) | |
- [DEV-171] improvements to escalation form (Artem)
- [DEV-137] small fixes (Artem)
git-svn-id: svn://svn.zabbix.com/trunk@5778 97f52cf1-0a1b-0410-bd0e-c28be96e8082
Diffstat (limited to 'frontends/php/include/config.inc.php')
| -rw-r--r-- | frontends/php/include/config.inc.php | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/frontends/php/include/config.inc.php b/frontends/php/include/config.inc.php index 6ce15123..adea212c 100644 --- a/frontends/php/include/config.inc.php +++ b/frontends/php/include/config.inc.php @@ -284,7 +284,7 @@ function TODO($msg) { echo "TODO: ".$msg.SBR; } // DEBUG INFO!!! $result = ( is_show_subnodes($forse_with_subnodes) ? $ZBX_CURRENT_SUBNODES : $ZBX_CURRENT_NODEID ); if(!is_null($perm)){ - $result = get_accessible_nodes_by_user($USER_DETAILS, PERM_READ_ONLY, null, $result); + $result = get_accessible_nodes_by_user($USER_DETAILS, PERM_READ_ONLY); } return $result; @@ -1106,7 +1106,7 @@ function TODO($msg) { echo "TODO: ".$msg.SBR; } // DEBUG INFO!!! /* $row=DBfetch(DBselect("select count(alertid) as cnt from alerts")); $status["alerts_count"]=$row["cnt"];*/ // triggers - $sql = 'SELECT COUNT(t.triggerid) as cnt '. + $sql = 'SELECT COUNT(DISTINCT t.triggerid) as cnt '. ' FROM triggers t, functions f, items i, hosts h'. ' WHERE t.triggerid=f.triggerid '. ' AND f.itemid=i.itemid '. @@ -1132,7 +1132,7 @@ function TODO($msg) { echo "TODO: ".$msg.SBR; } // DEBUG INFO!!! $row=DBfetch(DBselect($sql." and t.status=0 and t.value=2")); $status["triggers_count_unknown"]=$row["cnt"]; // items - $sql = 'SELECT COUNT(i.itemid) as cnt '. + $sql = 'SELECT COUNT(DISTINCT i.itemid) as cnt '. ' FROM items i, hosts h '. ' WHERE i.hostid=h.hostid '. ' AND h.status='.HOST_STATUS_MONITORED; |