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

an other case in which we need to filter out in-active accounts

Browse Source
This commit is contained in:
Ralf Becker 2013-08-02 18:27:35 +00:00
parent 19f42fecf8
commit 91957ab770
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -339,7 +339,7 @@ class addressbook_sql extends so_sql_cf
unset($filter['list']);
}
// 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)
if (!$owner && substr($this->account_repository,0,3) == 'sql' &&
if ((is_array($owner) ? in_array(0, $owner) : !$owner) && substr($this->account_repository,0,3) == 'sql' &&
strpos($join,$GLOBALS['egw']->accounts->backend->table) === false && !array_key_exists('account_id',$filter))
{
$join .= self::ACCOUNT_ACTIVE_JOIN;
@ -507,7 +507,7 @@ class addressbook_sql extends so_sql_cf
{
foreach($uids as $n => $sql)
{
if (strpos($sql, 'list_modified') !== false)
if (is_int($n) && strpos($sql, 'list_modified') !== false)
{
$group_by .= ' HAVING '.$sql;
unset($uids[$n]);