Changeset 6558

Timestamp:

12/04/2012 12:16:42 PM (12 years ago)

Author:

johnjamesjacoby

Message:

See #4671:

• Round one changes...
• Remove the cumbersome update wizard and associated CSS and images.
• Copy "About" and "Credits" pages from bbPress.
• First pass at default components array.
• Deprecate some functions, consolidate others.
• Introduce bp-core/admin/bp-core-actions.php to handle admin sub-actions.
• More to do here (update script, testing, css/images, etc...)

Location:

trunk

Files:

• bp-core/admin/bp-core-actions.php (added)
• bp-core/admin/bp-core-components.php (modified) (7 diffs)
• bp-core/admin/bp-core-functions.php (modified) (4 diffs)
• bp-core/admin/bp-core-slugs.php (modified) (2 diffs)
• bp-core/admin/bp-core-update.php (modified) (1 diff)
• bp-core/admin/css/common.css (modified) (2 diffs)
• bp-core/admin/css/wizard.css (deleted)
• bp-core/admin/css/wizard.min.css (deleted)
• bp-core/admin/images/completed.gif (deleted)
• bp-core/admin/images/installed.gif (deleted)
• bp-core/admin/js (deleted)
• bp-core/bp-core-admin.php (modified) (9 diffs)
• bp-core/bp-core-cssjs.php (modified) (2 diffs)
• bp-core/bp-core-functions.php (modified) (1 diff)
• bp-core/deprecated/1.7.php (modified) (2 diffs)
• bp-loader.php (modified) (2 diffs)

trunk/bp-core/admin/bp-core-components.php

@@ -44 +44 @@
  * Creates reusable markup for component setup on the Components and Pages dashboard panel.
  *
- * This markup has been abstracted so that it can be used both during the setup wizard as well as
- * when BP has been fully installed.
- *
  * @package BuddyPress
  * @since BuddyPress (1.6)
@@ -59 +56 @@
     // Declare local variables
     $deactivated_components = array();
-    $required_components    = array();
     $active_components      = apply_filters( 'bp_active_components', bp_get_option( 'bp-active-components' ) );
+
+    // The default components (if none are previously selected)
+    $default_components = array(
+        'xprofile' => array(
+            'title'       => __( 'Extended Profiles', 'buddypress' ),
+            'description' => __( 'Customize your community with fully editable profile fields that allow your users to describe themselves.', 'buddypress' )
+        )
+    );
+
+    // Required components
+    $required_components = array(
+        'core' => array(
+            'title'       => __( 'BuddyPress Core', 'buddypress' ),
+            'description' => __( 'It&#8216;s what makes <del>time travel</del> BuddyPress possible!', 'buddypress' )
+        ),
+        'members' => array(
+            'title'       => __( 'Community Members', 'buddypress' ),
+            'description' => __( 'Everything in a BuddyPress community revolves around its members.', 'buddypress' )
+        ),
+    );
 
     // Optional core components
@@ -103 +119 @@
     }
 
-    // Required components
-    $required_components = array(
-        'core' => array(
-            'title'       => __( 'BuddyPress Core', 'buddypress' ),
-            'description' => __( 'It&#8216;s what makes <del>time travel</del> BuddyPress possible!', 'buddypress' )
-        ),
-        'members' => array(
-            'title'       => __( 'Community Members', 'buddypress' ),
-            'description' => __( 'Everything in a BuddyPress community revolves around its members.', 'buddypress' )
-        ),
-    );
-
     // Merge optional and required together
     $all_components = $optional_components + $required_components;
@@ -139 +143 @@
     }
 
-    // On new install, set all components to be active by default
-    if ( empty( $active_components ) && ( bp_get_maintenance_mode() == 'install' ) ) {
-        $active_components = $optional_components;
+    // On new install, set active components to default
+    if ( empty( $active_components ) ) {
+        $active_components = $default_components;
     }
 
@@ -172 +176 @@
             $current_components = $required_components;
             break;
-    }
-    
-    if ( ! bp_get_maintenance_mode() ) : ?>
+    } ?>
 
     <ul class="subsubsub">
@@ -182 +184 @@
         <li><a href="<?php echo add_query_arg( array( 'page' => 'bp-components', 'action' => 'mustuse'  ), bp_get_admin_url( $page ) ); ?>" <?php if ( $action === 'mustuse'  ) : ?>class="current"<?php endif; ?>><?php printf( _n(  'Must-Use <span class="count">(%s)</span>', 'Must-Use <span class="count">(%s)</span>', count( $required_components ), 'buddypress' ), number_format_i18n( count( $required_components ) ) ); ?></a></li>
     </ul>
-
-    <?php endif; ?>
 
     <table class="widefat fixed plugins" cellspacing="0">
@@ -291 +291 @@
     }
 }
-add_action( 'admin_init', 'bp_core_admin_components_settings_handler' );
+add_action( 'bp_admin_init', 'bp_core_admin_components_settings_handler' );

trunk/bp-core/admin/bp-core-functions.php

@@ -37 +37 @@
 function bp_core_admin_backpat_menu() {
     global $_parent_pages, $_registered_pages, $submenu;
-
-    // Don't do anything if a BP upgrade is in progress, or if the bp-wizard is in progress.
-    if ( defined( 'BP_IS_UPGRADE' ) && BP_IS_UPGRADE || empty( $submenu['bp-general-settings'] ) )
-        return;
 
     /**
@@ -47 +43 @@
      * 'bp-general-settings' menu, it will only contain one item. Kill it.
      */
-    if ( 1 == count( $submenu['bp-general-settings'] ) ) {
-
-        // This removes the top-level menu
-        remove_submenu_page( 'bp-general-settings', 'bp-general-settings' );
-        remove_menu_page( 'bp-general-settings' );
-
-        // These stop people accessing the URL directly
-        unset( $_parent_pages['bp-general-settings'] );
-        unset( $_registered_pages['toplevel_page_bp-general-settings'] );
-    }
+    if ( 1 != count( $submenu['bp-general-settings'] ) )
+        remove;
+
+    // This removes the top-level menu
+    remove_submenu_page( 'bp-general-settings', 'bp-general-settings' );
+    remove_menu_page( 'bp-general-settings' );
+
+    // These stop people accessing the URL directly
+    unset( $_parent_pages['bp-general-settings'] );
+    unset( $_registered_pages['toplevel_page_bp-general-settings'] );
 }
 add_action( bp_core_admin_hook(), 'bp_core_admin_backpat_menu', 999 );
-
-/**
- * Tweak the Settings subnav menu to show only one BuddyPress menu item (Settings > BuddyPress).
- *
- * @since BuddyPress (1.6)
- */
-function bp_core_modify_admin_menu() {
-    $page  = bp_core_do_network_admin()  ? 'settings.php' : 'options-general.php';
-
-    remove_submenu_page( $page, 'bb-forums-setup' );
-    remove_submenu_page( $page, 'bp-page-settings' );
-    remove_submenu_page( $page, 'bp-settings'     );
-}
-add_action( 'admin_head', 'bp_core_modify_admin_menu', 999 );
 
 /**
@@ -180 +162 @@
 
 /**
- * Verify that some BP prerequisites are set up properly, and notify the admin if not
- *
- * On every Dashboard page, this function checks the following:
- *   - that pretty permalinks are enabled
- *   - that a BP-compatible theme is activated
- *   - that every BP component that needs a WP page for a directory has one
- *   - that no WP page has multiple BP components associated with it
- * The administrator will be shown a notice for each check that fails.
- *
- * @package BuddyPress Core
- */
-function bp_core_activation_notice() {
-    global $wp_rewrite, $wpdb;
-
-    $bp = buddypress();
-
-    // Only the super admin gets warnings
-    if ( !bp_current_user_can( 'bp_moderate' ) )
-        return;
-
-    // On multisite installs, don't load on a non-root blog, unless do_network_admin is
-    // overridden
-    if ( is_multisite() && bp_core_do_network_admin() && !bp_is_root_blog() )
-        return;
-
-    // Don't show these messages during setup or upgrade
-    if ( !empty( $bp->maintenance_mode ) )
-        return;
-
-    /**
-     * Check to make sure that the blog setup routine has run. This can't happen during the
-     * wizard because of the order which the components are loaded. We check for multisite here
-     * on the off chance that someone has activated the blogs component and then disabled MS
-     */
-    if ( bp_is_active( 'blogs' ) ) {
-        $count = $wpdb->get_var( "SELECT COUNT(*) FROM {$bp->blogs->table_name}" );
-
-        if ( empty( $count ) ) {
-            bp_blogs_record_existing_blogs();
-        }
-    }
-
-    /**
-     * Are pretty permalinks enabled?
-     */
-    if ( isset( $_POST['permalink_structure'] ) )
-        return false;
-
-    if ( empty( $wp_rewrite->permalink_structure ) ) {
-        bp_core_add_admin_notice( sprintf( __( '<strong>BuddyPress is almost ready</strong>. You must <a href="%s">update your permalink structure</a> to something other than the default for it to work.', 'buddypress' ), admin_url( 'options-permalink.php' ) ) );
-    }
-
-    /**
-     * Check for orphaned BP components (BP component is enabled, no WP page exists)
-     */
-    $orphaned_components = array();
-    $wp_page_components  = array();
-
-    // Only components with 'has_directory' require a WP page to function
-    foreach( array_keys( $bp->loaded_components ) as $component_id ) {
-        if ( !empty( $bp->{$component_id}->has_directory ) ) {
-            $wp_page_components[] = array(
-                'id'   => $component_id,
-                'name' => isset( $bp->{$component_id}->name ) ? $bp->{$component_id}->name : ucwords( $bp->{$component_id}->id )
-            );
-        }
-    }
-
-    // Activate and Register are special cases. They are not components but they need WP pages.
-    // If user registration is disabled, we can skip this step.
-    if ( bp_get_signup_allowed() ) {
-        $wp_page_components[] = array(
-            'id'   => 'activate',
-            'name' => __( 'Activate', 'buddypress' )
-        );
-
-        $wp_page_components[] = array(
-            'id'   => 'register',
-            'name' => __( 'Register', 'buddypress' )
-        );
-    }
-
-    foreach( $wp_page_components as $component ) {
-        if ( !isset( $bp->pages->{$component['id']} ) ) {
-            $orphaned_components[] = $component['name'];
-        }
-    }
-
-    // Special case: If the Forums component is orphaned, but the bbPress 1.x installation is
-    // not correctly set up, don't show a nag. (In these cases, it's probably the case that the
-    // user is using bbPress 2.x; see https://buddypress.trac.wordpress.org/ticket/4292
-    if ( isset( $bp->forums->name ) && in_array( $bp->forums->name, $orphaned_components ) && !bp_forums_is_installed_correctly() ) {
-        $forum_key = array_search( $bp->forums->name, $orphaned_components );
-        unset( $orphaned_components[$forum_key] );
-        $orphaned_components = array_values( $orphaned_components );
-    }
-
-    if ( !empty( $orphaned_components ) ) {
-        $admin_url = bp_get_admin_url( add_query_arg( array( 'page' => 'bp-page-settings' ), 'admin.php' ) );
-        $notice    = sprintf( __( 'The following active BuddyPress Components do not have associated WordPress Pages: %2$s. <a href="%1$s" class="button-secondary">Repair</a>', 'buddypress' ), $admin_url, '<strong>' . implode( '</strong>, <strong>', $orphaned_components ) . '</strong>' );
-
-        bp_core_add_admin_notice( $notice );
-    }
-
-    /**
-     * BP components cannot share a single WP page. Check for duplicate assignments, and post
-     * a message if found.
-     */
-    $dupe_names = array();
-    $page_ids   = (array)bp_core_get_directory_page_ids();
-    $dupes      = array_diff_assoc( $page_ids, array_unique( $page_ids ) );
-
-    if ( !empty( $dupes ) ) {
-        foreach( array_keys( $dupes ) as $dupe_component ) {
-            $dupe_names[] = $bp->pages->{$dupe_component}->title;
-        }
-
-        // Make sure that there are no duplicate duplicates :)
-        $dupe_names = array_unique( $dupe_names );
-    }
-
-    // If there are duplicates, post a message about them
-    if ( !empty( $dupe_names ) ) {
-        $admin_url = bp_get_admin_url( add_query_arg( array( 'page' => 'bp-page-settings' ), 'admin.php' ) );
-        $notice    = sprintf( __( 'Each BuddyPress Component needs its own WordPress page. The following WordPress Pages have more than one component associated with them: %2$s. <a href="%1$s" class="button-secondary">Repair</a>', 'buddypress' ), $admin_url, '<strong>' . implode( '</strong>, <strong>', $dupe_names ) . '</strong>' );
-
-        bp_core_add_admin_notice( $notice );
-    }
-}
-add_action( 'admin_init', 'bp_core_activation_notice' );
-
-/**
- * Add an extra update message to the update plugin notification.
- *
- * @package BuddyPress Core
- */
-function bp_core_update_message() {
-    echo '<p style="color: red; margin: 3px 0 0 0; border-top: 1px solid #ddd; padding-top: 3px">' . __( 'IMPORTANT: <a href="http://codex.buddypress.org/buddypress-site-administration/upgrading-buddypress/">Read this before attempting to update BuddyPress</a>', 'buddypress' ) . '</p>';
-}
-add_action( 'in_plugin_update_message-buddypress/bp-loader.php', 'bp_core_update_message' );
+ * Redirect user to bbPress's What's New page on activation
+ *
+ * @since bbPress (r4389)
+ *
+ * @internal Used internally to redirect bbPress to the about page on activation
+ *
+ * @uses get_transient() To see if transient to redirect exists
+ * @uses delete_transient() To delete the transient if it exists
+ * @uses is_network_admin() To bail if being network activated
+ * @uses wp_safe_redirect() To redirect
+ * @uses add_query_arg() To help build the URL to redirect to
+ * @uses admin_url() To get the admin URL to index.php
+ *
+ * @return If no transient, or in network admin, or is bulk activation
+ */
+function bp_do_activation_redirect() {
+
+    // Bail if no activation redirect
+    if ( ! get_transient( '_bp_activation_redirect' ) )
+        return;
+
+    // Delete the redirect transient
+    delete_transient( '_bp_activation_redirect' );
+
+    // Bail if activating from network, or bulk
+    if ( is_network_admin() || isset( $_GET['activate-multi'] ) )
+        return;
+
+    // Redirect to bbPress about page
+    wp_safe_redirect( add_query_arg( array( 'page' => 'bp-about' ), admin_url( 'index.php' ) ) );
+}
 
 /** UI/Styling ****************************************************************/
@@ -373 +246 @@
     do_action( 'bp_admin_tabs' );
 }
-
-/**
- * Add the confirmation inline javascript in the WP admin dashboard.
- *
- * Only add it if we're not in BP maintenance mode.
- *
- * @since BuddyPress (1.7)
- * @uses bp_get_maintenance_mode() To see if we're in BP maintenance mode.
- * @uses bp_core_confirmation_js() To output our inline JS.
- */
-function bp_core_admin_add_confirm_js() { 
-    if ( ! bp_get_maintenance_mode() )
-        bp_core_confirmation_js();
-} 
-add_action( 'admin_head', 'bp_core_admin_add_confirm_js' ); 

trunk/bp-core/admin/bp-core-slugs.php

@@ -43 +43 @@
 /**
  * Creates reusable markup for page setup on the Components and Pages dashboard panel.
- *
- * This markup has been abstracted so that it can be used both during the setup wizard as well as
- * when BP has been fully installed.
  *
  * @package BuddyPress
@@ -224 +221 @@
     }
 }
-add_action( 'admin_init', 'bp_core_admin_slugs_setup_handler' );
+add_action( 'bp_admin_init', 'bp_core_admin_slugs_setup_handler' );

trunk/bp-core/admin/bp-core-update.php

@@ -4 +4 @@
 if ( !defined( 'ABSPATH' ) ) exit;
 
-class BP_Core_Setup_Wizard {
-
-    /**
-     * @var int The current step of the updater
-     */
-    var $current_step;
-
-    /**
-     *
-     * @var array The total steps to be completed
-     */
-    var $steps;
-
-    /** Methods ***************************************************************/
-
-    function __construct() {
-
-        // Set/reset the wizard cookie
-        setcookie( 'bp-wizard-step', 0, time() + 60 * 60 * 24, COOKIEPATH );
-        $_COOKIE['bp-wizard-step'] = 0;
-
-        // Call the save method that will save data and modify $current_step
-        if ( isset( $_POST['save'] ) )
-            $this->save( $_POST['save'] );
-
-        // Build the steps needed for update or new installations
-        $this->steps = $this->add_steps();
-    }
-
-    function current_step() {
-        if ( isset( $_POST['step'] ) ) {
-            $current_step = (int) $_POST['step'] + 1;
-        } else {
-            if ( !empty( $_COOKIE['bp-wizard-step'] ) ) {
-                $current_step = $_COOKIE['bp-wizard-step'];
-            } else {
-                $current_step = 0;
-            }
-        }
-
-        return $current_step;
-    }
-
-    function add_steps() {
-
-        // Setup wizard steps
-        $steps = array();
-
-        // This is a first time installation
-        if ( bp_get_maintenance_mode() == 'install' ) {
-            $steps = array(
-                __( 'Components', 'buddypress' ),
-                __( 'Pages',      'buddypress' ),
-                __( 'Permalinks', 'buddypress' ),
-                __( 'Finish',     'buddypress' )
-            );
-
-        // This is an update to an existing install
-        } else {
-
-            // New for BP 1.5
-            if ( bp_get_db_version_raw() < 1801 || !bp_core_get_directory_page_ids() ) {
-                $steps[] = __( 'Components', 'buddypress' );
-                $steps[] = __( 'Pages',      'buddypress' );
-            }
-
-            // New for BP 1.6
-            if ( bp_get_db_version_raw() < 5222 && !defined( 'BP_USE_WP_ADMIN_BAR' ) )
-                $steps[] = __( 'Toolbar', 'buddypress' );
-
-            if ( bp_get_db_version_raw() < (int) bp_get_db_version() )
-                $steps[] = __( 'Database Update', 'buddypress' );
-
-            $steps[] = __( 'Finish', 'buddypress' );
-        }
-
-        return $steps;
-    }
-
-    function save( $step_name ) {
-
-        // Bail if user is not capable of being here
-        if ( ! bp_current_user_can( 'activate_plugins' ) )
-            wp_die( 'Uh... No.' );
-
-        // Save any posted values
-        switch ( $step_name ) {
-            case 'db_update':
-                $result = $this->step_db_update_save();
-                break;
-
-            case 'components':
-                $result = $this->step_components_save();
-                break;
-
-            case 'pages':
-                $result = $this->step_pages_save();
-                break;
-
-            case 'permalinks':
-                $result = $this->step_permalinks_save();
-                break;
-
-            case 'admin_bar':
-                $result = $this->step_admin_bar_save();
-                break;
-
-            case 'finish':
-            default:
-                $result = $this->step_finish_save();
-                break;
-        }
-
-        if ( 'finish' != $step_name )
-            setcookie( 'bp-wizard-step', (int) $this->current_step(), time() + 60 * 60 * 24, COOKIEPATH );
-    }
-
-    function html() {
-
-        // Bail if user is not capable of being here
-        if ( ! bp_current_user_can( 'activate_plugins' ) )
-            wp_die( 'You do not have sufficient permissions to access this page.' );
-        ?>
-
-        <div class="wrap" id="bp-wizard">
-
-            <?php screen_icon( 'buddypress' ); ?>
-
-            <h2>
-                <?php
-                if ( 'update' == bp_get_maintenance_mode() )
-                    _e( 'BuddyPress Update', 'buddypress' );
-                else
-                    _e( 'BuddyPress Setup', 'buddypress' );
-                ?>
-            </h2>
-
-            <?php
-                do_action( 'bp_admin_notices' );
-
-                $step_count  = count( $this->steps ) - 1;
-                $wiz_or_set  = $this->current_step() >= $step_count ? 'bp-components' : 'bp-wizard';
-                $form_action = bp_core_do_network_admin() ? network_admin_url( add_query_arg( array( 'page' => $wiz_or_set ), 'admin.php' ) ) : admin_url( add_query_arg( array( 'page' => $wiz_or_set ), 'index.php' ) );
-            ?>
-
-            <form action="<?php echo $form_action; ?>" method="post" id="bp-wizard-form">
-                <div id="bp-wizard-nav">
-                    <ol>
-
-                        <?php foreach( (array) $this->steps as $i => $name ) : ?>
-
-                            <li<?php if ( $this->current_step() == $i ) : ?> class="current"<?php endif; ?>>
-                                <?php if ( $this->current_step() > $i ) : ?>
-
-                                    <span class="complete">&nbsp;</span>
-
-                                <?php else :
-
-                                    echo $i + 1 . '. ';
-
-                                endif;
-
-                                echo esc_attr( $name ) ?>
-
-                            </li>
-
-                        <?php endforeach; ?>
-
-                    </ol>
-
-                    <?php if ( __( 'Finish', 'buddypress' ) == $this->steps[$this->current_step()] ) : ?>
-
-                        <div class="prev-next submit clear">
-                            <input type="submit" value="<?php _e( 'Finish &amp; Activate', 'buddypress' ); ?>" name="submit" />
-                        </div>
-
-                    <?php else : ?>
-
-                        <div class="prev-next submit clear">
-                            <input type="submit" value="<?php _e( 'Save &amp; Next', 'buddypress' ); ?>" name="submit" />
-                        </div>
-
-                    <?php endif; ?>
-
-                </div>
-
-                <div id="bp-wizard-content">
-
-                    <?php switch ( $this->steps[$this->current_step()] ) {
-                        case __( 'Database Update', 'buddypress') :
-                            $this->step_db_update();
-                            break;
-
-                        case __( 'Components', 'buddypress') :
-                            $this->step_components();
-                            break;
-
-                        case __( 'Pages', 'buddypress') :
-                            $this->step_pages();
-                            break;
-
-                        case __( 'Permalinks', 'buddypress') :
-                            $this->step_permalinks();
-                            break;
-
-                        case __( 'Toolbar', 'buddypress' ) :
-                            $this->step_admin_bar();
-                            break;
-
-                        case __( 'Finish', 'buddypress') :
-                            $this->step_finish();
-                            break;
-                    } ?>
-
-                </div>
-            </form>
-        </div>
-
-    <?php
-    }
-
-    /** Screen methods ********************************************************/
-
-    function step_db_update() {
-    ?>
-
-        <p><?php _e( 'To complete the update, a few changes need to be made to your database. These changes are not destructive and will not remove or change any existing settings.', 'buddypress' ); ?></p>
-
-        <div class="submit clear">
-            <input type="hidden" name="save" value="db_update" />
-            <input type="hidden" name="step" value="<?php echo esc_attr( $this->current_step() ); ?>" />
-
-            <?php wp_nonce_field( 'bpwizard_db_update' ) ?>
-
-        </div>
-
-    <?php
-    }
-
-    function step_components() {
-
-        if ( !function_exists( 'bp_core_admin_components_options' ) )
-            require ( BP_PLUGIN_DIR . 'bp-core/admin/bp-core-components.php' );
-
-        bp_core_admin_components_options(); ?>
-
-        <div class="submit clear">
-            <input type="hidden" name="save" value="components" />
-            <input type="hidden" name="step" value="<?php echo esc_attr( $this->current_step() ); ?>" />
-
-            <?php wp_nonce_field( 'bpwizard_components' ); ?>
-
-        </div>
-
-    <?php
-    }
-
-    function step_pages() {
-        global $wpdb;
-
-        // Get BuddyPress once in this scope
-        $bp = buddypress();
-
-        // Make sure that page info is pulled from bp_get_root_blog_id() (except when in
-        // multisite mode)
-        if ( !empty( $wpdb->blogid ) && ( $wpdb->blogid != bp_get_root_blog_id() ) && ( !defined( 'BP_ENABLE_MULTIBLOG' ) ) )
-            switch_to_blog( bp_get_root_blog_id() );
-
-        $existing_pages = bp_core_get_directory_page_ids();
-
-        // Provide empty indexes to avoid PHP errors with wp_dropdown_pages()
-        $indexes = array( 'members', 'activity', 'groups', 'forums', 'blogs', 'register', 'activate' );
-        foreach ( $indexes as $index ) {
-            if ( !isset( $existing_pages[$index] ) ) {
-                $existing_pages[$index] = '';
-            }
-        }
-
-        if ( !empty( $existing_pages['blogs'] ) )
-            $existing_blog_page = '&selected=' . $existing_pages['blogs'];
-        else
-            $existing_blog_page = '';
-
-        // Get active components
-        $active_components = apply_filters( 'bp_active_components', bp_get_option( 'bp-active-components' ) );
-
-        // Check for defined slugs
-        $members_slug    = !empty( $bp->members->slug    ) ? $bp->members->slug    : __( 'members',  'buddypress' );
-
-        // Groups
-        $groups_slug     = !empty( $bp->groups->slug     ) ? $bp->groups->slug     : __( 'groups',   'buddypress' );
-
-        // Activity
-        $activity_slug   = !empty( $bp->activity->slug   ) ? $bp->activity->slug   : __( 'activity', 'buddypress' );
-
-        // Forums
-        $forums_slug     = !empty( $bp->forums->slug     ) ? $bp->forums->slug     : __( 'forums',   'buddypress' );
-
-        // Blogs
-        $blogs_slug      = !empty( $bp->blogs->slug      ) ? $bp->blogs->slug      : __( 'blogs',    'buddypress' );
-
-        // Register
-        $register_slug   = !empty( $bp->register->slug   ) ? $bp->register->slug   : __( 'register', 'buddypress' );
-
-        // Activation
-        $activation_slug = !empty( $bp->activation->slug ) ? $bp->activation->slug : __( 'activate', 'buddypress' );
-
-        ?>
-
-        <script type="text/javascript">
-            jQuery( document ).ready( function() {
-                jQuery( 'select' ).change( function() {
-                    jQuery( this ).siblings( 'input[type=radio]' ).click();
-                });
-            });
-        </script>
-
-        <?php if ( bp_get_maintenance_mode() ) : ?>
-
-            <p><?php _e( 'BuddyPress uses WordPress pages to display directories. This allows you to easily change their titles and relocate them.', 'buddypress' ); ?></p>
-            <p><?php _e( 'Choose an existing page, have one auto-created, or create them manually and come back here once you are finished.', 'buddypress' ); ?></p>
-
-        <?php endif; ?>
-
-        <table class="form-table">
-
-            <tr valign="top">
-                <th scope="row">
-                    <h5><?php _e( 'Members', 'buddypress' ); ?></h5>
-                    <p><?php _e( 'Displays member profiles, and a directory of all site members.', 'buddypress' ); ?></p>
-                </th>
-                <td>
-                    <p><label><input type="radio" name="bp_pages[members]" <?php checked( empty( $existing_pages['members'] ) ); ?>  value="<?php echo $members_slug; ?>" /> <?php _e( 'Automatically create a page at:', 'buddypress' ) ?> <?php echo home_url( $members_slug ); ?>/</label></p>
-
-                    <?php if ( $members_page_dropdown = wp_dropdown_pages( "name=bp-members-page&echo=0&selected={$existing_pages['members']}&show_option_none=" . __( '- Select -', 'buddypress' ) ) ) : ?>
-
-                        <p><label><input type="radio" name="bp_pages[members]" <?php checked( !empty( $existing_pages['members'] ) ); ?> value="<?php echo get_post_field( 'post_name', $existing_pages['members'] ); ?>" /> <?php _e( 'Use an existing page:', 'buddypress' ); ?> <?php echo $members_page_dropdown ?></label></p>
-
-                    <?php endif ?>
-                </td>
-            </tr>
-
-            <?php if ( isset( $active_components['groups'] ) ) : ?>
-
-                <tr valign="top">
-                    <th scope="row">
-                        <h5><?php _e( 'Groups', 'buddypress' ); ?></h5>
-                        <p><?php _e( 'Displays individual groups as well as a directory of groups.', 'buddypress' ); ?></p>
-                    </th>
-                    <td>
-                        <p><label><input type="radio" name="bp_pages[groups]" <?php checked( empty( $existing_pages['groups'] ) ); ?>  value="<?php echo $groups_slug; ?>" /> <?php _e( 'Automatically create a page at:', 'buddypress' ); ?> <?php echo home_url( $groups_slug ); ?>/</label></p>
-
-                        <?php if ( $groups_page_dropdown = wp_dropdown_pages( "name=bp-groups-page&echo=0&selected={$existing_pages['groups']}&show_option_none=" . __( '- Select -', 'buddypress' ) ) ) : ?>
-                            <p><label><input type="radio" name="bp_pages[groups]" <?php checked( !empty( $existing_pages['groups'] ) ); ?> value="<?php echo get_post_field( 'post_name', $existing_pages['groups'] ); ?>" /> <?php _e( 'Use an existing page:', 'buddypress' ); ?> <?php echo $groups_page_dropdown ?></label></p>
-                        <?php endif ?>
-                    </td>
-                </tr>
-
-            <?php endif; ?>
-
-            <?php /* The Blogs component only needs a directory page when Multisite is enabled */ ?>
-            <?php if ( is_multisite() && isset( $active_components['blogs'] ) ) : ?>
-
-                <tr valign="top">
-                    <th scope="row">
-                        <h5><?php _e( 'Blogs', 'buddypress' ); ?></h5>
-                        <p><?php _e( 'Displays a directory of the blogs in your network.', 'buddypress' ); ?></p>
-                    </th>
-                    <td>
-                        <p><label><input type="radio" name="bp_pages[blogs]" <?php checked( empty( $existing_pages['blogs'] ) ); ?>  value="<?php echo $blogs_slug; ?>" /> <?php _e( 'Automatically create a page at:', 'buddypress' ); ?> <?php echo home_url( $blogs_slug ); ?>/</label></p>
-
-                        <?php if ( $blogs_page_dropdown = wp_dropdown_pages( "name=bp-blogs-page&echo=0&selected={$existing_pages['blogs']}&show_option_none=" . __( '- Select -', 'buddypress' ) ) ) : ?>
-                            <p><label><input type="radio" name="bp_pages[blogs]" <?php checked( !empty( $existing_pages['blogs'] ) ); ?> value="<?php echo get_post_field( 'post_name', $existing_pages['blogs'] ); ?>" /> <?php _e( 'Use an existing page:', 'buddypress' ); ?> <?php echo $blogs_page_dropdown ?></label></p>
-                        <?php endif ?>
-                    </td>
-                </tr>
-
-            <?php endif; ?>
-
-            <?php if ( isset( $active_components['activity'] ) ) : ?>
-
-                <tr valign="top">
-                    <th scope="row">
-                        <h5><?php _e( 'Activity', 'buddypress' ); ?></h5>
-                        <p><?php _e( "Displays the activity for the entire site, a member's friends, groups and @mentions.", 'buddypress' ); ?></p>
-                    </th>
-                    <td>
-                        <p><label><input type="radio" name="bp_pages[activity]" <?php checked( empty( $existing_pages['activity'] ) ); ?>  value="<?php echo $activity_slug; ?>" /> <?php _e( 'Automatically create a page at:', 'buddypress' ); ?> <?php echo home_url( $activity_slug ); ?>/</label></p>
-
-                        <?php if ( $activity_page_dropdown = wp_dropdown_pages( "name=bp-activity-page&echo=0&selected={$existing_pages['activity']}&show_option_none=" . __( '- Select -', 'buddypress' ) ) ) : ?>
-                            <p><label><input type="radio" name="bp_pages[activity]" <?php checked( !empty( $existing_pages['activity'] ) ); ?> value="<?php echo get_post_field( 'post_name', $existing_pages['activity'] ); ?>" /> <?php _e( 'Use an existing page:', 'buddypress' ); ?> <?php echo $activity_page_dropdown ?></label></p>
-                        <?php endif ?>
-                    </td>
-                </tr>
-
-            <?php endif; ?>
-
-            <?php if ( isset( $active_components['forums'] ) ) : ?>
-
-                <tr valign="top">
-                    <th scope="row">
-                        <h5><?php _e( 'Forums', 'buddypress' ); ?></h5>
-                        <p><?php _e( 'Displays a directory of public forum topics.', 'buddypress' ); ?></p>
-                    </th>
-                    <td>
-                        <p><label><input type="radio" name="bp_pages[forums]" <?php checked( empty( $existing_pages['forums'] ) ); ?>  value="<?php echo $forums_slug; ?>" /> <?php _e( 'Automatically create a page at:', 'buddypress' ); ?> <?php echo home_url( $forums_slug ); ?>/</label></p>
-
-                        <?php if ( $forums_page_dropdown = wp_dropdown_pages( "name=bp-forums-page&echo=0&selected={$existing_pages['forums']}&show_option_none=" . __( '- Select -', 'buddypress' ) ) ) : ?>
-                            <p><label><input type="radio" name="bp_pages[forums]" <?php checked( !empty( $existing_pages['forums'] ) ); ?> value="<?php echo get_post_field( 'post_name', $existing_pages['forums'] ); ?>" /> <?php _e( 'Use an existing page:', 'buddypress' ); ?> <?php echo $forums_page_dropdown ?></label></p>
-                        <?php endif ?>
-                    </td>
-                </tr>
-
-            <?php endif; ?>
-
-            <tr valign="top">
-                <th scope="row">
-                    <h5><?php _e( 'Register', 'buddypress' ); ?></h5>
-                    <p><?php _e( 'Displays a site registration page where users can create new accounts.', 'buddypress' ); ?></p>
-                </th>
-                <td>
-                    <p><label><input type="radio" name="bp_pages[register]" <?php checked( empty( $existing_pages['register'] ) ); ?>  value="<?php echo $register_slug; ?>" /> <?php _e( 'Automatically create a page at:', 'buddypress' ) ?> <?php echo home_url( $register_slug ) ?>/</label></p>
-
-                    <?php if ( $register_page_dropdown = wp_dropdown_pages( "name=bp-register-page&echo=0&selected={$existing_pages['register']}&show_option_none=" . __( '- Select -', 'buddypress' ) ) ) : ?>
-                        <p><label><input type="radio" name="bp_pages[register]" <?php checked( !empty( $existing_pages['register'] ) ); ?> value="<?php echo get_post_field( 'post_name', $existing_pages['register'] ); ?>" /> <?php _e( 'Use an existing page:', 'buddypress' ); ?> <?php echo $register_page_dropdown ?></label></p>
-                    <?php endif ?>
-                </td>
-            </tr>
-
-            <tr valign="top">
-                <th scope="row">
-                    <h5><?php _e( 'Activate', 'buddypress' ); ?></h5>
-                    <p><?php _e( 'The page users will visit to activate their account once they have registered.', 'buddypress' ); ?></p>
-                </th>
-                <td>
-                    <p><label><input type="radio" name="bp_pages[activate]" <?php checked( empty( $existing_pages['activate'] ) ); ?>  value="<?php echo $activation_slug; ?>" /> <?php _e( 'Automatically create a page at:', 'buddypress' ); ?> <?php echo home_url( $activation_slug ); ?>/</label></p>
-
-                    <?php if ( $activate_page_dropdown = wp_dropdown_pages( "name=bp-activate-page&echo=0&selected={$existing_pages['activate']}&show_option_none=" . __( '- Select -', 'buddypress' ) ) ) : ?>
-                        <p><label><input type="radio" name="bp_pages[activate]" <?php checked( !empty( $existing_pages['activate'] ) ); ?> value="<?php echo get_post_field( 'post_name', $existing_pages['activate'] ); ?>" /> <?php _e( 'Use an existing page:', 'buddypress' ); ?> <?php echo $activate_page_dropdown ?></label></p>
-                    <?php endif ?>
-                </td>
-            </tr>
-        </table>
-
-        <div class="submit clear">
-            <input type="hidden" name="save" value="pages" />
-            <input type="hidden" name="step" value="<?php echo esc_attr( $this->current_step() ); ?>" />
-
-            <?php wp_nonce_field( 'bpwizard_pages' ); ?>
-
-        </div>
-
-        <?php
-
-        restore_current_blog();
-    }
-
-    function step_permalinks() {
-
-        $prefix              = '';
-        $permalink_structure = bp_get_option( 'permalink_structure' );
-        $structures          = array( '', $prefix . '/%year%/%monthnum%/%day%/%postname%/', $prefix . '/%year%/%monthnum%/%postname%/', $prefix . '/archives/%post_id%' );
-
-        if ( !got_mod_rewrite() && !iis7_supports_permalinks() )
-            $prefix = '/index.php'; ?>
-
-        <p><?php
-
-            // If we're using permalinks already, adjust text accordingly
-            if ( !empty( $permalink_structure ) ) {
-                _e( 'Your permalink settings are compatible with BuddyPress.', 'buddypress' );
-            } else {
-                _e( 'Pretty permalinks must be active on your site.', 'buddypress' );
-            }
-
-        ?></p>
-        <p><?php printf( __( 'For more advanced options please visit the <a href="%s">permalink settings page</a> now and come back here later.', 'buddypress' ), admin_url( 'options-permalink.php' ) ); ?>
-
-        <table class="form-table">
-            
-            <?php if ( !empty( $permalink_structure ) && ! in_array( $permalink_structure, $structures ) ) : ?>
-                <tr>
-                    <th><label><input name="permalink_structure" type="radio" checked="checked" value="<?php echo esc_attr( $permalink_structure ); ?>" class="tog" <?php checked( true ); ?> />&nbsp;<?php _e( 'Current' ); ?></label></th>
-                    <td><code><?php echo get_home_url() . $prefix . $permalink_structure; ?></code></td>
-                </tr>
-            <?php endif; ?>
-
-            <tr>
-                <th><label><input name="permalink_structure" type="radio"<?php if ( empty( $permalink_structure ) || false != strpos( $permalink_structure, $structures[1] ) ) : ?> checked="checked" <?php endif; ?>value="<?php echo esc_attr( $structures[1] ); ?>" class="tog" <?php checked( $structures[1], $permalink_structure ); ?> />&nbsp;<?php _e( 'Day and name' ); ?></label></th>
-                <td><code><?php echo get_home_url() . $prefix . '/' . date('Y') . '/' . date('m') . '/' . date('d') . '/sample-post/'; ?></code></td>
-            </tr>
-            <tr>
-                <th><label><input name="permalink_structure" type="radio"<?php if ( empty( $permalink_structure ) || false != strpos( $permalink_structure, $structures[2] ) ) : ?> checked="checked" <?php endif; ?> value="<?php echo esc_attr( $structures[2] ); ?>" class="tog" <?php checked( $structures[2], $permalink_structure ); ?> />&nbsp;<?php _e( 'Month and name' ); ?></label></th>
-                <td><code><?php echo get_home_url() . $prefix . '/' . date('Y') . '/' . date('m') . '/sample-post/'; ?></code></td>
-            </tr>
-            <tr>
-                <th><label><input name="permalink_structure" type="radio"<?php if ( empty( $permalink_structure ) || false != strpos( $permalink_structure, $structures[3] ) ) : ?> checked="checked" <?php endif; ?> value="<?php echo esc_attr( $structures[3] ); ?>" class="tog" <?php checked( $structures[3], $permalink_structure ); ?> />&nbsp;<?php _e( 'Numeric' ); ?></label></th>
-                <td><code><?php echo get_home_url() . $prefix ?>/archives/123</code></td>
-            </tr>
-        </table>
-
-        <div class="submit clear">
-            <input type="hidden" name="save" value="permalinks" />
-            <input type="hidden" name="step" value="<?php echo esc_attr( $this->current_step() ); ?>" />
-
-            <?php if ( 'post' == strtolower( $_SERVER['REQUEST_METHOD'] ) && empty( $_POST['skip-htaccess'] ) ) : ?>
-
-                <input type="hidden" name="skip-htaccess" value="skip-htaccess" />
-
-            <?php endif; ?>
-
-            <?php wp_nonce_field( 'bpwizard_permalinks' ); ?>
-
-        </div>
-
-    <?php
-    }
-
-    /**
-     * When upgrading to BP 1.6, prompt the admin to switch to WordPress' Toolbar.
-     *
-     * @since BuddyPress (1.6)
-     */
-    function step_admin_bar() {
-    ?>
-
-        <p><?php _e( "BuddyPress now uses the WordPress Toolbar; we've turbo-charged it by adding social items to help your users explore your site and manage their content.", 'buddypress' ); ?></p>
-
-        <p><?php _e( "We've noticed that your site uses the old bar from earlier versions of BuddyPress.", 'buddypress' ); ?></p>
-
-        <p>
-            <label>
-                <input type="checkbox" name="keep_buddybar" value="1" />
-                <?php _e( "If you'd prefer to not switch to the WordPress Toolbar just yet, check this box. Don't worry, you can change your mind later.", 'buddypress' ); ?>
-            </label>
-        </p>
-
-        <div class="submit clear">
-            <input type="hidden" name="save" value="admin_bar" />
-            <input type="hidden" name="step" value="<?php echo esc_attr( $this->current_step() ); ?>" />
-
-            <?php wp_nonce_field( 'bpwizard_admin_bar' ) ?>
-
-        </div>
-
-        <?php
-    }
-
-    function step_finish() {
-    ?>
-        <p>
-            <?php
-            if ( 'update' == bp_get_maintenance_mode() )
-                _e( "The BuddyPress update is complete, and your site is ready to go!", 'buddypress' );
-            else
-                _e( "The BuddyPress setup is complete, and your site is ready to go!", 'buddypress' );
-            ?>
-        </p>
-
-        <div class="submit clear">
-            <input type="hidden" name="save" value="finish" />
-            <input type="hidden" name="step" value="<?php echo esc_attr( $this->current_step() ); ?>" />
-
-            <?php wp_nonce_field( 'bpwizard_finish' ); ?>
-
-        </div>
-
-    <?php
-    }
-
-    /** Save Step Methods *****************************************************/
-
-    function step_db_update_save() {
-
-        if ( ! isset( $_POST['submit'] ) )
-            return false;
-
-        check_admin_referer( 'bpwizard_db_update' );
-
-        // Run the schema install to update tables
-        bp_core_install();
-
-        // Update to 1.5
-        if ( bp_get_db_version_raw() < 1801 )
-            $this->update_1_5();
-
-        // Update to 1.6
-        if ( bp_get_db_version_raw() < bp_get_db_version() )
-            $this->update_1_6();
-
-        return true;
-    }
-
-    function step_components_save() {
-
-        if ( ! isset( $_POST['submit'] ) || ! isset( $_POST['bp_components'] ) )
-            return false;
-
-        check_admin_referer( 'bpwizard_components' );
-
-        $active_components = array();
-
-        // Settings form submitted, now save the settings.
-        foreach ( (array) $_POST['bp_components'] as $key => $value ) {
-            $active_components[$key] = 1;
-        }
-
-        bp_update_option( 'bp-active-components', $active_components );
-
-        wp_cache_flush();
-        bp_core_install();
-
-        return true;
-    }
-
-    function step_pages_save() {
-
-        if ( ! isset( $_POST['submit'] ) || ! isset( $_POST['bp_pages'] ) )
-            return false;
-
-        check_admin_referer( 'bpwizard_pages' );
-
-        // Make sure that the pages are created on the bp_get_root_blog_id()
-        //no matter which Dashboard the setup is being run on.
-        if ( !defined( 'BP_ENABLE_MULTIBLOG' ) )
-            switch_to_blog( bp_get_root_blog_id() );
-
-        $blog_pages = $this->setup_pages( (array) $_POST['bp_pages'] );
-        bp_update_option( 'bp-pages', $blog_pages );
-
-        if ( !defined( 'BP_ENABLE_MULTIBLOG' ) )
-            restore_current_blog();
-
-        return true;
-    }
-
-    function step_permalinks_save() {
-        global $wp_rewrite, $current_site, $current_blog;
-
-        // Prevent debug notices
-        $iis7_permalinks = $usingpi = $writable = false;
-
-        if ( ! isset( $_POST['submit'] ) )
-            return false;
-
-        check_admin_referer( 'bpwizard_permalinks' );
-
-        $home_path       = get_home_path();
-        $iis7_permalinks = iis7_supports_permalinks();
-
-        if ( isset( $_POST['permalink_structure'] ) ) {
-            $permalink_structure = $_POST['permalink_structure'];
-
-            if ( !empty( $permalink_structure ) )
-                $permalink_structure = preg_replace( '#/+#', '/', '/' . $_POST['permalink_structure'] );
-
-            if ( ( defined( 'VHOST' ) && constant( 'VHOST' ) == 'no' ) && $permalink_structure != '' && $current_site->domain . $current_site->path == $current_blog->domain . $current_blog->path )
-                $permalink_structure = '/blog' . $permalink_structure;
-
-            $wp_rewrite->set_permalink_structure( $permalink_structure );
-        }
-
-        if ( !empty( $iis7_permalinks ) ) {
-            if ( ( !file_exists( $home_path . 'web.config' ) && win_is_writable( $home_path ) ) || win_is_writable( $home_path . 'web.config' ) ) {
-                $writable = true;
-            }
-        } else {
-            if ( ( !file_exists( $home_path . '.htaccess' ) && is_writable( $home_path ) ) || is_writable( $home_path . '.htaccess' ) ) {
-                $writable = true;
-            }
-        }
-
-        if ( $wp_rewrite->using_index_permalinks() )
-            $usingpi = true;
-
-        $wp_rewrite->flush_rules();
-
-        if ( !empty( $iis7_permalinks ) || ( empty( $usingpi ) && empty( $writable ) ) ) {
-
-            function _bp_core_wizard_step_permalinks_message() {
-                global $wp_rewrite; ?>
-
-                <div id="message" class="updated fade"><p>
-
-                    <?php
-                        _e( 'Oops, there was a problem creating a configuration file. ', 'buddypress' );
-
-                        if ( !empty( $iis7_permalinks ) ) {
-
-                            if ( !empty( $permalink_structure ) && empty( $usingpi ) && empty( $writable ) ) {
-
-                                _e( 'If your <code>web.config</code> file were <a href="http://codex.wordpress.org/Changing_File_Permissions">writable</a>, we could do this automatically, but it isn&#8217;t so this is the url rewrite rule you should have in your <code>web.config</code> file. Click in the field and press <kbd>CTRL + a</kbd> to select all. Then insert this rule inside of the <code>/&lt;configuration&gt;/&lt;system.webServer&gt;/&lt;rewrite&gt;/&lt;rules&gt;</code> element in <code>web.config</code> file.' ); ?>
-
-                                <br /><br />
-
-                                <textarea rows="9" class="large-text readonly" style="background: #fff;" name="rules" id="rules" readonly="readonly"><?php echo esc_html( $wp_rewrite->iis7_url_rewrite_rules() ); ?></textarea>
-
-                            <?php
-
-                            } else if ( !empty( $permalink_structure ) && empty( $usingpi ) && !empty( $writable ) ); {
-                                _e( 'Permalink structure updated. Remove write access on web.config file now!' );
-                            }
-
-                        } else {
-
-                            _e( 'If your <code>.htaccess</code> file were <a href="http://codex.wordpress.org/Changing_File_Permissions">writable</a>, we could do this automatically, but it isn&#8217;t so these are the mod_rewrite rules you should have in your <code>.htaccess</code> file. Click in the field and press <kbd>CTRL + a</kbd> to select all.' ); ?>
-
-                            <br /><br />
-
-                            <textarea rows="6" class="large-text readonly" style="background: #fff;" name="rules" id="rules" readonly="readonly"><?php echo esc_html( $wp_rewrite->mod_rewrite_rules() ); ?></textarea>
-
-                        <?php } ?>
-
-                    <br /><br />
-
-                    <?php
-                        if ( empty( $iis7_permalinks ) )
-                            _e( 'Paste all these rules into a new <code>.htaccess</code> file in the root of your WordPress installation and save the file. Once you\'re done, please hit the "Save and Next" button to continue.', 'buddypress' );
-                    ?>
-
-                </p></div>
-
-            <?php
-            }
-
-            if ( 'post' == strtolower( $_SERVER['REQUEST_METHOD'] ) && !empty( $_POST['skip-htaccess'] ) ) {
-                return true;
-            } else {
-                add_action( 'bp_admin_notices', '_bp_core_wizard_step_permalinks_message' );
-                return false;
-            }
-        }
-
-        return true;
-    }
-
-    /**
-     * When upgrading to BP 1.6, the admin is prompted to switch to WordPress' Toolbar.
-     * If they choose not to, record that preference in the options table.
-     *
-     * @since BuddyPress (1.6)
-     */
-    function step_admin_bar_save() {
-        if ( ! isset( $_POST['submit'] ) )
-            return false;
-
-        check_admin_referer( 'bpwizard_admin_bar' );
-
-        if ( !empty( $_POST['keep_buddybar'] ) )
-            bp_update_option( '_bp_force_buddybar', 1 );
-
-        return true;
-    }
-
-    function step_finish_save() {
-
-        if ( ! isset( $_POST['submit'] ) )
-            return false;
-
-        check_admin_referer( 'bpwizard_finish' );
-
-        // Update the DB version in the database
-        bp_version_bump();
-
-        // Delete the setup cookie
-        @setcookie( 'bp-wizard-step', '', time() - 3600, COOKIEPATH );
-
-        // Redirect to the BuddyPress dashboard
-        $redirect = bp_core_do_network_admin() ? network_admin_url( 'settings.php' ) : admin_url( 'options-general.php' );
-        $redirect = add_query_arg( array( 'page' => 'bp-components' ), $redirect  );
-
-        wp_safe_redirect( $redirect );
-
-        // That's all!
-        exit();
-    }
-
-    function setup_pages( $pages ) {
-
-        $bp_pages = array();
-
-        // Delete any existing pages
-        foreach ( (array) bp_core_get_directory_page_ids() as $page_id ) {
-            wp_delete_post( $page_id, true );
-        }
-        bp_delete_option( 'bp-pages' );
-
-        foreach ( $pages as $key => $value ) {
-
-            // Check for the selected page
-            if ( 'page' == $value ) {
-                if ( !empty( $_POST['bp-' . $key . '-page'] ) ) {
-                    $bp_pages[$key] = (int) $_POST['bp-' . $key . '-page'];
-                } else {
-                    $bp_pages[$key] = wp_insert_post( array( 'comment_status' => 'closed', 'ping_status' => 'closed', 'post_title' => ucwords( $key ), 'post_status' => 'publish', 'post_type' => 'page' ) );
-                }
-
-            // Create a new page
-            } else {
-                $bp_pages[$key] = wp_insert_post( array( 'comment_status' => 'closed', 'ping_status' => 'closed', 'post_title' => ucwords( $value ), 'post_status' => 'publish', 'post_type' => 'page' ) );
-            }
-        }
-
-        return $bp_pages;
-    }
-
-    // Database update methods based on version numbers
-    function update_1_5() {
-        delete_site_option( 'bp-activity-db-version' );
-        delete_site_option( 'bp-blogs-db-version'    );
-        delete_site_option( 'bp-friends-db-version'  );
-        delete_site_option( 'bp-groups-db-version'   );
-        delete_site_option( 'bp-messages-db-version' );
-        delete_site_option( 'bp-xprofile-db-version' );
-    }
-
-    // Database update methods based on version numbers
-    function update_1_6() {
-
-        // Delete possible site options
-        delete_site_option( 'bp-db-version'       );
-        delete_site_option( '_bp_db_version'      );
-        delete_site_option( 'bp-core-db-version'  );
-        delete_site_option( '_bp-core-db-version' );
-
-        // Delete possible blog options
-        delete_blog_option( bp_get_root_blog_id(), 'bp-db-version'       );
-        delete_blog_option( bp_get_root_blog_id(), 'bp-core-db-version'  );
-        delete_site_option( bp_get_root_blog_id(), '_bp-core-db-version' );
-        delete_site_option( bp_get_root_blog_id(), '_bp_db_version'      );
-    }
-
-    /**
-     * Reset the cookie so the install script starts over
-     */
-    function reset_cookie() {
-        @setcookie( 'bp-wizard-step', '', time() - 3600, COOKIEPATH );
-    }
-}
-
-/**
- * Get the wizard
- *
- * @return boolean
- */
-function bp_get_wizard() {
-    $bp = buddypress();
-
-    if ( !empty( $bp->admin->wizard ) )
-        return $bp->admin->wizard;
-
-    return false;
-}

trunk/bp-core/admin/css/common.css

@@ -22 +22 @@
 /* Menu Icons
 ------------------------------------------------------------------------------*/
-
-/* Wizard */
-ul#adminmenu li.toplevel_page_bp-wizard .wp-menu-image {
-    background-image: url('../images/menu.png') !important;
-    background-position: -178px -34px;
-}
-ul#adminmenu li.toplevel_page_bp-wizard:hover .wp-menu-image,
-ul#adminmenu li.toplevel_page_bp-wizard.wp-has-current-submenu .wp-menu-image {
-    background-position: -178px -2px;
-}
 
 /* Backpat */
@@ -179 +169 @@
     vertical-align: top;
 }
+
+/* Version Badge */
+
+.bp-badge {
+    padding-top: 142px;
+    height: 50px;
+    width: 173px;
+    color: #fafafa;
+    font-weight: bold;
+    font-size: 14px;
+    text-align: center;
+    margin: 0 -5px;
+    background: #f00 no-repeat;
+}
+
+.about-wrap .bp-badge {
+    position: absolute;
+    top: 0;
+    right: 0;
+}
+    body.rtl .about-wrap .bp-badge {
+        right: auto;
+        left: 0;
+    }

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

@@ -21 +21 @@
 class BP_Admin {
 
-    /**
-     * Instance of the setup wizard
-     *
-     * @since BuddyPress (1.6)
-     * @var BP_Core_Setup_Wizard
-     */
-    public $wizard;
-
     /** Directory *************************************************************/
 
@@ -98 +90 @@
      */
     private function includes() {
-
-        // If in maintenance mode, only include updater and schema
-        if ( bp_get_maintenance_mode() ) {
-            require( $this->admin_dir . 'bp-core-schema.php' );
-            require( $this->admin_dir . 'bp-core-update.php' );
-
-        // No update needed so proceed with loading everything
-        } else {
-            require( $this->admin_dir . 'bp-core-settings.php'   );
-            require( $this->admin_dir . 'bp-core-functions.php'  );
-            require( $this->admin_dir . 'bp-core-components.php' );
-            require( $this->admin_dir . 'bp-core-slugs.php'      );
-        }
+        require( $this->admin_dir . 'bp-core-actions.php'    );
+        require( $this->admin_dir . 'bp-core-settings.php'   );
+        require( $this->admin_dir . 'bp-core-functions.php'  );
+        require( $this->admin_dir . 'bp-core-components.php' );
+        require( $this->admin_dir . 'bp-core-slugs.php'      );
     }
 
@@ -124 +108 @@
     private function setup_actions() {
 
-        // Start the wizard if in maintenance mode
-        if ( bp_get_maintenance_mode() ) {
-            add_action( bp_core_admin_hook(), array( $this, 'start_wizard' ), 2 );
-        }
-
         /** General Actions ***************************************************/
 
-        // Attach the BuddyPress admin_init action to the WordPress admin_init action.
-        add_action( 'admin_init',            array( $this, 'admin_init'  ) );
-
         // Add some page specific output to the <head>
-        add_action( 'admin_head',            array( $this, 'admin_head'  ) );
+        add_action( 'bp_admin_head',            array( $this, 'admin_head'  ), 999 );
 
         // Add menu item to settings menu
-        add_action( bp_core_admin_hook(),    array( $this, 'admin_menus' ), 5 );
-
-        // Add notice if an update is needed
-        add_action( 'admin_notices',         array( $this, 'admin_notices' ) );
-        add_action( 'network_admin_notices', array( $this, 'admin_notices' ) );
+        add_action( bp_core_admin_hook(),       array( $this, 'admin_menus' ), 5 );
 
         // Enqueue all admin JS and CSS
-        add_action( 'admin_enqueue_scripts', array( $this, 'enqueue_scripts'   ) );
+        add_action( 'bp_admin_enqueue_scripts', array( $this, 'enqueue_scripts' ) );
 
         /** BuddyPress Actions ************************************************/
 
         // Add settings
-        add_action( 'bp_admin_init',      array( $this, 'register_admin_settings' ) );
+        add_action( 'bp_register_admin_settings', array( $this, 'register_admin_settings' ) );
 
         /** Filters ***********************************************************/
 
         // Add link to settings page
-        add_filter( 'plugin_action_links', array( $this, 'add_settings_link' ), 10, 2 );
-    }
-
-    public function start_wizard() {
-        $this->wizard = new BP_Core_Setup_Wizard;
+        add_filter( 'plugin_action_links', array( $this, 'modify_plugin_action_links' ), 10, 2 );
     }
 
@@ -173 +141 @@
     public function admin_menus() {
 
-        // In maintenance mode
-        if ( bp_get_maintenance_mode() ) {
-
-            if ( !current_user_can( 'manage_options' ) ) {
-                return;
-            }
-
-            if ( bp_get_maintenance_mode() == 'install' ) {
-                $status = __( 'BuddyPress Setup', 'buddypress' );
-            } else {
-                $status = __( 'Update BuddyPress',  'buddypress' );
-            }
-
-            if ( bp_get_wizard() ) {
-                if ( ! is_multisite() || bp_is_multiblog_mode() ) {
-                    $hook = add_dashboard_page( $status, $status, 'manage_options', 'bp-wizard', array( bp_get_wizard(), 'html' ) );
-                } else {
-                    $hook = add_submenu_page( 'update-core.php', $status, $status, 'manage_options', 'bp-wizard', array( bp_get_wizard(), 'html' ) );
-                }
-            }
-
-        // Not in maintenance mode
-        } else {
-
-            // Bail if user cannot moderate
-            if ( ! bp_current_user_can( 'manage_options' ) ) {
-                return;
-            }
-
-            $hooks = array();
-            $page  = bp_core_do_network_admin()  ? 'settings.php' : 'options-general.php';
-
-            // Changed in BP 1.6 . See bp_core_admin_backpat_menu()
-            $hooks[] = add_menu_page(
-                __( 'BuddyPress', 'buddypress' ),
-                __( 'BuddyPress', 'buddypress' ),
-                'manage_options',
-                'bp-general-settings',
-                'bp_core_admin_backpat_menu',
-                'div'
-            );
-
-            $hooks[] = add_submenu_page(
-                'bp-general-settings',
-                __( 'BuddyPress Help', 'buddypress' ),
-                __( 'Help', 'buddypress' ),
-                'manage_options',
-                'bp-general-settings',
-                'bp_core_admin_backpat_page'
-            );
-
-            // Add the option pages
-            $hooks[] = add_submenu_page(
-                $page,
-                __( 'BuddyPress Components', 'buddypress' ),
-                __( 'BuddyPress', 'buddypress' ),
-                'manage_options',
-                'bp-components',
-                'bp_core_admin_components_settings'
-            );
-
-            $hooks[] = add_submenu_page(
-                $page,
-                __( 'BuddyPress Pages', 'buddypress' ),
-                __( 'BuddyPress Pages', 'buddypress' ),
-                'manage_options',
-                'bp-page-settings',
-                'bp_core_admin_slugs_settings'
-            );
-
-            $hooks[] = add_submenu_page(
-                $page,
-                __( 'BuddyPress Settings', 'buddypress' ),
-                __( 'BuddyPress Settings', 'buddypress' ),
-                'manage_options',
-                'bp-settings',
-                'bp_core_admin_settings'
-            );
-
-            // Fudge the highlighted subnav item when on a BuddyPress admin page
-            foreach( $hooks as $hook ) {
-                add_action( "admin_head-$hook", 'bp_core_modify_admin_menu_highlight' );
-            }
+        // Bail if user cannot moderate
+        if ( ! bp_current_user_can( 'manage_options' ) )
+            return;
+
+        // About
+        add_dashboard_page(
+            __( 'Welcome to BuddyPress',  'buddypress' ),
+            __( 'Welcome to BuddyPress',  'buddypress' ),
+            'manage_options',
+            'bp-about',
+            array( $this, 'about_screen' )
+        );
+
+        // Credits
+        add_dashboard_page(
+            __( 'Welcome to BuddyPress',  'buddypress' ),
+            __( 'Welcome to BuddyPress',  'buddypress' ),
+            'manage_options',
+            'bp-credits',
+            array( $this, 'credits_screen' )
+        );
+
+        $hooks = array();
+        $page  = bp_core_do_network_admin()  ? 'settings.php' : 'options-general.php';
+
+        // Changed in BP 1.6 . See bp_core_admin_backpat_menu()
+        $hooks[] = add_menu_page(
+            __( 'BuddyPress', 'buddypress' ),
+            __( 'BuddyPress', 'buddypress' ),
+            'manage_options',
+            'bp-general-settings',
+            'bp_core_admin_backpat_menu',
+            'div'
+        );
+
+        $hooks[] = add_submenu_page(
+            'bp-general-settings',
+            __( 'BuddyPress Help', 'buddypress' ),
+            __( 'Help', 'buddypress' ),
+            'manage_options',
+            'bp-general-settings',
+            'bp_core_admin_backpat_page'
+        );
+
+        // Add the option pages
+        $hooks[] = add_submenu_page(
+            $page,
+            __( 'BuddyPress Components', 'buddypress' ),
+            __( 'BuddyPress', 'buddypress' ),
+            'manage_options',
+            'bp-components',
+            'bp_core_admin_components_settings'
+        );
+
+        $hooks[] = add_submenu_page(
+            $page,
+            __( 'BuddyPress Pages', 'buddypress' ),
+            __( 'BuddyPress Pages', 'buddypress' ),
+            'manage_options',
+            'bp-page-settings',
+            'bp_core_admin_slugs_settings'
+        );
+
+        $hooks[] = add_submenu_page(
+            $page,
+            __( 'BuddyPress Settings', 'buddypress' ),
+            __( 'BuddyPress Settings', 'buddypress' ),
+            'manage_options',
+            'bp-settings',
+            'bp_core_admin_settings'
+        );
+
+        // Fudge the highlighted subnav item when on a BuddyPress admin page
+        foreach( $hooks as $hook ) {
+            add_action( "admin_head-$hook", 'bp_core_modify_admin_menu_highlight' );
         }
     }
@@ -267 +227 @@
      * @uses add_settings_field() To add various settings fields
      * @uses register_setting() To register various settings
-     * @uses do_action() Calls 'bp_register_admin_settings'
      */
     public function register_admin_settings() {
@@ -347 +306 @@
             }
         }
-
-        do_action( 'bp_register_admin_settings' );
     }
 
@@ -360 +317 @@
      * @return array Processed links
      */
-    public function add_settings_link( $links, $file ) {
-        if ( buddypress()->basename == $file ) {
-            $page = 'bp-components';
-            $text = __( 'Settings', 'buddypress' );
-            $url  = bp_core_do_network_admin() ? network_admin_url( 'settings.php' ) : admin_url( 'options-general.php' );
-
-            // If we're in install mode then the link needs to show "Wizard" and link
-            // to the wizard. Otherwise we can show the BuddyPress settings page link.
-            if ( 'install' == bp_get_maintenance_mode() ) {
-                $page = 'bp-wizard';
-                $text = __( 'Setup Wizard', 'buddypress' );
-                $url  = bp_core_do_network_admin() ? network_admin_url( 'admin.php?page=' . $page ) : admin_url( 'index.php?page=' . $page );
-            }
-
-            $settings_link  = '<a href="' . add_query_arg( array( 'page' => $page ), $url ) . '">' . $text . '</a>';
-
-            array_unshift( $links, $settings_link );
-        }
-
-        return $links;
-    }
-
-    /**
-     * BuddyPress's dedicated admin init action
-     *
-     * @since BuddyPress (1.6)
-     *
-     * @uses do_action() Calls 'bp_admin_init'
-     */
-    public function admin_init() {
-        do_action( 'bp_admin_init' );
+    public function modify_plugin_action_links( $links, $file ) {
+
+        // Return normal links if not BuddyPress
+        if ( plugin_basename( buddypress()->file ) != $file )
+            return $links;
+
+        $page = 'bp-components';
+        $text = __( 'Settings', 'buddypress' );
+        $url  = bp_core_do_network_admin() ? network_admin_url( 'settings.php' ) : admin_url( 'options-general.php' );
+
+        // Add a few links to the existing links array
+        return array_merge( $links, array(
+            'settings' => '<a href="' . add_query_arg( array( 'page' => $page      ), $url                      ) . '">' . $text                               . '</a>',
+            'about'    => '<a href="' . add_query_arg( array( 'page' => 'bp-about' ), admin_url( 'index.php'  ) ) . '">' . esc_html__( 'About', 'buddypress' ) . '</a>'
+        ) );
     }
 
@@ -398 +339 @@
      * @since BuddyPress (1.6)
      */
-    public function admin_head() { }
+    public function admin_head() {
+        $settings_page  = bp_core_do_network_admin()  ? 'settings.php' : 'options-general.php';
+
+        // Settings pages
+        remove_submenu_page( $settings_page, 'bb-forums-setup'  );
+        remove_submenu_page( $settings_page, 'bp-page-settings' );
+        remove_submenu_page( $settings_page, 'bp-settings'      );
+
+        // About and Credits pages
+        remove_submenu_page( 'index.php', 'bp-about'   );
+        remove_submenu_page( 'index.php', 'bp-credits' );
+    }
 
     /**
@@ -412 +364 @@
         $file = apply_filters( 'bp_core_admin_common_css', $file );
         wp_enqueue_style( 'bp-admin-common-css', $file, array(), bp_get_version() );
-
-        // Extra bits for the installation wizard
-        if ( bp_get_maintenance_mode() ) {
-
-            // Styling
-            $file = $this->css_url . "wizard{$min}.css";
-            $file = apply_filters( 'bp_core_admin_wizard_css', $file );
-            wp_enqueue_style( 'bp-admin-wizard-css', $file, array(), bp_get_version() );
-
-            // JS
-            $file = $this->js_url . "wizard{$min}.js";
-            $file = apply_filters( 'bp_core_admin_wizard_js', $file );
-            wp_enqueue_script( 'bp-admin-wizard-js', $file, array(), bp_get_version() );
-
-            // We'll need the thickbox too
-            wp_enqueue_script( 'thickbox' );
-            wp_enqueue_style( 'thickbox' );
-        }
-
-        do_action( 'bp_admin_head' );
-    }
-
-    /**
-     * Add any admin notices we might need, mostly for update or new installs
-     *
-     * @since BuddyPress (1.6)
-     *
-     * @global string $pagenow
-     * @return If no notice is needed
-     */
-    public function admin_notices() {
-        global $pagenow;
-
-        // Bail if not in maintenance mode
-        if ( ! bp_get_maintenance_mode() )
-            return;
-
-        // Bail if user cannot manage options
-        if ( ! current_user_can( 'manage_options' ) )
-            return;
-
-        // Are we looking at a network?
-        if ( bp_core_do_network_admin() ) {
-
-            // Bail if looking at wizard page
-            if ( ( 'admin.php' == $pagenow ) && ( !empty( $_GET['page'] ) && ( 'bp-wizard' == $_GET['page'] ) ) ) {
-                return;
-            }
-
-            // Set the url for the nag
-            $url = network_admin_url( 'admin.php?page=bp-wizard' );
-
-        // Single site
-        } else {
-
-            // Bail if looking at wizard page
-            if ( ( 'index.php' == $pagenow ) && ( !empty( $_GET['page'] ) && ( 'bp-wizard' == $_GET['page'] ) ) ) {
-                return;
-            }
-
-            // Set the url for the nag
-            $url = admin_url( 'index.php?page=bp-wizard' );
-        }
-
-        // What does the nag say?
-        switch ( bp_get_maintenance_mode() ) {
-
-            // Update text
-            case 'update' :
-                $msg = sprintf( __( 'BuddyPress has been updated! Please run the <a href="%s">update wizard</a>.', 'buddypress' ), esc_url( $url ) );
-                break;
-
-            // First install text
-            case 'install' : default :
-                $msg = sprintf( __( 'BuddyPress was successfully activated! Please run the <a href="%s">installation wizard</a>.', 'buddypress' ), esc_url( $url ) );
-                break;
-        } ?>
-
-        <div class="update-nag"><?php echo $msg; ?></div>
+    }
+    
+    /** About *****************************************************************/
+
+    /**
+     * Output the about screen
+     *
+     * @since BuddyPress (1.7)
+     */
+    public function about_screen() {
+
+        list( $display_version ) = explode( '-', bp_get_version() ); ?>
+
+        <div class="wrap about-wrap">
+            <h1><?php printf( __( 'Welcome to BuddyPress %s' ), $display_version ); ?></h1>
+            <div class="about-text"><?php printf( __( 'Thank you for updating to the latest version! BuddyPress %s is ready to make your community a safer, faster, and better looking place to hang out!' ), $display_version ); ?></div>
+            <div class="bp-badge"><?php printf( __( 'Version %s' ), $display_version ); ?></div>
+
+            <h2 class="nav-tab-wrapper">
+                <a class="nav-tab nav-tab-active" href="<?php echo esc_url( bp_get_admin_url( add_query_arg( array( 'page' => 'bp-about' ), 'index.php' ) ) ); ?>">
+                    <?php _e( 'What&#8217;s New' ); ?>
+                </a><a class="nav-tab" href="<?php echo esc_url( bp_get_admin_url( add_query_arg( array( 'page' => 'bp-credits' ), 'index.php' ) ) ); ?>">
+                    <?php _e( 'Credits' ); ?>
+                </a>
+            </h2>
+
+            <div class="changelog">
+                <h3><?php _e( 'Some neat thing', 'buddypress' ); ?></h3>
+
+                <div class="feature-section">
+                    <h4><?php _e( 'Whoa', 'buddypress' ); ?></h4>
+                    <p><?php _e( 'Nice!', 'buddypress' ); ?></p>
+
+                    <h4><?php _e( 'Wow', 'buddypress' ); ?></h4>
+                    <p><?php _e( 'Amazing!', 'buddypress' ); ?></p>
+                </div>
+            </div>
+
+            <div class="changelog">
+                <h3><?php _e( 'Another neat thing', 'buddypress' ); ?></h3>
+
+                <div class="feature-section">
+                    <h4><?php _e( 'No way', 'buddypress' ); ?></h4>
+                    <p><?php _e( 'Yes way.', 'buddypress' ); ?></p>
+                </div>
+            </div>
+
+            <div class="changelog">
+                <h3><?php _e( 'Under the Hood', 'buddypress' ); ?></h3>
+
+                <div class="feature-section three-col">
+                    <div>
+                        <h4><?php _e( 'One', 'buddypress' ); ?></h4>
+                        <p><?php _e( 'Uh huh.', 'buddypress' ); ?></p> 
+
+                        <h4><?php _e( 'Two', 'buddypress' ); ?></h4>
+                        <p><?php _e( 'Yeah.', 'buddypress' ); ?></p>
+                    </div>
+
+                    <div>
+                        <h4><?php _e( 'Three', 'buddypress' ); ?></h4>
+                        <p><?php _e( 'I hear ya.', 'buddypress' ); ?></p>
+
+                        <h4><?php _e( 'Four', 'buddypress' ); ?></h4>
+                        <p><?php _e( 'Tell me more.', 'buddypress' ); ?></p>
+                    </div>
+
+                    <div class="last-feature">
+                        <h4><?php _e( 'Five', 'buddypress' ); ?></h4>
+                        <p><?php _e( 'Well, shucks.', 'buddypress' ); ?></p>
+
+                        <h4><?php _e( 'Six', 'buddypress' ); ?></h4>
+                        <p><?php _e( ' Whoopie!', 'buddypress' ); ?></p>
+                    </div>
+                </div>
+            </div>
+
+            <div class="return-to-dashboard">
+                <a href="<?php echo esc_url( bp_get_admin_url( add_query_arg( array( 'page' => 'buddypress' ), 'options-general.php' ) ) ); ?>"><?php _e( 'Go to Community Settings' ); ?></a>
+            </div>
+
+        </div>
+
+        <?php
+    }
+
+    /**
+     * Output the credits screen
+     *
+     * Hardcoding this in here is pretty janky. It's fine for 2.2, but we'll
+     * want to leverage api.wordpress.org eventually.
+     *
+     * @since BuddyPress (1.7)
+     */
+    public function credits_screen() {
+
+        list( $display_version ) = explode( '-', bp_get_version() ); ?>
+
+        <div class="wrap about-wrap">
+            <h1><?php printf( __( 'Welcome to BuddyPress %s' ), $display_version ); ?></h1>
+            <div class="about-text"><?php printf( __( 'Thank you for updating to the latest version! BuddyPress %s is ready to make your community a safer, faster, and better looking place to hang out!' ), $display_version ); ?></div>
+            <div class="bp-badge"><?php printf( __( 'Version %s' ), $display_version ); ?></div>
+
+            <h2 class="nav-tab-wrapper">
+                <a href="<?php echo esc_url( bp_get_admin_url( add_query_arg( array( 'page' => 'bp-about' ), 'index.php' ) ) ); ?>" class="nav-tab">
+                    <?php _e( 'What&#8217;s New' ); ?>
+                </a><a href="<?php echo esc_url( bp_get_admin_url( add_query_arg( array( 'page' => 'bp-credits' ), 'index.php' ) ) ); ?>" class="nav-tab nav-tab-active">
+                    <?php _e( 'Credits' ); ?>
+                </a>
+            </h2>
+
+            <p class="about-description"><?php _e( 'BuddyPress is created by a worldwide network of friendly folks.', 'buddypress' ); ?></p>
+
+            <h4 class="wp-people-group"><?php _e( 'Project Leaders', 'buddypress' ); ?></h4>
+            <ul class="wp-people-group " id="wp-people-group-project-leaders">
+                <li class="wp-person" id="wp-person-apeatling">
+                    <a href="http://profiles.wordpress.org/apeatling"><img src="http://0.gravatar.com/avatar/767fc9c115a1b989744c755db47feb60?s=60" class="gravatar" alt="Andy Peatling" /></a>
+                    <a class="web" href="http://profiles.wordpress.org/apeatling">Andy Peatling</a>
+                    <span class="title"><?php _e( 'Founding Developer', 'buddypress' ); ?></span>
+                </li>
+                <li class="wp-person" id="wp-person-johnjamesjacoby">
+                    <a href="http://profiles.wordpress.org/johnjamesjacoby"><img src="http://0.gravatar.com/avatar/81ec16063d89b162d55efe72165c105f?s=60" class="gravatar" alt="John James Jacoby" /></a>
+                    <a class="web" href="http://profiles.wordpress.org/johnjamesjacoby">John James Jacoby</a>
+                    <span class="title"><?php _e( 'Project Lead', 'buddypress' ); ?></span>
+                </li>
+                <li class="wp-person" id="wp-person-boonebgorges">
+                    <a href="http://profiles.wordpress.org/boonebgorges"><img src="http://0.gravatar.com/avatar/6a7c997edea340616bcc6d0fe03f65dd?s=60" class="gravatar" alt="Boone B. Gorges" /></a>
+                    <a class="web" href="http://profiles.wordpress.org/boonebgorges">Boone B. Gorges</a>
+                    <span class="title"><?php _e( 'Lead Developer', 'buddypress' ); ?></span>
+                </li>
+                <li class="wp-person" id="wp-person-djpaul">
+                    <a href="http://profiles.wordpress.org/djpaul"><img src="http://0.gravatar.com/avatar/e341eca9e1a85dcae7127044301b4363?s=60" class="gravatar" alt="Paul Gibbs" /></a>
+                    <a class="web" href="http://profiles.wordpress.org/djpaul">Paul Gibbs</a>
+                    <span class="title"><?php _e( 'Lead Developer', 'buddypress' ); ?></span>
+                </li>
+            </ul>
+
+            <h4 class="wp-people-group"><?php _e( 'Contributing Developers', 'buddypress' ); ?></h4>
+            <ul class="wp-people-group " id="wp-people-group-contributing-developers">
+                <li class="wp-person" id="wp-person-jmdodd">
+                    <a href="http://profiles.wordpress.org/jmdodd"><img src="http://0.gravatar.com/avatar/6a7c997edea340616bcc6d0fe03f65dd?s=60" class="gravatar" alt="Jennifer M. Dodd" /></a>
+                    <a class="web" href="http://profiles.wordpress.org/jmdodd">Jennifer M. Dodd</a>
+                    <span class="title"></span>
+                </li>
+                <li class="wp-person" id="wp-person-jaredatch">
+                    <a href="http://profiles.wordpress.org/jaredatch"><img src="http://0.gravatar.com/avatar/e341eca9e1a85dcae7127044301b4363?s=60" class="gravatar" alt="Jared Atchison" /></a>
+                    <a class="web" href="http://profiles.wordpress.org/jaredatch">Jared Atchison</a>
+                    <span class="title"></span>
+                </li>
+                <li class="wp-person" id="wp-person-gautamgupta">
+                    <a href="http://profiles.wordpress.org/gautamgupta"><img src="http://0.gravatar.com/avatar/b0810422cbe6e4eead4def5ae7a90b34?s=60" class="gravatar" alt="Gautam Gupta" /></a>
+                    <a class="web" href="http://profiles.wordpress.org/gautamgupta">Gautam Gupta</a>
+                    <span class="title"></span>
+                </li>
+            </ul>
+
+            <h4 class="wp-people-group"><?php _e( 'Codex Rockstars', 'buddypress' ); ?></h4>
+            <ul class="wp-people-group " id="wp-people-group-codex-rockstars">
+                <li class="wp-person" id="wp-person-masonjames">
+                    <a href="http://profiles.wordpress.org/masonjames"><img src="http://0.gravatar.com/avatar/99dee4d5287d0f9e26ff72e7228d97ac?s=60" class="gravatar" alt="Mason James" /></a>
+                    <a class="web" href="http://profiles.wordpress.org/masonjames">Mason James</a>
+                    <span class="title"></span>
+                </li>
+                <li class="wp-person" id="wp-person-wordsforwp">
+                    <a href="http://profiles.wordpress.org/wordsforwp"><img src="http://0.gravatar.com/avatar/5437119b446adad1af813c44944e6c9c?s=60" class="gravatar" alt="Siobhan McKeown" /></a>
+                    <a class="web" href="http://profiles.wordpress.org/wordsforwp">Siobhan McKeown</a>
+                    <span class="title"></span>
+                </li>
+                <li class="wp-person" id="wp-person-JarretC">
+                    <a href="http://profiles.wordpress.org/JarretC"><img src="http://0.gravatar.com/avatar/e00501bf782b42d5db19ff75fca14f6a?s=60" class="gravatar" alt="Jarret Cade" /></a>
+                    <a class="web" href="http://profiles.wordpress.org/JarretC">Jarret Cade</a>
+                    <span class="title"></span>
+                </li>
+            </ul>
+
+            <h4 class="wp-people-group"><?php _e( 'Core Contributors to BuddyPress 1.7', 'buddypress' ); ?></h4>
+            <p class="wp-credits-list">
+                <a href="http://profiles.wordpress.org/alexvorn2">alexvorn2</a>,
+                <a href="http://profiles.wordpress.org/anointed">anointed</a>,
+                <a href="http://profiles.wordpress.org/chexee">chexee</a>,
+                <a href="http://profiles.wordpress.org/cnorris23">cnorris23</a>,
+                <a href="http://profiles.wordpress.org/DanielJuhl">DanielJuhl</a>,
+                <a href="http://profiles.wordpress.org/daveshine">daveshine</a>,
+                <a href="http://profiles.wordpress.org/dimadin">dimadin</a>,
+                <a href="http://profiles.wordpress.org/gawain">gawain</a>,
+                <a href="http://profiles.wordpress.org/iamzippy">iamzippy</a>,
+                <a href="http://profiles.wordpress.org/isaacchapman">isaacchapman</a>,
+                <a href="http://profiles.wordpress.org/jane">jane</a>,
+                <a href="http://profiles.wordpress.org/jkudish">jkudish</a>,
+                <a href="http://profiles.wordpress.org/mamaduka">mamaduka</a>,
+                <a href="http://profiles.wordpress.org/mercime">mercime</a>,
+                <a href="http://profiles.wordpress.org/mesayre">mesayre</a>,
+                <a href="http://profiles.wordpress.org/mordauk">mordauk</a>,
+                <a href="http://profiles.wordpress.org/MZAWeb">MZAWeb</a>,
+                <a href="http://profiles.wordpress.org/netweb">netweb</a>,
+                <a href="http://profiles.wordpress.org/nexia">nexia</a>,
+                <a href="http://profiles.wordpress.org/Omicron7">Omicron7</a>,
+                <a href="http://profiles.wordpress.org/otto42">otto42</a>,
+                <a href="http://profiles.wordpress.org/pavelevap">pavelevap</a>,
+                <a href="http://profiles.wordpress.org/plescheff">plescheff</a>,
+                <a href="http://profiles.wordpress.org/scribu">scribu</a>,
+                <a href="http://profiles.wordpress.org/sorich87">sorich87</a>,
+                <a href="http://profiles.wordpress.org/SteveAtty">SteveAtty</a>,
+                <a href="http://profiles.wordpress.org/tmoorewp">tmoorewp</a>,
+                <a href="http://profiles.wordpress.org/tott">tott</a>,
+                <a href="http://profiles.wordpress.org/tungdo">tungdo</a>,
+                <a href="http://profiles.wordpress.org/vibol">vibol</a>,
+                <a href="http://profiles.wordpress.org/wonderboymusic">wonderboymusic</a>,
+                <a href="http://profiles.wordpress.org/westi">westi</a>,
+                <a href="http://profiles.wordpress.org/xiosen">xiosen</a>,
+            </p>
+
+            <div class="return-to-dashboard">
+                <a href="<?php echo esc_url( bp_get_admin_url( add_query_arg( array( 'page' => 'buddypress' ), 'options-general.php' ) ) ); ?>"><?php _e( 'Go to Community Settings' ); ?></a>
+            </div>
+
+        </div>
 
         <?php

trunk/bp-core/bp-core-cssjs.php

@@ -4 +4 @@
 
 function bp_core_confirmation_js() {
-    global $wpdb;
 
-    if ( is_multisite() && $wpdb->blogid != bp_get_root_blog_id() )
+    if ( is_multisite() && ! bp_is_root_blog() )
         return false;
 
@@ -19 +18 @@
 <?php
 }
-add_action( 'wp_head', 'bp_core_confirmation_js', 100 );
+add_action( 'wp_head',    'bp_core_confirmation_js', 100 );
+add_action( 'admin_head', 'bp_core_confirmation_js', 100 );
 
 /**

trunk/bp-core/bp-core-functions.php

@@ -79 +79 @@
 
         return $retval;
-    }
-
-/**
- * Output the BuddyPress maintenance mode
- *
- * @since BuddyPress (1.6)
- * @uses bp_get_maintenance_mode() To get the BuddyPress maintenance mode
- */
-function bp_maintenance_mode() {
-    echo bp_get_maintenance_mode();
-}
-    /**
-     * Return the BuddyPress maintenance mode
-     *
-     * @since BuddyPress (1.6)
-     * @global BuddyPress $bp
-     * @return string The BuddyPress maintenance mode
-     */
-    function bp_get_maintenance_mode() {
-        global $bp;
-        return $bp->maintenance_mode;
     }
 

trunk/bp-core/deprecated/1.7.php

@@ -11 +11 @@
 if ( !defined( 'ABSPATH' ) ) exit;
 
+/**
+ * Output the BuddyPress maintenance mode
+ *
+ * @since BuddyPress (1.6)
+ * @uses bp_get_maintenance_mode() To get the BuddyPress maintenance mode
+ */
+function bp_maintenance_mode() {
+    echo bp_get_maintenance_mode();
+}
+    /**
+     * Return the BuddyPress maintenance mode
+     *
+     * @since BuddyPress (1.6)
+     * @return string The BuddyPress maintenance mode
+     */
+    function bp_get_maintenance_mode() {
+        return buddypress()->maintenance_mode;
+    }
 
 function xprofile_get_profile() {
@@ -59 +77 @@
     return $themes;
 }
+
+/** Admin *********************************************************************/
+
+
+/**
+ * Verify that some BP prerequisites are set up properly, and notify the admin if not
+ *
+ * On every Dashboard page, this function checks the following:
+ *   - that pretty permalinks are enabled
+ *   - that a BP-compatible theme is activated
+ *   - that every BP component that needs a WP page for a directory has one
+ *   - that no WP page has multiple BP components associated with it
+ * The administrator will be shown a notice for each check that fails.
+ *
+ * @package BuddyPress Core
+ */
+function bp_core_activation_notice() {
+    global $wp_rewrite, $wpdb;
+
+    $bp = buddypress();
+
+    // Only the super admin gets warnings
+    if ( !bp_current_user_can( 'bp_moderate' ) )
+        return;
+
+    // On multisite installs, don't load on a non-root blog, unless do_network_admin is
+    // overridden
+    if ( is_multisite() && bp_core_do_network_admin() && !bp_is_root_blog() )
+        return;
+
+    // Don't show these messages during setup or upgrade
+    if ( !empty( $bp->maintenance_mode ) )
+        return;
+
+    /**
+     * Check to make sure that the blog setup routine has run. This can't happen during the
+     * wizard because of the order which the components are loaded. We check for multisite here
+     * on the off chance that someone has activated the blogs component and then disabled MS
+     */
+    if ( bp_is_active( 'blogs' ) ) {
+        $count = $wpdb->get_var( "SELECT COUNT(*) FROM {$bp->blogs->table_name}" );
+
+        if ( empty( $count ) ) {
+            bp_blogs_record_existing_blogs();
+        }
+    }
+
+    /**
+     * Are pretty permalinks enabled?
+     */
+    if ( isset( $_POST['permalink_structure'] ) )
+        return false;
+
+    if ( empty( $wp_rewrite->permalink_structure ) ) {
+        bp_core_add_admin_notice( sprintf( __( '<strong>BuddyPress is almost ready</strong>. You must <a href="%s">update your permalink structure</a> to something other than the default for it to work.', 'buddypress' ), admin_url( 'options-permalink.php' ) ) );
+    }
+
+    /**
+     * Check for orphaned BP components (BP component is enabled, no WP page exists)
+     */
+    $orphaned_components = array();
+    $wp_page_components  = array();
+
+    // Only components with 'has_directory' require a WP page to function
+    foreach( array_keys( $bp->loaded_components ) as $component_id ) {
+        if ( !empty( $bp->{$component_id}->has_directory ) ) {
+            $wp_page_components[] = array(
+                'id'   => $component_id,
+                'name' => isset( $bp->{$component_id}->name ) ? $bp->{$component_id}->name : ucwords( $bp->{$component_id}->id )
+            );
+        }
+    }
+
+    // Activate and Register are special cases. They are not components but they need WP pages.
+    // If user registration is disabled, we can skip this step.
+    if ( bp_get_signup_allowed() ) {
+        $wp_page_components[] = array(
+            'id'   => 'activate',
+            'name' => __( 'Activate', 'buddypress' )
+        );
+
+        $wp_page_components[] = array(
+            'id'   => 'register',
+            'name' => __( 'Register', 'buddypress' )
+        );
+    }
+
+    foreach( $wp_page_components as $component ) {
+        if ( !isset( $bp->pages->{$component['id']} ) ) {
+            $orphaned_components[] = $component['name'];
+        }
+    }
+
+    // Special case: If the Forums component is orphaned, but the bbPress 1.x installation is
+    // not correctly set up, don't show a nag. (In these cases, it's probably the case that the
+    // user is using bbPress 2.x; see https://buddypress.trac.wordpress.org/ticket/4292
+    if ( isset( $bp->forums->name ) && in_array( $bp->forums->name, $orphaned_components ) && !bp_forums_is_installed_correctly() ) {
+        $forum_key = array_search( $bp->forums->name, $orphaned_components );
+        unset( $orphaned_components[$forum_key] );
+        $orphaned_components = array_values( $orphaned_components );
+    }
+
+    if ( !empty( $orphaned_components ) ) {
+        $admin_url = bp_get_admin_url( add_query_arg( array( 'page' => 'bp-page-settings' ), 'admin.php' ) );
+        $notice    = sprintf( __( 'The following active BuddyPress Components do not have associated WordPress Pages: %2$s. <a href="%1$s" class="button-secondary">Repair</a>', 'buddypress' ), $admin_url, '<strong>' . implode( '</strong>, <strong>', $orphaned_components ) . '</strong>' );
+
+        bp_core_add_admin_notice( $notice );
+    }
+
+    /**
+     * BP components cannot share a single WP page. Check for duplicate assignments, and post
+     * a message if found.
+     */
+    $dupe_names = array();
+    $page_ids   = (array)bp_core_get_directory_page_ids();
+    $dupes      = array_diff_assoc( $page_ids, array_unique( $page_ids ) );
+
+    if ( !empty( $dupes ) ) {
+        foreach( array_keys( $dupes ) as $dupe_component ) {
+            $dupe_names[] = $bp->pages->{$dupe_component}->title;
+        }
+
+        // Make sure that there are no duplicate duplicates :)
+        $dupe_names = array_unique( $dupe_names );
+    }
+
+    // If there are duplicates, post a message about them
+    if ( !empty( $dupe_names ) ) {
+        $admin_url = bp_get_admin_url( add_query_arg( array( 'page' => 'bp-page-settings' ), 'admin.php' ) );
+        $notice    = sprintf( __( 'Each BuddyPress Component needs its own WordPress page. The following WordPress Pages have more than one component associated with them: %2$s. <a href="%1$s" class="button-secondary">Repair</a>', 'buddypress' ), $admin_url, '<strong>' . implode( '</strong>, <strong>', $dupe_names ) . '</strong>' );
+
+        bp_core_add_admin_notice( $notice );
+    }
+}

trunk/bp-loader.php

@@ -279 +279 @@
         /** Loading ***********************************************************/
 
-        $this->maintenance_mode = '';
         $this->load_deprecated  = true;
 
@@ -377 +376 @@
         /** Update/Install ****************************************************/
 
-        // This is a new installation
-        if ( is_admin() ) {
-
-            // New installation
-            if ( empty( $this->db_version_raw ) ) {
-                $this->maintenance_mode = 'install';
-
-            // Update
-            } elseif ( (int) $this->db_version_raw < (int) $this->db_version ) {
-                $this->maintenance_mode = 'update';
-            }
-
-            // The installation process requires a few BuddyPress core libraries
-            if ( !empty( $this->maintenance_mode ) ) {
-                require( $this->plugin_dir . 'bp-core/bp-core-admin.php'     );
-                require( $this->plugin_dir . 'bp-core/bp-core-functions.php' );
-                require( $this->plugin_dir . 'bp-core/bp-core-template.php'  );
-                require( $this->plugin_dir . 'bp-core/bp-core-update.php'    );
-                require( $this->plugin_dir . 'bp-core/bp-core-caps.php'      );
-                require( $this->plugin_dir . 'bp-core/bp-core-options.php'   );
-
-                /**
-                 * Textdomain is usually loaded via the bp_core_loaded action, but
-                 * that action isn't available when BP is in maintenance mode.
-                 */
-                add_action( 'plugins_loaded', 'bp_core_load_buddypress_textdomain', 9 );
-
-                // Load up BuddyPress's admin
-                add_action( 'plugins_loaded', 'bp_admin' );
-            }
-        }
-
-        // Not in maintenance mode
-        if ( empty( $this->maintenance_mode ) ) {
-
-            // Theme compatability
-            require( $this->plugin_dir . 'bp-core/bp-core-template-loader.php'     );
-            require( $this->plugin_dir . 'bp-core/bp-core-theme-compatibility.php' );
-
-            // Require all of the BuddyPress core libraries
-            require( $this->plugin_dir . 'bp-core/bp-core-dependency.php' );
-            require( $this->plugin_dir . 'bp-core/bp-core-actions.php'    );
-            require( $this->plugin_dir . 'bp-core/bp-core-caps.php'       );
-            require( $this->plugin_dir . 'bp-core/bp-core-cache.php'      );
-            require( $this->plugin_dir . 'bp-core/bp-core-cssjs.php'      );
-            require( $this->plugin_dir . 'bp-core/bp-core-update.php'     );
-            require( $this->plugin_dir . 'bp-core/bp-core-options.php'    );
-            require( $this->plugin_dir . 'bp-core/bp-core-classes.php'    );
-            require( $this->plugin_dir . 'bp-core/bp-core-filters.php'    );
-            require( $this->plugin_dir . 'bp-core/bp-core-avatars.php'    );
-            require( $this->plugin_dir . 'bp-core/bp-core-widgets.php'    );
-            require( $this->plugin_dir . 'bp-core/bp-core-template.php'   );
-            require( $this->plugin_dir . 'bp-core/bp-core-adminbar.php'   );
-            require( $this->plugin_dir . 'bp-core/bp-core-buddybar.php'   );
-            require( $this->plugin_dir . 'bp-core/bp-core-catchuri.php'   );
-            require( $this->plugin_dir . 'bp-core/bp-core-component.php'  );
-            require( $this->plugin_dir . 'bp-core/bp-core-functions.php'  );
-            require( $this->plugin_dir . 'bp-core/bp-core-moderation.php' );
-            require( $this->plugin_dir . 'bp-core/bp-core-loader.php'     );
-
-            // Skip or load deprecated content
-            if ( false !== $this->load_deprecated ) {
-                require( $this->plugin_dir . 'bp-core/deprecated/1.5.php' );
-                require( $this->plugin_dir . 'bp-core/deprecated/1.6.php' );
-                require( $this->plugin_dir . 'bp-core/deprecated/1.7.php' );
-            }
+        // Theme compatability
+        require( $this->plugin_dir . 'bp-core/bp-core-template-loader.php'     );
+        require( $this->plugin_dir . 'bp-core/bp-core-theme-compatibility.php' );
+
+        // Require all of the BuddyPress core libraries
+        require( $this->plugin_dir . 'bp-core/bp-core-dependency.php' );
+        require( $this->plugin_dir . 'bp-core/bp-core-actions.php'    );
+        require( $this->plugin_dir . 'bp-core/bp-core-caps.php'       );
+        require( $this->plugin_dir . 'bp-core/bp-core-cache.php'      );
+        require( $this->plugin_dir . 'bp-core/bp-core-cssjs.php'      );
+        require( $this->plugin_dir . 'bp-core/bp-core-update.php'     );
+        require( $this->plugin_dir . 'bp-core/bp-core-options.php'    );
+        require( $this->plugin_dir . 'bp-core/bp-core-classes.php'    );
+        require( $this->plugin_dir . 'bp-core/bp-core-filters.php'    );
+        require( $this->plugin_dir . 'bp-core/bp-core-avatars.php'    );
+        require( $this->plugin_dir . 'bp-core/bp-core-widgets.php'    );
+        require( $this->plugin_dir . 'bp-core/bp-core-template.php'   );
+        require( $this->plugin_dir . 'bp-core/bp-core-adminbar.php'   );
+        require( $this->plugin_dir . 'bp-core/bp-core-buddybar.php'   );
+        require( $this->plugin_dir . 'bp-core/bp-core-catchuri.php'   );
+        require( $this->plugin_dir . 'bp-core/bp-core-component.php'  );
+        require( $this->plugin_dir . 'bp-core/bp-core-functions.php'  );
+        require( $this->plugin_dir . 'bp-core/bp-core-moderation.php' );
+        require( $this->plugin_dir . 'bp-core/bp-core-loader.php'     );
+
+        // Skip or load deprecated content
+        if ( false !== $this->load_deprecated ) {
+            require( $this->plugin_dir . 'bp-core/deprecated/1.5.php' );
+            require( $this->plugin_dir . 'bp-core/deprecated/1.6.php' );
+            require( $this->plugin_dir . 'bp-core/deprecated/1.7.php' );
         }
     }