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

extended socontacts_sql::search to search custom fields like other columns (a search by one string already searched all custom fields)

Browse Source
This commit is contained in:
Ralf Becker 2006-10-11 13:00:23 +00:00
parent 48a76e2354
commit a557977d23
1 changed files with 21 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
addressbook/inc/class.socontacts_sql.inc.php
View File

@ -23,6 +23,12 @@ include_once(EGW_INCLUDE_ROOT.'/etemplate/inc/class.so_sql.inc.php');
class socontacts_sql extends so_sql class socontacts_sql extends so_sql
{ {
/**
* name of customefields table
*
* @var string
*/
var $extra_table = 'egw_addressbook_extra';
var $extra_join = ' LEFT JOIN egw_addressbook_extra ON egw_addressbook.contact_id=egw_addressbook_extra.contact_id'; var $extra_join = ' LEFT JOIN egw_addressbook_extra ON egw_addressbook.contact_id=egw_addressbook_extra.contact_id';
var $account_repository = 'sql'; var $account_repository = 'sql';
var $contact_repository = 'sql'; var $contact_repository = 'sql';
@ -246,7 +252,20 @@ class socontacts_sql extends so_sql
implode(',',array_keys($this->grants)).") OR $this->table_name.contact_owner IS NULL)"; implode(',',array_keys($this->grants)).") OR $this->table_name.contact_owner IS NULL)";
} }
} }
if ($criteria['contact_value']) // search the custom-fields $search_customfields = isset($criteria['contact_value']) && !empty($criteria['contact_value']);
if (is_array($criteria))
{
foreach($criteria as $col => $val)
{
if ($col{0} == '#') // search for a value in a certain custom field
{
unset($criteria[$col]);
$criteria[] = $this->db->expression($this->extra_table,'(',array('contact_name'=>substr($col,1),'contact_value'=>$val),')');
$search_customfields = true;
}
}
}
if ($search_customfields) // search the custom-fields
{ {
$join .= $this->extra_join; $join .= $this->extra_join;
if (is_string($only_keys)) $only_keys = 'DISTINCT '.str_replace(array('contact_id','contact_owner'), if (is_string($only_keys)) $only_keys = 'DISTINCT '.str_replace(array('contact_id','contact_owner'),