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

fixing autocomplete fix in case account_ or contact_repository is not set in DB (defaults of sql are used)

Browse Source
This commit is contained in:
Ralf Becker 2013-07-03 08:27:13 +00:00
parent 7116826306
commit 8e2d4260f8
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
felamimail/inc/class.ajax_contacts.inc.php
View File

@ -31,20 +31,17 @@ class ajax_contacts {
if ($GLOBALS['egw_info']['user']['apps']['addressbook']) {
if (method_exists($GLOBALS['egw']->contacts,'search')) {
// 1.3+
$showAccounts = true;
$showAccounts = empty($GLOBALS['egw_info']['user']['preferences']['addressbook']['hide_accounts']);
//error_log(__METHOD__.__LINE__.$_searchString);
$seStAr = explode(' ',$_searchString);
foreach ($seStAr as $k => $v) if (strlen($v)<3) unset($seStAr[$k]);
$_searchString = trim(implode(' AND ',$seStAr));
//error_log(__METHOD__.__LINE__.$_searchString);
if ($GLOBALS['egw_info']['user']['preferences']['addressbook']['hide_accounts']) $showAccounts=false;
$filter = ($showAccounts?array():array('account_id' => null));
$filter['cols_to_search']=array('n_prefix','n_given','n_family','org_name','email','email_home');
$contacts = $GLOBALS['egw']->contacts->search(implode(' +',$seStAr),array('n_fn','n_prefix','n_given','n_family','org_name','email','email_home'),'n_fn','','%',false,'OR',array(0,100),$filter);
// additionally search the accounts, if the contact storage is not the account storage
if ($showAccounts &&
$GLOBALS['egw_info']['server']['account_repository'] != 'sql' &&
$GLOBALS['egw_info']['server']['contact_repository'] == 'sql')
if ($showAccounts && $GLOBALS['egw']->contacts->so_accounts)
{
$accounts = $GLOBALS['egw']->contacts->search(array(
'n_prefix' => $_searchString,