Changeset 8432 for trunk/src/bp-members/bp-members-admin.php

Timestamp:

05/20/2014 03:33:49 PM (12 years ago)

Author:

johnjamesjacoby

Message:

Member Admin:

• Allow admins to edit other admins.
• Allow admins to edit their own profiles.
• Replace our custom tabbed UL/LI interface with WordPress core H2 navigation (and update admin.css accordingly.)

See #5623.

File:

• trunk/src/bp-members/bp-members-admin.php (modified) (6 diffs)

trunk/src/bp-members/bp-members-admin.php

@@ -318 +318 @@
                 } ?>
 
-                <ul id="profile-nav" class="nav-tab-wrapper">
+                <h2 id="profile-nav" class="nav-tab-wrapper">
                         <?php
                         /**
@@ -326 +326 @@
                          */
                         ?>
-                        <?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( 'Profile', 'buddypress' ); ?></a></li>
-                        <?php endif ;?>
-                        <li class="nav-tab<?php echo esc_attr( $bp_active ); ?>"><a href="<?php echo esc_url( $community_url );?>"><?php _e( 'Extended Profile', 'buddypress' ); ?></a></li>
-
-                        <?php do_action( 'bp_members_admin_profile_nav', $active, $user ); ?>
-                </ul>
+                        <?php if ( current_user_can( 'edit_user' ) ) : ?>
+                                <a class="nav-tab<?php echo esc_attr( $wp_active ); ?>" href="<?php echo esc_url( $wordpress_url );?>"><?php _e( 'Profile', 'buddypress' ); ?></a>
+                        <?php endif; ?>
+                        <a class="nav-tab<?php echo esc_attr( $bp_active ); ?>" href="<?php echo esc_url( $community_url );?>"><?php _e( 'Extended Profile', 'buddypress' ); ?></a>
+                </h2>
 
                 <?php
@@ -351 +349 @@
                 if ( ! $user_id = intval( $_GET['user_id'] ) ) {
                         wp_die( __( 'No users were found', 'buddypress' ) );
-                }
-
-                // only edit others profile
-                if ( get_current_user_id() == $user_id ) {
-                        bp_core_redirect( get_edit_user_link( $user_id ) );
                 }
 
@@ -632 +625 @@
                                 <div id="misc-publishing-actions">
                                         <?php
+
+                                        // Get the spam status once here to compare against below
+                                        $is_spammer = bp_is_user_spammer( $user->ID );
+
                                         /**
-                                         * 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.
+                                         * 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.
+                                         *
+                                         * Also prevent admins from marking themselves or other
+                                         * admins as spammers.
                                          */
-                                        ?>
-                                        <?php if ( empty( $this->subsite_activated ) || ( ! empty( $this->subsite_activated ) && current_user_can( 'manage_network_users' ) ) ) : ?>
+                                        if ( ( get_current_user_id() !== $user->ID ) && ( ! in_array( $user->user_login, get_super_admins() ) ) &&  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>
+                                                        <label class="approved"><input type="radio" name="user_status" value="ham" <?php checked( $is_spammer, false ); ?>><?php esc_html_e( 'Active', 'buddypress' ); ?></label><br />
+                                                        <label class="spam"><input type="radio" name="user_status" value="spam" <?php checked( $is_spammer, true ); ?>><?php esc_html_e( 'Spammer', 'buddypress' ); ?></label>
                                                 </div>
                                         <?php endif ;?>
@@ -737 +736 @@
          */
         public function row_actions( $actions = '', $user = null ) {
-                // only edit others profile
-                if ( get_current_user_id() == $user->ID ) {
-                        return $actions;
-                }
-
-                // Prevent a regular admin to edit a super admin
-                if( in_array( $user->user_login, get_super_admins() ) ) {
-                        return $actions;
-                }
 
                 $edit_profile = add_query_arg( array(
@@ -752 +742 @@
                 ), $this->edit_profile_url );
 
-                $edit_profile_link = '<a href="' . esc_url( $edit_profile ) . '">' . esc_html__( 'Extended Profile', 'buddypress' ) . '</a>';
+                $edit_profile_link = sprintf( '<a href="%1$s">%2$s</a>',  esc_url( $edit_profile ), esc_html__( 'Extended', 'buddypress' ) );
 
                 /**