- configurable format of icon labels for maps (Alexei)

 - added column sysmaps.label_type (Alexei)


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

3 files changed, 14 insertions, 4 deletions

diff --git a/frontends/php/include/config.inc.php b/frontends/php/include/config.inc.php
index 79baf9ef..c9b799e6 100644
--- a/frontends/php/include/config.inc.php
+++ b/frontends/php/include/config.inc.php
@@ -2992,7 +2992,7 @@ echo "</head>";
 
 	# Update System Map
 
-	function	update_sysmap($sysmapid,$name,$width,$height,$background)
+	function	update_sysmap($sysmapid,$name,$width,$height,$background,$label_type)
 	{
 		global	$ERROR_MSG;
 
@@ -3002,7 +3002,7 @@ echo "</head>";
 			return 0;
 		}
 
-		$sql="update sysmaps set name='$name',width=$width,height=$height,background='$background' where sysmapid=$sysmapid";
+		$sql="update sysmaps set name='$name',width=$width,height=$height,background='$background',label_type=$label_type where sysmapid=$sysmapid";
 		return	DBexecute($sql);
 	}
 
@@ -3036,7 +3036,7 @@ echo "</head>";
 
 	# Add System Map
 
-	function	add_sysmap($name,$width,$height,$background)
+	function	add_sysmap($name,$width,$height,$background,$label_type)
 	{
 		global	$ERROR_MSG;
 
@@ -3046,7 +3046,7 @@ echo "</head>";
 			return 0;
 		}
 
-		$sql="insert into sysmaps (name,width,height,background) values ('$name',$width,$height,'$background')";
+		$sql="insert into sysmaps (name,width,height,background,label_type) values ('$name',$width,$height,'$background',$label_type)";
 		return	DBexecute($sql);
 	}
 
diff --git a/frontends/php/include/defines.inc.php b/frontends/php/include/defines.inc.php
index c707dc60..2011487a 100644
--- a/frontends/php/include/defines.inc.php
+++ b/frontends/php/include/defines.inc.php
@@ -60,6 +60,11 @@
 	define("GRAPH_YAXIS_TYPE_CALCULATED",0);
 	define("GRAPH_YAXIS_TYPE_FIXED",1);
 
+	define("MAP_LABEL_TYPE_HOSTLABEL",0);
+	define("MAP_LABEL_TYPE_IP",1);
+	define("MAP_LABEL_TYPE_HOSTNAME",2);
+	define("MAP_LABEL_TYPE_NOTHING",3);
+
 	define("ITEM_TYPE_ZABBIX",0);
 	define("ITEM_TYPE_SNMPV1",1);
 	define("ITEM_TYPE_TRAPPER",2);
diff --git a/frontends/php/include/local_en.inc.php b/frontends/php/include/local_en.inc.php
index ccd8c2d5..418b4ba4 100644
--- a/frontends/php/include/local_en.inc.php
+++ b/frontends/php/include/local_en.inc.php
@@ -376,6 +376,11 @@
 	define("S_NO_MAPS_TO_DISPLAY",			"No maps to display");
 	define("S_SELECT_MAP_TO_DISPLAY",		"Select map to display");
 	define("S_SELECT_MAP_DOT_DOT_DOT",		"Select map...");
+	define("S_BACKGROUND_IMAGE",			"Background image");
+	define("S_ICON_LABEL_TYPE",			"Icon label type");
+	define("S_HOST_LABEL",				"Host label");
+	define("S_HOST_NAME",				"Host name");
+	define("S_NOTHING",				"Nothing");
 
 //	media.php
 	define("S_MEDIA",				"Media");