diff --git a/lam/lib/modules/account.inc b/lam/lib/modules/account.inc index 50ca8fc0..59feeb9d 100644 --- a/lam/lib/modules/account.inc +++ b/lam/lib/modules/account.inc @@ -67,7 +67,7 @@ class account { return _('account'); } - function is_base_module() { + function is_base_module($scope) { return false; } diff --git a/lam/lib/modules/inetOrgPerson.inc b/lam/lib/modules/inetOrgPerson.inc index 5f585394..38b8e779 100644 --- a/lam/lib/modules/inetOrgPerson.inc +++ b/lam/lib/modules/inetOrgPerson.inc @@ -70,7 +70,7 @@ class inetOrgPerson { return _('inetOrgPerson'); } - function is_base_module() { + function is_base_module($scope) { return false; } diff --git a/lam/lib/modules/main.inc b/lam/lib/modules/main.inc index 8ab20ab2..b9eb07dd 100644 --- a/lam/lib/modules/main.inc +++ b/lam/lib/modules/main.inc @@ -67,7 +67,7 @@ class main { return _('main'); } - function is_base_module() { + function is_base_module($scope) { return false; } diff --git a/lam/lib/modules/posixAccount.inc b/lam/lib/modules/posixAccount.inc index 78d9ee67..76a8411b 100644 --- a/lam/lib/modules/posixAccount.inc +++ b/lam/lib/modules/posixAccount.inc @@ -133,10 +133,16 @@ class posixAccount { return "posixAccount"; } - function is_base_module() { + function is_base_module($scope) { return true; } + // returns an LDAP filter for the account lists + // $scope: the account type ("user", "group", "host") + function get_ldap_filter($scope) { + return "(objectClass=posixAccount)"; + } + /* This function returns a list with all required modules */ function get_dependencies($scope) { diff --git a/lam/lib/modules/posixGroup.inc b/lam/lib/modules/posixGroup.inc index 8ee8c87f..4cbaa38f 100644 --- a/lam/lib/modules/posixGroup.inc +++ b/lam/lib/modules/posixGroup.inc @@ -123,10 +123,16 @@ class posixGroup { return _('posixGroup'); } - function is_base_module() { + function is_base_module($scope) { return true; } + // returns an LDAP filter for the account lists + // $scope: the account type ("user", "group", "host") + function get_ldap_filter($scope) { + return "(objectClass=posixGroup)"; + } + /* This function returns a list with all required modules */ function get_dependencies($scope) { diff --git a/lam/lib/modules/quota.inc b/lam/lib/modules/quota.inc index 6f08df7b..993b7127 100644 --- a/lam/lib/modules/quota.inc +++ b/lam/lib/modules/quota.inc @@ -71,7 +71,7 @@ class quota { return _('quota'); } - function is_base_module() { + function is_base_module($scope) { return false; } diff --git a/lam/lib/modules/sambaAccount.inc b/lam/lib/modules/sambaAccount.inc index 9d81f243..16e0e0da 100644 --- a/lam/lib/modules/sambaAccount.inc +++ b/lam/lib/modules/sambaAccount.inc @@ -126,7 +126,7 @@ class sambaAccount { return _('sambaAccount'); } - function is_base_module() { + function is_base_module($scope) { return false; } diff --git a/lam/lib/modules/sambaGroupMapping.inc b/lam/lib/modules/sambaGroupMapping.inc index 005b8868..59c1f1a2 100644 --- a/lam/lib/modules/sambaGroupMapping.inc +++ b/lam/lib/modules/sambaGroupMapping.inc @@ -97,7 +97,7 @@ class sambaGroupMapping { return _('sambaGroupMapping'); } - function is_base_module() { + function is_base_module($scope) { return false; } diff --git a/lam/lib/modules/sambaSamAccount.inc b/lam/lib/modules/sambaSamAccount.inc index 6cb17b91..a8de194a 100644 --- a/lam/lib/modules/sambaSamAccount.inc +++ b/lam/lib/modules/sambaSamAccount.inc @@ -126,7 +126,7 @@ class sambaSamAccount { return _('sambaSamAccount'); } - function is_base_module() { + function is_base_module($scope) { return false; } diff --git a/lam/lib/modules/shadowAccount.inc b/lam/lib/modules/shadowAccount.inc index 87355024..4307b125 100644 --- a/lam/lib/modules/shadowAccount.inc +++ b/lam/lib/modules/shadowAccount.inc @@ -91,7 +91,7 @@ class shadowAccount { return _('shadowAccount'); } - function is_base_module() { + function is_base_module($scope) { return false; }