diff options
Diffstat (limited to 'frontends/php/include')
| -rw-r--r-- | frontends/php/include/services.inc.php | 13 | ||||
| -rw-r--r-- | frontends/php/include/triggers.inc.php | 7 |
2 files changed, 9 insertions, 11 deletions
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']); diff --git a/frontends/php/include/triggers.inc.php b/frontends/php/include/triggers.inc.php index 4eba2c6c..7d451fca 100644 --- a/frontends/php/include/triggers.inc.php +++ b/frontends/php/include/triggers.inc.php @@ -266,18 +266,19 @@ * Function: get_trigger_priority * * Description: - * retrive triggers priority + * retrive trigger's priority * * Author: - * Artem Suahrev + * Artem Suharev * * Comments: * */ function get_trigger_priority($triggerid){ - $sql = 'SELECT count(*) as count, priority FROM triggers WHERE triggerid='.$triggerid.' GROUP BY priority'; + $sql = 'SELECT count(*) as count, priority FROM triggers WHERE triggerid='.$triggerid.' AND status=0 GROUP BY priority'; $rows = DBfetch(DBselect($sql)); + if($rows && !is_null($rows['count']) && !is_null($rows['priority']) && ($rows['count'] > 0)){ $status = $rows['priority']; } |