keith/friendica
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

network groups now filtered by parent in group

Browse source
This commit is contained in:
Mike Macgirvin 2010-08-11 15:40:18 -07:00
parent d2c6fa3fa1
commit 3d7bb9c37c
1 changed files with 4 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
mod/network.php
View file

@ -65,10 +65,6 @@ function network_content(&$a, $update = false) {
// that belongs to you, hence you can see all of it. We will filter by group if // that belongs to you, hence you can see all of it. We will filter by group if
// desired. // desired.
// TODO: Perhaps we should limit the group filter to those with the group in the ACL,
// rather than just the contact-id of the post.
// Otherwise we're not showing complete conversations, unless all the conversants
// happen to be in the group.
$sql_extra = ''; $sql_extra = '';
@ -78,14 +74,16 @@ function network_content(&$a, $update = false) {
intval($_SESSION['uid']) intval($_SESSION['uid'])
); );
if(! count($r)) { if(! count($r)) {
notice("No such group"); notice( t('No such group') . EOL );
goaway($a->get_baseurl() . '/network'); goaway($a->get_baseurl() . '/network');
return; // NOTREACHED return; // NOTREACHED
} }
$contacts = expand_groups(array($group)); $contacts = expand_groups(array($group));
$contacts[] = $_SESSION['cid'];
$contact_str = implode(',',$contacts); $contact_str = implode(',',$contacts);
$sql_extra = dbesc(" AND `item`.`parent` IN
( SELECT `parent` FROM `item` WHERE `id` = `parent` AND `contact-id` IN ( $contact_str )) ");
$sql_extra = dbesc(" AND `contact`.`id` IN ( $contact_str ) "); $sql_extra = dbesc(" AND `contact`.`id` IN ( $contact_str ) ");
$o = '<h4>' . t('Group: ') . $r[0]['name'] . '</h4>' . $o; $o = '<h4>' . t('Group: ') . $r[0]['name'] . '</h4>' . $o;