- fixed adding new pie graph (Artem)

 - improved javascripts (Artem)

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

3 files changed, 3 insertions, 3 deletions

diff --git a/frontends/php/include/classes/pie.inc.php b/frontends/php/include/classes/pie.inc.php
index dd14bb41..b2a8d483 100644
--- a/frontends/php/include/classes/pie.inc.php
+++ b/frontends/php/include/classes/pie.inc.php
@@ -180,7 +180,7 @@ function selectData(){
 	}
 	
 	if(isset($graph_sum)) $this->sum = $graph_sum;
-	$this->shiftlegendright += $strvaluelenght * 6;
+	$this->shiftlegendright += $strvaluelenght * 7;
 }
 
 
diff --git a/frontends/php/include/forms.inc.php b/frontends/php/include/forms.inc.php
index 34506e2d..8a22783e 100644
--- a/frontends/php/include/forms.inc.php
+++ b/frontends/php/include/forms.inc.php
@@ -2524,7 +2524,7 @@
 						url_param($graphtype, false, 'graphtype').
 						url_param($gitem, false).
 						url_param($gid,false,'gid').
-						url_param($_REQUEST['graphid'],false,'graphid').
+						url_param(get_request('graphid',0),false,'graphid').
 						'",550,400,"graph_item_form");');
 
 				if(($graphtype == GRAPH_TYPE_PIE) || ($graphtype == GRAPH_TYPE_EXPLODED)){
diff --git a/frontends/php/include/graphs.inc.php b/frontends/php/include/graphs.inc.php
index 8e561cd1..f3bb3dc8 100644
--- a/frontends/php/include/graphs.inc.php
+++ b/frontends/php/include/graphs.inc.php
@@ -176,7 +176,7 @@
 		return $result;
 	}
 
-	function	add_graph_with_items($name,$width,$height,$yaxistype,$yaxismin,$yaxismax,$showworkperiod,$showtriggers,$graphtype,$legend,$graph3d,$items=array(),$templateid)
+	function	add_graph_with_items($name,$width,$height,$yaxistype,$yaxismin,$yaxismax,$showworkperiod,$showtriggers,$graphtype,$legend,$graph3d,$items=array(),$templateid=0)
 	{
 		if($result = add_graph($name,$width,$height,$yaxistype,$yaxismin,$yaxismax,$showworkperiod,$showtriggers,$graphtype,$legend,$graph3d,$templateid))
 		{