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

Implement searching in group email addresses

Browse Source
This commit is contained in:
Nathan Gray 2015-03-31 14:18:27 +00:00
parent df1208fd4a
commit c2283686e0
1 changed files with 20 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -416,6 +416,18 @@ class accounts_sql
} }
if ($param['sort']) $order = implode(' '.$param['sort'].',', explode(',', $order)).' '.$param['sort']; if ($param['sort']) $order = implode(' '.$param['sort'].',', explode(',', $order)).' '.$param['sort'];
$search_cols = array('account_lid','n_family','n_given','email');
$join = $this->contacts_join;
$email_cols = array('email');
// Add in group email searching
if (!isset($GLOBALS['egw_setup']) || in_array(emailadmin_smtp_sql::TABLE, $this->db->table_names(true)))
{
$email_cols = array('coalesce('.$this->contacts_table.'.contact_email,'.emailadmin_smtp_sql::TABLE.'.mail_value) as email');
$search_cols[] = emailadmin_smtp_sql::TABLE.'.mail_value';
$join .= ' LEFT JOIN '.emailadmin_smtp_sql::TABLE.' ON '.$this->table.'.account_id=-'.emailadmin_smtp_sql::TABLE.'.account_id AND mail_type='.emailadmin_smtp_sql::TYPE_ALIAS;
}
$filter = array(); $filter = array();
switch($param['type']) switch($param['type'])
{ {
@ -480,7 +492,7 @@ class accounts_sql
case 'all': case 'all':
default: default:
case 'exact': case 'exact':
foreach(array('account_lid','n_family','n_given','email') as $col) foreach($search_cols as $col)
{ {
$criteria[$col] = $query; $criteria[$col] = $query;
} }
@ -500,6 +512,11 @@ class accounts_sql
case 'account_email': case 'account_email':
case 'email': case 'email':
$criteria['email'] = $query; $criteria['email'] = $query;
// Group email
if(in_array(emailadmin_smtp_sql::TABLE, $this->db->table_names(true)))
{
$criteria[emailadmin_smtp_sql::TABLE.'.mail_value'] = $query;
}
break; break;
} }
} }
@ -507,11 +524,11 @@ class accounts_sql
$accounts = array(); $accounts = array();
foreach((array) $GLOBALS['egw']->contacts->search($criteria, foreach((array) $GLOBALS['egw']->contacts->search($criteria,
"1,n_given,n_family,email,id,created,modified,$this->table.account_id AS account_id", array_merge(array(1,'n_given','n_family','id','created','modified',$this->table.'.account_id AS account_id'),$email_cols),
$order,"account_lid,account_type,account_status,account_expires,account_primary_group", $order,"account_lid,account_type,account_status,account_expires,account_primary_group",
$wildcard,false,$query[0] == '!' ? 'AND' : 'OR', $wildcard,false,$query[0] == '!' ? 'AND' : 'OR',
$param['offset'] ? array($param['start'], $param['offset']) : (is_null($param['start']) ? false : $param['start']), $param['offset'] ? array($param['start'], $param['offset']) : (is_null($param['start']) ? false : $param['start']),
$filter,$this->contacts_join) as $contact) $filter,$join) as $contact)
{ {
if ($contact) if ($contact)
{ {