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

fixed accounts::search sometimes returning too many lines

Browse Source
This commit is contained in:
Ralf Becker 2013-07-17 13:14:46 +00:00
parent 8497dee410
commit c92eea6284
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
phpgwapi/inc/class.accounts_sql.inc.php
View File

@ -326,7 +326,6 @@ class accounts_sql
*/ */
function get_list($_type='both', $start = null,$sort = '', $order = '', $query = '', $offset = null, $query_type='') function get_list($_type='both', $start = null,$sort = '', $order = '', $query = '', $offset = null, $query_type='')
{ {
//echo "<p>accounts_sql($_type,$start,$sort,$order,$query,$offset,$query_type)</p>\n";
static $order2contact = array( static $order2contact = array(
'account_firstname' => 'n_given', 'account_firstname' => 'n_given',
'account_lastname' => 'n_family', 'account_lastname' => 'n_family',
@ -395,7 +394,7 @@ class accounts_sql
$accounts = array(); $accounts = array();
foreach((array) $GLOBALS['egw']->contacts->search($criteria,"1,n_given,n_family,email,id,created,modified,$this->table.account_id AS account_id", foreach((array) $GLOBALS['egw']->contacts->search($criteria,"1,n_given,n_family,email,id,created,modified,$this->table.account_id AS account_id",
$order,"account_lid,account_type,account_status", $order,"account_lid,account_type,account_status",
$wildcard,false,$query[0] == '!' ? 'AND' : 'OR',$offset ? array($start,$offset) : is_null($start) ? false : $start, $wildcard,false,$query[0] == '!' ? 'AND' : 'OR',$offset ? array($start,$offset) : (is_null($start) ? false : $start),
$filter,$this->contacts_join) as $contact) $filter,$this->contacts_join) as $contact)
{ {
if ($contact) if ($contact)
@ -416,7 +415,7 @@ class accounts_sql
} }
} }
$this->total = $GLOBALS['egw']->contacts->total; $this->total = $GLOBALS['egw']->contacts->total;
//error_log(__METHOD__."('$_type', $start, '$sort', '$order', '$query', $offset, '$query_type') returning ".count($accounts).'/'.$this->total);
return $accounts; return $accounts;
} }