extern/egroupware
1
0
Fork 1
mirror of https://github.com/EGroupware/egroupware.git synced 2025-01-15 02:19:39 +01:00
Code Issues Packages Projects Releases Wiki Activity

fixed bug: only 2 levels of categories get returned

Browse Source
This commit is contained in:
Ralf Becker 2005-11-23 23:01:28 +00:00
parent 27c3c7ecb3
commit e9bbdad358
1 changed files with 34 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
phpgwapi/inc/class.categories.inc.php
View File

@ -29,7 +29,7 @@
* class to manage categories in eGroupWare * class to manage categories in eGroupWare
* *
* @license LGPL * @license LGPL
* @package phpgwapi * @package api
* @subpackage categories * @subpackage categories
*/ */
class categories class categories
@ -222,8 +222,6 @@
/** /**
* return a sorted array populated with categories * return a sorted array populated with categories
* *
* I'm sure the limited query cant work as expected, maybe it's not use -- RalfBecker 2005/11/05
*
* @param int $start see $limit * @param int $start see $limit
* @param boolean $limit if true limited query starting with $start * @param boolean $limit if true limited query starting with $start
* @param string $query='' query-pattern * @param string $query='' query-pattern
@ -276,37 +274,52 @@
$where = '(cat_appname=' . $this->db->quote($this->app_name) . ' AND ' . $grant_cats . $global_cats . ')' . $querymethod; $where = '(cat_appname=' . $this->db->quote($this->app_name) . ' AND ' . $grant_cats . $global_cats . ')' . $querymethod;
$this->db->select($this->table,'COUNT(*)',$where . $parent_select,__LINE__,__FILE__); $parents = $cats = array();
$this->total_records = $this->db->next_record() ? $this->db->f(0) : 0; $this->db->select($this->table,'*',$where . $parent_select,__LINE__,__FILE__,false,$ordermethod);
if (!$this->total_records) return false;
$cats = $mains = array();
$this->db->select($this->table,'*',$where . $parent_select,__LINE__,__FILE__,$limit ? (int)$start : false,$ordermethod);
while (($cat = $this->db->row(true,'cat_'))) while (($cat = $this->db->row(true,'cat_')))
{ {
$cat['app_name'] = $cat['appname']; $cat['app_name'] = $cat['appname'];
$this->cache_id2cat_data[$cat['id']] = $cat; $this->cache_id2cat_data[$cat['id']] = $cat;
$mains[] = $cat;
}
foreach ($mains as $cat)
{
$cats[] = $cat; $cats[] = $cat;
$parents[] = $cat['id'];
$sub_select = ' AND cat_parent=' . $cat['id'] . ' AND cat_level=' . ($cat['level']+1); }
while (count($parents))
$this->db->select($this->table,'COUNT(*)',$where . $sub_select,__LINE__,__FILE__); {
$this->total_records += $this->db->next_record() ? $this->db->f(0) : 0; $sub_select = ' AND cat_parent IN (' . implode(',',$parents) . ')';
$parents = $children = array();
$this->db->select($this->table,'*',$where . $sub_select,__LINE__,__FILE__,false, $ordermethod); $this->db->select($this->table,'*',$where . $sub_select,__LINE__,__FILE__,false, $ordermethod);
while (($cat = $this->db->row(true,'cat_'))) while (($cat = $this->db->row(true,'cat_')))
{ {
$cat['app_name'] = $cat['appname']; $cat['app_name'] = $cat['appname'];
$this->cache_id2cat_data[$cat['id']] = $cat; $this->cache_id2cat_data[$cat['id']] = $cat;
$cats[] = $cat; $parents[] = $cat['id'];
$children[$cat['parent']][] = $cat;
} }
// sort the cats into the mains
if (count($children))
{
$cats2 = $cats;
$cats = array();
foreach($cats2 as $cat)
{
$cats[] = $cat;
if (isset($children[$cat['id']]))
{
foreach($children[$cat['id']] as $child)
{
$cats[] = $child;
}
}
}
}
}
$this->total_records = count($cats);
if ($limit)
{
return array_slice($cats,(int)$start,$GLOBALS['egw_info']['user']['preferences']['common']['maxmatchs']);
} }
return $cats; return $cats;
} }