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

* Admin/LDAP: deactivated accounts could not be reactivated, as account popup was not showing selected account

Browse Source
This commit is contained in:
Ralf Becker 2014-07-21 14:37:35 +00:00
parent 1f9dbdbce5
commit 3cade237e2
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
addressbook/inc/class.addressbook_ldap.inc.php
View File

@ -411,7 +411,7 @@ class addressbook_ldap
$filter = $this->id_filter($contact_id);
}
$rows = $this->_searchLDAP($this->allContactsDN,
$filter, $this->all_attributes, ADDRESSBOOK_ALL);
$filter, $this->all_attributes, ADDRESSBOOK_ALL, array('_posixaccount2egw'));
return $rows ? $rows[0] : false;
}
@ -996,9 +996,10 @@ class addressbook_ldap
* @param string $_filter
* @param array $_attributes
* @param int $_addressbooktype
* @param array $_skipPlugins=null schema-plugins to skip
* @return array/boolean with eGW contacts or false on error
*/
function _searchLDAP($_ldapContext, $_filter, $_attributes, $_addressbooktype)
function _searchLDAP($_ldapContext, $_filter, $_attributes, $_addressbooktype, array $_skipPlugins=null)
{
$this->total = 0;
@ -1046,7 +1047,7 @@ class addressbook_ldap
}
}
$objectclass2egw = '_'.$objectclass.'2egw';
if (method_exists($this,$objectclass2egw))
if (!in_array($objectclass2egw, (array)$_skipPlugins) &&method_exists($this,$objectclass2egw))
{
if (($ret=$this->$objectclass2egw($contact,$entry)) === false)
{