<!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][5330] trunk: Audit is_super_admin and is_site_admin usage.</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/5330">5330</a></dd>
<dt>Author</dt> <dd>johnjamesjacoby</dd>
<dt>Date</dt> <dd>2011-11-14 05:27:59 +0000 (Mon, 14 Nov 2011)</dd>
</dl>
<h3>Log Message</h3>
<pre>Audit is_super_admin and is_site_admin usage. See <a href="http://buddypress.trac.wordpress.org/ticket/3740">#3740</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbpactivitybpactivityadminphp">trunk/bp-activity/bp-activity-admin.php</a></li>
<li><a href="#trunkbpactivitybpactivityfunctionsphp">trunk/bp-activity/bp-activity-functions.php</a></li>
<li><a href="#trunkbpactivitybpactivitytemplatephp">trunk/bp-activity/bp-activity-template.php</a></li>
<li><a href="#trunkbpgroupsbpgroupstemplatephp">trunk/bp-groups/bp-groups-template.php</a></li>
<li><a href="#trunkbpmembersbpmembersfunctionsphp">trunk/bp-members/bp-members-functions.php</a></li>
<li><a href="#trunkbpmembersbpmembersloaderphp">trunk/bp-members/bp-members-loader.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkbpactivitybpactivityadminphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-activity/bp-activity-admin.php (5329 => 5330)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-activity/bp-activity-admin.php 2011-11-14 05:19:12 UTC (rev 5329)
+++ trunk/bp-activity/bp-activity-admin.php 2011-11-14 05:27:59 UTC (rev 5330)
</span><span class="lines">@@ -28,7 +28,7 @@
</span><span class="cx"> function bp_activity_add_admin_menu() {
</span><span class="cx"> global $bp;
</span><span class="cx">
</span><del>- if ( !$bp->loggedin_user->is_super_admin )
</del><ins>+ if ( !bp_current_user_can( 'bp_moderate' ) )
</ins><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> // Add our screen
</span></span></pre></div>
<a id="trunkbpactivitybpactivityfunctionsphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-activity/bp-activity-functions.php (5329 => 5330)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-activity/bp-activity-functions.php 2011-11-14 05:19:12 UTC (rev 5329)
+++ trunk/bp-activity/bp-activity-functions.php 2011-11-14 05:27:59 UTC (rev 5330)
</span><span class="lines">@@ -1335,7 +1335,7 @@
</span><span class="cx"> */
</span><span class="cx"> function bp_activity_user_can_mark_spam() {
</span><span class="cx"> global $bp;
</span><del>- return apply_filters( 'bp_activity_user_can_mark_spam', $bp->loggedin_user->is_site_admin );
</del><ins>+ return apply_filters( 'bp_activity_user_can_mark_spam', bp_current_user_can( 'bp_moderate' ) );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span></span></pre></div>
<a id="trunkbpactivitybpactivitytemplatephp"></a>
<div class="modfile"><h4>Modified: trunk/bp-activity/bp-activity-template.php (5329 => 5330)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-activity/bp-activity-template.php 2011-11-14 05:19:12 UTC (rev 5329)
+++ trunk/bp-activity/bp-activity-template.php 2011-11-14 05:27:59 UTC (rev 5330)
</span><span class="lines">@@ -272,7 +272,7 @@
</span><span class="cx"> $object = $bp->groups->id;
</span><span class="cx"> $primary_id = $bp->groups->current_group->id;
</span><span class="cx">
</span><del>- if ( 'public' != $bp->groups->current_group->status && ( groups_is_user_member( bp_loggedin_user_id(), $bp->groups->current_group->id ) || $bp->loggedin_user->is_super_admin ) )
</del><ins>+ if ( ( 'public' != $bp->groups->current_group->status ) && ( groups_is_user_member( bp_loggedin_user_id(), $bp->groups->current_group->id ) || bp_current_user_can( 'bp_moderate' ) ) )
</ins><span class="cx"> $show_hidden = true;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1221,7 +1221,7 @@
</span><span class="cx">
</span><span class="cx"> $can_delete = false;
</span><span class="cx">
</span><del>- if ( $bp->loggedin_user->is_super_admin )
</del><ins>+ if ( bp_current_user_can( 'bp_moderate' ) )
</ins><span class="cx"> $can_delete = true;
</span><span class="cx">
</span><span class="cx"> if ( $activity->user_id == bp_loggedin_user_id() )
</span></span></pre></div>
<a id="trunkbpgroupsbpgroupstemplatephp"></a>
<div class="modfile"><h4>Modified: trunk/bp-groups/bp-groups-template.php (5329 => 5330)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-groups/bp-groups-template.php 2011-11-14 05:19:12 UTC (rev 5329)
+++ trunk/bp-groups/bp-groups-template.php 2011-11-14 05:27:59 UTC (rev 5330)
</span><span class="lines">@@ -110,7 +110,7 @@
</span><span class="cx"> $this->pag_page = isset( $_REQUEST['grpage'] ) ? intval( $_REQUEST['grpage'] ) : $page;
</span><span class="cx"> $this->pag_num = isset( $_REQUEST['num'] ) ? intval( $_REQUEST['num'] ) : $per_page;
</span><span class="cx">
</span><del>- if ( $bp->loggedin_user->is_super_admin || ( is_user_logged_in() && $user_id == bp_loggedin_user_id() ) )
</del><ins>+ if ( bp_current_user_can( 'bp_moderate' ) || ( is_user_logged_in() && $user_id == bp_loggedin_user_id() ) )
</ins><span class="cx"> $show_hidden = true;
</span><span class="cx">
</span><span class="cx"> if ( 'invites' == $type ) {
</span><span class="lines">@@ -299,7 +299,7 @@
</span><span class="cx"> function bp_group_is_visible( $group = false ) {
</span><span class="cx"> global $bp, $groups_template;
</span><span class="cx">
</span><del>- if ( $bp->loggedin_user->is_super_admin )
</del><ins>+ if ( bp_current_user_can( 'bp_moderate' ) )
</ins><span class="cx"> return true;
</span><span class="cx">
</span><span class="cx"> if ( !$group )
</span><span class="lines">@@ -1343,7 +1343,7 @@
</span><span class="cx"> *
</span><span class="cx"> * Checks if current user is member of a group.
</span><span class="cx"> *
</span><del>- * @uses is_super_admin Check if current user is super admin
</del><ins>+ * @uses bp_current_user_can() Check if current user is super admin
</ins><span class="cx"> * @uses apply_filters Creates bp_group_is_member filter and passes $is_member
</span><span class="cx"> * @usedby groups/activity.php, groups/single/forum/edit.php, groups/single/forum/topic.php to determine template part visibility
</span><span class="cx"> * @global array $bp BuddyPress Master global
</span><span class="lines">@@ -1355,7 +1355,7 @@
</span><span class="cx"> global $bp, $groups_template;
</span><span class="cx">
</span><span class="cx"> // Site admins always have access
</span><del>- if ( $bp->loggedin_user->is_super_admin )
</del><ins>+ if ( bp_current_user_can( 'bp_moderate' ) )
</ins><span class="cx"> return true;
</span><span class="cx">
</span><span class="cx"> if ( !$group )
</span><span class="lines">@@ -1371,7 +1371,6 @@
</span><span class="cx"> * check $groups_template->group->is_banned instead of making another SQL query.
</span><span class="cx"> * However, if used in a single group's pages, we must use groups_is_user_banned().
</span><span class="cx"> *
</span><del>- * @global object $bp BuddyPress global settings
</del><span class="cx"> * @global BP_Groups_Template $groups_template Group template loop object
</span><span class="cx"> * @param object $group Group to check if user is banned from the group
</span><span class="cx"> * @param int $user_id
</span><span class="lines">@@ -1379,10 +1378,10 @@
</span><span class="cx"> * @since 1.5
</span><span class="cx"> */
</span><span class="cx"> function bp_group_is_user_banned( $group = false, $user_id = 0 ) {
</span><del>- global $bp, $groups_template;
</del><ins>+ global $groups_template;
</ins><span class="cx">
</span><span class="cx"> // Site admins always have access
</span><del>- if ( $bp->loggedin_user->is_super_admin )
</del><ins>+ if ( bp_current_user_can( 'bp_moderate' ) )
</ins><span class="cx"> return false;
</span><span class="cx">
</span><span class="cx"> if ( !$group ) {
</span></span></pre></div>
<a id="trunkbpmembersbpmembersfunctionsphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-members/bp-members-functions.php (5329 => 5330)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-members/bp-members-functions.php 2011-11-14 05:19:12 UTC (rev 5329)
+++ trunk/bp-members/bp-members-functions.php 2011-11-14 05:27:59 UTC (rev 5330)
</span><span class="lines">@@ -653,11 +653,11 @@
</span><span class="cx"> $user_id = bp_loggedin_user_id();
</span><span class="cx">
</span><span class="cx"> // Make sure account deletion is not disabled
</span><del>- if ( !empty( $bp->site_options['bp-disable-account-deletion'] ) && !$bp->loggedin_user->is_super_admin )
</del><ins>+ if ( !empty( $bp->site_options['bp-disable-account-deletion'] ) && !bp_current_user_can( 'bp_moderate' ) )
</ins><span class="cx"> return false;
</span><span class="cx">
</span><span class="cx"> // Site admins cannot be deleted
</span><del>- if ( is_super_admin( bp_core_get_username( $user_id ) ) )
</del><ins>+ if ( is_super_admin( $user_id ) )
</ins><span class="cx"> return false;
</span><span class="cx">
</span><span class="cx"> // Specifically handle multi-site environment
</span></span></pre></div>
<a id="trunkbpmembersbpmembersloaderphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-members/bp-members-loader.php (5329 => 5330)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-members/bp-members-loader.php 2011-11-14 05:19:12 UTC (rev 5329)
+++ trunk/bp-members/bp-members-loader.php 2011-11-14 05:27:59 UTC (rev 5330)
</span><span class="lines">@@ -78,7 +78,7 @@
</span><span class="cx"> $bp->loggedin_user->fullname = bp_core_get_user_displayname( bp_loggedin_user_id() );
</span><span class="cx">
</span><span class="cx"> // Hits the DB on single WP installs so get this separately
</span><del>- $bp->loggedin_user->is_super_admin = $bp->loggedin_user->is_site_admin = bp_current_user_can( 'bp_moderate' );
</del><ins>+ $bp->loggedin_user->is_super_admin = $bp->loggedin_user->is_site_admin = is_super_admin( bp_loggedin_user_id() );
</ins><span class="cx">
</span><span class="cx"> // The domain for the user currently logged in. eg: http://domain.com/members/andy
</span><span class="cx"> $bp->loggedin_user->domain = bp_core_get_user_domain( bp_loggedin_user_id() );
</span></span></pre>
</div>
</div>
</body>
</html>