extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-12-22 23:00:56 +01:00
Code Issues Packages Projects Releases Wiki Activity

* API: taking care of sorting AND filtering by customfields with names containing whitespace; (best way to deal with this issue, is not using whitespace in your customfield names at all)

Browse Source
This commit is contained in:
Klaus Leithoff 2011-08-22 13:08:19 +00:00
parent 1db6a7aaf5
commit b76da493de
1 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
etemplate/inc/class.so_sql_cf.inc.php
View File

@ -518,6 +518,7 @@ class so_sql_cf extends so_sql
// check if we filter by a custom field // check if we filter by a custom field
if (is_array($filter)) if (is_array($filter))
{ {
$_cfnames = array_keys($this->customfields);
foreach($filter as $name => $val) foreach($filter as $name => $val)
{ {
// replace ambiguous auto-id with (an exact match of) table_name.autoid // replace ambiguous auto-id with (an exact match of) table_name.autoid
@ -587,7 +588,19 @@ class so_sql_cf extends so_sql
} }
elseif(is_int($name) && $this->is_cf($val)) // lettersearch: #cfname LIKE 's%' elseif(is_int($name) && $this->is_cf($val)) // lettersearch: #cfname LIKE 's%'
{ {
list($cf) = explode(' ',$val); $_cf = explode(' ',$val);
foreach($_cf as $ci => $cf_np)
{
// building cf_name by glueing parts together (, in case someone used whitespace in their custom field names)
$tcf_name = ($tcf_name?$tcf_name.' ':'').$cf_np;
// reacts on the first one found that matches an existing customfield, should be better then the old behavior of
// simply splitting by " " and using the first part
if ($this->is_cf($tcf_name) && ($cfn = $this->get_cf_name($tcf_name)) && array_search($cfn,(array)$_cfnames,true)!==false )
{
$cf = $tcf_name;
break;
}
}
$join .= str_replace('extra_filter','extra_filter'.$extra_filter,$this->extra_join_filter. $join .= str_replace('extra_filter','extra_filter'.$extra_filter,$this->extra_join_filter.
' AND extra_filter.'.$this->extra_key.'='.$this->db->quote($this->get_cf_name($cf)). ' AND extra_filter.'.$this->extra_key.'='.$this->db->quote($this->get_cf_name($cf)).
' AND '.str_replace($cf,'extra_filter.'.$this->extra_value,$val)); ' AND '.str_replace($cf,'extra_filter.'.$this->extra_value,$val));