From f64f65b91a2d9de5c5c71ea2c6783e7dab4be300 Mon Sep 17 00:00:00 2001 From: bettina Date: Thu, 7 Jun 2001 06:25:48 +0000 Subject: [PATCH] update acl in return_array --- phpgwapi/inc/class.categories.inc.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/phpgwapi/inc/class.categories.inc.php b/phpgwapi/inc/class.categories.inc.php index 1516f8c217..e2301425d5 100644 --- a/phpgwapi/inc/class.categories.inc.php +++ b/phpgwapi/inc/class.categories.inc.php @@ -122,11 +122,11 @@ $public_user_list[] = $user; } reset($public_user_list); - $grant_cats = " (cat_owner='" . $this->account_id . "' OR cat_access='public' OR cat_owner in(" . implode(',',$public_user_list) . ")) "; + $grant_cats = " (cat_owner='" . $this->account_id . "' OR cat_access='public' AND cat_owner in(" . implode(',',$public_user_list) . ")) "; } else { - $grant_cats = " (cat_owner='" . $this->account_id . "' OR cat_access='public') "; + $grant_cats = " (cat_owner='" . $this->account_id . "') "; } if ($parent_id) @@ -144,8 +144,8 @@ $limitmethod = " " . $this->db->limit($start); } - $sql = "SELECT * from phpgw_categories WHERE (cat_appname='" . $this->app_name . "' $public_cats $parent_filter) AND " - . " $grant_cats $querymethod $filter"; + $sql = "SELECT * from phpgw_categories WHERE (cat_appname='" . $this->app_name . "' $parent_filter AND " + . " $grant_cats) $public_cats $querymethod $filter"; $this->db2->query($sql,__LINE__,__FILE__);