spacefreak/user_sql
1
0
Fork 0
Code Pull Requests Activity

Merge pull request #9 from pvalsecc/master

Browse Source 
Better getGroups implementation
This commit is contained in:
Marcin Łojewski
2017-12-20 09:33:40 +01:00
committed by GitHub
parent ddc1922d0a 96c9bfeba8
commit 7bcfa82867
3 changed files with 24 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
group_sql.php
View File

@@ -42,8 +42,9 @@ class OC_GROUP_SQL extends \OC_Group_Backend implements \OCP\GroupInterface
if(empty($this -> settings['sql_group_table'])) if(empty($this -> settings['sql_group_table']))
{ {
return []; 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) if($rows === false)
{ {
return []; return [];
@@ -75,5 +76,20 @@ class OC_GROUP_SQL extends \OC_Group_Backend implements \OCP\GroupInterface
} }
return $users; return $users;
} }
public function countUsersInGroup($gid, $search = '') {
if(empty($this -> settings['sql_group_table']))
{
return 0;
}
$search = "%".$search."%";
$count = $this -> helper -> runQuery('countUsersInGroup', array('gid' => $gid, 'search' => $search));
if($count === false)
{
return 0;
} else {
return intval(reset($count));
}
}
} }
?> ?>

6
lib/helper.php
View File

@@ -182,12 +182,16 @@ class Helper {
break; break;
case 'getGroups': 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; break;
case 'getGroupUsers': case 'getGroupUsers':
$query = "SELECT distinct ".$this->settings['col_group_username']." FROM ".$this->settings['sql_group_table']." WHERE ".$this->settings['col_group_name']." = :gid"; $query = "SELECT distinct ".$this->settings['col_group_username']." FROM ".$this->settings['sql_group_table']." WHERE ".$this->settings['col_group_name']." = :gid";
break; break;
case 'countUsersInGroup':
$query = "SELECT count(".$this->settings['col_group_username'].") FROM ".$this->settings['sql_group_table']." WHERE ".$this->settings['col_group_name']." = :gid AND ".$this->settings['col_group_username']." LIKE :search";
break;
} }
if(isset($limits['limit']) && $limits['limit'] !== null) if(isset($limits['limit']) && $limits['limit'] !== null)

2
user_sql.php
View File

@@ -404,7 +404,7 @@ class OC_USER_SQL extends \OC_User_Backend implements \OCP\IUserBackend, \OCP\Us
} }
else else
{ {
$search = "%".$this -> doUserDomainMapping("")."%"; $search = "%".$this -> doUserDomainMapping("")."%";
} }
$rows = $this -> helper -> runQuery('getUsers', array('search' => $search), false, true, array('limit' => $limit, 'offset' => $offset)); $rows = $this -> helper -> runQuery('getUsers', array('search' => $search), false, true, array('limit' => $limit, 'offset' => $offset));