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

fix for search to return also the entries from sub-categoris, as sugested by Stephan Hilchenbach from the german list

Browse Source
This commit is contained in:
Ralf Becker 2004-04-04 22:23:47 +00:00
parent f68cd32ede
commit 4b7ced6e84
3 changed files with 38 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
calendar/inc/class.socalendar.inc.php
View File

@ -72,7 +72,21 @@
{
$extra = '';
$extra .= (strpos($this->filter,'private')?'AND phpgw_cal.is_public=0 ':'');
$extra .= ($this->cat_id?"AND phpgw_cal.category like '%".$this->cat_id."%' ":'');
//$extra .= ($this->cat_id?"AND phpgw_cal.category like '%".$this->cat_id."%' ":'');
if ($this->cat_id)
{
if (!is_object($GLOBALS['phpgw']->categories))
{
$GLOBALS['phpgw']->categories = CreateObject('phpgwapi.categories');
}
$cats = $GLOBALS['phpgw']->categories->return_all_children($this->cat_id);
$extra .= "AND (phpgw_cal.category".(count($cats) > 1 ? ' IN ('.implode(',',$cats).')' : '='.(int)$this->cat_id);
foreach($cats as $cat)
{
$extra .= " OR phpgw_cal.category LIKE '$cat,%' OR phpgw_cal.category LIKE '%,$cat,%' OR phpgw_cal.category LIKE '%,$cat'";
}
$extra .= ') ';
}
if($owner_id)
{
return $this->cal->list_events($startYear,$startMonth,$startDay,$endYear,$endMonth,$endDay,$extra,$GLOBALS['phpgw']->datetime->tz_offset,$owner_id);

10
infolog/inc/class.soinfolog.inc.php
View File

@ -518,9 +518,15 @@
}
//echo "<p>filtermethod='$filtermethod'</p>";
if (intval($query['cat_id']))
if ((int)$query['cat_id'])
{
$filtermethod .= ' AND info_cat='.intval($query['cat_id']).' ';
//$filtermethod .= ' AND info_cat='.intval($query['cat_id']).' ';
if (!is_object($GLOBALS['phpgw']->categories))
{
$GLOBALS['phpgw']->categories = CreateObject('phpgwapi.categories');
}
$cats = $GLOBALS['phpgw']->categories->return_all_children((int)$query['cat_id']);
$filtermethod .= ' AND info_cat'.(count($cats)>1? ' IN ('.implode(',',$cats).') ' : '='.(int)$query['cat_id']);
}
$join = '';
if ($query['query']) $query['search'] = $query['query']; // allow both names

16
phpgwapi/inc/class.contacts_sql.inc.php
View File

@ -348,7 +348,21 @@
{
if($name == 'cat_id')
{
$filterlist[] = "(" . $name . " LIKE '%," . (int)$value . ",%' OR " . $name."='".(int)$value."')";
if (!(int)$value) continue; // nothing to filter
//$filterlist[] = "(" . $name . " LIKE '%," . (int)$value . ",%' OR " . $name."='".(int)$value."')";
if (!is_object($GLOBALS['phpgw']->categories))
{
$GLOBALS['phpgw']->categories = CreateObject('phpgwapi.categories');
}
$cats = $GLOBALS['phpgw']->categories->return_all_children((int)$value);
$cat_filter = '(cat_id IN ('.implode(',',$cats).')';
foreach($cats as $cat)
{
$cat_filter .= " OR cat_id LIKE '%,$cat,%'";
}
$cat_filter .= ')';
$filterlist[] = $cat_filter;
}
elseif(@is_int($value))
{