Fixes for screenedit.php (Alexei)

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

3 files changed, 27 insertions, 3 deletions

diff --git a/frontends/php/chart.php b/frontends/php/chart.php
index 3b569e71..a9cf1467 100644
--- a/frontends/php/chart.php
+++ b/frontends/php/chart.php
@@ -71,7 +71,12 @@
 
 		function setWidth($width)
 		{
-			$this->width=$width;
+			$this->sizeX=$width;
+		}
+
+		function setHeight($height)
+		{
+			$this->sizeY=$height;
 		}
 
 		function setBorder($border)
@@ -618,6 +623,10 @@
 	{
 		$graph->setWidth($HTTP_GET_VARS["width"]);
 	}
+	if(isset($HTTP_GET_VARS["height"]))
+	{
+		$graph->setHeight($HTTP_GET_VARS["height"]);
+	}
 	if(isset($HTTP_GET_VARS["border"]))
 	{
 		$graph->setBorder(0);
diff --git a/frontends/php/include/config.inc.php b/frontends/php/include/config.inc.php
index bdc0ec97..8b5d1aa4 100644
--- a/frontends/php/include/config.inc.php
+++ b/frontends/php/include/config.inc.php
@@ -4281,12 +4281,24 @@ where h.hostid=i.hostid and i.itemid=f.itemid and f.triggerid=$triggerid";
                 return  DBexecute($sql);
         }
 
+        function update_screen_graph($screengraphid,$itemid,$width,$height)
+        {
+                $sql="update screens_graphs set itemid=$itemid,width=$width,height=$height where screengraphid=$screengraphid";
+                return  DBexecute($sql);
+        }
+
         function delete_screen_item($screenitemid)
         {
                 $sql="delete from screens_items where screenitemid=$screenitemid";
                 return  DBexecute($sql);
         }
 
+        function delete_screen_graph($screengraphid)
+        {
+                $sql="delete from screens_graphs where screengraphid=$screengraphid";
+                return  DBexecute($sql);
+        }
+
         function get_drawtype_description($drawtype)
         {
 		if($drawtype==0)
diff --git a/frontends/php/screenedit.php b/frontends/php/screenedit.php
index 55b7255e..e5b897ad 100644
--- a/frontends/php/screenedit.php
+++ b/frontends/php/screenedit.php
@@ -43,13 +43,16 @@
 		if($HTTP_GET_VARS["register"]=="delete")
 		{
 			$result=delete_screen_item($HTTP_GET_VARS["screenitemid"]);
+			$result=delete_screen_graph($HTTP_GET_VARS["screengraphid"]);
 			show_messages($result,"Item deleted","Cannot delete item");
-			unset($gitemid);
+			unset($HTTP_GET_VARS["x"]);
 		}
                 if($HTTP_GET_VARS["register"]=="update")
                 {
                         $result=update_screen_item($HTTP_GET_VARS["screenitemid"],$HTTP_GET_VARS["graphid"],$HTTP_GET_VARS["width"],$HTTP_GET_VARS["height"]);
+                        $result=update_screen_graph($HTTP_GET_VARS["screengraphid"],$HTTP_GET_VARS["itemid"],$HTTP_GET_VARS["width"],$HTTP_GET_VARS["height"]);
                         show_messages($result,"Item updated","Cannot update item");
+			unset($HTTP_GET_VARS["x"]);
                 }
 		unset($HTTP_GET_VARS["register"]);
 
@@ -210,7 +213,7 @@
 
 			show_table2_v_delimiter2();
 			echo "<input type=\"submit\" name=\"register\" value=\"add\">";
-			if($screenitemid!=0) 
+			if(($screenitemid!=0)||($screengraphid!=0)) 
 			{ 
 				echo "<input type=\"submit\" name=\"register\" value=\"update\">";
 			}