<!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][6352] trunk/bp-xprofile: Add an "admins only" visibility option to profile fields.</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, #logmsg > ol { margin-left: 0; 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">
<dt>Revision</dt> <dd><a href="http://buddypress.trac.wordpress.org/changeset/6352">6352</a></dd>
<dt>Author</dt> <dd>djpaul</dd>
<dt>Date</dt> <dd>2012-09-28 21:52:18 +0000 (Fri, 28 Sep 2012)</dd>
</dl>
<h3>Log Message</h3>
<pre>Add an "admins only" visibility option to profile fields. Fixes <a href="http://buddypress.trac.wordpress.org/ticket/4440">#4440</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbpxprofilebpxprofilefunctionsphp">trunk/bp-xprofile/bp-xprofile-functions.php</a></li>
<li><a href="#trunkbpxprofilebpxprofileloaderphp">trunk/bp-xprofile/bp-xprofile-loader.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkbpxprofilebpxprofilefunctionsphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-xprofile/bp-xprofile-functions.php (6351 => 6352)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-xprofile/bp-xprofile-functions.php 2012-09-27 21:36:34 UTC (rev 6351)
+++ trunk/bp-xprofile/bp-xprofile-functions.php 2012-09-28 21:52:18 UTC (rev 6352)
</span><span class="lines">@@ -671,26 +671,34 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // @todo - This is where you'd swap out for current_user_can() checks
</span><ins>+ $hidden_levels = array();
</ins><span class="cx">
</span><ins>+ // Current user is logged in
</ins><span class="cx"> if ( $current_user_id ) {
</span><del>- // Current user is logged in
</del><ins>+
+ // If you're viewing your own profile, nothing's private
</ins><span class="cx"> if ( $displayed_user_id == $current_user_id ) {
</span><del>- // If you're viewing your own profile, nothing's private
- $hidden_fields = array();
</del><span class="cx">
</span><del>- } else if ( bp_is_active( 'friends' ) && friends_check_friendship( $displayed_user_id, $current_user_id ) ) {
- // If the current user and displayed user are friends, show all
- $hidden_fields = array();
</del><ins>+ // If the current user and displayed user are friends, show all
+ } elseif ( bp_is_active( 'friends' ) && friends_check_friendship( $displayed_user_id, $current_user_id ) ) {
+ if ( ! bp_current_user_can( 'bp_moderate' ) )
+ $hidden_levels[] = 'adminsonly';
</ins><span class="cx">
</span><ins>+ $hidden_fields = bp_xprofile_get_fields_by_visibility_levels( $displayed_user_id, $hidden_levels );
+
+ // current user is logged-in but not friends, so exclude friends-only
</ins><span class="cx"> } else {
</span><del>- // current user is logged-in but not friends, so exclude friends-only
</del><span class="cx"> $hidden_levels = array( 'friends' );
</span><ins>+
+ if ( ! bp_current_user_can( 'bp_moderate' ) )
+ $hidden_levels[] = 'adminsonly';
+
</ins><span class="cx"> $hidden_fields = bp_xprofile_get_fields_by_visibility_levels( $displayed_user_id, $hidden_levels );
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ // Current user is not logged in, so exclude friends-only, loggedin, and adminsonly.
</ins><span class="cx"> } else {
</span><del>- // Current user is not logged in, so exclude friends-only and loggedin
- $hidden_levels = array( 'friends', 'loggedin' );
</del><ins>+ $hidden_levels = array( 'friends', 'loggedin', 'adminsonly', );
</ins><span class="cx"> $hidden_fields = bp_xprofile_get_fields_by_visibility_levels( $displayed_user_id, $hidden_levels );
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -704,7 +712,7 @@
</span><span class="cx"> * @see bp_xprofile_get_hidden_fields_for_user()
</span><span class="cx"> *
</span><span class="cx"> * @param int $user_id The id of the profile owner
</span><del>- * @param array $levels An array of visibility levels ('public', 'friends', 'loggedin', etc) to be
</del><ins>+ * @param array $levels An array of visibility levels ('public', 'friends', 'loggedin', 'adminsonly' etc) to be
</ins><span class="cx"> * checked against
</span><span class="cx"> * @return array $field_ids The fields that match the requested visibility levels for the given user
</span><span class="cx"> */
</span></span></pre></div>
<a id="trunkbpxprofilebpxprofileloaderphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-xprofile/bp-xprofile-loader.php (6351 => 6352)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-xprofile/bp-xprofile-loader.php 2012-09-27 21:36:34 UTC (rev 6351)
+++ trunk/bp-xprofile/bp-xprofile-loader.php 2012-09-28 21:52:18 UTC (rev 6352)
</span><span class="lines">@@ -101,14 +101,18 @@
</span><span class="cx">
</span><span class="cx"> // Register the visibility levels. See bp_xprofile_get_visibility_levels() to filter
</span><span class="cx"> $this->visibility_levels = array(
</span><del>- 'public' => array(
- 'id' => 'public',
</del><ins>+ 'public' => array(
+ 'id' => 'public',
</ins><span class="cx"> 'label' => __( 'Anyone', 'buddypress' )
</span><span class="cx"> ),
</span><span class="cx"> 'loggedin' => array(
</span><del>- 'id' => 'loggedin',
</del><ins>+ 'id' => 'loggedin',
</ins><span class="cx"> 'label' => __( 'Logged In Users', 'buddypress' )
</span><del>- )
</del><ins>+ ),
+ 'adminsonly' => array(
+ 'id' => 'adminsonly',
+ 'label' => __( 'Admins Only', 'buddypress' )
+ ),
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> if ( bp_is_active( 'friends' ) ) {
</span></span></pre>
</div>
</div>
</body>
</html>