Changeset 12660

Timestamp:

05/30/2020 09:26:01 AM (6 years ago)

Author:

imath

Message:

xProfile Group Admin: add confirmation screen for the delete action

Props oztaser

Fixes #8305

Location:

trunk/src/bp-xprofile

Files:

• admin/css/admin-rtl.css (modified) (1 diff)
• admin/css/admin.css (modified) (1 diff)
• bp-xprofile-admin.php (modified) (3 diffs)
• classes/class-bp-xprofile-group.php (modified) (3 diffs)

trunk/src/bp-xprofile/admin/css/admin-rtl.css

@@ -323 +323 @@
 }
 
+ul.bp-xprofile-delete-group-list {
+        list-style-type: disc;
+        margin: 4px 26px;
+}
+
+
 @media screen and (max-width: 782px) {
 

trunk/src/bp-xprofile/admin/css/admin.css

@@ -323 +323 @@
 }
 
+ul.bp-xprofile-delete-group-list {
+        list-style-type: disc;
+        margin: 4px 26px;
+}
+
+
 @media screen and (max-width: 782px) {
 

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

@@ -66 +66 @@
                 'edit_group',
                 'delete_group',
+                'do_delete_group',
                 'add_field',
                 'edit_field',
@@ -87 +88 @@
 
                         // Delete group.
-                        } elseif ( 'delete_group' === $mode ) {
+                        } elseif ( in_array( $mode, array( 'delete_group', 'do_delete_group' ), true ) ) {
                                 xprofile_admin_delete_group( $group_id );
 
@@ -404 +405 @@
         check_admin_referer( 'bp_xprofile_delete_group' );
 
+        $mode = ! empty( $_GET['mode'] )
+                  ? sanitize_key( $_GET['mode'] )
+                  : false;
+
+        // Display the group delete confirmation screen.
+        if ( 'delete_group' === $mode ) {
+                xprofile_admin_delete_group_screen( $group_id );
+
+        // Handle the deletion of group.
+        } else {
+                $group = new BP_XProfile_Group( $group_id );
+
+                if ( ! $group->delete() ) {
+                        $message = _x( 'There was an error deleting the group. Please try again.', 'Error when deleting profile fields group', 'buddypress' );
+                        $type    = 'error';
+                } else {
+                        $message = _x( 'The group was deleted successfully.', 'Profile fields group was deleted successfully', 'buddypress' );
+                        $type    = 'success';
+
+                        /**
+                         * Fires at the end of group deletion process, if successful.
+                         *
+                         * @since 1.0.0
+                         *
+                         * @param BP_XProfile_Group $group Current BP_XProfile_Group object.
+                         */
+                        do_action( 'xprofile_groups_deleted_group', $group );
+                }
+
+                xprofile_admin_screen( $message, $type );
+        }
+}
+
+/**
+ * Display the delete confirmation screen of profile data groups.
+ *
+ * @since 7.0.0
+ */
+function xprofile_admin_delete_group_screen( $group_id ) {
+
+        if ( ! bp_current_user_can( 'bp_moderate' ) ) {
+                die( '-1' );
+        }
+
         $group = new BP_XProfile_Group( $group_id );
 
-        if ( !$group->delete() ) {
-                $message = _x( 'There was an error deleting the group. Please try again.', 'Error when deleting profile fields group', 'buddypress' );
-                $type    = 'error';
-        } else {
-                $message = _x( 'The group was deleted successfully.', 'Profile fields group was deleted successfully', 'buddypress' );
-                $type    = 'success';
-
-                /**
-                 * Fires at the end of group deletion process, if successful.
-                 *
-                 * @since 1.0.0
-                 *
-                 * @param BP_XProfile_Group $group Current BP_XProfile_Group object.
-                 */
-                do_action( 'xprofile_groups_deleted_group', $group );
-        }
-
-        xprofile_admin_screen( $message, $type );
+        $base_url = remove_query_arg( array( 'mode', 'group_id', '_wpnonce' ), $_SERVER['REQUEST_URI'] ); ?>
+
+        <div class="wrap">
+                <h1><?php esc_html_e( 'Delete Field Group', 'buddypress' ) ?></h1>
+                <p><?php esc_html_e( 'You are about to delete the following field group:', 'buddypress' ) ?></p>
+
+                <ul class="bp-xprofile-delete-group-list">
+                        <li><?php echo esc_html( $group->name ); ?></li>
+                </ul>
+
+                <p><strong><?php esc_html_e( 'This action cannot be undone.', 'buddypress' ) ?></strong></p>
+
+                <a class="button-primary" href="<?php echo esc_url( wp_nonce_url( add_query_arg( array( 'mode' => 'do_delete_group', 'group_id' => $group_id ), $base_url ), 'bp_xprofile_delete_group' ) ); ?>"><?php esc_html_e( 'Delete Permanently', 'buddypress' ) ?></a>
+                <a class="button" href="<?php echo esc_attr( $base_url ); ?>"><?php esc_html_e( 'Cancel', 'buddypress' ) ?></a>
+        </div>
+
+        <?php
 }
 

trunk/src/bp-xprofile/classes/class-bp-xprofile-group.php

@@ -832 +832 @@
                                 'group_id' => (int) $this->id
                         ), $users_url );
+
+                        if ( $this->can_delete ) {
+                                // Delete Group URL.
+                                $delete_url = wp_nonce_url( add_query_arg( array(
+                                        'page'     => 'bp-profile-setup',
+                                        'mode'     => 'delete_group',
+                                        'group_id' => (int) $this->id
+                                ), $users_url ), 'bp_xprofile_delete_group' );
+                        }
                 } ?>
 
@@ -894 +903 @@
 
                                                         <div id="submitdiv" class="postbox">
-                                                                <h2><?php _e( 'Submit', 'buddypress' ); ?></h2>
+                                                                <h2><?php esc_html_e( 'Submit', 'buddypress' ); ?></h2>
                                                                 <div class="inside">
                                                                         <div id="submitcomment" class="submitbox">
@@ -918 +927 @@
                                                                                         </div>
                                                                                         <div id="delete-action">
-                                                                                                <a href="<?php echo esc_url( $cancel_url ); ?>" class="deletion"><?php _e( 'Cancel', 'buddypress' ); ?></a>
+                                                                                                <?php if ( ! empty( $this->id ) && isset( $delete_url ) ) : ?>
+                                                                                                        <a href="<?php echo esc_url( $delete_url ); ?>" class="submitdelete deletion"><?php esc_html_e( 'Delete Group', 'buddypress' ); ?></a>
+                                                                                                <?php endif; ?>
+
+                                                                                                <div><a href="<?php echo esc_url( $cancel_url ); ?>" class="deletion"><?php esc_html_e( 'Cancel', 'buddypress' ); ?></a></div>
                                                                                         </div>
                                                                                         <div class="clear"></div>