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

Merge branch 'dev' into 'dev'

Browse Source 
init_groups_visitor: include xchans from all zot-like networks

See merge request hubzilla/core!1549
This commit is contained in:
Mario 2019-03-11 09:38:27 +01:00
commit 9ed5cddb89
1 changed files with 23 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
include/security.php
View File

@ -564,22 +564,38 @@ function check_form_security_token_ForbiddenOnErr($typename = '', $formname = 'f
function init_groups_visitor($contact_id) { function init_groups_visitor($contact_id) {
$groups = []; $groups = [];
// private profiles are treated as a virtual group $x = q("select * from xchan where xchan_hash = '%s'",
$r = q("SELECT abook_profile from abook where abook_xchan = '%s' and abook_profile != '' ",
dbesc($contact_id) dbesc($contact_id)
); );
if (! $x) {
return $groups;
}
// include xchans for all zot-like networks
$xchans = q("select xchan_hash from xchan where xchan_hash = '%s' OR ( xchan_guid = '%s' AND xchan_pubkey = '%s' ) ",
dbesc($contact_id),
dbesc($x[0]['xchan_guid']),
dbesc($x[0]['xchan_pubkey'])
);
if($xchans) {
$hashes = ids_to_querystr($xchans,'xchan_hash',true);
}
// private profiles are treated as a virtual group
$r = q("SELECT abook_profile from abook where abook_xchan in ( " . protect_sprintf($hashes) . " ) and abook_profile != '' ");
if($r) { if($r) {
foreach($r as $rv) { foreach($r as $rv) {
$groups[] = 'vp.' . $rv['abook_profile']; $groups[] = 'vp.' . $rv['abook_profile'];
} }
} }
// physical groups this channel is a member of // physical groups this identity is a member of
$r = q("SELECT hash FROM pgrp left join pgrp_member on pgrp.id = pgrp_member.gid WHERE xchan = '%s' ", $r = q("SELECT hash FROM pgrp left join pgrp_member on pgrp.id = pgrp_member.gid WHERE xchan in ( " . protect_sprintf($hashes) . " ) ");
dbesc($contact_id)
);
if($r) { if($r) {
foreach($r as $rr) foreach($r as $rr)
$groups[] = $rr['hash']; $groups[] = $rr['hash'];