simplify two methods a bit, because they are not used for group search anymore

diff --git a/apps/user_ldap/lib/wizard.php b/apps/user_ldap/lib/wizard.php
index 4766451fe63a02bb07885ac1eac0214dddd1d17e..b61e83b1c1c2279355e49575673fd1efa8e31054 100644 (file)
--- a/apps/user_ldap/lib/wizard.php
+++ b/apps/user_ldap/lib/wizard.php
@@ -904,14 +904,12 @@ class Wizard extends LDAPUtility {
         * specified attribute
         * @param $filters array, the filters that shall be used in the search
         * @param $attr the attribute of which a list of values shall be returned
-        * @param $lfw bool, whether the last filter is a wildcard which shall not
-        * be processed if there were already findings, defaults to true
         * @param $maxF string. if not null, this variable will have the filter that
         * yields most result entries
         * @return mixed, an array with the values on success, false otherwise
         *
         */
-       public function cumulativeSearchOnAttribute($filters, $attr, $lfw = true, $dnReadLimit = 3, &$maxF = null) {
+       public function cumulativeSearchOnAttribute($filters, $attr, $dnReadLimit = 3, &$maxF = null) {
                $dnRead = array();
                $foundItems = array();
                $maxEntries = 0;
@@ -929,7 +927,7 @@ class Wizard extends LDAPUtility {
                        $lastFilter = $filters[count($filters)-1];
                }
                foreach($filters as $filter) {
-                       if($lfw && $lastFilter === $filter && count($foundItems) > 0) {
+                       if($lastFilter === $filter && count($foundItems) > 0) {
                                //skip when the filter is a wildcard and results were found
                                continue;
                        }
@@ -998,16 +996,11 @@ class Wizard extends LDAPUtility {
 
                //how deep to dig?
                //When looking for objectclasses, testing few entries is sufficient,
-               //when looking for group we need to get all names, though.
-               if(strtolower($attr) === 'objectclass') {
-                       $dig = 3;
-               } else {
-                       $dig = 0;
-               }
+               $dig = 3;
 
                $availableFeatures =
                        $this->cumulativeSearchOnAttribute($objectclasses, $attr,
-                                                                                          true, $dig, $maxEntryObjC);
+                                                                                          $dig, $maxEntryObjC);
                if(is_array($availableFeatures)
                   && count($availableFeatures) > 0) {
                        natcasesort($availableFeatures);

diff --git a/apps/user_ldap/tests/wizard.php b/apps/user_ldap/tests/wizard.php
index f5a9a1dfe8ecfd3667b84042fd42c30b0157d0c3..786769a88cfbbef18125207b2c1cc720d89c8f75 100644 (file)
--- a/apps/user_ldap/tests/wizard.php
+++ b/apps/user_ldap/tests/wizard.php
@@ -127,7 +127,7 @@ class Test_Wizard extends \PHPUnit_Framework_TestCase {
 
                # The following expectations are the real test #
                $filters = array('f1', 'f2', '*');
-               $wizard->cumulativeSearchOnAttribute($filters, 'cn', true, 5);
+               $wizard->cumulativeSearchOnAttribute($filters, 'cn', 5);
                unset($uidnumber);
        }
 
@@ -203,7 +203,7 @@ class Test_Wizard extends \PHPUnit_Framework_TestCase {
 
                # The following expectations are the real test #
                $filters = array('f1', 'f2', '*');
-               $wizard->cumulativeSearchOnAttribute($filters, 'cn', true, 0);
+               $wizard->cumulativeSearchOnAttribute($filters, 'cn', 0);
                unset($uidnumber);
        }