Changeset 12554 for trunk/src/bp-xprofile/classes/class-bp-xprofile-user-admin.php

Timestamp:

02/29/2020 03:33:10 PM (5 years ago)

Author:

imath

Message:

Move Avatars & Cover from xProfile to Members component : step 2

Move User Avatar's management from the xProfile User Admin to the Members User Admin class.

See #8156

File:

• trunk/src/bp-xprofile/classes/class-bp-xprofile-user-admin.php (modified) (5 diffs)

trunk/src/bp-xprofile/classes/class-bp-xprofile-user-admin.php

@@ -57 +57 @@
      */
     private function setup_actions() {
-        // Enqueue scripts.
-        add_action( 'bp_members_admin_enqueue_scripts',  array( $this, 'enqueue_scripts'    ), 10, 1 );
 
         // Register the metabox in Member's community admin profile.
         add_action( 'bp_members_admin_xprofile_metabox', array( $this, 'register_metaboxes' ), 10, 3 );
 
-        // Saves the profile actions for user ( avatar, profile fields ).
+        // Saves the profile actions for user ( profile fields ).
         add_action( 'bp_members_admin_update_user',      array( $this, 'user_admin_load'    ), 10, 4 );
-    }
-
-    /**
-     * Enqueue needed scripts.
-     *
-     * @since 2.3.0
-     *
-     * @param int $screen_id Screen ID being displayed.
-     */
-    public function enqueue_scripts( $screen_id ) {
-        if ( ( false === strpos( $screen_id, 'users_page_bp-profile-edit' )
-            && false === strpos( $screen_id, 'profile_page_bp-profile-edit' ) )
-            || bp_core_get_root_option( 'bp-disable-avatar-uploads' )
-            || ! buddypress()->avatar->show_avatars
-            || ! bp_attachments_is_wp_version_supported() ) {
-            return;
-        }
-
-        /**
-         * Get Thickbox.
-         *
-         * We cannot simply use add_thickbox() here as WordPress is not playing
-         * nice with Thickbox width/height see https://core.trac.wordpress.org/ticket/17249
-         * Using media-upload might be interesting in the future for the send to editor stuff
-         * and we make sure the tb_window is wide enough
-         */
-        wp_enqueue_style ( 'thickbox' );
-        wp_enqueue_script( 'media-upload' );
-
-        // Get Avatar Uploader.
-        bp_attachments_enqueue_scripts( 'BP_Attachment_Avatar' );
     }
 
@@ -156 +123 @@
             );
         }
-
-        if ( buddypress()->avatar->show_avatars ) {
-            // Avatar Metabox.
-            add_meta_box(
-                'bp_xprofile_user_admin_avatar',
-                _x( 'Profile Photo', 'xprofile user-admin edit screen', 'buddypress' ),
-                array( $this, 'user_admin_avatar_metabox' ),
-                $screen_id,
-                'side',
-                'low'
-            );
-        }
     }
 
@@ -177 +132 @@
      *
      * @since 2.0.0
+     * @since 6.0.0 The `delete_avatar` action is now managed into BP_Members_Admin::user_admin_load().
      *
      * @param string $doaction    Action being run.
@@ -185 +141 @@
     public function user_admin_load( $doaction = '', $user_id = 0, $request = array(), $redirect_to = '' ) {
 
-        // Eventually delete avatar.
-        if ( 'delete_avatar' === $doaction ) {
-
-            check_admin_referer( 'delete_avatar' );
-
-            $redirect_to = remove_query_arg( '_wpnonce', $redirect_to );
-
-            if ( bp_core_delete_existing_avatar( array( 'item_id' => $user_id ) ) ) {
-                $redirect_to = add_query_arg( 'updated', 'avatar', $redirect_to );
-            } else {
-                $redirect_to = add_query_arg( 'error', 'avatar', $redirect_to );
-            }
-
-            bp_core_redirect( $redirect_to );
-
-        } elseif ( isset( $_POST['field_ids'] ) ) {
-            // Update profile fields.
+        // Update profile fields.
+        if ( isset( $_POST['field_ids'] ) ) {
+
             // Check the nonce.
             check_admin_referer( 'edit-bp-profile_' . $user_id );
@@ -435 +377 @@
     }
 
-    /**
-     * Render the Avatar metabox to moderate inappropriate images.
-     *
-     * @since 2.0.0
-     *
-     * @param WP_User|null $user The WP_User object for the user being edited.
-     */
-    public function user_admin_avatar_metabox( $user = null ) {
-
-        if ( empty( $user->ID ) ) {
-            return;
-        } ?>
-
-        <div class="avatar">
-
-            <?php echo bp_core_fetch_avatar( array(
-                'item_id' => $user->ID,
-                'object'  => 'user',
-                'type'    => 'full',
-                'title'   => $user->display_name
-            ) ); ?>
-
-            <?php if ( bp_get_user_has_avatar( $user->ID ) ) :
-
-                $query_args = array(
-                    'user_id' => $user->ID,
-                    'action'  => 'delete_avatar'
-                );
-
-                if ( ! empty( $_REQUEST['wp_http_referer'] ) ) {
-                    $wp_http_referer = wp_unslash( $_REQUEST['wp_http_referer'] );
-                    $wp_http_referer = remove_query_arg( array( 'action', 'updated' ), $wp_http_referer );
-                    $wp_http_referer = wp_validate_redirect( esc_url_raw( $wp_http_referer ) );
-                    $query_args['wp_http_referer'] = urlencode( $wp_http_referer );
-                }
-
-                $community_url = add_query_arg( $query_args, buddypress()->members->admin->edit_profile_url );
-                $delete_link   = wp_nonce_url( $community_url, 'delete_avatar' ); ?>
-
-                <a href="<?php echo esc_url( $delete_link ); ?>" class="bp-xprofile-avatar-user-admin"><?php esc_html_e( 'Delete Profile Photo', 'buddypress' ); ?></a>
-
-            <?php endif;
-
-            // Load the Avatar UI templates if user avatar uploads are enabled and current WordPress version is supported.
-            if ( ! bp_core_get_root_option( 'bp-disable-avatar-uploads' ) && bp_attachments_is_wp_version_supported() ) : ?>
-                <a href="#TB_inline?width=800px&height=400px&inlineId=bp-xprofile-avatar-editor" class="thickbox bp-xprofile-avatar-user-edit"><?php esc_html_e( 'Edit Profile Photo', 'buddypress' ); ?></a>
-                <div id="bp-xprofile-avatar-editor" style="display:none;">
-                    <?php bp_attachments_get_template_part( 'avatars/index' ); ?>
-                </div>
-            <?php endif; ?>
-
-        </div>
-        <?php
-    }
-
 }
 endif; // End class_exists check.