Changeset 6280

Timestamp:

08/31/2012 02:29:29 AM (12 years ago)

Author:

boonebgorges

Message:

Improves Group Deletion process in Dashboard

• Introduces confirmation screen in place of confirmation alert box, since BP Group deletion is permanent
• Fixes bulk delete

See #4414

Location:

trunk/bp-groups

Files:

• admin/css/admin.css (modified) (1 diff)
• bp-groups-admin.php (modified) (10 diffs)

trunk/bp-groups/admin/css/admin.css

@@ -15 +15 @@
     margin-bottom: 15px;
 }
+ul.bp-group-delete-list {
+    list-style-type: disc;
+    margin: 4px 26px;
+}

trunk/bp-groups/bp-groups-admin.php

@@ -62 +62 @@
 
     // Edit screen
-    if ( 'delete' == $doaction && ! empty( $_GET['gid'] ) ) {
+    if ( 'do_delete' == $doaction && ! empty( $_GET['gid'] ) ) {
 
         check_admin_referer( 'bp-groups-delete' );
@@ -372 +372 @@
     $doaction = ! empty( $_REQUEST['action'] ) ? $_REQUEST['action'] : '';
 
-    // Display the single activity edit screen
+    // Display the single group edit screen
     if ( 'edit' == $doaction && ! empty( $_GET['gid'] ) ) {
         bp_groups_admin_edit();
 
-    // Otherwise, display the Activity index screen
+    // Display the group deletion confirmation screen
+    } else if ( 'delete' == $doaction && ! empty( $_GET['gid'] ) ) {
+        bp_groups_admin_delete();
+
+    // Otherwise, display the groups index screen
     } else {
         bp_groups_admin_index();
@@ -391 +395 @@
     global $screen_layout_columns;
 
-    // @todo: Check if user is allowed to edit activity items
-    // if ( ! current_user_can( 'bp_edit_activity' ) )
     if ( ! is_super_admin() )
         die( '-1' );
@@ -502 +504 @@
 
 <?php
+}
+
+/**
+ * Display the Group delete confirmation screen
+ *
+ * We include a separate confirmation because group deletion is truly
+ * irreversible.
+ *
+ * @since (BuddyPress) 1.7
+ */
+function bp_groups_admin_delete() {
+
+    if ( ! is_super_admin() )
+        die( '-1' );
+
+    $group_ids = isset( $_REQUEST['gid'] ) ? $_REQUEST['gid'] : 0;
+    if ( ! is_array( $group_ids ) ) {
+        $group_ids = explode( ',', $group_ids );
+    }
+    $group_ids = wp_parse_id_list( $group_ids );
+    $groups    = groups_get_groups( array( 'include' => $group_ids ) );
+
+    // Create a new list of group ids, based on those that actually exist
+    $gids = array();
+    foreach ( $groups['groups'] as $group ) {
+        $gids[] = $group->id;
+    }
+
+    $base_url  = remove_query_arg( array( 'action', 'action2', 'paged', 's', '_wpnonce', 'gid' ), $_SERVER['REQUEST_URI'] );
+
+    ?>
+
+    <div class="wrap">
+        <?php screen_icon( 'buddypress-groups' ); ?>
+        <h2><?php _e( 'Delete Groups', 'buddypress' ) ?></h2>
+        <p><?php _e( 'You are about to delete the following groups:', 'buddypress' ) ?></p>
+
+        <ul class="bp-group-delete-list">
+        <?php foreach ( $groups['groups'] as $group ) : ?>
+            <li><?php echo esc_html( $group->name ) ?></li>
+        <?php endforeach; ?>
+        </ul>
+
+        <p><strong><?php _e( 'This action cannot be undone.', 'buddypress' ) ?></strong></p>
+
+        <a class="button-primary" href="<?php echo wp_nonce_url( add_query_arg( array( 'action' => 'do_delete', 'gid' => implode( ',', $gids ) ), $base_url ), 'bp-groups-delete' ) ?>"><?php _e( 'Delete Permanently', 'buddypress' ) ?></a>
+        <a class="button" href="<?php echo $base_url ?>"><?php _e( 'Cancel', 'buddypress' ) ?></a>
+    </div>
+
+    <?php
 }
 
@@ -754 +806 @@
         <div id="major-publishing-actions">
             <div id="delete-action">
-                <a onclick="javascript:return confirm('<?php echo esc_js( __( 'Are you sure?', 'buddypress' ) ) ?>');" class="submitdelete deletion" href="<?php echo wp_nonce_url( add_query_arg( 'action', 'delete', $base_url ), 'bp-groups-delete' ) ?>"><?php _e( 'Delete', 'buddypress' ) ?></a>
+                <a class="submitdelete deletion" href="<?php echo wp_nonce_url( add_query_arg( 'action', 'delete', $base_url ), 'bp-groups-delete' ) ?>"><?php _e( 'Delete Group', 'buddypress' ) ?></a>
             </div>
 
@@ -1057 +1109 @@
     function get_bulk_actions() {
         $actions = array();
-        $actions['bulk_delete'] = __( 'Delete Permanently', 'buddypress' );
+        $actions['delete'] = __( 'Delete', 'buddypress' );
 
         return apply_filters( 'bp_groups_list_table_get_bulk_actions', $actions );
@@ -1104 +1156 @@
      */
     function column_cb( $item ) {
-        printf( '<input type="checkbox" name="aid[]" value="%d" />', (int) $item['id'] );
+        printf( '<input type="checkbox" name="gid[]" value="%d" />', (int) $item['id'] );
     }
 
@@ -1129 +1181 @@
     function column_comment( $item ) {
 
-        // Preorder items: Visit | Edit | Delete Permanently
+        // Preorder items: Visit | Edit | Delete
         $actions = array(
             'visit'  => '',
@@ -1141 +1193 @@
         // Build actions URLs
         $base_url   = network_admin_url( 'admin.php?page=bp-groups&amp;gid=' . $item['id'] );
-        $spam_nonce = esc_html( '_wpnonce=' . wp_create_nonce( 'spam-groups_' . $item['id'] ) );
-
-        $delete_url = $base_url . "&amp;action=delete&amp;$spam_nonce";
+
+        $delete_url = wp_nonce_url( $base_url . "&amp;action=delete", 'bp-groups-delete' );
         $edit_url   = $base_url . '&amp;action=edit';
         $visit_url  = bp_get_group_permalink( $item_obj );
@@ -1156 +1207 @@
 
         // Delete
-        $actions['delete'] = sprintf( '<a href="%s" onclick="%s">%s</a>', $delete_url, "javascript:return confirm('" . esc_js( __( 'Are you sure?', 'buddypress' ) ) . "'); ", __( 'Delete Permanently', 'buddypress' ) );
+        $actions['delete'] = sprintf( '<a href="%s">%s</a>', $delete_url, __( 'Delete', 'buddypress' ) );
 
         // Other plugins can filter which actions are shown