- [DEV-90] fixed SQL (Artem)

 - [DEV-55] fixes for Screen elements (Artem)

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

2 files changed, 13 insertions, 4 deletions

diff --git a/frontends/php/include/perm.inc.php b/frontends/php/include/perm.inc.php
index a0eec67e..df137f8b 100644
--- a/frontends/php/include/perm.inc.php
+++ b/frontends/php/include/perm.inc.php
@@ -353,7 +353,7 @@ COpt::counter_up('perm');
 					$do_break = true;
 
 					if(is_array($nodeid) && !in_array($node_data['nodeid'],$nodeid))	continue;
-					else if(isset($nodeid) and (bccomp($node_data['nodeid'] ,$nodeid) != 0))		continue;
+					else if(!is_array($nodeid) && (bccomp($node_data['nodeid'] ,$nodeid) != 0))		continue;
 				}
 				else
 				{
diff --git a/frontends/php/include/screens.inc.php b/frontends/php/include/screens.inc.php
index d5a65fce..6190aaa9 100644
--- a/frontends/php/include/screens.inc.php
+++ b/frontends/php/include/screens.inc.php
@@ -126,7 +126,7 @@
 			$screenitemid=get_dbid("screens_items","screenitemid");
 			$result=DBexecute('INSERT INTO screens_items '.
 								'(screenitemid,resourcetype,screenid,x,y,resourceid,width,height,'.
-								' colspan,rowspan,elements,valign,halign,style,url) '.
+								' colspan,rowspan,elements,valign,halign,style,url,dynamic) '.
 							' VALUES '.
 								"($screenitemid,$resourcetype,$screenid,$x,$y,$resourceid,$width,$height,$colspan,".
 								"$rowspan,$elements,$valign,$halign,$style,".zbx_dbstr($url).",$dynamic)");
@@ -335,7 +335,8 @@
 					$yaxis = 0;
 					
 // GRAPH & ZOOM features
-					$sql = 'SELECT MAX(g.graphid) as graphid, MAX(g.graphtype) as graphtype, MIN(gi.yaxisside) as yaxissidel, MAX(gi.yaxisside) as yaxissider'.
+					$sql = 'SELECT MAX(g.graphid) as graphid, MAX(g.graphtype) as graphtype, MIN(gi.yaxisside) as yaxissidel, MAX(gi.yaxisside) as yaxissider,'.
+								' MAX(g.show_legend) as legend, MAX(g.show_3d) as show3d '.
 							' FROM graphs g, graphs_items gi '.
 							' WHERE g.graphid='.$resourceid.
 								' AND gi.graphid=g.graphid ';
@@ -346,6 +347,9 @@
 						$graphtype = $graph['graphtype'];
 						$yaxis = $graph['yaxissider'];
 						$yaxis = ($graph['yaxissidel'] == $yaxis)?($yaxis):(2);
+						
+						$legend = $graph['legend'];
+						$graph3d = $graph['show3d'];
 					}
 					if($yaxis == 2){
 						$shiftXleft = 60;
@@ -383,7 +387,12 @@
 						}
 					
 						$item = new CLink(
-							new CImg($url."&width=$width&height=$height"."&period=$effectiveperiod".url_param("stime")),
+							new CImg($url.'&width='.$width.
+											'&height='.$height.
+											'&period='.$effectiveperiod.
+											url_param('stime').
+											'&legend='.$legend.
+											'&graph3d='.$graph3d),
 							$action
 							);
 					}