mirror of
https://codeberg.org/streams/streams.git
synced 2024-09-20 09:15:19 +00:00
revert f62ec4132e
- allow one self to be added to a privacy group.
This commit is contained in:
parent
ea54987ca4
commit
5ad9b48f1d
2 changed files with 3 additions and 3 deletions
|
@ -200,7 +200,7 @@ function group_get_members($gid) {
|
||||||
if(intval($gid)) {
|
if(intval($gid)) {
|
||||||
$r = q("SELECT * FROM `group_member`
|
$r = q("SELECT * FROM `group_member`
|
||||||
LEFT JOIN abook ON abook_xchan = `group_member`.`xchan` left join xchan on xchan_hash = abook_xchan
|
LEFT JOIN abook ON abook_xchan = `group_member`.`xchan` left join xchan on xchan_hash = abook_xchan
|
||||||
WHERE `gid` = %d AND abook_channel = %d and `group_member`.`uid` = %d and xchan_deleted = 0 and abook_blocked = 0 and abook_pending = 0 ORDER BY xchan_name ASC ",
|
WHERE `gid` = %d AND abook_channel = %d and `group_member`.`uid` = %d and xchan_deleted = 0 and abook_self = 0 and abook_blocked = 0 and abook_pending = 0 ORDER BY xchan_name ASC ",
|
||||||
intval($gid),
|
intval($gid),
|
||||||
intval(local_channel()),
|
intval(local_channel()),
|
||||||
intval(local_channel())
|
intval(local_channel())
|
||||||
|
|
|
@ -117,7 +117,7 @@ function group_content(&$a) {
|
||||||
|
|
||||||
check_form_security_token_ForbiddenOnErr('group_member_change', 't');
|
check_form_security_token_ForbiddenOnErr('group_member_change', 't');
|
||||||
|
|
||||||
$r = q("SELECT abook_xchan from abook left join xchan on abook_xchan = xchan_hash where abook_xchan = '%s' and abook_channel = %d and xchan_deleted = 0 and abook_blocked = 0 and abook_pending = 0 limit 1",
|
$r = q("SELECT abook_xchan from abook left join xchan on abook_xchan = xchan_hash where abook_xchan = '%s' and abook_channel = %d and xchan_deleted = 0 and abook_self = 0 and abook_blocked = 0 and abook_pending = 0 limit 1",
|
||||||
dbesc(base64url_decode(argv(2))),
|
dbesc(base64url_decode(argv(2))),
|
||||||
intval(local_channel())
|
intval(local_channel())
|
||||||
);
|
);
|
||||||
|
@ -208,7 +208,7 @@ function group_content(&$a) {
|
||||||
group_rmv_member(local_channel(),$group['name'],$member['xchan_hash']);
|
group_rmv_member(local_channel(),$group['name'],$member['xchan_hash']);
|
||||||
}
|
}
|
||||||
|
|
||||||
$r = q("SELECT abook.*, xchan.* FROM `abook` left join xchan on abook_xchan = xchan_hash WHERE `abook_channel` = %d AND abook_blocked = 0 and abook_pending = 0 and xchan_deleted = 0 order by xchan_name asc",
|
$r = q("SELECT abook.*, xchan.* FROM `abook` left join xchan on abook_xchan = xchan_hash WHERE `abook_channel` = %d AND abook_self = 0 and abook_blocked = 0 and abook_pending = 0 and xchan_deleted = 0 order by xchan_name asc",
|
||||||
intval(local_channel())
|
intval(local_channel())
|
||||||
);
|
);
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue