- fixes to services calculation algorithms (Artem)

git-svn-id: svn://svn.zabbix.com/trunk@5570 97f52cf1-0a1b-0410-bd0e-c28be96e8082

2 files changed, 9 insertions, 6 deletions

diff --git a/frontends/php/include/services.inc.php b/frontends/php/include/services.inc.php
index a43821c2..cc3c199a 100644
--- a/frontends/php/include/services.inc.php
+++ b/frontends/php/include/services.inc.php
@@ -801,7 +801,7 @@ function update_services($triggerid, $status){
 	$result = DBselect('SELECT serviceid,algorithm FROM services WHERE triggerid='.$triggerid);
 
 	while(($rows=DBfetch($result))){
-		$status = get_service_status($rows['serviceid'],$rows['algorithm']);
+//		$status = get_service_status($rows['serviceid'],$rows['algorithm'],$triggerid);
 		add_service_alarm($rows['serviceid'],$status,time());
 
 		update_services_rec($rows['serviceid']);
diff --git a/frontends/php/report3.php b/frontends/php/report3.php
index 118a6f04..660dfeab 100644
--- a/frontends/php/report3.php
+++ b/frontends/php/report3.php
@@ -52,11 +52,14 @@ include_once "include/page_header.php";
 
 	$denyed_hosts = get_accessible_hosts_by_user($USER_DETAILS,PERM_READ_ONLY,PERM_MODE_LT);
 	
-	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 '.DBin_node('s.serviceid').
-		" and s.serviceid=".$_REQUEST["serviceid"]
+	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 '.DBin_node('s.serviceid').
+						' AND s.serviceid='.$_REQUEST['serviceid']
 		))))
 	{
 		access_deny();