<!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][11544] trunk/src/bp-groups/classes: Add $is_visible and $is_user_member properties to BP_Groups_Group object.</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 { 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/11544">11544</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/11544","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>dcavins</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2017-04-28 14:36:15 +0000 (Fri, 28 Apr 2017)</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'>Add $is_visible and $is_user_member properties to BP_Groups_Group object.
During single group setup in the `BP_Groups_Component`, we're doing
some checks that duplicate logic that is, or should be, handled in
`BP_Groups_Group`. Then, `BP_Groups_Component` can rely on
`BP_Groups_Group` to provide the details via recently added magic
methods.
Note: $is_user_member is an alias of $is_member for backward
compatibility.
Fixes <a href="http://buddypress.trac.wordpress.org/ticket/7494">#7494</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcbpgroupsclassesclassbpgroupscomponentphp">trunk/src/bp-groups/classes/class-bp-groups-component.php</a></li>
<li><a href="#trunksrcbpgroupsclassesclassbpgroupsgroupphp">trunk/src/bp-groups/classes/class-bp-groups-group.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcbpgroupsclassesclassbpgroupscomponentphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/bp-groups/classes/class-bp-groups-component.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/bp-groups/classes/class-bp-groups-component.php 2017-04-27 17:31:10 UTC (rev 11543)
+++ trunk/src/bp-groups/classes/class-bp-groups-component.php 2017-04-28 14:36:15 UTC (rev 11544)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -242,20 +242,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> bp_update_is_item_mod ( groups_is_user_mod ( bp_loggedin_user_id(), $this->current_group->id ), 'groups' );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Is the logged in user a member of the group?
- if ( ( is_user_logged_in() && groups_is_user_member( bp_loggedin_user_id(), $this->current_group->id ) ) ) {
- $this->current_group->is_user_member = true;
- } else {
- $this->current_group->is_user_member = false;
- }
-
- // Should this group be visible to the logged in user?
- if ( 'public' == $this->current_group->status || $this->current_group->is_user_member ) {
- $this->current_group->is_visible = true;
- } else {
- $this->current_group->is_visible = false;
- }
-
</del><span class="cx" style="display: block; padding: 0 10px"> // Check once if the current group has a custom front template.
</span><span class="cx" style="display: block; padding: 0 10px"> $this->current_group->front_template = bp_groups_get_front_template( $this->current_group );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -557,7 +543,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // member and does not have an outstanding invitation,
</span><span class="cx" style="display: block; padding: 0 10px"> // show a "Request Membership" nav item.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( is_user_logged_in() &&
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ! $this->current_group->is_user_member &&
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ! $this->current_group->is_member &&
</ins><span class="cx" style="display: block; padding: 0 10px"> ! groups_check_for_membership_request( bp_loggedin_user_id(), $this->current_group->id ) &&
</span><span class="cx" style="display: block; padding: 0 10px"> $this->current_group->status == 'private' &&
</span><span class="cx" style="display: block; padding: 0 10px"> ! groups_check_user_has_invite( bp_loggedin_user_id(), $this->current_group->id )
</span></span></pre></div>
<a id="trunksrcbpgroupsclassesclassbpgroupsgroupphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/bp-groups/classes/class-bp-groups-group.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/bp-groups/classes/class-bp-groups-group.php 2017-04-27 17:31:10 UTC (rev 11543)
+++ trunk/src/bp-groups/classes/class-bp-groups-group.php 2017-04-28 14:36:15 UTC (rev 11544)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -126,6 +126,15 @@
</span><span class="cx" style="display: block; padding: 0 10px"> protected $is_member;
</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">+ * Is the current user a member of this group?
+ * Alias of $is_member for backward compatibility.
+ *
+ * @since 2.9.0
+ * @var bool
+ */
+ protected $is_user_member;
+
+ /**
</ins><span class="cx" style="display: block; padding: 0 10px"> * Does the current user have an outstanding invitation to this group?
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 1.9.0
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -158,6 +167,14 @@
</span><span class="cx" style="display: block; padding: 0 10px"> protected $user_has_access;
</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">+ * Can the current user know that this group exists?
+ *
+ * @since 2.9.0
+ * @var bool
+ */
+ protected $is_visible;
+
+ /**
</ins><span class="cx" style="display: block; padding: 0 10px"> * Raw arguments passed to the constructor.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 2.0.0
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -416,6 +433,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> return $this->get_mods();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> case 'is_member' :
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ case 'is_user_member' :
</ins><span class="cx" style="display: block; padding: 0 10px"> return $this->get_is_member();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> case 'is_invited' :
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -427,6 +445,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> case 'user_has_access' :
</span><span class="cx" style="display: block; padding: 0 10px"> return $this->get_user_has_access();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ case 'is_visible' :
+ return $this->is_visible();
+
</ins><span class="cx" style="display: block; padding: 0 10px"> default :
</span><span class="cx" style="display: block; padding: 0 10px"> return isset( $this->{$key} ) ? $this->{$key} : null;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -448,11 +469,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> case 'admins' :
</span><span class="cx" style="display: block; padding: 0 10px"> case 'is_invited' :
</span><span class="cx" style="display: block; padding: 0 10px"> case 'is_member' :
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ case 'is_user_member' :
</ins><span class="cx" style="display: block; padding: 0 10px"> case 'is_pending' :
</span><span class="cx" style="display: block; padding: 0 10px"> case 'last_activity' :
</span><span class="cx" style="display: block; padding: 0 10px"> case 'mods' :
</span><span class="cx" style="display: block; padding: 0 10px"> case 'total_member_count' :
</span><span class="cx" style="display: block; padding: 0 10px"> case 'user_has_access' :
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ case 'is_visible' :
</ins><span class="cx" style="display: block; padding: 0 10px"> case 'forum_id' :
</span><span class="cx" style="display: block; padding: 0 10px"> return true;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -607,6 +630,34 @@
</span><span class="cx" style="display: block; padding: 0 10px"> return $this->user_has_access;
</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">+ /**
+ * Checks whether the current user can know the group exists.
+ *
+ * @since 2.9.0
+ *
+ * @return bool
+ */
+ protected function is_visible() {
+ if ( isset( $this->is_visible ) ) {
+ return $this->is_visible;
+ }
+
+ if ( 'hidden' === $this->status ) {
+
+ // Assume user can not know about hidden groups.
+ $this->is_visible = false;
+
+ // Group members or community moderators have access.
+ if ( ( is_user_logged_in() && $this->get_is_member() ) || bp_current_user_can( 'bp_moderate' ) ) {
+ $this->is_visible = true;
+ }
+ } else {
+ $this->is_visible = true;
+ }
+
+ return $this->is_visible;
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> /** Static Methods ****************************************************/
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span></span></pre>
</div>
</div>
</body>
</html>