Ticket #3026: 3026.patch

bp-core/admin/bp-core-admin.php

@@ -113 +113 @@
                 <?php if ( isset( $_POST['bp-admin'] ) ) : ?>
 
                         <div id="message" class="updated fade">
-                                <p><?php _e( 'Settings Saved', 'buddypress' ); ?></p>
+                                <p><?php _e( 'Settings saved.', 'buddypress' ); ?></p>
                         </div>
 
                 <?php endif; ?>
@@ -203 +203 @@
 <?php
 }
 
+/**
+ * Saves settings data submitted from the Components panel
+ *
+ * @package BuddyPress Core
+ * @since 1.3
+ * @uses bp_core_update_page_meta() To save bp_pages data
+ */
 function bp_core_admin_component_setup_handler() {
         global $wpdb, $bp;
 
@@ -210 +217 @@
                 if ( !check_admin_referer('bp-admin-component-setup') )
                         return false;
 
-                // Settings form submitted, now save the settings. First, set active components
+                // Check to see which components have just been disabled or enabled
+                // We do this first so we'll still have access to old component settings data
+                $previous_components    = get_site_option( 'bp-active-components' ) ? get_site_option( 'bp-active-components' ) : array();
+                $new_components         = isset( $_POST['bp_components'] ) ? $_POST['bp_components'] : array();
+
+                $activated      = array_diff_assoc( $new_components, $previous_components ); 
+                $deactivated    = array_diff_assoc( $previous_components, $new_components );
+
+                // Create the query arguments. 
+                // Translated component names are available now only for deactivated components
+                $deactivated_names = array();
+                foreach ( $deactivated as $component_id => $a ) {
+                        if ( !empty( $bp->{$component_id}->name ) )
+                                $deactivated_names[] = $bp->{$component_id}->name;
+                }
+                $deactivated_qs = urlencode( implode( ',', $deactivated_names ) );
+                
+                // We'll get the activated component names after the redirect
+                $activated_qs   = urlencode( implode( ',', array_keys( $activated ) ) );
+
+                // Now save the settings. First, set active components
                 if ( isset( $_POST['bp_components'] ) ) {
                         $bp->active_components = stripslashes_deep( $_POST['bp_components'] );
                         update_site_option( 'bp-active-components', $bp->active_components );
@@ -227 +254 @@
                         bp_core_update_page_meta( $directory_pages );
                 }
 
-                wp_redirect( network_admin_url( add_query_arg( array( 'page' => 'bp-general-settings', 'updated' => 'true' ), 'admin.php' ) ) );
+                $redirect = network_admin_url( add_query_arg( array( 'page' => 'bp-general-settings', 'updated' => 'true' ), 'admin.php' ) );
+
+                if ( $activated_qs )
+                        $redirect = add_query_arg( array( 'activated' => $activated_qs ), $redirect );
+                
+                if ( $deactivated_qs )
+                        $redirect = add_query_arg( array( 'deactivated' => $deactivated_qs ), $redirect );
+
+                wp_redirect( $redirect );
         }
 }
 add_action( 'admin_init', 'bp_core_admin_component_setup_handler' );
 
 /**
- * Renders the Component Setup admin panel.
+ * Renders the Components admin panel.
  *
  * @package BuddyPress Core
  * @since {@internal Unknown}}
  * @uses bp_core_admin_component_options()
  */
 function bp_core_admin_component_setup() {
+        global $bp;
+        
+        if ( isset( $_GET['activated'] ) ) {
+                $activated_component_ids = explode( ',', urldecode( $_GET['activated'] ) );
+                
+                // Translated component names for activated components are only available now,
+                // after activation
+                $activated_components = array();
+                foreach ( $activated_component_ids as $component_id ) {
+                        if ( !empty( $bp->{$component_id}->name ) )
+                                $activated_components[] = $bp->{$component_id}->name;
+                }
+        }
+
+        if ( isset( $_GET['deactivated'] ) ) {
+                // Deactivated component names have already come through the query string
+                $deactivated_components = explode( ',', urldecode( $_GET['deactivated'] ) );
+        }
 ?>
 
         <div class="wrap">
@@ -252 +305 @@
 
                         <div id="message" class="updated fade">
 
-                                <p><?php _e( 'Settings Saved', 'buddypress' ); ?></p>
+                                <p><?php _e( 'Settings saved.', 'buddypress' ); ?></p>
+                                
+                                <?php if ( !empty( $activated_components ) ) : ?>
+                                        <p><?php printf( __( '<strong>Newly activated components:</strong> You have just activated the following components: <em>%1$s</em>. Finish setting them up under Directory Pages below. Note: you may need to <a href="%2$s">create a page for each newly activated component</a>, and then return to this screen to complete setup.', 'buddypress' ), implode( ', ', $activated_components ), admin_url( 'post-new.php?post_type=page' ) ) ?></p>
+                                <?php endif ?>
+                                
+                                <?php if ( !empty( $deactivated_components ) ) : ?>
+                                        <p><?php printf( __( '<strong>Newly deactivated components:</strong> You have just deactivated the following components: <em>%1$s</em>. You may want to <a href="%2$s">delete or unpublish the old, unused directory pages</a>, so that they don\'t clutter your navigation.', 'buddypress' ), implode( ', ', $deactivated_components ), admin_url( 'edit.php?post_type=page' ) ) ?></p>
+                                <?php endif ?>
 
                         </div>