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

"Patch for negate the seaching in custom fields, starting with \"!\" "

Browse Source
This commit is contained in:
Stefan Becker 2008-06-18 10:12:11 +00:00
parent 4dfa864be1
commit 40c143c843
1 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
addressbook/inc/class.addressbook_sql.inc.php
View File

@ -287,17 +287,14 @@ class addressbook_sql extends so_sql
} else {
$valarray[]=$val;
}
$negate = false; //negate the search funktion
if ($criteria[$col][0] == '!') $negate = True;
unset($criteria[$col]);
foreach ($valarray as $vkey => $part)
{
if ($op=='AND') {
$criteria[] =$this->extra_table.'.contact_id in (select '.$this->extra_table.'.contact_id from '.$this->extra_table.' where '.
"(".$this->extra_table.".contact_name='".substr($col,1)."' AND ".$this->extra_table.".contact_value".($wildcard?' LIKE ':'=')."'".$wildcard.$part.$wildcard."'))";
} else {
$criteria[] = $this->db->expression($this->extra_table,'(',array(
$this->extra_table.'.contact_name='."'".substr($col,1)."'",
$this->extra_table.'.contact_value'.($wildcard?' LIKE ':'=')."'".$wildcard.$part.$wildcard."'"),')');
}
$criteria[] =$this->table_name.'.contact_id'.($negate ? ' not ' :'').' in (select '.$this->extra_table.'.contact_id from '.$this->extra_table.' where '.
"(".$this->extra_table.".contact_name='".substr($col,1)."' AND ".$this->extra_table.".contact_value".(!$wildcard?' = ':' LIKE ')."'".$wildcard.($negate?substr($part,1):$part).$wildcard."'"."))";
}
$search_customfields = true;
}