- 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, 8 insertions, 8 deletions

diff --git a/frontends/php/include/maps.inc.php b/frontends/php/include/maps.inc.php
index 9517927d..cb394fe8 100644
--- a/frontends/php/include/maps.inc.php
+++ b/frontends/php/include/maps.inc.php
@@ -28,11 +28,8 @@
 		{
 			return	$row;
 		}
-		else
-		{
-			error("No system map with sysmapid=[$sysmapid]");
-		}
-		return	$result;
+		error("No system map with sysmapid=[$sysmapid]");
+		return false;
 	}
 
 	function	get_sysmaps_element_by_selementid($selementid)
@@ -64,6 +61,9 @@
 		$result = DBexecute("delete from sysmaps_elements where sysmapid=$sysmapid");
 		if(!$result)	return	$result;
 
+	// delete map permisions
+		DBexecute('delete from rights where name=\'Network map\' and id='.$sysmapid);
+
 		return DBexecute("delete from sysmaps where sysmapid=$sysmapid");
 	}
 
@@ -251,8 +251,8 @@
 	{
 		global $colors;
 
-		$info = "";
 		$count = 0;
+		$info = "OK";
 		$color= $colors["Dark Green"];
 		
 		$db_element = get_sysmaps_element_by_selementid($selementid);
@@ -300,8 +300,8 @@
 
 			if($count==0)
 			{
-				$out_info	= S_OK_BIG;
-				$out_color	= $colors["Dark Green"];
+				$info	= S_OK_BIG;
+				$color	= $colors["Dark Green"];
 			}
 		}
 		elseif($db_element["elementtype"]==SYSMAP_ELEMENT_TYPE_IMAGE)