- fixed span handling for screens (Alexei)

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

1 files changed, 33 insertions, 4 deletions

diff --git a/frontends/php/screens.php b/frontends/php/screens.php
index 9fa11428..28ebac10 100644
--- a/frontends/php/screens.php
+++ b/frontends/php/screens.php
@@ -108,12 +108,41 @@
 			$map="<a href=\"screens.php?screenid=".$_REQUEST["screenid"]."&fullscreen=1\">".$row["name"]."</a>";
 		}
 	show_table_header($map);*/
-          echo "<TABLE BORDER=1 COLS=".$row["cols"]." align=center WIDTH=100% BGCOLOR=\"#FFFFFF\">";
+	for($r=0;$r<$row["rows"];$r++)
+	{
+		for($c=0;$c<$row["cols"];$c++)
+		{
+			$spancheck[$r][$c]=1;
+		}
+	}
+	for($r=0;$r<$row["rows"];$r++)
+	{
+		for($c=0;$c<$row["cols"];$c++)
+		{
+			$sql="select * from screens_items where screenid=$screenid and x=$c and y=$r";
+			$iresult=DBSelect($sql);
+			$colspan=0;
+			$rowspan=0;
+			if(DBnum_rows($iresult)>0)
+			{
+				$irow=DBfetch($iresult);
+				$colspan=$irow["colspan"];
+				$rowspan=$irow["rowspan"];
+			}
+			for($i=0;$i<$rowspan;$i++)
+				for($j=0;$j<$colspan;$j++)
+					if(($i!=0)||($j!=0))	$spancheck[$r+$i][$c+$j]=0;
+				
+		}
+	}
+
+          echo "<TABLE BORDER=1 COLS=".$row["cols"]." align=center WIDTH=100% BGCOLOR=\"#FFFFFF\">\n";
           for($r=0;$r<$row["rows"];$r++)
           {
-          echo "<TR>";
+          echo "<TR>\n";
           for($c=0;$c<$row["cols"];$c++)
           {
+		if($spancheck[$r][$c]==0)	continue;
 
 		$sql="select * from screens_items where screenid=$screenid and x=$c and y=$r";
 		$iresult=DBSelect($sql);
@@ -171,11 +200,11 @@
 		{
 			echo "&nbsp;";
 		}
-		echo "</TD>";
+		echo "</TD>\n";
           }
           echo "</TR>\n";
           }
-          echo "</TABLE>";
+          echo "</TABLE>\n";
 		navigation_bar("screens.php");
 	}
 	else