- 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, 39 insertions, 184 deletions

diff --git a/frontends/php/screens.php b/frontends/php/screens.php
index 830a917b..85404168 100644
--- a/frontends/php/screens.php
+++ b/frontends/php/screens.php
@@ -25,19 +25,8 @@
 	$page["title"] = "S_CUSTOM_SCREENS";
 	$page["file"] = "screens.php";
 
-	$nomenu=0;
-	if(isset($_REQUEST["fullscreen"]))
-	{
-		$nomenu=1;
-	}
-	if(isset($_REQUEST["screenid"]))
-	{
-		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"] >= 1 ? 1 : 0);
 ?>
 
 <?php
@@ -53,208 +42,74 @@
 		"stime"=>		array(T_ZBX_STR, O_OPT,  P_SYS, 	NULL,NULL),
 		"action"=>		array(T_ZBX_STR, O_OPT,  P_SYS, 	IN("'go'"),NULL),
 		"reset"=>		array(T_ZBX_STR, O_OPT,  P_SYS, 	IN("'reset'"),NULL),
-		"fullscreen"=>		array(T_ZBX_INT, O_OPT,	P_SYS,		IN("1"),		NULL)
+		"fullscreen"=>		array(T_ZBX_INT, O_OPT,	P_SYS,		IN("0,1"),		NULL)
 	);
 
 	check_fields($fields);
 ?>
 
 <?php
-	$effectiveperiod=navigation_bar_calc();
-?>
-
-<?php
 	$_REQUEST["screenid"]=get_request("screenid",get_profile("web.screens.screenid",0));
+
 	update_profile("web.screens.screenid",$_REQUEST["screenid"]);
 	update_profile("web.menu.view.last",$page["file"]);
 ?>
 
 <?php
-		if(isset($_REQUEST["screenid"])&&($_REQUEST["screenid"]==0))
-		{
-			unset($_REQUEST["screenid"]);
-		}
-
-		if(isset($_REQUEST["screenid"]))
+	$text = array(S_SCREENS_BIG);
+	if($_REQUEST["screenid"] > 0)
 		{
-			$screen=get_screen_by_screenid($_REQUEST["screenid"]);
-			$map=$screen["name"];
-			$map=iif(isset($_REQUEST["fullscreen"]),
-				"<a href=\"screens.php?screenid=".$_REQUEST["screenid"]."\">".$map."</a>",
-				"<a href=\"screens.php?screenid=".$_REQUEST["screenid"]."&fullscreen=1\">".$map."</a>");
+		$screen = get_screen_by_screenid($_REQUEST["screenid"]);
+		if($screen) {
+			$url = "screens.php?screenid=".$_REQUEST["screenid"];
+			if($_REQUEST["fullscreen"]==0) $url .= "&fullscreen=1";
+			array_push($text,nbsp(" / "),new CLink($screen["name"], $url));
 		}
 		else
 		{
-			$map=S_SELECT_SCREEN_TO_DISPLAY;
+			$_REQUEST["screenid"] = 0;
+			update_profile("web.screens.screenid",$_REQUEST["screenid"]);
 		}
+	}
 
-		$h1=S_SCREENS_BIG.nbsp(" / ").$map;
-
-		$h2="";
-		if(isset($_REQUEST["fullscreen"]))
-		{
-			$h2=$h2."<input name=\"fullscreen\" type=\"hidden\" value=".$_REQUEST["fullscreen"].">";
-		}
+	$form = new CForm();
+	$form->AddVar("fullscreen",$_REQUEST["fullscreen"]);
 
-		$h2=$h2."<select class=\"biginput\" name=\"screenid\" onChange=\"submit()\">";
-		$h2=$h2.form_select("screenid",0,S_SELECT_SCREEN_DOT_DOT_DOT);
+	$cmbScreens = new CComboBox("screenid",$_REQUEST["screenid"],"submit()");
+	$screen_correct = 0;
+	$first_screen = 0;
+	$result=DBselect("select screenid,name from screens order by name");
+	while($row=DBfetch($result))
+	{
+		if(!check_right("Screen","R",$row["screenid"]))
+			continue;
+		$cmbScreens->AddItem($row["screenid"],$row["name"]);
+		if($_REQUEST["screenid"] == $row["screenid"]) $screen_correct = 1;
+		if($first_screen == 0) $first_screen = $row["screenid"];
+	}
+	if($screen_correct == 0 && $first_screen != 0)
+	{
+		$_REQUEST["screenid"] = $first_screen;
+		$cmbScreens->SetValue($first_screen);
+	}
 
-		$result=DBselect("select screenid,name from screens order by name");
-		while($row=DBfetch($result))
-		{
-			if(!check_right("Screen","R",$row["screenid"]))
-			{
-				continue;
-			}
-			$h2=$h2.form_select("screenid",$row["screenid"],$row["name"]);
-		}
-		$h2=$h2."</select>";
+	$form->AddItem($cmbScreens);
 
-		show_header2($h1,$h2,"<form name=\"form2\" method=\"get\" action=\"screens.php\">","</form>");
+	show_header2($text,$form);
 ?>
 
 <?php
-//	if(isset($_REQUEST["screenid"]))
-	if( isset($_REQUEST["screenid"]) && check_right("Screen","R",$_REQUEST["screenid"]))
+	if($_REQUEST["screenid"] > 0 && check_right("Screen","R",$_REQUEST["screenid"]))
 	{
-		$screenid=$_REQUEST["screenid"];
-		$result=DBselect("select name,cols,rows from screens where screenid=$screenid");
-		$row=DBfetch($result);
-/*		if(isset($_REQUEST["fullscreen"]))
-		{
-			$map="<a href=\"screens.php?screenid=".$_REQUEST["screenid"]."\">".$row["name"]."</a>";
-		}
-		else
-		{
-			$map="<a href=\"screens.php?screenid=".$_REQUEST["screenid"]."&fullscreen=1\">".$row["name"]."</a>";
-		}
-	show_table_header($map);*/
-
-		for($r=0;$r<$row["rows"];$r++)
-		{
-			for($c=0;$c<$row["cols"];$c++)
-			{
-				if(isset($skip_field[$r][$c]))	continue;
-
-				$sql="select * from screens_items where screenid=$screenid and x=$c and y=$r";
-				$iresult=DBSelect($sql);
-				if(DBnum_rows($iresult)>0)
-				{
-					$irow=DBfetch($iresult);
-					$colspan=$irow["colspan"];
-					$rowspan=$irow["rowspan"];
-				} else {
-					$colspan=0;
-					$rowspan=0;
-				}
-				for($i=0; $i < $rowspan || $i==0; $i++){
-					for($j=0; $j < $colspan || $j==0; $j++){
-						if($i!=0 || $j!=0)
-							$skip_field[$r+$i][$c+$j]=1;
-					}
-				}
-			}
-		}
-
-		$table = new CTable(
-			new CLink("No rows in screen ".$row["name"],"screenconf.php?".
-				"form=update&screenid=".$screenid),
-			"screen_view");
-	
-		for($r=0;$r<$row["rows"];$r++)
-		{
-		$new_cols = array();
-		for($c=0;$c<$row["cols"];$c++)
-		{
-			if(isset($skip_field[$r][$c]))		continue;
-			
-			$iresult=DBSelect("select * from screens_items".
-				" where screenid=$screenid and x=$c and y=$r");
-
-			if(DBnum_rows($iresult)>0)
-			{
-				$irow		= DBfetch($iresult);
-				$screenitemid	= $irow["screenitemid"];
-				$resource	= $irow["resource"];
-				$resourceid	= $irow["resourceid"];
-				$width		= $irow["width"];
-				$height		= $irow["height"];
-				$colspan	= $irow["colspan"];
-				$rowspan	= $irow["rowspan"];
-				$elements	= $irow["elements"];
-			}
-			else
-			{
-				$screenitemid	= 0;
-				$screenitemid	= 0;
-				$resource	= 0;
-				$resourceid	= 0;
-				$width		= 0;
-				$height		= 0;
-				$colspan	= 0;
-				$rowspan	= 0;
-				$elements	= 0;
-			}
-
-			if( ($screenitemid!=0) && ($resource==0) )
-			{
-				$item = new CLink(
-					new CImg("chart2.php?graphid=$resourceid&width=$width&height=$height".
-						"&period=$effectiveperiod".url_param("stime").url_param("from")),
-					"charts.php?graphid=$resourceid".url_param("period").
-						url_param("inc").url_param("dec")
-					);
-			}
-			else if( ($screenitemid!=0) && ($resource==1) )
-			{
-				$item = new CLink(
-					new CImg("chart.php?itemid=$resourceid&width=$width&height=$height".
-                                        	"&period=$effectiveperiod".url_param("stime").url_param("from")),
-					"history.php?action=showhistory&itemid=$resourceid".
-						url_param("period").url_param("inc").url_param("dec")
-					);
-			}
-			else if( ($screenitemid!=0) && ($resource==2) )
-			{
-				$item = new CImg("map.php?noedit=1&sysmapid=$resourceid".
-	                                        "&width=$width&height=$height");
-			}
-			else if( ($screenitemid!=0) && ($resource==3) )
-			{
-				$item = array(get_screen_plaintext($resourceid,$elements));
-			}
-			else
-			{
-				$item = SPACE;
-			}
-			$new_col = new CCol($item,"screen_view");
-
-			if($colspan) $new_col->SetColSpan($colspan);
-			if($rowspan) $new_col->SetRowSpan($rowspan);
-
-			array_push($new_cols, $new_col);
-		}
-		$table->AddRow(new CRow($new_cols));
-		}
-
+		$effectiveperiod=navigation_bar_calc();
+		$table = get_screen($_REQUEST["screenid"], 0, $effectiveperiod);
 		$table->Show();
 		
 		navigation_bar("screens.php");
 	}
-	else
-	{
-//		show_table_header(S_SELECT_SCREEN_TO_DISPLAY);		
-		echo "<TABLE BORDER=0 align=center COLS=4 WIDTH=100% BGCOLOR=\"#CCCCCC\" cellspacing=1 cellpadding=3>";
-		echo "<TR BGCOLOR=#DDDDDD>";
-		echo "<TD ALIGN=CENTER>";
-		echo "...";
-		echo "</TD>";
-		echo "</TR>";
-		echo "</TABLE>";
-	}
 ?>
 <?php
-	if(!isset($_REQUEST["fullscreen"]))
+	if($_REQUEST["fullscreen"]==0)
 	{
 		show_page_footer();
 	}