Move regexpToLike to AJXP_Utils

Signed-off-by: Etienne CHAMPETIER <etienne.champetier@fiducial.net>
pydio · Apr 23, 2014 · 17b7c0b · 17b7c0b
1 parent 05b2736
commit 17b7c0b
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 21 deletions.
diff --git a/core/src/core/classes/class.AJXP_Utils.php b/core/src/core/classes/class.AJXP_Utils.php
@@ -1852,4 +1852,21 @@ public static function glob_recursive($pattern, $flags = 0)
         return $files;
     }
 
+    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;
+    }
 }
diff --git a/core/src/plugins/auth.sql/class.sqlAuthDriver.php b/core/src/plugins/auth.sql/class.sqlAuthDriver.php
@@ -61,7 +61,7 @@ public function supportsUsersPagination()
     public function listUsersPaginated($baseGroup, $regexp, $offset, $limit)
     {
         if ($regexp != null) {
-            $like = self::regexpToLike($regexp);
+            $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) ;
         } 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);
@@ -84,7 +84,7 @@ public function getUsersCount($baseGroup = "/", $regexp = "", $filterProperty =
 
         $wheres = array();
         if(!empty($regexp)){
-            $wheres[] = "[ajxp_users].[login] ". self::regexpToLike($regexp);
+            $wheres[] = "[ajxp_users].[login] ". AJXP_Utils::regexpToLike($regexp);
         }
         $wheres[] = "[ajxp_users].[groupPath] LIKE %like~";
 
@@ -120,7 +120,7 @@ public function getUsersCount($baseGroup = "/", $regexp = "", $filterProperty =
 
         if (!empty($regexp)) {
             $res = dibi::query($q, $regexp, $baseGroup);
-            //$like = self::regexpToLike($regexp);
+            //$like = AJXP_Utils::regexpToLike($regexp);
             //$res = dibi::query("SELECT COUNT(*) FROM [ajxp_users] WHERE [login] ".$like." AND [groupPath] LIKE %like~", $regexp, $baseGroup) ;
         } else {
             $res = dibi::query($q, $baseGroup);
@@ -129,24 +129,6 @@ public function getUsersCount($baseGroup = "/", $regexp = "", $filterProperty =
         return $res->fetchSingle();
     }
 
-    private 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 function listUsers($baseGroup="/")
     {
         $pairs = array();