- added "Data overview" for screens

 - added "Triggers overview" for screens (Eugene)
 - added blinking into Trigger overview (Eugene)
 - added screen displaying in other screen (Eugene)
 - improved Overview table header, vertical text added (Eugene)
 - developed "ZABBIX Clock" module for screens (Eugene)
 - developed "ZABBIX server info" module for screens (Eugene)
 - developed "Triggers info" module for screens (Eugene)
 - developed "Host info" module for screens (Eugene)
 - improved screens displaying, added item alignment (Eugene)
 - improved ZABBIX server report (Eugene)
 - improved images configuration (Eugene)
 - added onserver image resizing for thumbs by php (Eugene)
 - developed acknowledges system (Eugene)
 - added icons displaying for maps (Eugene)
 - added maps displaying for maps (Eugene)
 - improved maps (Eugene)


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

1 files changed, 51 insertions, 77 deletions

diff --git a/frontends/php/maps.php b/frontends/php/maps.php
index 8dd7eb5e..bd628901 100644
--- a/frontends/php/maps.php
+++ b/frontends/php/maps.php
@@ -23,26 +23,17 @@
 	$page["title"] = "S_NETWORK_MAPS";
 	$page["file"] = "maps.php";
 
-	$nomenu=0;
-	if(isset($_REQUEST["fullscreen"]))
-	{
-		$nomenu=1;
-	}
-	if(isset($_REQUEST["sysmapid"]))
-	{
-		show_header($page["title"],1,$nomenu);
-	}
-	else
-	{
-		show_header($page["title"],0,$nomenu);
-	}
+	$_REQUEST["fullscreen"] = get_request("fullscreen", 0);
+
+	show_header($page["title"],1, $_REQUEST["fullscreen"] > 0 ? 1 : 0);
+
 ?>
 
 <?php
 //		VAR			TYPE	OPTIONAL FLAGS	VALIDATION	EXCEPTION
 	$fields=array(
-		"sysmapid"=>		array(T_ZBX_INT, O_OPT,	P_SYS|P_NZERO,	BETWEEN(0,65535),	NULL),
-		"fullscreen"=>		array(T_ZBX_INT, O_OPT,	P_SYS,		IN("1"),		NULL)
+		"sysmapid"=>		array(T_ZBX_INT, O_OPT,	P_SYS|P_NZERO,	DB_ID,		NULL),
+		"fullscreen"=>		array(T_ZBX_INT, O_OPT,	P_SYS,		IN("0,1"),	NULL)
 	);
 
 	check_fields($fields);
@@ -50,7 +41,21 @@
 ?>
 
 <?php
-	if(isset($_REQUEST["sysmapid"])&&!check_right("Network map","R",$_REQUEST["sysmapid"]))
+	$_REQUEST["sysmapid"] = get_request("sysmapid",get_profile("web.maps.sysmapid",0));
+
+	if($_REQUEST["sysmapid"] <=0 )
+	{
+		$db_sysmaps = DBselect("select sysmapid,name from sysmaps order by name");
+		if($sysmap = DBfetch($db_sysmaps))
+		{
+			$_REQUEST["sysmapid"] = $sysmap["sysmapid"];
+		}
+	}
+
+	update_profile("web.maps.sysmapid",$_REQUEST["sysmapid"]);
+	update_profile("web.menu.view.last",$page["file"]);
+
+	if($_REQUEST["sysmapid"] > 0 && !check_right("Network map","R",$_REQUEST["sysmapid"]))
 	{
 		show_table_header("<font color=\"AA0000\">".S_NO_PERMISSIONS."</font>");
 		show_page_footer();
@@ -58,81 +63,50 @@
 	}
 ?>
 
-<?php
-	$_REQUEST["sysmapid"]=@iif(isset($_REQUEST["sysmapid"]),$_REQUEST["sysmapid"],get_profile("web.maps.sysmapid",0));
-	update_profile("web.maps.sysmapid",$_REQUEST["sysmapid"]);
-	update_profile("web.menu.view.last",$page["file"]);
-	if($_REQUEST["sysmapid"] == 0)	unset($_REQUEST["sysmapid"]);
-?>
 
 <?php
-//	if(!isset($_REQUEST["fullscreen"]))
+	$text = array(S_NETWORK_MAPS_BIG);
+	if($_REQUEST["sysmapid"] > 0)
 	{
+		$sysmap = get_sysmap_by_sysmapid($_REQUEST["sysmapid"]);
 
-		if(isset($_REQUEST["sysmapid"]))
-		{
-			$result=get_map_by_sysmapid($_REQUEST["sysmapid"]);
-			$h1=$result["name"];
-			$h1=iif(isset($_REQUEST["fullscreen"]),
-				"<a href=\"maps.php?sysmapid=".$_REQUEST["sysmapid"]."\">".$h1."</a>",
-				"<a href=\"maps.php?sysmapid=".$_REQUEST["sysmapid"]."&fullscreen=1\">".$h1."</a>");
-		}
-		else
-		{
-			$h1=S_SELECT_MAP_TO_DISPLAY;
-		}
-
-		$h1=S_NETWORK_MAPS_BIG.nbsp(" / ").$h1;
-
-		$h2="";
-
-		if(isset($_REQUEST["fullscreen"]))
-		{
-			$h2=$h2."<input name=\"fullscreen\" type=\"hidden\" value=".$_REQUEST["fullscreen"].">";
-		}
-
-		if(isset($_REQUEST["sysmapid"])&&($_REQUEST["sysmapid"]==0))
-		{
-			unset($_REQUEST["sysmapid"]);
-		}
+		$url = "maps.php?sysmapid=".$_REQUEST["sysmapid"];
+		if($_REQUEST["fullscreen"]==0)
+			$url .= "&fullscreen=1";
 
-		$h2=$h2."<select class=\"biginput\" name=\"sysmapid\" onChange=\"submit()\">";
-		$h2=$h2.form_select("sysmapid",0,S_SELECT_MAP_DOT_DOT_DOT);
+		array_push($text, nbsp(" / "), new CLink($sysmap["name"],$url));
+	}
 
-		$result=DBselect("select sysmapid,name from sysmaps order by name");
-		while($row=DBfetch($result))
-		{
-			if(!check_right("Network map","R",$row["sysmapid"]))
-			{
-				continue;
-			}
-			$h2=$h2.form_select("sysmapid",$row["sysmapid"],$row["name"]);
-		}
-		$h2=$h2."</select>";
+	$form = new CForm();
+	if($_REQUEST["fullscreen"]>=1)
+		$form->AddVar("fullscreen",$_REQUEST["fullscreen"]);
 
-		show_header2($h1,$h2,"<form name=\"form2\" method=\"get\" action=\"maps.php\">","</form>");
+	$cmbMaps = new CComboBox("sysmapid",$_REQUEST["sysmapid"],"submit()");
+	$result=DBselect("select sysmapid,name from sysmaps order by name");
+	while($row=DBfetch($result))
+	{
+		if(!check_right("Network map","R",$row["sysmapid"]))		continue;
+		$cmbMaps->AddItem($row["sysmapid"],$row["name"]);
 	}
+	$form->AddItem($cmbMaps);
+
+	show_header2($text,$form);
 ?>
 
 <?php
-	echo "<TABLE BORDER=0 align=center WIDTH=\"100%\" BGCOLOR=\"#CCCCCC\" cellspacing=1 cellpadding=3>";
-	echo "<TR BGCOLOR=\"#EEEEEE\">";
-	echo "<TR BGCOLOR=\"#DDDDDD\">";
-	echo "<TD ALIGN=CENTER>";
-	if(isset($_REQUEST["sysmapid"]))
+	$table = new CTable(NULL,"map");
+	if($_REQUEST["sysmapid"] > 0)
 	{
-		echo get_map_imagemap($_REQUEST["sysmapid"]);
-		echo "<IMG SRC=\"map.php?noedit=1&sysmapid=".$_REQUEST["sysmapid"]."\" border=0 usemap=#links".$_REQUEST["sysmapid"].">";
-	}
-	else
-	{
-		echo "...";
+		$action_map = get_action_map_by_sysmapid($_REQUEST["sysmapid"]);
+		$table->AddRow($action_map);
+
+		$imgMap = new CImg("map.php?noedit=1&sysmapid=".$_REQUEST["sysmapid"]);
+		$imgMap->SetMap($action_map->GetName());
+		$table->AddRow($imgMap);
+
 	}
-	echo "</TD>";
-	echo "</TR>";
-	echo "</TABLE>";
+	$table->Show();
 ?>
-
 <?php
 	show_page_footer();
 ?>