Minor changes.

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

3 files changed, 9 insertions, 7 deletions

diff --git a/frontends/php/include/classes.inc.php b/frontends/php/include/classes.inc.php
index 5fa2ac9c..e13404b6 100644
--- a/frontends/php/include/classes.inc.php
+++ b/frontends/php/include/classes.inc.php
@@ -155,7 +155,7 @@
 			$this->items[$this->itemids[$itemid]]["drawtype"]=$drawtype;
 		}
 
-		function setAxisSide($itemid,$axisside)
+		function setYAxisSide($itemid,$axisside)
 		{
 			$this->items[$this->itemids[$itemid]]["axisside"]=$axisside;
 			if($axisside == GRAPH_YAXIS_SIDE_LEFT)
diff --git a/frontends/php/include/graphs.inc.php b/frontends/php/include/graphs.inc.php
index c72302e4..f2d44c2a 100644
--- a/frontends/php/include/graphs.inc.php
+++ b/frontends/php/include/graphs.inc.php
@@ -34,15 +34,15 @@
 		return DBinsert_id($result,"graphs","graphid");
 	}
 
-	function	update_graph_item($gitemid,$itemid,$color,$drawtype,$sortorder)
+	function	update_graph_item($gitemid,$itemid,$color,$drawtype,$sortorder,$yaxisside)
 	{
-		$sql="update graphs_items set itemid=$itemid,color='$color',drawtype=$drawtype,sortorder=$sortorder where gitemid=$gitemid";
+		$sql="update graphs_items set itemid=$itemid,color='$color',drawtype=$drawtype,sortorder=$sortorder,yaxisside=$yaxisside where gitemid=$gitemid";
 		return	DBexecute($sql);
 	}
 
-	function	add_item_to_graph($graphid,$itemid,$color,$drawtype,$sortorder)
+	function	add_item_to_graph($graphid,$itemid,$color,$drawtype,$sortorder,$yaxisside)
 	{
-		$sql="insert into graphs_items (graphid,itemid,color,drawtype,sortorder) values ($graphid,$itemid,'$color',$drawtype,$sortorder)";
+		$sql="insert into graphs_items (graphid,itemid,color,drawtype,sortorder) values ($graphid,$itemid,'$color',$drawtype,$sortorder,$yaxisside)";
 		$result=DBexecute($sql);
 		return DBinsert_id($result,"graphs_items","gitemid");
 	}
@@ -146,14 +146,14 @@
 			$host=get_host_by_hostid($row["hostid"]);
 			while($row2=DBfetch($result2))
 			{
-				add_item_to_graph($row2["graphid"],$itemid,$graph_item["color"],$graph_item["drawtype"],$graph_item["sortorder"]);
+				add_item_to_graph($row2["graphid"],$itemid,$graph_item["color"],$graph_item["drawtype"],$graph_item["sortorder"],$graph_item["taxisside"]);
 				info("Added graph element to graph ".$graph["name"]." of linked host ".$host["host"]);
 			}
 			if(DBnum_rows($result2)==0)
 			{
 				$graphid=add_graph($graph["name"],$graph["width"],$graph["height"],$graph["yaxistype"],$graph["yaxismin"],$graph["yaxismax"]);
 				info("Added graph ".$graph["name"]." of linked host ".$host["host"]);
-				add_item_to_graph($graphid,$itemid,$graph_item["color"],$graph_item["drawtype"],$graph_item["sortorder"]);
+				add_item_to_graph($graphid,$itemid,$graph_item["color"],$graph_item["drawtype"],$graph_item["sortorder"],$graph_item["yaxisside"]);
 				info("Added graph element to graph ".$graph["name"]." of linked host ".$host["host"]);
 			}
 		}
diff --git a/frontends/php/include/locales/en_gb.inc.php b/frontends/php/include/locales/en_gb.inc.php
index d8cb5ccd..940354b3 100644
--- a/frontends/php/include/locales/en_gb.inc.php
+++ b/frontends/php/include/locales/en_gb.inc.php
@@ -259,6 +259,8 @@
 	"S_DOWN"=>				"Down",
 	"S_NEW_ITEM_FOR_THE_GRAPH"=>		"New item for the graph",
 	"S_SORT_ORDER_1_100"=>			"Sort order (0->100)",
+	"S_YAXIS_SIDE"=>			"Y axis side",
+	"S_LEFT"=>				"Left",
 
 //	graphs.php
 	"S_CONFIGURATION_OF_GRAPHS"=>		"Configuration of graphs",