- developed aggrgated graphs (Eugene)

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

1 files changed, 10 insertions, 2 deletions

diff --git a/frontends/php/chart2.php b/frontends/php/chart2.php
index 53c465e1..a39a21f6 100644
--- a/frontends/php/chart2.php
+++ b/frontends/php/chart2.php
@@ -77,11 +77,19 @@
 	$graph->setYAxisMin($row["yaxismin"]);
 	$graph->setYAxisMax($row["yaxismax"]);
 
-	$result=DBselect("select gi.itemid,i.description,gi.color,h.host,gi.drawtype,gi.yaxisside,gi.calc_fnc from graphs_items gi,items i,hosts h where gi.itemid=i.itemid and gi.graphid=".$_REQUEST["graphid"]." and i.hostid=h.hostid order by gi.sortorder");
+	$result=DBselect("select gi.*,i.description,h.host,gi.drawtype from graphs_items gi,items i,hosts h where gi.itemid=i.itemid and gi.graphid=".$_REQUEST["graphid"]." and i.hostid=h.hostid order by gi.sortorder");
 
 	while($row=DBfetch($result))
 	{
-		$graph->addItem($row["itemid"], $row["yaxisside"], $row["calc_fnc"], $row["color"], $row["drawtype"]);
+		$graph->addItem(
+			$row["itemid"],
+			$row["yaxisside"],
+			$row["calc_fnc"],
+			$row["color"],
+			$row["drawtype"],
+			$row["type"],
+			$row["periods_cnt"]
+			);
 	}
 	$graph->Draw();
 ?>