From 5c4dbe12cc821ac7b4a7042cc7940c357270a825 Mon Sep 17 00:00:00 2001 From: bettina Date: Sun, 25 Mar 2001 05:58:28 +0000 Subject: [PATCH] added global cats --- admin/addcategory.php | 2 +- admin/categories.php | 4 +-- admin/editcategory.php | 2 +- phpgwapi/inc/class.categories.inc.php | 45 +++++++++++++++++---------- 4 files changed, 32 insertions(+), 21 deletions(-) diff --git a/admin/addcategory.php b/admin/addcategory.php index 1eac67da76..c5ac509aa6 100644 --- a/admin/addcategory.php +++ b/admin/addcategory.php @@ -48,7 +48,7 @@ $t->set_var('hidden_vars',''); $t->set_var('lang_select_parent',lang('Select parent category')); - $t->set_var('category_list',$c->formated_list('select','all',$cat_parent)); + $t->set_var('category_list',$c->formated_list('select','False','all',$cat_parent)); $t->set_var('lang_name',lang('Category name')); $t->set_var('lang_descr',lang('Category description')); $t->set_var('cat_name',$cat_name); diff --git a/admin/categories.php b/admin/categories.php index 15ae253792..609e5ea7c4 100644 --- a/admin/categories.php +++ b/admin/categories.php @@ -1,6 +1,6 @@ categories($phpgw_info['user']['account_id'],'phpgw'); - $categories = $c->return_array($type,$start,$limit,$query,$sort,$order); + $categories = $c->return_array('False','all',$start,$limit,$query,$sort,$order); //--------------------------------- nextmatch -------------------------------------------- diff --git a/admin/editcategory.php b/admin/editcategory.php index 4bdc5cb582..3a5932ae0d 100644 --- a/admin/editcategory.php +++ b/admin/editcategory.php @@ -71,7 +71,7 @@ $t->set_var('cat_name',$phpgw->strip_html($cats[0]['name'])); $t->set_var('cat_description',$phpgw->strip_html($cats[0]['description'])); - $t->set_var('category_list',$c->formated_list('select','all',$cat_parent)); + $t->set_var('category_list',$c->formated_list('select','False','all',$cat_parent)); $t->set_var('edithandle',''); $t->set_var('addhandle',''); diff --git a/phpgwapi/inc/class.categories.inc.php b/phpgwapi/inc/class.categories.inc.php index 7d6d96bf1c..d9da2cd42e 100644 --- a/phpgwapi/inc/class.categories.inc.php +++ b/phpgwapi/inc/class.categories.inc.php @@ -82,11 +82,16 @@ @param $order order by @result $cats array */ - function return_array($type = 'all',$start,$limit,$query = '',$sort = '',$order = '') + function return_array($public = 'False',$type = 'all',$start,$limit,$query = '',$sort = '',$order = '') { global $phpgw, $phpgw_info; $this->db2 = $this->db; + + if ($public == 'True') + { + $public_cats = " OR cat_appname='phpgw' "; + } $filter = $this->filter($type); if (!$sort) @@ -105,13 +110,13 @@ if ($query) { - $sql = "select * from phpgw_categories where cat_appname='" . $this->app_name . "' and " + $sql = "select * from phpgw_categories where cat_appname='" . $this->app_name . "' $public_cats and " . "(cat_name like '%$query%' or cat_description like '%$query%') $filter $ordermethod"; } else { $sql = "select * from phpgw_categories where cat_appname='" . $this->app_name . "'" - . "$filter $ordermethod"; + . "$public_cats $filter $ordermethod"; } $this->db2->query($sql,__LINE__,__FILE__); @@ -123,6 +128,7 @@ { $cats[$i]['id'] = $this->db->f('cat_id'); $cats[$i]['owner'] = $this->db->f('cat_owner'); + $cats[$i]['app_name'] = $this->db->f('cat_appname'); $cats[$i]['parent'] = $this->db->f('cat_parent'); $cats[$i]['name'] = $this->db->f('cat_name'); $cats[$i]['description'] = $this->db->f('cat_description'); @@ -145,14 +151,14 @@ . "cat_appname='" . $this->app_name . "'",__LINE__,__FILE__); while ($this->db->next_record()) { - $cats[0]['id'] = $this->db->f('cat_id'); - $cats[0]['owner'] = $this->db->f('cat_owner'); - $cats[0]['parent'] = $this->db->f('cat_parent'); - $cats[0]['name'] = $this->db->f('cat_name'); - $cats[0]['description'] = $this->db->f('cat_description'); - $cats[0]['data'] = $this->db->f('cat_data'); - } - return $cats; + $cats[0]['id'] = $this->db->f('cat_id'); + $cats[0]['owner'] = $this->db->f('cat_owner'); + $cats[0]['parent'] = $this->db->f('cat_parent'); + $cats[0]['name'] = $this->db->f('cat_name'); + $cats[0]['description'] = $this->db->f('cat_description'); + $cats[0]['data'] = $this->db->f('cat_data'); + } + return $cats; } /*! @function categories @@ -171,11 +177,11 @@ $app_name = $phpgw_info['flags']['currentapp']; } - $this->account_id = $account_id; - $this->app_name = $app_name; - $this->db = $phpgw->db; + $this->account_id = $account_id; + $this->app_name = $app_name; + $this->db = $phpgw->db; $this->total_records = $this->db->num_rows(); - $this->cats = $this->return_array($type,$start,$limit,$query,$sort,$order); + $this->cats = $this->return_array($public,$type,$start,$limit,$query,$sort,$order); } // Return into a select box, list or other formats @@ -187,15 +193,20 @@ @param $selected ? @result $s array - populated with categories */ - function formated_list($format,$type,$selected = "") + function formated_list($format,$public = 'False',$type,$selected = "") { global $phpgw; $filter = $this->filter($type); + if ($public == 'True') + { + $public_cats = " OR cat_appname='phpgw' "; + } + if ($format == 'select') { $this->db->query("select * from phpgw_categories where cat_appname='" . $this->app_name - . "' $filter",__LINE__,__FILE__); + . "' $public_cats $filter",__LINE__,__FILE__); while ($this->db->next_record()) { $s .= '