WMDE
/
LDAPAccountManager
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

added type id to get LDAP filter

This commit is contained in:
Roland Gruber 2017-12-22 09:41:52 +01:00
parent ea33f2f5ac
commit 574ddbcbb6
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lam/lib/baseModule.inc
View File

@ -425,11 +425,12 @@ abstract class baseModule {
* <br> * <br>
* <b>Example:</b> return array('or' => '(objectClass=posixAccount)', 'and' => '(!(uid=*$))') * <b>Example:</b> return array('or' => '(objectClass=posixAccount)', 'and' => '(!(uid=*$))')
* *
* @param string $typeId account type id
* @return string LDAP filter * @return string LDAP filter
* *
* @see baseModule::get_metaData() * @see baseModule::get_metaData()
*/ */
public function get_ldap_filter() { public function get_ldap_filter($typeId) {
if (isset($this->meta['ldap_filter'])) return $this->meta['ldap_filter']; if (isset($this->meta['ldap_filter'])) return $this->meta['ldap_filter'];
else return ""; else return "";
} }

2
lam/lib/modules.inc
View File

@ -101,7 +101,7 @@ function get_ldap_filter($typeId) {
$orFilter = ''; $orFilter = '';
for ($i = 0; $i < sizeof($mods); $i++) { for ($i = 0; $i < sizeof($mods); $i++) {
$module = moduleCache::getModule($mods[$i], $type->getScope()); $module = moduleCache::getModule($mods[$i], $type->getScope());
$modinfo = $module->get_ldap_filter(); $modinfo = $module->get_ldap_filter($typeId);
if (isset($modinfo['or'])) { if (isset($modinfo['or'])) {
$filters['or'][] = $modinfo['or']; $filters['or'][] = $modinfo['or'];
} }