php5 and general code tidy

Author: pedro_morgan

interface/lib/classes/cmstree.inc.php

@@ -29,42 +29,43 @@
 */
 
 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
     // - title      :Titel des Eintrages
     // - 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 +75,16 @@ function node_list()
             }
         }
 
-        $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,13 +99,12 @@ function ptree($myobj, $tiefe, &$optionlist){
 				}
 				*/
 				$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,
 										depth			=> $tiefe);

interface/lib/classes/getconf.inc.php

@@ -1,5 +1,12 @@
 <?php
-
+/**
+ * getconf class
+ * 
+ * @author Till Brehm
+ * @copyright  2005, Till Brehm, projektfarm Gmbh
+ * @version 0.1
+ * @package ISPConfig
+ */
 /*
 Copyright (c) 2006, Till Brehm, projektfarm Gmbh
 All rights reserved.
@@ -30,31 +37,24 @@
 
 class getconf {
 
-	var $config;
+	private $config;
 
-	function get_server_config($server_id, $section = '') {
+	public function get_server_config($server_id, $section = '') {
 		global $app;
-		
+	
 		if(!is_array($this->config[$server_id])) {
 			$app->uses('ini_parser');
 			$server_id = intval($server_id);
 			$server = $app->db->queryOneRecord("SELECT config FROM server WHERE server_id = $server_id");
 			$this->config[$server_id] = $app->ini_parser->parse_ini_string(stripslashes($server["config"]));
 		}
-		
-		if($section == '') {
-			return $this->config[$server_id];
-		} else {
-			return $this->config[$server_id][$section];
-		}
+		return ($section == '') ? $this->config[$server_id] : $this->config[$server_id][$section];
 	}
 
-	function get_global_config() {
+	public function get_global_config() {
 
 		die("not yet implemented");
-		
 	}
-	
 }
 
 ?>

interface/lib/classes/ini_parser.inc.php

@@ -57,8 +57,6 @@ public function parse_ini_string($ini) {
 		return $this->config;
 	}
 
-
-
 	public function get_ini_string($file) {
 		$content = '';
 		foreach($this->config as $section => $data) {
@@ -71,7 +69,6 @@ public function get_ini_string($file) {
 		}
 		return $content;
 	}
-
 }
 
 ?>