Changeset 11870

Timestamp:

02/28/2018 07:25:32 PM (7 years ago)

Author:

dcavins

Message:

Notices Admin List: Handle status change action links.

• Add support for activating, deactivating and deleting site wide notices via action links on the notices list.
• Use notice- and action-specific nonces for status change links.
• Change success/error parameters to allow more specific feedback messages.
• Reformat the code that creates the status change action links.
• Prepend the currently active notice with the tag "Active:".

Location:

trunk/src/bp-messages/classes

Files:

• class-bp-messages-notices-admin.php (modified) (3 diffs)
• class-bp-messages-notices-list-table.php (modified) (1 diff)

trunk/src/bp-messages/classes/class-bp-messages-notices-admin.php

@@ -115 +115 @@
      */
     public function admin_load() {
+        $redirect_to = false;
+
+        // Catch new notice saves.
         if ( ! empty( $_POST['bp_notice']['send'] ) ) {
 
@@ -125 +128 @@
 
             if ( messages_send_notice( $notice['subject'], $notice['content'] ) ) {
-                $redirect_to = add_query_arg( 'success', 1, $this->url );
+                $redirect_to = add_query_arg( 'success', 'create', $this->url );
 
             // Notice could not be sent.
             } else {
-                $redirect_to = add_query_arg( 'error', 1, $this->url );
+                $redirect_to = add_query_arg( 'error', 'create', $this->url );
             }
-
+        }
+
+        // Catch activation/deactivation/delete requests
+        if ( ! empty( $_GET['notice_id'] ) && ! empty( $_GET['notice_action'] ) ) {
+            $notice_id = absint( $_GET['notice_id'] );
+
+            check_admin_referer( 'messages-' . $_GET['notice_action'] . '-notice-' . $notice_id );
+
+            $success = false;
+            switch ( $_GET['notice_action'] ) {
+                case 'activate':
+                    $notice = new BP_Messages_Notice( $notice_id );
+                    $success = $notice->activate();
+                    break;
+                case 'deactivate':
+                    $notice = new BP_Messages_Notice( $notice_id );
+                    $success = $notice->deactivate();
+                    break;
+                case 'delete':
+                    $notice = new BP_Messages_Notice( $notice_id );
+                    $success = $notice->delete();
+                    break;          
+            }
+            if ( $success ) {
+                $redirect_to = add_query_arg( 'success', 'update', $this->url );
+
+            // Notice could not be updated.
+            } else {
+                $redirect_to = add_query_arg( 'error', 'update', $this->url );
+            }
+
+        }
+
+        if ( $redirect_to ) {
             wp_safe_redirect( $redirect_to );
             exit();
@@ -191 +227 @@
                     <p>
                         <?php
-                        if ( isset( $_GET['error'] ) ) :
-                            esc_html_e( 'Notice was not created. Please try again.', 'buddypress' );
-                        else :
-                            esc_html_e( 'Notice successfully created.', 'buddypress' );
-                        endif;
+                        if ( isset( $_GET['error'] ) ) {
+                            if ( 'create' === $_GET['error'] ) {
+                                esc_html_e( 'Notice was not created. Please try again.', 'buddypress' );
+                            } else {
+                                esc_html_e( 'Notice was not updated. Please try again.', 'buddypress' );                            
+                            }
+                         } else {
+                            if ( 'create' === $_GET['success'] ) {
+                                esc_html_e( 'Notice successfully created.', 'buddypress' );
+                            } else {
+                                esc_html_e( 'Notice successfully updated.', 'buddypress' );
+                            }
+                        }
                         ?>
                     </p>

trunk/src/bp-messages/classes/class-bp-messages-notices-list-table.php

@@ -110 +110 @@
     public function column_subject( $item ) {
         $actions = array(
-            'activate_deactivate' => '<a href="' . esc_url( wp_nonce_url( add_query_arg( array(
-                'page' => 'bp-notices',
-                'activate' => $item->id
-            ), bp_get_admin_url( 'users.php' ) ) ), 'messages_activate_notice' ) . '" data-bp-notice-id="' . $item->id . '" data-bp-action="activate">' . esc_html__( 'Activate Notice', 'buddypress' ) . '</a>',
-            'delete' => '<a href="' . esc_url( wp_nonce_url( add_query_arg( array(
-                'page' => 'bp-notices',
-                'delete' => $item->id
-            ), bp_get_admin_url( 'users.php' ) ) ), 'messages_delete_thread' ) . '" data-bp-notice-id="' . $item->id . '" data-bp-action="delete">' . esc_html__( 'Delete Notice', 'buddypress' ) . '</a>',
+            'activate_deactivate' => sprintf( '<a href="%s" data-bp-notice-id="%d" data-bp-action="activate">%s</a>', 
+                esc_url( wp_nonce_url( add_query_arg( array(
+                    'page'          => 'bp-notices',
+                    'notice_action' => 'activate',
+                    'notice_id'     => $item->id
+                ), bp_get_admin_url( 'users.php' ) ), 'messages-activate-notice-' . $item->id ) ),
+                (int) $item->id,
+                esc_html__( 'Activate Notice', 'buddypress' ) ),
+            'delete' => sprintf( '<a href="%s" data-bp-notice-id="%d" data-bp-action="delete">%s</a>', 
+                esc_url( wp_nonce_url( add_query_arg( array(
+                    'page'          => 'bp-notices',
+                    'notice_action' => 'delete',
+                    'notice_id'     => $item->id
+                ), bp_get_admin_url( 'users.php' ) ), 'messages-delete-notice-' . $item->id ) ),
+                (int) $item->id,
+                esc_html__( 'Delete Notice', 'buddypress' ) )
         );
 
         if ( ! empty( $item->is_active ) ) {
-            $actions['activate_deactivate'] = '<a href="' . esc_url( wp_nonce_url( add_query_arg( array(
-                'page' => 'bp-notices',
-                'deactivate' => $item->id
-            ), bp_get_admin_url( 'users.php' ) ) ), 'messages_deactivate_notice' ) . '" data-bp-notice-id="' . $item->id . '" data-bp-action="deactivate">' . esc_html__( 'Deactivate Notice', 'buddypress' ) . '</a>';
+            $item->subject = sprintf( _x( 'Active: %s', 'Tag prepended to active site-wide notice titles on WP Admin notices list table', 'buddypress' ), $item->subject );
+            $actions['activate_deactivate'] = sprintf( '<a href="%s" data-bp-notice-id="%d" data-bp-action="deactivate">%s</a>', 
+                esc_url( wp_nonce_url( add_query_arg( array(
+                    'page'          => 'bp-notices',
+                    'notice_action' => 'deactivate',
+                    'notice_id'     => $item->id
+                ), bp_get_admin_url( 'users.php' ) ), 'messages-deactivate-notice-' . $item->id ) ),
+                (int) $item->id,
+                esc_html__( 'Deactivate Notice', 'buddypress' ) );
         }