holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

allow to specify multiple cat_id's

Browse Source
This commit is contained in:
Ralf Becker 2016-09-26 14:35:52 +02:00
parent c10654e1da
commit 601ce45c4d
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
api/src/Categories.php
View File

@ -156,7 +156,7 @@ class Categories
*/ */
function return_all_children($cat_id) function return_all_children($cat_id)
{ {
$all_children = (array) $cat_id; $all_children = array_map('intval', (array)$cat_id);
$children = $this->return_array('subs',0,False,'','','',True,$cat_id,-1,'id'); $children = $this->return_array('subs',0,False,'','','',True,$cat_id,-1,'id');
if (is_array($children) && count($children)) if (is_array($children) && count($children))

8
api/src/Contacts/Sql.php
View File

@ -118,7 +118,7 @@ class Sql extends Api\Storage
if ($advanced_search || (isset($param['wildcard']) && !empty($param['wildcard']))) $wildcard = ($param['wildcard']?$param['wildcard']:''); if ($advanced_search || (isset($param['wildcard']) && !empty($param['wildcard']))) $wildcard = ($param['wildcard']?$param['wildcard']:'');
// fix cat_id filter to search in comma-separated multiple cats and return subcats // fix cat_id filter to search in comma-separated multiple cats and return subcats
if ((int)$filter['cat_id']) if ($filter['cat_id'])
{ {
$filter[] = $this->_cat_filter($filter['cat_id']); $filter[] = $this->_cat_filter($filter['cat_id']);
unset($filter['cat_id']); unset($filter['cat_id']);
@ -285,7 +285,7 @@ class Sql extends Api\Storage
$filter['cat_id'] = substr($filter['cat_id'],1); $filter['cat_id'] = substr($filter['cat_id'],1);
$not = 'NOT'; $not = 'NOT';
} }
$filter[] = $this->_cat_filter((int)$filter['cat_id'],$not); $filter[] = $this->_cat_filter($filter['cat_id'],$not);
unset($filter['cat_id']); unset($filter['cat_id']);
} }
@ -430,7 +430,7 @@ class Sql extends Api\Storage
* fix cat_id filter to search in comma-separated multiple cats and return subcats * fix cat_id filter to search in comma-separated multiple cats and return subcats
* *
* @internal * @internal
* @param int $cat_id * @param int|array $cat_id
* @return string sql to filter by given cat * @return string sql to filter by given cat
*/ */
function _cat_filter($cat_id, $not='') function _cat_filter($cat_id, $not='')
@ -439,7 +439,7 @@ class Sql extends Api\Storage
{ {
$GLOBALS['egw']->categories = new Api\Categories; $GLOBALS['egw']->categories = new Api\Categories;
} }
foreach($GLOBALS['egw']->categories->return_all_children((int)$cat_id) as $cat) foreach($GLOBALS['egw']->categories->return_all_children($cat_id) as $cat)
{ {
$cat_filter[] = $this->db->concat("','",cat_id,"','")." $not LIKE '%,$cat,%'"; $cat_filter[] = $this->db->concat("','",cat_id,"','")." $not LIKE '%,$cat,%'";
} }