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

regard addressbook preference to hide accounts or not in ajax search for emailadresses while composing messages, even if accountstorage is the same as the authmechanismn

Browse Source
This commit is contained in:
Klaus Leithoff 2011-06-21 13:53:42 +00:00
parent a6fc9eb4d9
commit d56f69615e
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -12,7 +12,7 @@
* option) any later version. * * option) any later version. *
\***************************************************************************/ \***************************************************************************/
/* $Id: class.ajaxfelamimail.inc.php 21848 2006-06-15 21:50:59Z ralfbecker $ */ /* $Id$ */
class ajax_contacts { class ajax_contacts {
function ajax_contacts() { function ajax_contacts() {
@ -24,14 +24,14 @@
if ($GLOBALS['egw_info']['user']['apps']['addressbook']) { if ($GLOBALS['egw_info']['user']['apps']['addressbook']) {
if (method_exists($GLOBALS['egw']->contacts,'search')) { if (method_exists($GLOBALS['egw']->contacts,'search')) {
// 1.3+ // 1.3+
$showAccounts = true;
if ($GLOBALS['egw_info']['user']['preferences']['addressbook']['hide_accounts']) $showAccounts=false;
$contacts = $GLOBALS['egw']->contacts->search(array( $contacts = $GLOBALS['egw']->contacts->search(array(
'n_fn' => $_searchString, 'n_fn' => $_searchString,
'email' => $_searchString, 'email' => $_searchString,
'email_home' => $_searchString, 'email_home' => $_searchString,
),array('n_fn','email','email_home'),'n_fn','','%',false,'OR',array(0,20)); ),array('n_fn','email','email_home'),'n_fn','','%',false,'OR',array(0,20),($showAccounts?array():array('account_id' => null)));
$showAccounts = true;
if ($GLOBALS['egw_info']['user']['preferences']['addressbook']['hide_accounts']) $showAccounts=false;
// additionally search the accounts, if the contact storage is not the account storage // additionally search the accounts, if the contact storage is not the account storage
if ($showAccounts && if ($showAccounts &&
$GLOBALS['egw_info']['server']['account_repository'] == 'ldap' && $GLOBALS['egw_info']['server']['account_repository'] == 'ldap' &&