- [DEV-137] fixes in services (Artem)

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

2 files changed, 7 insertions, 4 deletions

diff --git a/frontends/php/include/classes/ctag.inc.php b/frontends/php/include/classes/ctag.inc.php
index 9f9e9cbf..e05ac3f1 100644
--- a/frontends/php/include/classes/ctag.inc.php
+++ b/frontends/php/include/classes/ctag.inc.php
@@ -262,7 +262,7 @@
 				$this->options[$name] = unpack_object($value);
 			}
 			else if(!empty($value)){
-				$this->options[$name] = htmlentities(str_replace(array("\r", "\n"), '', strval($value)),ENT_COMPAT,S_HTML_CHARSET); 
+				$this->options[$name] = htmlentities(str_replace(array("\r", "\n"), '', strval($value)),ENT_COMPAT,S_HTML_CHARSET);
 			}
 		}
 
diff --git a/frontends/php/include/classes/ctree.inc.php b/frontends/php/include/classes/ctree.inc.php
index 369f5cde..affbfd3e 100644
--- a/frontends/php/include/classes/ctree.inc.php
+++ b/frontends/php/include/classes/ctree.inc.php
@@ -43,7 +43,8 @@ var $maxlevel=0;
 		if(!$this->CheckTree()){
 			$this->Destroy();
 			return false;
-		} else {
+		} 
+		else {
 			$this->CountDepth();
 		}
 	}
@@ -232,6 +233,7 @@ var $maxlevel=0;
 	}
 	
 	public function GetImg($id,$img){
+
 		$img=str_replace('T','I',$img);
 		$img=str_replace('L','O',$img);
 		$ch = 'L';
@@ -243,6 +245,7 @@ var $maxlevel=0;
 			$ch='T';
 		}
 		$img.=$ch;
+		
 	return $img;
 	}
 	
@@ -254,10 +257,10 @@ var $maxlevel=0;
 			$this->tree[$id]['nodetype'] = 0;
 			
 			$parentid=$cell['parentid'];
-			$this->tree[$parentid]['childnodes'][] = $cell['id'];
+			$this->tree[$parentid]['childnodes'][] = $id;//$cell['id'];
 	
 			$this->tree[$id]['nodelist'] = '';
-	//		echo $id.BR;
+//		echo $parentid.' : '.$id.'('.$cell['id'].')'.SBR;
 		}
 		
 	return true;