- speed improvement for Overview screens (Eugene)

 - developed 'net.if.total[*]' parameter (Eugene)
 - fixed new map link adding (Eugene)
 - fixed host group adding (Eugene)
 - fixed map displaying (Eugene)
 - fixed 'No permissions' for 'Latest data','Triggers','Alarms' screens (Eugene)
 - fixed permision deletion (Eugene)
 - fixed 'get_map_by_sysmapid' function calls(Eugene)
 - improved php code execution speed (Eugene)


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

1 files changed, 11 insertions, 12 deletions

diff --git a/frontends/php/include/services.inc.php b/frontends/php/include/services.inc.php
index 84362b3a..62fb69a3 100644
--- a/frontends/php/include/services.inc.php
+++ b/frontends/php/include/services.inc.php
@@ -79,6 +79,9 @@
 		{
 			return	$result;
 		}
+	// delete service permisions
+		DBexecute('delete from rights where name=\'Service\' and id='.$serviceid);
+
 		$sql="delete from services where serviceid=$serviceid";
 		return DBexecute($sql);
 	}
@@ -314,29 +317,25 @@
 	{
 		$sql="select * from services where serviceid=$serviceid";
 		$result=DBselect($sql);
-		if(Dbnum_rows($result) == 1)
-		{
-			return	DBfetch($result);
-		}
-		else
+		$res = DBfetch($result);
+		if(!$res)
 		{
 			error("No service with serviceid=[$serviceid]");
+			return	FALSE;
 		}
-		return	FALSE;
+		return $res;
 	}
 
 	function	get_services_links_by_linkid($linkid)
 	{
 		$result=DBselect("select * from services_links where linkid=$linkid");
-		if(Dbnum_rows($result) == 1)
-		{
-			return	DBfetch($result);
-		}
-		else
+		$res = DBfetch($result);
+		if(!$res)
 		{
 			error("No service linkage with linkid=[$linkid]");
+			return	FALSE;
 		}
-		return	FALSE;
+		return $res;
 	}
 
 	function algorithm2str($algorithm)