<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[BuddyPress][12368] Activity: Ensure that 'favorites' stream doesn't include items from groups of which the user is not a member.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { white-space: pre-line; overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="http://buddypress.trac.wordpress.org/changeset/12368">12368</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"http://buddypress.trac.wordpress.org/changeset/12368","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>boonebgorges</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2019-04-25 14:17:38 +0000 (Thu, 25 Apr 2019)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>Activity: Ensure that 'favorites' stream doesn't include items from groups of which the user is not a member.
Merges <a href="http://buddypress.trac.wordpress.org/changeset/12366">[12366]</a> to the 4.0 branch.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branches40srcbpgroupsbpgroupsactivityphp">branches/4.0/src/bp-groups/bp-groups-activity.php</a></li>
</ul>
<h3>Property Changed</h3>
<ul>
<li><a href="#branches40">branches/4.0/</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<span class="cx" style="display: block; padding: 0 10px">Index: branches/4.0
</span><span class="cx" style="display: block; padding: 0 10px">===================================================================
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">--- branches/4.0 2019-04-25 14:16:59 UTC (rev 12367)
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+++ branches/4.0 2019-04-25 14:17:38 UTC (rev 12368)
</ins><a id="branches40"></a>
<div class="propset"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Property changes: branches/4.0</h4>
<pre class="diff"><span>
</span></pre></div>
<a id="svnmergeinfo"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: svn:mergeinfo</h4></div>
<span class="cx" style="display: block; padding: 0 10px"> /branches/1.5:5187,5203,5210-5216,5220,5225,5247,5635
</span><span class="cx" style="display: block; padding: 0 10px"> /branches/2.4:10363
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-/trunk:12303,12305,12307,12311-12312,12326,12334,12336,12338,12340,12345,12359,12365
</del><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of property
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+/trunk:12303,12305,12307,12311-12312,12326,12334,12336,12338,12340,12345,12359,12365-12366
</ins><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of property
</span><a id="branches40srcbpgroupsbpgroupsactivityphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/4.0/src/bp-groups/bp-groups-activity.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/4.0/src/bp-groups/bp-groups-activity.php 2019-04-25 14:16:59 UTC (rev 12367)
+++ branches/4.0/src/bp-groups/bp-groups-activity.php 2019-04-25 14:17:38 UTC (rev 12368)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -298,6 +298,119 @@
</span><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'bp_activity_set_groups_scope_args', 'bp_groups_filter_activity_scope', 10, 2 );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Enforces group membership restrictions on activity favorite queries.
+ *
+ * @since 4.3.0
+
+ * @param array $retval Query arguments.
+ * @param array $filter
+ * @return array
+ */
+function bp_groups_filter_activity_favorites_scope( $retval, $filter ) {
+ // Only process for viewers looking at their own favorites feed.
+ if ( ! empty( $filter['user_id'] ) ) {
+ $user_id = (int) $filter['user_id'];
+ } else {
+ $user_id = bp_displayed_user_id() ? bp_displayed_user_id() : bp_loggedin_user_id();
+ }
+
+ if ( ! $user_id || ! is_user_logged_in() || $user_id !== bp_loggedin_user_id() ) {
+ return $retval;
+ }
+
+ $favs = bp_activity_get_user_favorites( $user_id );
+ if ( empty( $favs ) ) {
+ return $retval;
+ }
+
+ $user_groups = bp_get_user_groups(
+ $user_id,
+ array(
+ 'is_admin' => null,
+ 'is_mod' => null,
+ )
+ );
+
+ $retval = array(
+ 'relation' => 'OR',
+
+ // Allow hidden items for items unconnected to groups.
+ 'non_groups' => array(
+ 'relation' => 'AND',
+ array(
+ 'column' => 'component',
+ 'compare' => '!=',
+ 'value' => buddypress()->groups->id,
+ ),
+ array(
+ 'column' => 'hide_sitewide',
+ 'compare' => 'IN',
+ 'value' => array( 1, 0 ),
+ ),
+ array(
+ 'column' => 'id',
+ 'compare' => 'IN',
+ 'value' => $favs,
+ ),
+ ),
+
+ // Trust the favorites list for group items that are not hidden sitewide.
+ 'non_hidden_groups' => array(
+ 'relation' => 'AND',
+ array(
+ 'column' => 'component',
+ 'compare' => '=',
+ 'value' => buddypress()->groups->id,
+ ),
+ array(
+ 'column' => 'hide_sitewide',
+ 'compare' => '=',
+ 'value' => 0,
+ ),
+ array(
+ 'column' => 'id',
+ 'compare' => 'IN',
+ 'value' => $favs,
+ ),
+ ),
+
+ // For hidden group items, limit to those in the user's groups.
+ 'hidden_groups' => array(
+ 'relation' => 'AND',
+ array(
+ 'column' => 'component',
+ 'compare' => '=',
+ 'value' => buddypress()->groups->id,
+ ),
+ array(
+ 'column' => 'hide_sitewide',
+ 'compare' => '=',
+ 'value' => 1,
+ ),
+ array(
+ 'column' => 'id',
+ 'compare' => 'IN',
+ 'value' => $favs,
+ ),
+ array(
+ 'column' => 'item_id',
+ 'compare' => 'IN',
+ 'value' => wp_list_pluck( $user_groups, 'group_id' ),
+ ),
+ ),
+
+ 'override' => array(
+ 'display_comments' => true,
+ 'filter' => array( 'user_id' => 0 ),
+ 'show_hidden' => true,
+ ),
+ );
+
+ return $retval;
+}
+add_filter( 'bp_activity_set_favorites_scope_args', 'bp_groups_filter_activity_favorites_scope', 20, 2 );
+
+/**
</ins><span class="cx" style="display: block; padding: 0 10px"> * Record an activity item related to the Groups component.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * A wrapper for {@link bp_activity_add()} that provides some Groups-specific
</span></span></pre>
</div>
</div>
</body>
</html>