Introduce cleanRegexp()

Use it instead of changing regexpToLike input parameter (less error prone) Signed-off-by: Etienne CHAMPETIER <etienne.champetier@fiducial.net>
pydio · Apr 23, 2014 · 5f5ff4d · 5f5ff4d
1 parent 17b7c0b
commit 5f5ff4d
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 9 deletions.
diff --git a/core/src/core/classes/class.AJXP_Utils.php b/core/src/core/classes/class.AJXP_Utils.php
@@ -1852,21 +1852,24 @@ public static function glob_recursive($pattern, $flags = 0)
         return $files;
     }
 
-    public static function regexpToLike(&$regexp)
+    public static function regexpToLike($regexp)
     {
         $left = "~";
         $right = "~";
         if ($regexp[0]=="^") {
-            $regexp = ltrim($regexp, "^");
             $left = "";
         }
         if ($regexp[strlen($regexp)-1] == "$") {
-            $regexp = rtrim($regexp, "$");
             $right = "";
         }
         if ($left == "" && $right == "") {
             return "= %s";
         }
         return "LIKE %".$left."like".$right;
     }
+
+    public static function cleanRegexp($regexp)
+    {
+        return ltrim(rtrim($regexp, "$"), "^");
+    }
 }
diff --git a/core/src/plugins/auth.sql/class.sqlAuthDriver.php b/core/src/plugins/auth.sql/class.sqlAuthDriver.php
@@ -61,8 +61,7 @@ public function supportsUsersPagination()
     public function listUsersPaginated($baseGroup, $regexp, $offset, $limit)
     {
         if ($regexp != null) {
-            $like = AJXP_Utils::regexpToLike($regexp);
-            $res = dibi::query("SELECT * FROM [ajxp_users] WHERE [login] ".$like." AND [groupPath] LIKE %like~ ORDER BY [login] ASC", $regexp, $baseGroup) ;
+            $res = dibi::query("SELECT * FROM [ajxp_users] WHERE [login] ".AJXP_Utils::regexpToLike($regexp)." AND [groupPath] LIKE %like~ ORDER BY [login] ASC", AJXP_Utils::cleanRegexp($regexp), $baseGroup) ;
         } else if ($offset != -1 || $limit != -1) {
             $res = dibi::query("SELECT * FROM [ajxp_users] WHERE [groupPath] LIKE %like~ ORDER BY [login] ASC %lmt %ofs", $baseGroup, $limit, $offset);
         } else {
@@ -84,7 +83,7 @@ public function getUsersCount($baseGroup = "/", $regexp = "", $filterProperty =
 
         $wheres = array();
         if(!empty($regexp)){
-            $wheres[] = "[ajxp_users].[login] ". AJXP_Utils::regexpToLike($regexp);
+            $wheres[] = "[ajxp_users].[login] ".AJXP_Utils::regexpToLike($regexp);
         }
         $wheres[] = "[ajxp_users].[groupPath] LIKE %like~";
 
@@ -119,9 +118,8 @@ public function getUsersCount($baseGroup = "/", $regexp = "", $filterProperty =
 
 
         if (!empty($regexp)) {
-            $res = dibi::query($q, $regexp, $baseGroup);
-            //$like = AJXP_Utils::regexpToLike($regexp);
-            //$res = dibi::query("SELECT COUNT(*) FROM [ajxp_users] WHERE [login] ".$like." AND [groupPath] LIKE %like~", $regexp, $baseGroup) ;
+            $res = dibi::query($q, AJXP_Utils::cleanRegexp($regexp), $baseGroup);
+            //$res = dibi::query("SELECT COUNT(*) FROM [ajxp_users] WHERE [login] ".AJXP_Utils::regexpToLike($regexp)." AND [groupPath] LIKE %like~", AJXP_Utils::cleanRegexp($regexp), $baseGroup) ;
         } else {
             $res = dibi::query($q, $baseGroup);
             //$res = dibi::query("SELECT COUNT(*) FROM [ajxp_users] WHERE [groupPath] LIKE %like~", $baseGroup);