- [DEV-137] minor fix (Artem)

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

3 files changed, 15 insertions, 27 deletions

diff --git a/frontends/php/chart5.php b/frontends/php/chart5.php
index 490eeadc..26d21eab 100644
--- a/frontends/php/chart5.php
+++ b/frontends/php/chart5.php
@@ -42,30 +42,14 @@ include_once "include/page_header.php";
 		fatal_error(S_NO_IT_SERVICE_DEFINED);
 	}
 
-	$available_hosts = get_accessible_hosts_by_user($USER_DETAILS, PERM_READ_ONLY);
+	$available_triggers = get_accessible_triggers(PERM_READ_ONLY, PERM_RES_IDS_ARRAY);
 	
 	$sql = 'SELECT s.serviceid '.
-			' FROM services s, triggers t, functions f, items i '.
-			' WHERE s.serviceid='.$_REQUEST['serviceid'].
-				' AND t.triggerid=s.triggerid '.
-				' AND f.triggerid=t.triggerid '.
-				' AND i.itemid=f.itemid	'.
-				' AND i.hostid NOT IN ('.$available_hosts.')';
-
-	if(DBfetch(DBselect($sql,1))){
-		access_deny();
-	}
+				' FROM services s '.
+				' WHERE (s.triggerid is NULL OR '.DBcondition('s.triggerid',$available_triggers).') '.
+					' AND s.serviceid='.$_REQUEST['serviceid'];
 
-	
-	$sql = 'SELECT s.* '.
-			' FROM services s '.
-				' LEFT JOIN triggers t ON s.triggerid=t.triggerid '.
-				' LEFT JOIN functions f ON t.triggerid=f.triggerid '.
-				' LEFT JOIN items i on f.itemid=i.itemid '.
-			' WHERE s.serviceid='.$_REQUEST['serviceid'].
-				' AND i.hostid IN ('.$available_hosts.')';
-		
-	if(!$service = DBfetch(DBselect($sql))){
+	if(!$service = DBfetch(DBselect($sql,1))){
 		access_deny();
 	}
 ?>
diff --git a/frontends/php/include/classes/ctree.inc.php b/frontends/php/include/classes/ctree.inc.php
index 1ef6e16e..64c3a8e3 100644
--- a/frontends/php/include/classes/ctree.inc.php
+++ b/frontends/php/include/classes/ctree.inc.php
@@ -20,18 +20,21 @@
 
 class CTree{
 
-/*public*/
+/*public *//*
 var $tree='';
 var $fields='';
 var $treename='';
 
-/*private*/
+/*private *//*
 var $size=0;
 var $maxlevel=0;
-
+*/
 
 	/*public*/
 	/*public*/ function CTree($value=array(),$fields=array()){
+	
+		$this->maxlevel=0;
+
 		$this->tree = $value;
 		$this->fields = $fields;
 		$this->treename = $this->fields['caption'];
diff --git a/frontends/php/srv_status.php b/frontends/php/srv_status.php
index 3daac4e9..4309c07b 100644
--- a/frontends/php/srv_status.php
+++ b/frontends/php/srv_status.php
@@ -37,7 +37,7 @@ include_once "include/page_header.php";
 //		VAR			TYPE	OPTIONAL FLAGS	VALIDATION	EXCEPTION
 	$fields=array(
 		"serviceid"=>		array(T_ZBX_INT, O_OPT,	P_SYS|P_NZERO,	DB_ID,			NULL),
-		"showgraph"=>		array(T_ZBX_INT, O_OPT,	P_SYS,		IN("1")."isset({serviceid})",NULL),
+		"showgraph"=>		array(T_ZBX_INT, O_OPT,	P_SYS,			IN("1"),		'isset({serviceid})'),
 // ajax
 		'favobj'=>		array(T_ZBX_STR, O_OPT, P_ACT,	IN("'hat'"),		NULL),
 		'favid'=>		array(T_ZBX_STR, O_OPT, P_ACT,  NOT_EMPTY,	'isset({favobj})'),
@@ -71,9 +71,10 @@ include_once "include/page_header.php";
 	if(isset($_REQUEST["serviceid"]) && $_REQUEST["serviceid"] > 0){
 		$sql = 'SELECT s.serviceid '.
 					' FROM services s '.
-					' WHERE (s.triggerid is NULL OR '.DBcondition('s.triggerid',$available_triggers,true).') '.
+					' WHERE (s.triggerid is NULL OR '.DBcondition('s.triggerid',$available_triggers).') '.
 						' AND s.serviceid='.$_REQUEST['serviceid'];
-		if(DBfetch(DBselect($sql,1))){
+
+		if(!$service = DBfetch(DBselect($sql,1))){
 			access_deny();
 		}
 	}