From c133b4b106eb5561911d6228aa5c059ee9a775ba Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Thu, 14 May 2009 07:59:51 +0000
Subject: [PATCH] "- docu update - using public and private for class vars -
 __construct()"

---
 phpgwapi/inc/class.categories.inc.php | 28 +++++++++++++++++----------
 1 file changed, 18 insertions(+), 10 deletions(-)

diff --git a/phpgwapi/inc/class.categories.inc.php b/phpgwapi/inc/class.categories.inc.php
index 2bfef42650..15bba26460 100644
--- a/phpgwapi/inc/class.categories.inc.php
+++ b/phpgwapi/inc/class.categories.inc.php
@@ -35,38 +35,38 @@ class categories
 	 *
 	 * @var int
 	 */
-	var $account_id;
+	public $account_id;
 	/**
 	 * Application this class is instancated for ('phpgw' for application global cats)
 	 *
 	 * @var string
 	 */
-	var $app_name;
+	public $app_name;
 	/**
 	 * @var egw_db
 	 */
-	var $db;
+	private $db;
 	/**
 	 * Total number of records of return_(sorted_)array (returning only a limited number of rows)
 	 *
 	 * @var int
 	 */
-	var $total_records;
+	public $total_records;
 	/**
 	 * Grants from other users for account_id and app_name (init by return array)
 	 *
 	 * @var array
 	 */
-	var $grants;
+	public $grants;
 	/**
 	 * Name of the categories table
 	 */
 	const TABLE = 'egw_categories';
 	/**
-	 * @deprecated use categoris::TABLE
+	 * @deprecated use categories::TABLE
 	 * @var string
 	 */
-	var $table = self::TABLE;
+	public $table = self::TABLE;
 	/**
 	 * Cache holding all categories, set via init_cache() method
 	 *
@@ -74,14 +74,13 @@ class categories
 	 */
 	private static $cache;
 
-
 	/**
 	 * constructor for categories class
 	 *
 	 * @param int/string $accountid='' account id or lid, default to current user
 	 * @param string $app_name='' app name defaults to current app
 	 */
-	function categories($accountid='',$app_name = '')
+	function __construct($accountid='',$app_name = '')
 	{
 		if (!$app_name) $app_name = $GLOBALS['egw_info']['flags']['currentapp'];
 
@@ -95,6 +94,16 @@ class categories
 		}
 	}
 
+	/**
+	 * php4 constructor
+	 *
+	 * @deprecated
+	 */
+	function categories($accountid='',$app_name='')
+	{
+		self::__construct($accountid,$app_name);
+	}
+
 	/**
 	 * return_all_children
 	 * returns array with id's of all children from $cat_id and $cat_id itself!
@@ -268,7 +277,6 @@ class categories
 		}
 		while (count($parents))
 		{
-			$sub_select = ' AND cat_parent IN (' . implode(',',$parents) . ')';
 			if (!($subs = $this->return_array('all',0,false,$query,$sort,$order,$globals,$parents)))
 			{
 				break;