- added pie graphs (Artem)

 - added subclasses chart.inc.php and pie.inc.php, extending graph.inc.php (Artem)

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

1 files changed, 43 insertions, 39 deletions

diff --git a/frontends/php/chart2.php b/frontends/php/chart2.php
index a0dcbe60..a4c2ca7f 100644
--- a/frontends/php/chart2.php
+++ b/frontends/php/chart2.php
@@ -19,15 +19,15 @@
 **/
 ?>
 <?php
-	require_once "include/config.inc.php";
-	require_once "include/graphs.inc.php";
-	require_once "include/classes/graph.inc.php";
+	require_once 'include/config.inc.php';
+	require_once 'include/graphs.inc.php';
+	require_once 'include/classes/chart.inc.php';
 	
-	$page["file"]	= "chart2.php";
-	$page["title"]	= "S_CHART";
-	$page["type"]	= PAGE_TYPE_IMAGE;
+	$page['file']	= 'chart2.php';
+	$page['title']	= 'S_CHART';
+	$page['type']	= PAGE_TYPE_IMAGE;
 
-include_once "include/page_header.php";
+include_once 'include/page_header.php';
 
 ?>
 <?php
@@ -47,59 +47,63 @@ include_once "include/page_header.php";
 <?php
 	$denyed_hosts = get_accessible_hosts_by_user($USER_DETAILS, PERM_READ_ONLY, PERM_MODE_LT);
 	
-	if( !($db_data = DBfetch(DBselect("select g.*,h.host,h.hostid from graphs g left join graphs_items gi on g.graphid=gi.graphid ".
-		" left join items i on gi.itemid=i.itemid left join hosts h on i.hostid=h.hostid ".
-		" where g.graphid=".$_REQUEST["graphid"].
-		/* " and ".DBid2nodeid("g.graphid")."=".$ZBX_CURNODEID. */ /* NOTE: the chart can display any accesiable graph! */
-		" and ( h.hostid not in (".$denyed_hosts.") OR h.hostid is NULL) "))))
+	if( !($db_data = DBfetch(DBselect('SELECT g.*,h.host,h.hostid '.
+									' FROM graphs g '.
+										' LEFT JOIN graphs_items gi ON g.graphid=gi.graphid '.
+										' LEFT JOIN items i ON gi.itemid=i.itemid '.
+										' LEFT JOIN hosts h ON i.hostid=h.hostid '.
+									' WHERE g.graphid='.$_REQUEST['graphid'].
+		/* ' and '.DBid2nodeid('g.graphid').'='.$ZBX_CURNODEID. */ /* NOTE: the chart can display any accesiable graph! */
+										' AND ( h.hostid not in ('.$denyed_hosts.') '.
+										' OR h.hostid is NULL) '))))
 	{
 		access_deny();
 	}
+	
+	$graph = new Chart($db_data['graphtype']);
 
-	$graph = new Graph($db_data["graphtype"]);
-
-	if(isset($_REQUEST["period"]))		$graph->SetPeriod($_REQUEST["period"]);
-	if(isset($_REQUEST["from"]))		$graph->SetFrom($_REQUEST["from"]);
-	if(isset($_REQUEST["stime"]))		$graph->SetSTime($_REQUEST["stime"]);
-	if(isset($_REQUEST["border"]))		$graph->SetBorder(0);
+	if(isset($_REQUEST['period']))		$graph->SetPeriod($_REQUEST['period']);
+	if(isset($_REQUEST['from']))		$graph->SetFrom($_REQUEST['from']);
+	if(isset($_REQUEST['stime']))		$graph->SetSTime($_REQUEST['stime']);
+	if(isset($_REQUEST['border']))		$graph->SetBorder(0);
 
-	$width = get_request("width", 0);
+	$width = get_request('width', 0);
 
-	if($width <= 0) $width = $db_data["width"];
+	if($width <= 0) $width = $db_data['width'];
 
-	$height = get_request("height", 0);
-	if($height <= 0) $height = $db_data["height"];
+	$height = get_request('height', 0);
+	if($height <= 0) $height = $db_data['height'];
 
-	$graph->ShowWorkPeriod($db_data["show_work_period"]);
-	$graph->ShowTriggers($db_data["show_triggers"]);
+	$graph->ShowWorkPeriod($db_data['show_work_period']);
+	$graph->ShowTriggers($db_data['show_triggers']);
 
 	$graph->SetWidth($width);
 	$graph->SetHeight($height);
-	$graph->SetHeader($db_data["host"].":".$db_data['name']);
-	$graph->SetYAxisType($db_data["yaxistype"]);
-	$graph->SetYAxisMin($db_data["yaxismin"]);
-	$graph->SetYAxisMax($db_data["yaxismax"]);
+	$graph->SetHeader($db_data['host'].':'.$db_data['name']);
+	$graph->SetYAxisType($db_data['yaxistype']);
+	$graph->SetYAxisMin($db_data['yaxismin']);
+	$graph->SetYAxisMax($db_data['yaxismax']);
 
-	$result = DBselect("select gi.* from graphs_items gi ".
-		" where gi.graphid=".$db_data["graphid"].
-		" order by gi.sortorder, gi.itemid desc");
+	$result = DBselect('SELECT gi.* FROM graphs_items gi '.
+		' WHERE gi.graphid='.$db_data['graphid'].
+		' order by gi.sortorder, gi.itemid desc');
 
 	while($db_data=DBfetch($result))
 	{
 		$graph->AddItem(
-			$db_data["itemid"],
-			$db_data["yaxisside"],
-			$db_data["calc_fnc"],
-			$db_data["color"],
-			$db_data["drawtype"],
-			$db_data["type"],
-			$db_data["periods_cnt"]
+			$db_data['itemid'],
+			$db_data['yaxisside'],
+			$db_data['calc_fnc'],
+			$db_data['color'],
+			$db_data['drawtype'],
+			$db_data['type'],
+			$db_data['periods_cnt']
 			);
 	}
 	$graph->Draw();
 ?>
 <?php
 
-include_once "include/page_footer.php";
+include_once 'include/page_footer.php';
 
 ?>