From cabd6f6205756a51064fb856aca2ed94d28b1cf7 Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Fri, 12 Sep 2008 11:31:19 -0400
Subject: [PATCH] Disabled suphp_UserGroup directive by default to make the setup compatible with the suphp compile options from most linux distributions. If you want some extra security, enable this directive again and recompile mod_suphp with the the option --with-setid-mode=paranoid

---
 interface/lib/classes/cmstree.inc.php |   52 +++++++++++++++++++++++++++-------------------------
 1 files changed, 27 insertions(+), 25 deletions(-)

diff --git a/interface/lib/classes/cmstree.inc.php b/interface/lib/classes/cmstree.inc.php
index 7acf224..1a3cb84 100644
--- a/interface/lib/classes/cmstree.inc.php
+++ b/interface/lib/classes/cmstree.inc.php
@@ -1,5 +1,12 @@
 <?
-
+/**
+ * cmstree Class
+ * 
+ * @author Till Brehm
+ * @copyright  2005, Till Brehm, projektfarm Gmbh
+ * @version 0.1
+ * @package ISPConfig
+ */
 /*
 Copyright (c) 2005, Till Brehm, projektfarm Gmbh
 All rights reserved.
@@ -29,16 +36,17 @@
 */
 
 class nodetree {
-var $childs;
-var $btext;
-var $id;
+    public $childs;
+    public $btext;
+    public $id;
 }
 
 class cmstree
 {
-var $_table;
+    //TODO is this used ?? - pedro
+    //var $_table;
 
-    // $vars enth�lt:
+    // $vars enth�lt:
     // - parent     :id des Elternelementes
     // - type       :n = node, i = item
     // - doctype_id :id des Dokumententyps, wenn nicht im content Feld
@@ -46,25 +54,25 @@
     // - status     :1 = ok, d = delete
     // - icon       :icon im node-tree, optional
     // - modul      :modul des Eintrages, noch nicht verwendet
-    // - doc_id     :id des zugeh�rigen Dokumentes
+    // - doc_id     :id des zugeh�rigen Dokumentes
     
-    function node_list()
+    public function node_list()
     {
-    global $app;
+        global $app;
     
-	    $nodes = $app->db->queryAllRecords("SELECT * FROM media_cat order by sort, name");
+	    $nodes = $app->db->queryAllRecords('SELECT * FROM media_cat order by sort, name');
         
         $optionlist = array();
         $my0 = new nodetree();
 
         foreach($nodes as $row) {
 
-            $id = "my".$row["media_cat_id"];
-            $btext = $row["name"];
-            $ordner = 'my'.$row["parent"];
+            $id = 'my'.$row['media_cat_id'];
+            $btext = $row['name'];
+            $ordner = 'my'.$row['parent'];
             if(!is_object($$id)) $$id = new nodetree();
             $$id->btext = $btext;
-            $$id->id = $row["media_cat_id"];
+            $$id->id = $row['media_cat_id'];
 
             if(is_object($$ordner)) {
                  $$ordner->childs[] = &$$id;
@@ -74,21 +82,16 @@
             }
         }
        
-        $this->ptree($my0,0,$optionlist);       
-        
-        if(is_array($nodes)){
-			return $optionlist;
-		} else {
-			return false;
-		}
+        $this->ptree($my0, 0, $optionlist);       
+        return is_array($nodes) ?  $optionlist : false;
     }
     
-    function ptree($myobj, $tiefe, &$optionlist){
+    private function ptree($myobj, $tiefe, &$optionlist){
      	global $_SESSION;
 		$tiefe += 1;
 		$id = $myobj->id;
 
-        if(is_array($myobj->childs) and ($_SESSION["s"]["cat_open"][$id] == 1 or $tiefe <= 1)) {
+        if(is_array($myobj->childs) and ($_SESSION['s']['cat_open'][$id] == 1 or $tiefe <= 1)) {
         	foreach($myobj->childs as $val) {
 				// kategorie 		=> str_repeat('- &nbsp;',$tiefe) . $val->btext,
 				
@@ -103,12 +106,11 @@
 				}
 				*/
 				$val_id = $val->id;
-				if($_SESSION["s"]["cat_open"][$val_id] == 1) {
+				if($_SESSION['s']['cat_open'][$val_id] == 1) {
 					$kategorie = "<div class='mnuLevel".$tiefe."'>&nbsp; <a href='treenavi.php?kat=".$val->id."' class='navtext' onClick=\"parent.content.location='media_list.php?search_media_cat_id=".$val->id."'\" style=\"text-decoration: none;\"><img src='../themes/default/icons/folder.png' border='0'> ".$val->btext."</a></div>";
 				} else {
 					$kategorie = "<div class='mnuLevel".$tiefe."'>&nbsp; <a href='treenavi.php?kat=".$val->id."' class='navtext' onClick=\"parent.content.location='media_list.php?search_media_cat_id=".$val->id."'\" style=\"text-decoration: none;\"><img src='../themes/default/icons/folder_closed.png' border='0'> ".$val->btext."</a></div>";
 				}
-				
 				
 				$optionlist[] = array( 	media_cat 		=> $kategorie,
                                    		media_cat_id 	=> $val->id,

--
Gitblit v1.9.1