Stop restraining search by putting ^

The ^ was introduced in a609f72 This broke da8e24e (which was only taking care of sql, not ldap) If i only remember that the login contains with "jeu", now i can search ... Introduce regexpToLdap, and use it. "^a" matches everything that start with a "a$" matches everything that end with a "^a$" matches exactly a "a" matches everything that contains a Signed-off-by: Etienne CHAMPETIER <etienne.champetier@fiducial.net>
pydio · Apr 24, 2014 · 1b97c71 · 1b97c71
1 parent 36c3aab
commit 1b97c71
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 11 deletions.
diff --git a/core/src/core/classes/class.AJXP_Utils.php b/core/src/core/classes/class.AJXP_Utils.php
@@ -1893,4 +1893,22 @@ public static function cleanLike($regexp)
     {
         return ltrim(rtrim($regexp, "%"), "%");
     }
+
+    public static function regexpToLdap($regexp)
+    {
+        if(empty($regexp))
+            return null;
+
+        $left = "*";
+        $right = "*";
+        if ($regexp[0]=="^") {
+            $regexp = ltrim($regexp, "^");
+            $left = "";
+        }
+        if ($regexp[strlen($regexp)-1] == "$") {
+            $regexp = rtrim($regexp, "$");
+            $right = "";
+        }
+        return $left.$regexp.$right;
+    }
 }
diff --git a/core/src/plugins/access.ajxp_conf/class.ajxp_confAccessDriver.php b/core/src/plugins/access.ajxp_conf/class.ajxp_confAccessDriver.php
@@ -237,7 +237,7 @@ public function recursiveSearchGroups($baseGroup, $term)
 
         }
 
-        $users = AuthService::listUsers($baseGroup, "^".$term);
+        $users = AuthService::listUsers($baseGroup, $term);
         foreach ($users as $userId => $userObject) {
 
             $nodeKey = "/data/users/".trim($userObject->getGroupPath(),"/")."/".$userId;

diff --git a/core/src/plugins/auth.ldap/class.ldapAuthDriver.php b/core/src/plugins/auth.ldap/class.ldapAuthDriver.php
@@ -330,10 +330,7 @@ public function listUsersPaginated($baseGroup, $regexp, $offset, $limit)
             return array();
         }
 
-        if($regexp[0]=="^") $regexp = ltrim($regexp, "^")."*";
-        else if($regexp[strlen($regexp)-1] == "$") $regexp = "*".rtrim($regexp, "$");
-
-        $entries = $this->getUserEntries($regexp, false, $offset, $limit, true);
+        $entries = $this->getUserEntries(AJXP_Utils::regexpToLdap($regexp), false, $offset, $limit, true);
         $this->dynamicFilter = null;
         $persons = array();
         unset($entries['count']); // remove 'count' entry
@@ -354,12 +351,7 @@ public function getUsersCount($baseGroup = "/", $regexp = "", $filterProperty =
             }
         }
 
-        $re = null;
-        if (!empty($regexp)) {
-            if($regexp[0]=="^") $re = ltrim($regexp, "^")."*";
-            else if($regexp[strlen($regexp)-1] == "$") $re = "*".rtrim($regexp, "$");
-        }
-        $res = $this->getUserEntries($re, true, null);
+        $res = $this->getUserEntries(AJXP_Utils::regexpToLdap($regexp), true, null);
         $this->dynamicFilter = null;
         return $res["count"];
     }