From d287bd3f8fcb0f9f33f139bafb98d736553ac7df Mon Sep 17 00:00:00 2001 From: artem Date: Wed, 1 Aug 2007 08:36:39 +0000 Subject: - merged rev. 4492:4494 of branches/1.4.2/ (Artem) [fixed getting trigger priority - fixed updating services] git-svn-id: svn://svn.zabbix.com/trunk@4495 97f52cf1-0a1b-0410-bd0e-c28be96e8082 --- frontends/php/include/services.inc.php | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) (limited to 'frontends/php/include/services.inc.php') diff --git a/frontends/php/include/services.inc.php b/frontends/php/include/services.inc.php index 9b951592..f0c14362 100644 --- a/frontends/php/include/services.inc.php +++ b/frontends/php/include/services.inc.php @@ -141,7 +141,7 @@ * retrive true status * * Author: - * Artem Suahrev + * Artem Suharev * * Comments: * @@ -207,7 +207,7 @@ * removes any links between trigger and service if service is not leaf (treenode) * * Author: - * Artem Suahrev + * Artem Suharev * * Comments: * @@ -825,7 +825,7 @@ function update_services($triggerid, $status){ * Cleaning parent nodes from triggers, updating ALL services status. * * Author: - * Artem Suahrev + * Artem Suharev * * Comments: !!! Don't forget sync code with C !!! * @@ -833,12 +833,9 @@ function update_services($triggerid, $status){ function update_services_status_all(){ - clear_parents_from_trigger(); + clear_parents_from_trigger(); - $result = DBselect('SELECT sl.servicedownid as serviceid,s.algorithm,s.triggerid '. - ' FROM services_links as sl, services as s '. - ' WHERE s.serviceid = sl.servicedownid '. - ' GROUP BY sl.servicedownid'); + $result = DBselect('SELECT s.serviceid,s.algorithm,s.triggerid FROM services as s '); while($rows=DBfetch($result)){ $status = get_service_status($rows['serviceid'],$rows['algorithm'],$rows['triggerid']); -- cgit