From cada0b6df12dab6e91aa7b560eccdf9f334f2b98 Mon Sep 17 00:00:00 2001 From: zotlabs Date: Sun, 10 Mar 2019 15:50:45 -0700 Subject: init_groups_visitor: include xchans from all zot-like networks --- include/security.php | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) (limited to 'include/security.php') diff --git a/include/security.php b/include/security.php index 493d34699..4af46c257 100644 --- a/include/security.php +++ b/include/security.php @@ -575,11 +575,29 @@ function init_groups_visitor($contact_id) { } } - // physical groups this channel is a member of - - $r = q("SELECT hash FROM pgrp left join pgrp_member on pgrp.id = pgrp_member.gid WHERE xchan = '%s' ", + $x = q("select * from xchan where xchan_hash = '%s'", 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); + } + + // 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 in ( " . protect_sprintf($hashes) . " ) " ); if($r) { foreach($r as $rr) $groups[] = $rr['hash']; -- cgit v1.2.3