harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix #328 by using a seperate query instead of group_concat

Browse Source
This commit is contained in:
Mario Vavti 2016-03-20 20:26:55 +01:00
parent 23419e4c26
commit 9fcd470aca
2 changed files with 22 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
include/group.php
View File

@ -211,6 +211,22 @@ function group_get_members($gid) {
return $ret; return $ret;
} }
function group_get_members_xchan($gid) {
$ret = array();
if(intval($gid)) {
$r = q("SELECT xchan FROM group_member WHERE gid = %d AND uid = %d",
intval($gid),
intval(local_channel())
);
if(count($r)) {
foreach($r as $rr) {
$ret[] = $rr['xchan'];
}
}
}
return $ret;
}
function mini_group_select($uid,$group = '') { function mini_group_select($uid,$group = '') {
$grps = array(); $grps = array();

15
mod/acl.php
View File

@ -2,6 +2,7 @@
/* ACL selector json backend */ /* ACL selector json backend */
require_once("include/acl_selectors.php"); require_once("include/acl_selectors.php");
require_once("include/group.php");
function acl_init(&$a){ function acl_init(&$a){
@ -48,32 +49,28 @@ function acl_init(&$a){
if ($type=='' || $type=='g'){ if ($type=='' || $type=='g'){
$r = q("SELECT `groups`.`id`, `groups`.`hash`, `groups`.`name`, $r = q("SELECT `groups`.`id`, `groups`.`hash`, `groups`.`name`
%s as uids
FROM `groups`,`group_member` FROM `groups`,`group_member`
WHERE `groups`.`deleted` = 0 AND `groups`.`uid` = %d WHERE `groups`.`deleted` = 0 AND `groups`.`uid` = %d
AND `group_member`.`gid`=`groups`.`id` AND `group_member`.`gid`=`groups`.`id`
$sql_extra $sql_extra
GROUP BY `groups`.`id` GROUP BY `groups`.`id`
ORDER BY `groups`.`name` ORDER BY `groups`.`name`
LIMIT %d OFFSET %d", LIMIT %d OFFSET %d",
db_concat('group_member.xchan', ','),
intval(local_channel()), intval(local_channel()),
intval($count), intval($count),
intval($start) intval($start)
); );
foreach($r as $g){ foreach($r as $g){
// logger('acl: group: ' . $g['name'] . ' members: ' . $g['uids']); // logger('acl: group: ' . $g['name'] . ' members: ' . group_get_members_xchan($g['id']));
$groups[] = array( $groups[] = array(
"type" => "g", "type" => "g",
"photo" => "images/twopeople.png", "photo" => "images/twopeople.png",
"name" => $g['name'], "name" => $g['name'],
"id" => $g['id'], "id" => $g['id'],
"xid" => $g['hash'], "xid" => $g['hash'],
//FIXME: db_concat aka GROUP_CONCAT has a defoult setting of group_concat_max_len = 1024 in mysql. "uids" => group_get_members_xchan($g['id']),
// This value is quickly exceeded here. As a result $g['uids'] only contains a part of the complete xchan set.
"uids" => explode(",",$g['uids']),
"link" => '' "link" => ''
); );
} }