"fix for bug #2106 - Addressbook warning message when deleting LDAP contact"

This commit is contained in:
Ralf Becker 2009-06-01 19:13:48 +00:00
parent 608697c1d4
commit af18ea1f7d

View File

@ -259,7 +259,8 @@ class addressbook_so
$this->account_extra_search = array('uid'); $this->account_extra_search = array('uid');
} }
} }
if ($this->contact_repository == 'sql' || $this->contact_repository = 'sql-ldap') { if ($this->contact_repository == 'sql' || $this->contact_repository == 'sql-ldap')
{
$tda2list = $this->db->get_table_definitions('phpgwapi','egw_addressbook2list'); $tda2list = $this->db->get_table_definitions('phpgwapi','egw_addressbook2list');
$tdlists = $this->db->get_table_definitions('phpgwapi','egw_addressbook_lists'); $tdlists = $this->db->get_table_definitions('phpgwapi','egw_addressbook_lists');
$this->distributionlist_tabledef = array('fd' => array( $this->distributionlist_tabledef = array('fd' => array(
@ -269,7 +270,7 @@ class addressbook_so
$this->distri_value => $tdlists['fd'][$this->distri_value], $this->distri_value => $tdlists['fd'][$this->distri_value],
), 'pk' => array(), 'fk' => array(), 'ix' => array(), 'uc' => array(), ), 'pk' => array(), 'fk' => array(), 'ix' => array(), 'uc' => array(),
); );
} }
// add grants for accounts: if account_selection not in ('none','groupmembers'): everyone has read access, // add grants for accounts: if account_selection not in ('none','groupmembers'): everyone has read access,
// if he has not set the hide_accounts preference // if he has not set the hide_accounts preference
// ToDo: be more specific for 'groupmembers', they should be able to see the groupmembers // ToDo: be more specific for 'groupmembers', they should be able to see the groupmembers