<!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][8149] trunk/bp-members/bp-members-admin.php: In wp-admin/profile, be consistent with front-end when BuddyPress is not network activated</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">
<dt>Revision</dt> <dd><a href="http://buddypress.trac.wordpress.org/changeset/8149">8149</a></dd>
<dt>Author</dt> <dd>imath</dd>
<dt>Date</dt> <dd>2014-03-20 23:14:32 +0000 (Thu, 20 Mar 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>In wp-admin/profile, be consistent with front-end when BuddyPress is not network activated
In this specific config, on front-end, the regular Admin :
- can edit members profile,
- cannot edit a Super Admin profile,
- cannot mark as spam a user.
We need to make sure, this is also the case in the wp-admin/profile screens.
See <a href="http://buddypress.trac.wordpress.org/ticket/5367">#5367</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbpmembersbpmembersadminphp">trunk/bp-members/bp-members-admin.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkbpmembersbpmembersadminphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-members/bp-members-admin.php (8148 => 8149)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-members/bp-members-admin.php 2014-03-20 22:01:10 UTC (rev 8148)
+++ trunk/bp-members/bp-members-admin.php 2014-03-20 23:14:32 UTC (rev 8149)
</span><span class="lines">@@ -311,7 +311,16 @@
</span><span class="cx"> } ?>
</span><span class="cx">
</span><span class="cx"> <ul id="profile-nav" class="nav-tab-wrapper">
</span><del>- <li class="nav-tab<?php echo esc_attr( $wp_active ); ?>"><a href="<?php echo esc_url( $wordpress_url );?>"><?php _e( 'WordPress Profile', 'buddypress' ); ?></a></li>
</del><ins>+ <?php
+ /**
+ * In configs where BuddyPress is not network activated, as regular
+ * admins do not have the capacity to edit other users, we must add
+ * this check.
+ */
+ ?>
+ <?php if ( current_user_can( 'edit_user' ) ) :?>
+ <li class="nav-tab<?php echo esc_attr( $wp_active ); ?>"><a href="<?php echo esc_url( $wordpress_url );?>"><?php _e( 'WordPress Profile', 'buddypress' ); ?></a></li>
+ <?php endif ;?>
</ins><span class="cx"> <li class="nav-tab<?php echo esc_attr( $bp_active ); ?>"><a href="<?php echo esc_url( $community_url );?>"><?php _e( 'Community Profile', 'buddypress' ); ?></a></li>
</span><span class="cx">
</span><span class="cx"> <?php do_action( 'bp_members_admin_profile_nav', $active, $user ); ?>
</span><span class="lines">@@ -622,10 +631,19 @@
</span><span class="cx"> </div><!-- #minor-publishing-actions -->
</span><span class="cx">
</span><span class="cx"> <div id="misc-publishing-actions">
</span><del>- <div class="misc-pub-section" id="comment-status-radio">
- <label class="approved"><input type="radio" name="user_status" value="ham" <?php checked( bp_is_user_spammer( $user->ID ), false ); ?>><?php esc_html_e( 'Active', 'buddypress' ); ?></label><br />
- <label class="spam"><input type="radio" name="user_status" value="spam" <?php checked( bp_is_user_spammer( $user->ID ), true ); ?>><?php esc_html_e( 'Spammer', 'buddypress' ); ?></label>
- </div>
</del><ins>+ <?php
+ /**
+ * In configs where BuddyPress is not network activated, regular admins
+ * cannot mark a user as a spammer on front end. This prevent them to do
+ * it in backend.
+ */
+ ?>
+ <?php if ( empty( $this->subsite_activated ) || ( ! empty( $this->subsite_activated ) && current_user_can( 'manage_network_users' ) ) ) : ?>
+ <div class="misc-pub-section" id="comment-status-radio">
+ <label class="approved"><input type="radio" name="user_status" value="ham" <?php checked( bp_is_user_spammer( $user->ID ), false ); ?>><?php esc_html_e( 'Active', 'buddypress' ); ?></label><br />
+ <label class="spam"><input type="radio" name="user_status" value="spam" <?php checked( bp_is_user_spammer( $user->ID ), true ); ?>><?php esc_html_e( 'Spammer', 'buddypress' ); ?></label>
+ </div>
+ <?php endif ;?>
</ins><span class="cx">
</span><span class="cx"> <div class="misc-pub-section curtime misc-pub-section-last">
</span><span class="cx"> <?php
</span><span class="lines">@@ -722,18 +740,34 @@
</span><span class="cx"> return $actions;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ // Prevent a regular admin to edit a super admin
+ if( in_array( $user->user_login, get_super_admins() ) ) {
+ return $actions;
+ }
+
</ins><span class="cx"> $edit_profile = add_query_arg( array(
</span><span class="cx"> 'user_id' => $user->ID,
</span><span class="cx"> 'wp_http_referer' => urlencode( wp_unslash( $_SERVER['REQUEST_URI'] ) ),
</span><span class="cx"> ), $this->edit_profile_url );
</span><span class="cx">
</span><del>- $edit_action = $actions['edit'];
- unset( $actions['edit'] );
</del><ins>+ $edit_profile_link = '<a href="' . esc_url( $edit_profile ) . '">' . esc_html__( 'Profile', 'buddypress' ) . '</a>';
</ins><span class="cx">
</span><del>- $new_edit_actions = array(
- 'edit' => $edit_action,
- 'edit-profile' => '<a href="' . esc_url( $edit_profile ) . '">' . esc_html__( 'Profile', 'buddypress' ) . '</a>'
- );
</del><ins>+ /**
+ * Check the edit action is available
+ * and preserve the order edit | profile | remove/delete
+ */
+ if ( ! empty( $actions['edit'] ) ) {
+ $edit_action = $actions['edit'];
+ unset( $actions['edit'] );
+
+ $new_edit_actions = array(
+ 'edit' => $edit_action,
+ 'edit-profile' => $edit_profile_link,
+ );
+ // if not available simply add the edit profile action
+ } else {
+ $new_edit_actions = array( 'edit-profile' => $edit_profile_link );
+ }
</ins><span class="cx">
</span><span class="cx"> return array_merge( $new_edit_actions, $actions );
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>