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

"- search($criterial,...) was removing critera with numerical key 0

Browse Source 
- pending postgres bugfix (got no feedback from list)"
This commit is contained in:
Ralf Becker 2009-05-09 07:57:25 +00:00
parent 701fe5661b
commit c84a6fd78a
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -287,7 +287,7 @@ class addressbook_sql extends so_sql
{ {
foreach($criteria as $col => $val) foreach($criteria as $col => $val)
{ {
if ($col[0] == '#') // search for a value in a certain custom field if ($col[0] === '#') // search for a value in a certain custom field
{ {
$valarray=array(); $valarray=array();
# val may be a list of values, constructed by multiple select fields, to be able to do the contains feature of adv-search # val may be a list of values, constructed by multiple select fields, to be able to do the contains feature of adv-search
@ -308,12 +308,12 @@ class addressbook_sql extends so_sql
} }
$search_customfields = true; $search_customfields = true;
} }
elseif($col == 'cat_id') // search in comma-sep. cat-column elseif($col === 'cat_id') // search in comma-sep. cat-column
{ {
$criteria = array_merge($criteria,$this->_cat_search($val)); $criteria = array_merge($criteria,$this->_cat_search($val));
unset($criteria[$col]); unset($criteria[$col]);
} }
elseif($col == 'contact_value') elseif($col === 'contact_value')
{ {
if ($order_by[0] == '#') if ($order_by[0] == '#')
{ {
@ -400,10 +400,11 @@ class addressbook_sql extends so_sql
unset($criteria['owner']); unset($criteria['owner']);
} }
// postgres requires that expressions in order by appear in the columns of a distinct select // postgres requires that expressions in order by appear in the columns of a distinct select
if ($this->db->Type != 'mysql' && preg_match("/(\w+<>'')/",$order_by,$matches)) if ($this->db->Type != 'mysql' && preg_match("/([a-zA-Z_.]+)<>''/",$order_by,$matches))
{ {
if (!is_array($extra_cols)) $extra_cols = $extra_cols ? explode(',',$extra_cols) : array(); if (!is_array($extra_cols)) $extra_cols = $extra_cols ? explode(',',$extra_cols) : array();
$extra_cols[] = $matches[1]; $extra_cols[] = $matches[1];
$extra_cols[] = $matches[1]."<>''";
} }
} }
// add join to show only active accounts (only if accounts are shown and in sql and we not already join the accounts table, eg. used by admin) // add join to show only active accounts (only if accounts are shown and in sql and we not already join the accounts table, eg. used by admin)