From 96c9bfeba8c924fb0d8bb709518ea1d04d41331b Mon Sep 17 00:00:00 2001 From: Patrick Valsecchi Date: Tue, 19 Dec 2017 20:21:06 +0100 Subject: [PATCH] Better getGroups implementation --- group_sql.php | 5 +++-- lib/helper.php | 2 +- user_sql.php | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/group_sql.php b/group_sql.php index e1c1a26..08c8d76 100644 --- a/group_sql.php +++ b/group_sql.php @@ -42,8 +42,9 @@ class OC_GROUP_SQL extends \OC_Group_Backend implements \OCP\GroupInterface if(empty($this -> settings['sql_group_table'])) { return []; - } - $rows = $this -> helper -> runQuery('getGroups', array(), false, true); + } + $search = "%".$search."%"; + $rows = $this -> helper -> runQuery('getGroups', array('search' => $search), false, true, array('limit' => $limit, 'offset' => $offset)); if($rows === false) { return []; diff --git a/lib/helper.php b/lib/helper.php index 5de5d6a..0074f1d 100644 --- a/lib/helper.php +++ b/lib/helper.php @@ -182,7 +182,7 @@ class Helper { break; case 'getGroups': - $query = "SELECT distinct ".$this->settings['col_group_name']." FROM ".$this->settings['sql_group_table']; + $query = "SELECT distinct ".$this->settings['col_group_name']." FROM ".$this->settings['sql_group_table']." WHERE ".$this->settings['col_group_name']." LIKE :search"; break; case 'getGroupUsers': diff --git a/user_sql.php b/user_sql.php index cfb8404..4186b33 100644 --- a/user_sql.php +++ b/user_sql.php @@ -404,7 +404,7 @@ class OC_USER_SQL extends \OC_User_Backend implements \OCP\IUserBackend, \OCP\Us } else { - $search = "%".$this -> doUserDomainMapping("")."%"; + $search = "%".$this -> doUserDomainMapping("")."%"; } $rows = $this -> helper -> runQuery('getUsers', array('search' => $search), false, true, array('limit' => $limit, 'offset' => $offset));