diff options
| author | osmiy <osmiy@97f52cf1-0a1b-0410-bd0e-c28be96e8082> | 2007-08-13 08:22:32 +0000 |
|---|---|---|
| committer | osmiy <osmiy@97f52cf1-0a1b-0410-bd0e-c28be96e8082> | 2007-08-13 08:22:32 +0000 |
| commit | abaab90a1c9d3367f1ef636557cfe8e661716749 (patch) | |
| tree | 3e266e5523a635c45a7e7ef6d4571e7323f26065 /frontends/php/srv_status.php | |
| parent | 8901654871973b4267f106a97183001189189c82 (diff) | |
| download | zabbix-abaab90a1c9d3367f1ef636557cfe8e661716749.tar.gz zabbix-abaab90a1c9d3367f1ef636557cfe8e661716749.tar.xz zabbix-abaab90a1c9d3367f1ef636557cfe8e661716749.zip | |
- merger rev. 4546:4547 of branches/1.4.j [developed data monitoring of multiple nodes]
git-svn-id: svn://svn.zabbix.com/trunk@4549 97f52cf1-0a1b-0410-bd0e-c28be96e8082
Diffstat (limited to 'frontends/php/srv_status.php')
| -rw-r--r-- | frontends/php/srv_status.php | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/frontends/php/srv_status.php b/frontends/php/srv_status.php index 124f2b77..f09b4fef 100644 --- a/frontends/php/srv_status.php +++ b/frontends/php/srv_status.php @@ -54,7 +54,7 @@ include_once "include/page_header.php"; if( !($service = DBfetch(DBselect("select s.* from services s left join triggers t on s.triggerid=t.triggerid ". " left join functions f on t.triggerid=f.triggerid left join items i on f.itemid=i.itemid ". " where (i.hostid is null or i.hostid not in (".$denyed_hosts.")) ". - " and ".DBid2nodeid("s.serviceid")."=".$ZBX_CURNODEID. + ' and '.DBin_node('s.serviceid'). " and s.serviceid=".$_REQUEST["serviceid"] )))) { @@ -80,7 +80,7 @@ include_once "include/page_header.php"; ' LEFT JOIN services_links sl_p ON s.serviceid = sl_p.servicedownid and sl_p.soft=0 '. ' LEFT JOIN functions f ON t.triggerid=f.triggerid '. ' LEFT JOIN items i ON f.itemid=i.itemid '. - ' WHERE '.DBid2nodeid("s.serviceid").'='.$ZBX_CURNODEID. + ' WHERE '.DBin_node('s.serviceid'). ' AND (i.hostid is null or i.hostid not in ('.$denyed_hosts.')) '. ' ORDER BY s.sortorder, sl_p.serviceupid, s.serviceid'; @@ -121,7 +121,7 @@ include_once "include/page_header.php"; $row['reason'] = new CList(null,"itservices"); $result2=DBselect("select s.triggerid,s.serviceid from services s, triggers t ". " where s.status>0 and s.triggerid is not NULL and t.triggerid=s.triggerid ". - " and ".DBid2nodeid("s.serviceid")."=".$ZBX_CURNODEID. + ' and '.DBin_node('s.serviceid'). " order by s.status desc,t.description"); while($row2=DBfetch($result2)){ |