Changeset 5749

Timestamp:

02/13/2012 04:03:55 AM (13 years ago)

Author:

johnjamesjacoby

Message:

First pass at refactoring update/install wizard to remove code duplication:

• Rename and move admin images, css, and js into bp-core/admin/ folders
• Load the wizard from inside BP_Admin instead of selectively alone, so that basic functions are available
• Properly enqueue admin scripts
• Remove duplicated _update_ functions in bp-core-updater.php
• Remove weird redirect hack as it's no longer needed
• Remove purpose built functions that are no longer needed
• See #4005.
• Indirectly fixes #3964.

Location:

trunk

Files:

• bp-activity/bp-activity-admin.php (modified) (1 diff)
• bp-core/admin/bp-core-components.php (modified) (3 diffs)
• bp-core/admin/bp-core-functions.php (modified) (3 diffs)
• bp-core/admin/bp-core-schema.php (modified) (3 diffs)
• bp-core/admin/bp-core-update.php (modified) (33 diffs)
• bp-core/admin/css (added)
• bp-core/admin/css/common.css (added)
• bp-core/admin/css/common.dev.css (added)
• bp-core/admin/css/wizard.css (moved) (moved from trunk/bp-core/css/admin.css)
• bp-core/admin/css/wizard.dev.css (moved) (moved from trunk/bp-core/css/admin.dev.css) (8 diffs)
• bp-core/admin/images (added)
• bp-core/admin/images/completed.gif (moved) (moved from trunk/bp-core/images/completed.gif)
• bp-core/admin/images/find.png (moved) (moved from trunk/bp-core/images/find.png)
• bp-core/admin/images/icons32.png (moved) (moved from trunk/bp-core/images/icons32.png)
• bp-core/admin/images/installed.gif (moved) (moved from trunk/bp-core/images/installed.gif)
• bp-core/admin/images/menu.png (moved) (moved from trunk/bp-core/images/menu.png)
• bp-core/admin/js (added)
• bp-core/admin/js/wizard.dev.js (moved) (moved from trunk/bp-core/js/update.dev.js)
• bp-core/admin/js/wizard.js (moved) (moved from trunk/bp-core/js/update.js)
• bp-core/bp-core-admin.php (modified) (9 diffs)
• bp-core/images/admin_menu_icon.png (deleted)
• bp-forums/bp-forums-admin.php (modified) (5 diffs)
• bp-loader.php (modified) (2 diffs)
• bp-xprofile/bp-xprofile-admin.php (modified) (1 diff)
• bp-xprofile/bp-xprofile-cssjs.php (modified) (2 diffs)

trunk/bp-activity/bp-activity-admin.php

@@ -35 +35 @@
 
     // Hook into early actions to load custom CSS and our init handler.
-    add_action( "admin_print_styles-$hook", 'bp_core_add_admin_menu_styles' );
     add_action( "load-$hook", 'bp_activity_admin_load' );
 }

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

@@ -52 +52 @@
  */
 function bp_core_admin_components_options() {
-    global $bp_wizard;
 
     // Load core functions, if needed
@@ -131 +130 @@
 
     // On new install, set all components to be active by default
-    if ( !empty( $bp_wizard ) && 'install' == $bp_wizard->setup_type && empty( $active_components ) )
+    if ( empty( $active_components ) && ( bp_get_maintenance_mode() == 'install' ) )
         $active_components = $optional_components;
 
-    ?>
-
-    <?php /* The setup wizard uses different, more descriptive text here */ ?>
-    <?php if ( empty( $bp_wizard ) ) : ?>
+    // The setup wizard uses different, more descriptive text
+    if ( bp_get_maintenance_mode() ) : ?>
 
         <h3><?php _e( 'Available Components', 'buddypress' ); ?></h3>
@@ -169 +166 @@
     </table>
 
-    <?php if ( empty( $bp_wizard ) ) : ?>
+    <?php if ( bp_get_maintenance_mode() ) : ?>
 
         <h3><?php _e( 'Required Components', 'buddypress' ); ?></h3>

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

@@ -332 +332 @@
 
 /**
- * Loads admin panel styles and scripts.
- *
- * @package BuddyPress Core
- * @since {@internal Unknown}}
- */
-function bp_core_add_admin_menu_styles() {
-    if ( defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG )
-        wp_enqueue_style( 'bp-admin-css', apply_filters( 'bp_core_admin_css', BP_PLUGIN_URL . 'bp-core/css/admin.dev.css' ), array(), '20110723' );
-    else
-        wp_enqueue_style( 'bp-admin-css', apply_filters( 'bp_core_admin_css', BP_PLUGIN_URL . 'bp-core/css/admin.css' ), array(), '20110723' );
-
-    wp_enqueue_script( 'thickbox' );
-    wp_enqueue_style( 'thickbox' );
-}
-
-/**
  * Output the tabs in the admin area
  *
@@ -363 +347 @@
     $tabs = array(
         '0' => array(
-            'href' => bp_get_admin_url( add_query_arg( array( 'page' => 'bp-components' ), 'admin.php' ) ),
+            'href' => bp_get_admin_url( add_query_arg( array( 'page' => 'bp-components'    ), 'admin.php' ) ),
             'name' => __( 'Components', 'buddypress' )
         ),
         '1' => array(
-            'href' => bp_get_admin_url( add_query_arg( array( 'page' => 'bp-page-settings'      ), 'admin.php' ) ),
+            'href' => bp_get_admin_url( add_query_arg( array( 'page' => 'bp-page-settings' ), 'admin.php' ) ),
             'name' => __( 'Permalinks', 'buddypress' )
         ),
         '2' => array(
-            'href' => bp_get_admin_url( add_query_arg( array( 'page' => 'bp-settings'   ), 'admin.php' ) ),
+            'href' => bp_get_admin_url( add_query_arg( array( 'page' => 'bp-settings'      ), 'admin.php' ) ),
             'name' => __( 'Settings',   'buddypress' )
         )
@@ -379 +363 @@
     if ( bp_is_active( 'forums' ) ) {
         $tabs['3'] = array(
-            'href' => bp_get_admin_url( add_query_arg( array( 'page' => 'bb-forums-setup' ), 'admin.php' ) ),
+            'href' => bp_get_admin_url( add_query_arg( array( 'page' => 'bb-forums-setup'  ), 'admin.php' ) ),
             'name' => __( 'Forums', 'buddypress' )
         );

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

@@ -1 +1 @@
 <?php
+
 // Exit if accessed directly
 if ( !defined( 'ABSPATH' ) ) exit;
@@ -13 +14 @@
 
     return '';
+}
+
+function bp_core_install( $active_components = false ) {
+
+    if ( empty( $active_components ) )
+        $active_components = apply_filters( 'bp_active_components', bp_get_option( 'bp-active-components' ) );
+
+    // Core DB Tables
+    bp_core_install_notifications();
+
+    // Activity Streams
+    if ( !empty( $active_components['activity'] ) )
+        bp_core_install_activity_streams();
+
+    // Friend Connections
+    if ( !empty( $active_components['friends'] ) )
+        bp_core_install_friends();
+
+    // Extensible Groups
+    if ( !empty( $active_components['groups'] ) )
+        bp_core_install_groups();
+
+    // Private Messaging
+    if ( !empty( $active_components['messages'] ) )
+        bp_core_install_private_messaging();
+
+    // Extended Profiles
+    if ( !empty( $active_components['xprofile'] ) )
+        bp_core_install_extended_profiles();
+
+    // Blog tracking
+    if ( !empty( $active_components['blogs'] ) )
+        bp_core_install_blog_tracking();
 }
 
@@ -301 +335 @@
 }
 
+/**
+ * I don't appear to be used anymore, but I'm here anyways. I was originally
+ * used in olden days to update pre-1.1 schemas, but that was before we had
+ * a legitimate update process. Keep me around just incase.
+ *
+ * @global WPDB $wpdb
+ * @global BuddyPress $bp 
+ */
+function bp_update_db_stuff() {
+    global $wpdb, $bp;
+
+    $bp_prefix = bp_core_get_table_prefix();
+
+    // Rename the old user activity cached table if needed.
+    if ( $wpdb->get_var( "SHOW TABLES LIKE '%{$bp_prefix}bp_activity_user_activity_cached%'" ) )
+        $wpdb->query( "RENAME TABLE {$bp_prefix}bp_activity_user_activity_cached TO {$bp->activity->table_name}" );
+
+    // Rename fields from pre BP 1.2
+    if ( $wpdb->get_var( "SHOW TABLES LIKE '%{$bp->activity->table_name}%'" ) ) {
+        if ( $wpdb->get_var( "SHOW COLUMNS FROM {$bp->activity->table_name} LIKE 'component_action'" ) ) {
+            $wpdb->query( "ALTER TABLE {$bp->activity->table_name} CHANGE component_action type varchar(75) NOT NULL" );
+        }
+
+        if ( $wpdb->get_var( "SHOW COLUMNS FROM {$bp->activity->table_name} LIKE 'component_name'" ) ) {
+            $wpdb->query( "ALTER TABLE {$bp->activity->table_name} CHANGE component_name component varchar(75) NOT NULL" );
+        }
+    }
+
+    // On first installation - record all existing blogs in the system.
+    if ( !(int) $bp->site_options['bp-blogs-first-install'] ) {
+        bp_blogs_record_existing_blogs();
+        bp_update_option( 'bp-blogs-first-install', 1 );
+    }
+
+    if ( is_multisite() ) {
+        bp_core_add_illegal_names();
+    }
+
+    // Update and remove the message threads table if it exists
+    if ( $wpdb->get_var( "SHOW TABLES LIKE '%{$bp_prefix}bp_messages_threads%'" ) ) {
+        if ( BP_Messages_Thread::update_tables() ) {
+            $wpdb->query( "DROP TABLE {$bp_prefix}bp_messages_threads" );
+        }
+    }
+
+}
+
 ?>

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

@@ -16 +16 @@
     var $steps;
 
-    /**
-     * @var int Database version of current BuddyPress files
-     */
-    var $db_version;
-
-    /**
-     * @var int Database version raw from the database connection
-     */
-    var $db_version_raw;
-
-    /**
-     * @var string What kind of setup/update are we performing
-     */
-    var $setup_type;
-
-    /** Functions *************************************************************/
-
-    function bp_core_setup_wizard() {
-        $this->__construct();
-    }
+    /** Methods ***************************************************************/
 
     function __construct() {
-        global $bp;
 
         // Ensure that we have access to some utility functions. Must use require_once()
@@ -44 +24 @@
         require_once( BP_PLUGIN_DIR . '/bp-core/bp-core-functions.php' );
 
-        // Get current DB version
-        $this->db_version_raw = !empty( $bp->db_version_raw ) ? (int) $bp->db_version_raw : 0;
-
+        // Set/reset the wizard cookie
         setcookie( 'bp-wizard-step', 0, time() + 60 * 60 * 24, COOKIEPATH );
         $_COOKIE['bp-wizard-step'] = 0;
-
-        $this->db_version   = bp_get_db_version();
-        $this->setup_type   = $bp->maintenance_mode;
-        $this->current_step = $this->current_step();
-
-        // Remove the admin menu while we update/install
-        remove_action( bp_core_admin_hook(), 'bp_core_add_admin_menu', 9 );
 
         // Call the save method that will save data and modify $current_step
@@ -64 +35 @@
         $this->steps = $this->add_steps();
     }
-
+    
     function current_step() {
         if ( isset( $_POST['step'] ) ) {
@@ -84 +55 @@
         $steps = array();
 
-        if ( 'install' == $this->setup_type ) {
+        if ( bp_get_maintenance_mode() == 'install' ) {
             $steps = array(
                 __( 'Components', 'buddypress' ),
@@ -96 +67 @@
         } else {
 
-            if ( $this->db_version_raw < (int) $this->db_version )
+            if ( bp_get_db_version_raw() < (int) bp_get_db_version() )
                 $steps[] = __( 'Database Update', 'buddypress' );
 
             // New for BP 1.5
-            if ( $this->db_version_raw < 1801 || !bp_core_get_directory_page_ids() ) {
+            if ( bp_get_db_version_raw() < 1801 || !bp_core_get_directory_page_ids() ) {
                 $steps[] = __( 'Components', 'buddypress' );
                 $steps[] = __( 'Pages',      'buddypress' );
@@ -106 +77 @@
 
             // New for BP 1.6
-            if ( $this->db_version_raw < 5222 && !defined( 'BP_USE_WP_ADMIN_BAR' ) )
+            if ( bp_get_db_version_raw() < 5222 && !defined( 'BP_USE_WP_ADMIN_BAR' ) )
                 $steps[] = __( 'Admin Bar', 'buddypress' );
 
@@ -116 +87 @@
 
     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
@@ -149 +124 @@
         }
 
-        if ( !$result && $this->current_step )
-            $this->current_step--;
-
         if ( 'finish' != $step_name )
-            setcookie( 'bp-wizard-step', (int) $this->current_step, time() + 60 * 60 * 24, COOKIEPATH );
+            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.' );
+
         // Update or Setup
-        $type = ( 'update' == $this->setup_type ) ? __( 'Update', 'buddypress' ) : __( 'Setup', 'buddypress' );
-
+        $type = ( 'update' == bp_get_maintenance_mode() ) ? __( 'Update', 'buddypress' ) : __( 'Setup', 'buddypress' ); 
+        
         ?>
 
-        <div class="wrap" id="bp-admin">
+        <div class="wrap" id="bp-wizard">
 
             <?php screen_icon( 'buddypress' ); ?>
@@ -173 +149 @@
 
                 $step_count  = count( $this->steps ) - 1;
-                $wiz_or_set  = $this->current_step >= $step_count ? 'bp-components' : 'bp-wizard';
-                $form_action = bp_core_update_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 ), 'admin.php' ) );
+                $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-admin-form">
-                <div id="bp-admin-nav">
+            <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 ) : ?>
+                            <li<?php if ( $this->current_step() == $i ) : ?> class="current"<?php endif; ?>>
+                                <?php if ( $this->current_step() > $i ) : ?>
 
                                     <span class="complete">&nbsp;</span>
@@ -202 +178 @@
                     </ol>
 
-                    <?php if ( __( 'Finish', 'buddypress' ) == $this->steps[$this->current_step] ) : ?>
+                    <?php if ( __( 'Finish', 'buddypress' ) == $this->steps[$this->current_step()] ) : ?>
 
                         <div class="prev-next submit clear">
@@ -218 +194 @@
                 </div>
 
-                <div id="bp-admin-content">
-
-                    <?php switch ( $this->steps[$this->current_step] ) {
+                <div id="bp-wizard-content">
+
+                    <?php switch ( $this->steps[$this->current_step()] ) {
                         case __( 'Database Update', 'buddypress') :
                             $this->step_db_update();
@@ -260 +236 @@
 
     function step_db_update() {
-        if ( !current_user_can( 'activate_plugins' ) )
-            return false; ?>
+    ?>
 
         <p><?php _e( 'Before you can continue using BuddyPress, a few minor adjustments need to be made. These changes are not destructive and will not remove or change any existing settings.', 'buddypress' ); ?></p>
@@ -267 +242 @@
         <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 ); ?>" />
+            <input type="hidden" name="step" value="<?php echo esc_attr( $this->current_step() ); ?>" />
 
             <?php wp_nonce_field( 'bpwizard_db_update' ) ?>
@@ -277 +252 @@
 
     function step_components() {
-        if ( !current_user_can( 'activate_plugins' ) )
-            return false;
 
         if ( !function_exists( 'bp_core_admin_components_options' ) )
@@ -289 +262 @@
         <div class="submit clear">
             <input type="hidden" name="save" value="components" />
-            <input type="hidden" name="step" value="<?php echo esc_attr( $this->current_step ); ?>" />
+            <input type="hidden" name="step" value="<?php echo esc_attr( $this->current_step() ); ?>" />
 
             <?php wp_nonce_field( 'bpwizard_components' ); ?>
@@ -306 +279 @@
             switch_to_blog( bp_get_root_blog_id() );
 
-        if ( !current_user_can( 'activate_plugins' ) )
-            return false;
-
-        $existing_pages = bp_core_update_get_page_meta();
+        $existing_pages = bp_core_get_directory_page_ids();
 
         // Provide empty indexes to avoid PHP errors with wp_dropdown_pages()
@@ -484 +454 @@
         <div class="submit clear">
             <input type="hidden" name="save" value="pages" />
-            <input type="hidden" name="step" value="<?php echo esc_attr( $this->current_step ); ?>" />
+            <input type="hidden" name="step" value="<?php echo esc_attr( $this->current_step() ); ?>" />
 
             <?php wp_nonce_field( 'bpwizard_pages' ); ?>
@@ -496 +466 @@
 
     function step_permalinks() {
-        if ( !current_user_can( 'activate_plugins' ) )
-            return false;
 
         $prefix              = '';
@@ -532 +500 @@
         <div class="submit clear">
             <input type="hidden" name="save" value="permalinks" />
-            <input type="hidden" name="step" value="<?php echo esc_attr( $this->current_step ); ?>" />
+            <input type="hidden" name="step" value="<?php echo esc_attr( $this->current_step() ); ?>" />
 
             <?php if ( 'post' == strtolower( $_SERVER['REQUEST_METHOD'] ) && empty( $_POST['skip-htaccess'] ) ) : ?>
@@ -548 +516 @@
 
     function step_theme() {
-        if ( !current_user_can( 'activate_plugins' ) )
-            return false;
 
         $installed_plugins = get_plugins();
@@ -603 +569 @@
             </tr>
 
-            <?php if ( $bp_theme_installed ) : ?>
+            <?php if ( !empty( $bp_theme_installed ) ) : ?>
+
                 <tr>
                     <th>
                         <h5><?php _e( 'Other themes', 'buddypress' ); ?></h5>
-                        <img src="<?php echo plugins_url( '/buddypress/bp-core/images/find.png' ); ?>" alt="<?php _e( 'A BuddyPress theme', 'buddypress' ); ?>" />
+                        <img src="<?php echo plugins_url( '/buddypress/bp-core/admin/images/find.png' ); ?>" alt="<?php _e( 'A BuddyPress theme', 'buddypress' ); ?>" />
                     </th>
                     <td>
@@ -627 +594 @@
                     </td>
                 </tr>
+
             <?php endif; ?>
 
-            <tr>
-                <th>
-                    <h5><?php _e( 'Manually update current theme', 'buddypress' ); ?></h5>
-
-                    <?php if ( !empty( $screenshot ) ) : ?>
-
-                        <img src="<?php echo esc_url( $screenshot ); ?>" alt="<?php _e( 'Your existing theme', 'buddypress' ); ?>" />
-
-                    <?php endif; ?>
-
-                </th>
-                <td>
-                    <p><?php _e( 'The BuddyPress Template Pack will guide you through the process of manually editing your existing theme. It comes with a step-by-step guide and involves copying the BuddyPress template files into your theme. <strong>This option requires knowledge of CSS and HTML.</strong> You will need to tweak the new templates to match your existing theme.', 'buddypress' ); ?></p>
-
-                    <?php if ( empty( $template_pack_installed ) ) : ?>
-
-                        <p><a id="bp-template-pack" class="thickbox onclick button" href="<?php echo network_admin_url( 'plugin-install.php?tab=plugin-information&plugin=bp-template-pack&TB_iframe=true&width=640&height=500' ); ?>"><?php _e( 'Install BuddyPress Template Pack', 'buddypress' ); ?></a></p>
-
-                    <?php else : ?>
-
-                        <p><label><input type="radio" name="theme" value="manual_wp" /> <?php _e( 'Choose this option (go to Appearance &rarr; BP Compatibility after setup is complete)', 'buddypress' ); ?></label></p>
-                        <p><a id="bp-template-pack" class="button installed disabled" href="javascript:void();"><span></span><?php _e( 'Plugin Installed', 'buddypress' ); ?></a></p>
-
-                    <?php endif; ?>
-
-                </td>
-            </tr>
+            <?php if ( ! current_theme_supports( 'buddypress' ) ) : ?>
+
+                <tr>
+                    <th>
+                        <h5><?php _e( 'Manually update current theme', 'buddypress' ); ?></h5>
+
+                        <?php if ( !empty( $screenshot ) ) : ?>
+
+                            <img src="<?php echo esc_url( $screenshot ); ?>" alt="<?php _e( 'Your existing theme', 'buddypress' ); ?>" />
+
+                        <?php endif; ?>
+
+                    </th>
+                    <td>
+                        <p><?php _e( 'The BuddyPress Template Pack will guide you through the process of manually editing your existing theme. It comes with a step-by-step guide and involves copying the BuddyPress template files into your theme. <strong>This option requires knowledge of CSS and HTML.</strong> You will need to tweak the new templates to match your existing theme.', 'buddypress' ); ?></p>
+
+                        <?php if ( empty( $template_pack_installed ) ) : ?>
+
+                            <p><a id="bp-template-pack" class="thickbox onclick button" href="<?php echo network_admin_url( 'plugin-install.php?tab=plugin-information&plugin=bp-template-pack&TB_iframe=true&width=640&height=500' ); ?>"><?php _e( 'Install BuddyPress Template Pack', 'buddypress' ); ?></a></p>
+
+                        <?php else : ?>
+
+                            <p><label><input type="radio" name="theme" value="manual_wp" /> <?php _e( 'Choose this option (go to Appearance &rarr; BP Compatibility after setup is complete)', 'buddypress' ); ?></label></p>
+                            <p><a id="bp-template-pack" class="button installed disabled" href="javascript:void();"><span></span><?php _e( 'Plugin Installed', 'buddypress' ); ?></a></p>
+
+                        <?php endif; ?>
+
+                    </td>
+                </tr>
+
+            <?php endif; ?>
 
             <tr>
@@ -673 +645 @@
         <div class="submit clear">
             <input type="hidden" name="save" value="theme" />
-            <input type="hidden" name="step" value="<?php echo esc_attr( $this->current_step ) ?>" />
+            <input type="hidden" name="step" value="<?php echo esc_attr( $this->current_step() ) ?>" />
 
             <?php wp_nonce_field( 'bpwizard_theme' ) ?>
@@ -688 +660 @@
      */
     function step_admin_bar() {
-        if ( !current_user_can( 'activate_plugins' ) )
-            return false;
-        ?>
+    ?>
 
         <p><?php _e( "BuddyPress now uses WordPress' Admin Bar; this sits at the top of your site and contains various links to useful admin screens. We've turbo-charged the Admin Bar by adding social items to help your users explore your site, and manage their content.", 'buddypress' ); ?></p>
@@ -705 +675 @@
         <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 ); ?>" />
+            <input type="hidden" name="step" value="<?php echo esc_attr( $this->current_step() ); ?>" />
 
             <?php wp_nonce_field( 'bpwizard_admin_bar' ) ?>
+
         </div>
 
@@ -714 +685 @@
 
     function step_finish() {
-        if ( !current_user_can( 'activate_plugins' ) )
-            return false;
 
         // What type of action is happening here?
-        $type = ( 'install' == $this->setup_type ) ? __( 'setup', 'buddypress' ) : __( 'update', 'buddypress' ); ?>
-
-        <p><?php printf( __( "The BuddyPress %1\$s is complete, and your site is ready to go!", 'buddypress' ), $type, $type ); ?></p>
+        $type = ( bp_get_maintenance_mode() == 'install' ) ? __( 'setup', 'buddypress' ) : __( 'update', 'buddypress' ); ?>
+
+        <p><?php printf( __( "The BuddyPress %1\$s is complete, and your site is ready to go!", 'buddypress' ), $type ); ?></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 ); ?>" />
+            <input type="hidden" name="step" value="<?php echo esc_attr( $this->current_step() ); ?>" />
 
             <?php wp_nonce_field( 'bpwizard_finish' ); ?>
@@ -736 +705 @@
 
     function step_db_update_save() {
-        global $bp;
 
         if ( isset( $_POST['submit'] ) ) {
@@ -744 +712 @@
             bp_core_install();
 
-            if ( $this->db_version_raw < 1801 )
+            // Update to 1.5
+            if ( bp_get_db_version_raw() < 1801 )
                 $this->update_1_5();
 
-            // Update the active components option early if we're updating
-            if ( 'update' == $this->setup_type )
-                bp_update_option( 'bp-active-components', $bp->active_components );
+            // Update to 1.6
+            if ( bp_get_db_version_raw() < bp_get_db_version() )
+                $this->update_1_6();
 
             return true;
@@ -792 +761 @@
 
             // Delete any existing pages
-            $existing_pages = bp_core_update_get_page_meta( 'bp-pages' );
+            $existing_pages = bp_core_get_directory_page_ids();
 
             foreach ( (array) $existing_pages as $page_id ) {
@@ -992 +961 @@
             check_admin_referer( 'bpwizard_finish' );
 
-            // 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'      );
-
             // Update the DB version in the database
             // Stored in sitemeta. Do not use bp_update_option()
-            update_blog_option( bp_get_root_blog_id(), '_bp_db_version', $this->db_version );
+            update_blog_option( bp_get_root_blog_id(), '_bp_db_version', bp_get_db_version() );
 
             // Delete the setup cookie
             @setcookie( 'bp-wizard-step', '', time() - 3600, COOKIEPATH );
 
-            // Load BP and hook the admin menu, so that the redirect is successful
-            require_once( WP_PLUGIN_DIR . '/buddypress/bp-core/bp-core-admin.php' );
-            require_once( WP_PLUGIN_DIR . '/buddypress/bp-core/bp-core-template.php' );
-            bp_admin();
-
             // Redirect to the BuddyPress dashboard
-            $redirect = bp_core_update_do_network_admin() ? add_query_arg( array( 'page' => 'bp-components' ), network_admin_url( 'settings.php' ) ) : add_query_arg( array( 'page' => 'bp-components' ), admin_url( 'options-general.php' ) );
+            $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 );
 
-            return true;
+            // That's all!
+            exit();
         }
 
@@ -1049 +1003 @@
     // Database update methods based on version numbers
     function update_1_5() {
+
         // Delete old database version options
         delete_site_option( 'bp-activity-db-version' );
@@ -1058 +1013 @@
     }
 
+    // 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
@@ -1063 +1034 @@
     function reset_cookie() {
         @setcookie( 'bp-wizard-step', '', time() - 3600, COOKIEPATH );
-    }
+    }   
 }
 
-function bp_core_setup_wizard_init() {
-    global $bp_wizard;
-
-    $bp_wizard = new BP_Core_Setup_Wizard;
+/**
+ * Get the wizard
+ *
+ * @global type $bp
+ * @return boolean 
+ */
+function bp_get_wizard() {
+    global $bp;
+
+    if ( !empty( $bp->admin->wizard ) )
+        return $bp->admin->wizard;
+
+    return false;
 }
-add_action( bp_core_update_admin_hook(), 'bp_core_setup_wizard_init', 7 );
-
-function bp_core_install( $active_components = false ) {
-
-    if ( empty( $active_components ) )
-        $active_components = apply_filters( 'bp_active_components', bp_get_option( 'bp-active-components' ) );
-
-    require( dirname( __FILE__ ) . '/bp-core-schema.php' );
-
-    // Core DB Tables
-    bp_core_install_notifications();
-
-    // Activity Streams
-    if ( !empty( $active_components['activity'] ) )
-        bp_core_install_activity_streams();
-
-    // Friend Connections
-    if ( !empty( $active_components['friends'] ) )
-        bp_core_install_friends();
-
-    // Extensible Groups
-    if ( !empty( $active_components['groups'] ) )
-        bp_core_install_groups();
-
-    // Private Messaging
-    if ( !empty( $active_components['messages'] ) )
-        bp_core_install_private_messaging();
-
-    // Extended Profiles
-    if ( !empty( $active_components['xprofile'] ) )
-        bp_core_install_extended_profiles();
-
-    // Blog tracking
-    if ( !empty( $active_components['blogs'] ) )
-        bp_core_install_blog_tracking();
-}
-
-function bp_core_update( $disabled ) {
-    require( dirname( __FILE__ ) . '/bp-core-schema.php' );
-}
-
-function bp_update_db_stuff() {
-    $bp_prefix = bp_core_get_table_prefix();
-    // Rename the old user activity cached table if needed.
-    if ( $wpdb->get_var( "SHOW TABLES LIKE '%{$bp_prefix}bp_activity_user_activity_cached%'" ) )
-        $wpdb->query( "RENAME TABLE {$bp_prefix}bp_activity_user_activity_cached TO {$bp->activity->table_name}" );
-
-    // Rename fields from pre BP 1.2
-    if ( $wpdb->get_var( "SHOW TABLES LIKE '%{$bp->activity->table_name}%'" ) ) {
-        if ( $wpdb->get_var( "SHOW COLUMNS FROM {$bp->activity->table_name} LIKE 'component_action'" ) )
-            $wpdb->query( "ALTER TABLE {$bp->activity->table_name} CHANGE component_action type varchar(75) NOT NULL" );
-
-        if ( $wpdb->get_var( "SHOW COLUMNS FROM {$bp->activity->table_name} LIKE 'component_name'" ) )
-            $wpdb->query( "ALTER TABLE {$bp->activity->table_name} CHANGE component_name component varchar(75) NOT NULL" );
-    }
-
-    // On first installation - record all existing blogs in the system.
-    if ( !(int) $bp->site_options['bp-blogs-first-install'] ) {
-        bp_blogs_record_existing_blogs();
-        bp_update_option( 'bp-blogs-first-install', 1 );
-    }
-
-    if ( is_multisite() )
-        bp_core_add_illegal_names();
-
-    // Update and remove the message threads table if it exists
-    if ( $wpdb->get_var( "SHOW TABLES LIKE '%{$bp_prefix}bp_messages_threads%'" ) ) {
-        $update = BP_Messages_Thread::update_tables();
-
-        if ( $update )
-            $wpdb->query( "DROP TABLE {$bp_prefix}bp_messages_threads" );
-    }
-
-}
-
-function bp_core_wizard_message() {
-    if ( isset( $_GET['updated'] ) )
-        $message = __( 'Installation was successful. The available options have now been updated, please continue with your selection.', 'buddypress' );
-    else
-        return false; ?>
-
-    <div id="message" class="updated">
-        <p><?php echo esc_attr( $message ) ?></p>
-    </div>
-
-<?php
-}
-add_action( 'bp_admin_notices', 'bp_core_wizard_message' );
-
-// Alter thickbox screens so the entire plugin download and install
-// interface is contained within.
-function bp_core_wizard_thickbox() {
-    $form_action = bp_core_update_do_network_admin() ? network_admin_url( add_query_arg( array( 'page' => 'bp-wizard', 'updated' => '1' ), 'admin.php' ) ) : admin_url( add_query_arg( array( 'page' => 'bp-wizard', 'updated' => '1' ), 'admin.php' ) ); ?>
-
-    <script type="text/javascript">
-        jQuery('p.action-button a').attr( 'target', '' );
-
-        if ( window.location != window.parent.location ) {
-            jQuery('#adminmenu, #wphead, #footer, #update-nag, #screen-meta').hide();
-            jQuery('#wpbody').css( 'margin', '15px' );
-            jQuery('body').css( 'min-width', '30px' );
-            jQuery('#wpwrap').css( 'min-height', '30px' );
-            jQuery('a').removeClass( 'thickbox thickbox-preview onclick' );
-            jQuery('body.update-php div.wrap p:last').hide();
-            jQuery('body.update-php div.wrap p:last').after( '<p><a class="button" target="_parent" href="<?php echo $form_action; ?>"><?php _e( 'Finish', 'buddypress' ) ?></a></p>' );
-        }
-    </script>
-
-<?php
-}
-add_action( 'admin_footer', 'bp_core_wizard_thickbox' );
-
-function bp_core_update_add_admin_menu_styles() {
-    if ( defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ) {
-        wp_enqueue_style( 'bp-admin-css', apply_filters( 'bp_core_admin_css', plugins_url( '/buddypress' ) . '/bp-core/css/admin.dev.css' ), array(), '20110723' );
-        wp_enqueue_script( 'bp-update-js', apply_filters( 'bp_core_update_js', plugins_url( '/buddypress' ) . '/bp-core/js/update.dev.js' ), array( 'jquery' ), '20110723' );
-    } else {
-        wp_enqueue_style( 'bp-admin-css', apply_filters( 'bp_core_admin_css', plugins_url( '/buddypress' ) . '/bp-core/css/admin.css' ), array(), '20110723' );
-        wp_enqueue_script( 'bp-update-js', apply_filters( 'bp_core_update_js', plugins_url( '/buddypress' ) . '/bp-core/js/update.js' ), array( 'jquery' ), '20110723' );
-    }
-
-    wp_enqueue_script( 'thickbox' );
-    wp_enqueue_style( 'thickbox' );
-}
-add_action( 'admin_head', 'bp_core_update_add_admin_menu_styles' );
-
-/**
- * Fetches BP pages from the meta table
- *
- * @package BuddyPress Core
- * @since 1.5
- *
- * @return array $page_ids
- */
-function bp_core_update_get_page_meta() {
-    $page_ids = bp_get_option( 'bp-pages' );
-    if ( empty( $page_ids ) )
-        $page_ids = array();
-
-    return apply_filters( 'bp_core_update_get_page_meta', $page_ids );
-}
-
-function bp_core_update_do_network_admin() {
-    $do_network_admin = false;
-
-    if ( is_multisite() && ( !defined( 'BP_ENABLE_MULTIBLOG' ) || !BP_ENABLE_MULTIBLOG ) )
-        $do_network_admin = true;
-
-    return apply_filters( 'bp_core_do_network_admin', $do_network_admin );
-}
-
-function bp_core_update_admin_hook() {
-    $hook = bp_core_update_do_network_admin() ? 'network_admin_menu' : 'admin_menu';
-
-    return apply_filters( 'bp_core_admin_hook', $hook );
-}
-
-/**
- * Adds the "BuddyPress" admin submenu item to the Site Admin tab.
- *
- * @package BuddyPress Core
- * @global object $bp Global BuddyPress settings object
- * @global $wpdb WordPress DB access object.
- * @uses add_submenu_page() WP function to add a submenu item
- */
-function bp_core_update_add_admin_menu() {
-    global $bp_wizard;
-
-    // Only load this version of the menu if this is an upgrade or a new installation
-    if ( empty( $bp_wizard->setup_type ) )
-        return false;
-
-    if ( !current_user_can( 'manage_options' ) )
-        return false;
-
-    if ( 'install' == $bp_wizard->setup_type )
-        $status = __( 'BuddyPress Setup', 'buddypress' );
-    else
-        $status = __( 'Update BuddyPress',  'buddypress' );
-
-    // Add the administration tab under the "Site Admin" tab for site administrators
-    if ( ! is_multisite() || bp_is_multiblog_mode() )
-        $hook = add_dashboard_page( $status, $status, 'manage_options', 'bp-wizard', array( $bp_wizard, 'html' ) );
-    else
-        $hook = add_submenu_page( 'update-core.php', $status, $status, 'manage_options', 'bp-wizard', array( $bp_wizard, 'html' ) );
-
-    // Add a hook for css/js
-    add_action( "admin_print_styles-$hook", 'bp_core_update_add_admin_menu_styles' );
-}
-add_action( bp_core_update_admin_hook(),  'bp_core_update_add_admin_menu', 9 );
-
-/**
- * Adds an admin nag about running the BP upgrade/install wizard
- *
- * @package BuddyPress Core
- * @since 1.5
- * @global $pagenow The current admin page
- */
-function bp_core_update_nag() {
-    global $bp_wizard, $pagenow;
-
-    // Bail if no wizard
-    if ( empty( $bp_wizard->setup_type ) )
-        return;
-
-    // Bail if user cannot manage options
-    if ( ! current_user_can( 'manage_options' ) )
-        return;
-
-    // Are we looking at a network?
-    if ( bp_core_update_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_wizard->setup_type ) {
-
-        // Update text
-        case 'update' :
-            $msg = sprintf( __( 'BuddyPress has been updated! Please run the <a href="%s">update wizard</a>.', 'buddypress' ), $url );
-            break;
-
-        // First install text
-        case 'install' : default :
-            $msg = sprintf( __( 'BuddyPress was successfully activated! Please run the <a href="%s">installation wizard</a>.', 'buddypress' ), $url );
-            break;
-    } ?>
-
-    <div class="update-nag"><?php echo $msg; ?></div>
-
-<?php
-}
-add_action( 'admin_notices',         'bp_core_update_nag', 5 );
-add_action( 'network_admin_notices', 'bp_core_update_nag', 5 );
 
 ?>

trunk/bp-core/admin/css/wizard.dev.css

@@ -1 @@
-
-/* Icon 32
-------------------------------------------------------------------------------*/
-
-div#icon-buddypress {
-    background: url( ../images/icons32.png ) no-repeat -370px -6px;
-}
-
-div#icon-buddypress-activity {
-    background: url( ../images/icons32.png ) no-repeat -10px -6px;
-}
-
-/* Menu Icons
-------------------------------------------------------------------------------*/
-
-ul#adminmenu li.toplevel_page_bp-wizard .wp-menu-image a img {
-    display: none;
-}
-ul#adminmenu li.toplevel_page_bp-wizard .wp-menu-image a {
-    background-image: url( '../images/menu.png' ) !important;
-    background-position: -178pxpx -34px;
-}
-ul#adminmenu li.toplevel_page_bp-wizard:hover .wp-menu-image a,
-ul#adminmenu li.toplevel_page_bp-wizard.wp-has-current-submenu .wp-menu-image a {
-    background-position: -178px -2px;
-}
-
-/* Backpat Icon */
-ul#adminmenu li.toplevel_page_bp-components .wp-menu-image a img,
-ul#adminmenu li.toplevel_page_bp-general-settings .wp-menu-image a img {
-    display: none;
-}
-
-ul#adminmenu li.toplevel_page_bp-components .wp-menu-image a,
-ul#adminmenu li.toplevel_page_bp-general-settings .wp-menu-image a {
-    background-image: url( '../images/menu.png' ) !important;
-    background-position: -178px -34px;
-}
-
-ul#adminmenu li.toplevel_page_bp-components:hover .wp-menu-image a,
-ul#adminmenu li.toplevel_page_bp-general-settings:hover .wp-menu-image a,
-ul#adminmenu li.toplevel_page_bp-components.wp-has-current-submenu .wp-menu-image a,
-ul#adminmenu li.toplevel_page_bp-general-settings.wp-has-current-submenu .wp-menu-image a {
-    background-position: -178px -2px;
-}
-
-/* Activity Icon */
-ul#adminmenu li.toplevel_page_bp-activity .wp-menu-image a img {
-    display: none;
-}
-ul#adminmenu li.toplevel_page_bp-activity .wp-menu-image a {
-    background-image: url( '../images/menu.png' ) !important;
-    background-position: 0px -34px;
-}
-ul#adminmenu li.toplevel_page_bp-activity:hover .wp-menu-image a,
-ul#adminmenu li.toplevel_page_bp-activity.current .wp-menu-image a,
-ul#adminmenu li.toplevel_page_bp-activity.wp-has-current-submenu .wp-menu-image a {
-    background-position: 0 -2px;
-}
 
 /* General Admin Styling
 ------------------------------------------------------------------------------*/
 
-div#bp-admin {
+div#bp-wizard {
     color: #555;
     min-width: 680px;
 }
-div#bp-admin p {
+div#bp-wizard p {
     line-height: 170%;
 }
 
-form#bp-admin-form {
+form#bp-wizard-form {
     margin: 0 10px;
 }
 
-div#bp-admin-nav {
+div#bp-wizard-nav {
     background: #e0e0e0;
     margin: 15px -10px 10px;
@@ -83 +24 @@
     border-radius: 2px;
 }
-div#bp-admin-nav div.submit {
+div#bp-wizard-nav div.submit {
     position: relative;
     float: right;
     margin-top: -36px !important;
 }
-div#bp-admin-nav div.submit input {
+div#bp-wizard-nav div.submit input {
     padding: 6px 10px;
 }
-    div#bp-admin-nav ol {
+    div#bp-wizard-nav ol {
         list-style-type: decimal;
         margin: 0;
         padding: 0;
     }
-        div#bp-admin-nav ol li {
+        div#bp-wizard-nav ol li {
             float: left;
             margin: 0 10px 0 0;
             color: #666;
         }
-            div#bp-admin-nav ol li {
+            div#bp-wizard-nav ol li {
                 padding: 8px 12px;
                 display: block;
@@ -109 +50 @@
                 text-decoration: none;
             }
-                div#bp-admin-nav ol li.current {
+                div#bp-wizard-nav ol li.current {
                     background: #fff;
                     color: #555;
                 }
 
-    div#bp-admin-nav ol li span.complete {
+    div#bp-wizard-nav ol li span.complete {
         background: url( ../images/completed.gif ) center left no-repeat;
         padding: 6px;
@@ -155 +96 @@
     }
 
-div#bp-admin div.prev-next, div#bp-admin div.prev-next p,
-div#bp-admin div.submit, div#bp-admin div.submit p {
+div#bp-wizard div.prev-next, div#bp-wizard div.prev-next p,
+div#bp-wizard div.submit, div#bp-wizard div.submit p {
     margin: 0;
     padding: 0;
 }
-div#bp-admin div.submit { margin-top: 30px; }
-div#bp-admin div.prev-next { text-align: right; margin-top: 0; }
+div#bp-wizard div.submit {
+    margin-top: 30px;
+}
+div#bp-wizard div.prev-next {
+    text-align: right;
+    margin-top: 0;
+}
 
-div#bp-admin div.prev-next {
+div#bp-wizard div.prev-next {
     margin: 0 -20px;
     padding: 0 20px 10px;
 }
 
-div#bp-admin table td {
+div#bp-wizard table td {
     font-family: helvetica, arial, tahoma, sans-serif;
     vertical-align: top;
 }
 
-div#bp-admin table.form-table th {
+div#bp-wizard table.form-table th {
     border-right: 1px solid #eee;
     padding: 15px 25px 15px 0;
@@ -179 +125 @@
     vertical-align: top;
 }
-    div#bp-admin table.form-table tr {
+    div#bp-wizard table.form-table tr {
         border-bottom: 1px dotted #f0f0f0;
     }
-    div#bp-admin table.form-table td { padding-left: 25px; font-size: 12px; }
+    div#bp-wizard table.form-table td {
+        padding-left: 25px;
+        font-size: 12px;
+    }
 
-    div#bp-admin table.form-table th h5 {
+    div#bp-wizard table.form-table th h5 {
         font-size: 14px;
         margin: 0;
@@ -190 +139 @@
     }
 
-    div#bp-admin table.form-table th img {
+    div#bp-wizard table.form-table th img {
         margin-top: 5px;
     }
 
-    div#bp-admin table.form-table th p { margin: 3px 0 0 0; }
+    div#bp-wizard table.form-table th p {
+        margin: 3px 0 0 0;
+    }
 
-div#bp-admin code, div#bp-admin kbd {
+div#bp-wizard code, div#bp-wizard kbd {
     font-size: 12px;
     background: #f0f0f0;
 }
 
-div#bp-admin div#message code, div#bp-admin div#message kbd {
+div#bp-wizard div#message code, div#bp-wizard div#message kbd {
     background: #ffe293;
 }
@@ -209 +160 @@
 }
 
-a.installed, a.installed:hover, a.installed:active {
+a.installed,
+a.installed:hover,
+a.installed:active {
     padding-left: 15px;
     color: #888;
@@ -217 +170 @@
 
 a.installed span {
-    background: url( ../images/installed.gif) left center no-repeat;
+    background: url( ../images/installed.gif ) left center no-repeat;
     padding: 6px 10px 7px 6px;
     margin-left: -5px;

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

@@ -45 +45 @@
     public $styles_url = '';
 
+    /**
+     * @var string URL to the BuddyPress admin CSS directory
+     */
+    public $css_url = '';
+
+    /**
+     * @var string URL to the BuddyPress admin JS directory
+     */
+    public $js_url = '';
+
     /** Recounts **************************************************************/
 
@@ -59 +69 @@
     public $content_depth = 0;
 
-    /** Functions *************************************************************/
+    /** Methods ***************************************************************/
 
     /**
@@ -77 +87 @@
 
     /**
+     * Admin globals
+     *
+     * @since BuddyPress (1.6)
+     * @access private
+     */
+    private function setup_globals() {
+        global $bp;
+
+        // Admin url
+        $this->admin_dir  = trailingslashit( $bp->plugin_dir . 'bp-core/admin' );
+
+        // Admin url
+        $this->admin_url  = trailingslashit( $bp->plugin_url . 'bp-core/admin' );
+
+        // Admin images URL
+        $this->images_url = trailingslashit( $this->admin_url . 'images' );
+
+        // Admin css URL
+        $this->css_url    = trailingslashit( $this->admin_url . 'css'    );
+
+        // Admin css URL
+        $this->js_url     = trailingslashit( $this->admin_url . 'js'     );
+
+        // Admin images URL
+        $this->styles_url = trailingslashit( $this->admin_url . 'styles' );
+    }
+
+    /**
+     * Include required files
+     *
+     * @since BuddyPress (1.6)
+     * @access private
+     */
+    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'      );
+        }
+    }
+
+    /**
      * Setup the admin hooks, actions and filters
      *
@@ -87 +147 @@
     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 general styling to the admin area
-        add_action( 'admin_head',         array( $this, 'admin_head'                 ) );
+        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 menu item to settings menu
-        add_action( bp_core_admin_hook(), array( $this, 'admin_menus'                ), 5 );
+        add_action( bp_core_admin_hook(),    array( $this, 'admin_menus' ), 5 );
 
         // Add notice if not using a BuddyPress theme
-        add_action( 'admin_notices',      array( $this, 'activation_notice'          ) );
-
-        // Add importers
-        //add_action( 'bp_admin_init',      array( $this, 'register_importers'         ) );
-
-        // Add green admin style
-        //add_action( 'bp_admin_init',      array( $this, 'register_admin_style'       ) );
-
-        // Add settings
-        add_action( 'bp_admin_init',      array( $this, 'register_admin_settings'    ) );
+        add_action( 'admin_notices',         array( $this, 'admin_notices' ) );
+
+        // Enqueue all admin JS and CSS
+        add_action( 'admin_enqueue_scripts', array( $this, 'enqueue_scripts'   ) );
 
         // Forums 'Right now' Dashboard widget
         //add_action( 'wp_dashboard_setup', array( $this, 'dashboard_widget_right_now' ) );
 
+        /** BuddyPress Actions ************************************************/
+
+        // Add importers
+        //add_action( 'bp_admin_init',      array( $this, 'register_importers'      ) );
+
+        // Add red admin style
+        //add_action( 'bp_admin_init',      array( $this, 'register_admin_style'    ) );
+
+        // Add settings
+        add_action( 'bp_admin_init',      array( $this, 'register_admin_settings' ) );
+
         /** Filters ***********************************************************/
 
@@ -122 +192 @@
     }
 
-    /**
-     * Include required files
-     *
-     * @since BuddyPress (1.6)
-     * @access private
-     */
-    private function includes() {
-
-        // Include the files
-        require_once( $this->admin_dir . 'bp-core-settings.php'   );
-        require_once( $this->admin_dir . 'bp-core-functions.php'  );
-        require_once( $this->admin_dir . 'bp-core-components.php' );
-        require_once( $this->admin_dir . 'bp-core-slugs.php'      );
-        //require( $this->admin_dir . 'bp-metaboxes.php'       );
-    }
-
-    /**
-     * Admin globals
-     *
-     * @since BuddyPress (1.6)
-     * @access private
-     */
-    private function setup_globals() {
-        global $bp;
-
-        // Admin url
-        $this->admin_dir  = trailingslashit( $bp->plugin_dir . 'bp-core/admin' );
-
-        // Admin url
-        $this->admin_url  = trailingslashit( $bp->plugin_url . 'bp-core/bp-admin' );
-
-        // Admin images URL
-        $this->images_url = trailingslashit( $this->admin_url . 'images' );
-
-        // Admin images URL
-        $this->styles_url = trailingslashit( $this->admin_url . 'styles' );
+    public function start_wizard() {
+        $this->wizard = new BP_Core_Setup_Wizard;
     }
 
@@ -171 +207 @@
     public function admin_menus() {
 
-        if ( ! bp_current_user_can( 'bp_moderate' ) )
-            return;
-
-        // Don't add this version of the admin menu if a BP upgrade is in progress.
-        // @see bp_core_update_add_admin_menu().
-        if ( defined( 'BP_IS_UPGRADE' ) && BP_IS_UPGRADE )
-            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',
-            ''
-        );
-
-        $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'
-        );
-
-        foreach( $hooks as $hook ) {
-
-            // Add a hook for common BP admin CSS/JS scripts
-            add_action( "admin_print_styles-$hook", 'bp_core_add_admin_menu_styles' );
+        // 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',
+                ''
+            );
+
+            $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
-            add_action( "admin_head-$hook", 'bp_core_modify_admin_menu_highlight' );
+            foreach( $hooks as $hook ) {
+                add_action( "admin_head-$hook", 'bp_core_modify_admin_menu_highlight' );
+            }
         }
     }
@@ -398 +449 @@
 
     /**
-     * Admin area activation notice
-     *
-     * Shows a nag message in admin area about the theme not supporting BuddyPress
-     *
-     * @since BuddyPress (1.6)
-     *
-     * @uses current_user_can() To check notice should be displayed.
-     */
-    public function activation_notice() {
-        // @todo - something fun
-    }
-
-    /**
      * Add Settings link to plugins area
      *
@@ -457 +495 @@
      *
      * @since BuddyPress (1.6)
-     *
-     * @uses bp_get_forum_post_type() To get the forum post type
-     * @uses bp_get_topic_post_type() To get the topic post type
-     * @uses bp_get_reply_post_type() To get the reply post type
-     * @uses sanitize_html_class() To sanitize the classes
-     * @uses do_action() Calls 'bp_admin_head'
-     */
-    public function admin_head() {
-
-        // Icons for top level admin menus
-        $menu_icon_url = $this->images_url . 'menu.png';
-        $icon32_url    = $this->images_url . 'icons32.png'; ?>
-
-        <style type="text/css" media="screen">
-        /*<![CDATA[*/
-
-            #bp-dashboard-right-now p.sub,
-            #bp-dashboard-right-now .table,
-            #bp-dashboard-right-now .versions {
-                margin: -12px;
-            }
-
-            #bp-dashboard-right-now .inside {
-                font-size: 12px;
-                padding-top: 20px;
-                margin-bottom: 0;
-            }
-
-            #bp-dashboard-right-now p.sub {
-                padding: 5px 0 15px;
-                color: #8f8f8f;
-                font-size: 14px;
-                position: absolute;
-                top: -17px;
-
-                <?php if ( is_rtl() ) : ?>
-
-                    right: 15px;
-
-                <?php else : ?>
-
-                    left: 15px;
-
-                <?php endif; ?>
-
-            }
-
-            #bp-dashboard-right-now .table {
-                margin: 0;
-                padding: 0;
-                position: relative;
-            }
-
-            #bp-dashboard-right-now .table_content {
-
-                <?php if ( is_rtl() ) : ?>
-
-                    float: right;
-
-                <?php else : ?>
-
-                    float: left;
-
-                <?php endif; ?>
-
-                border-top: #ececec 1px solid;
-                width: 45%;
-            }
-
-            #bp-dashboard-right-now .table_discussion {
-
-                <?php if ( is_rtl() ) : ?>
-
-                    float: left;
-
-                <?php else : ?>
-
-                    float: right;
-
-                <?php endif; ?>
-
-                border-top: #ececec 1px solid;
-                width: 45%;
-            }
-
-            #bp-dashboard-right-now table td {
-                padding: 3px 0;
-                white-space: nowrap;
-            }
-
-            #bp-dashboard-right-now table tr.first td {
-                border-top: none;
-            }
-
-            #bp-dashboard-right-now td.b {
-
-                <?php if ( is_rtl() ) : ?>
-
-                    padding-left: 6px;
-
-                <?php else : ?>
-
-                    padding-right: 6px;
-
-                <?php endif; ?>
-
-                text-align: right;
-                font-family: Georgia, "Times New Roman", "Bitstream Charter", Times, serif;
-                font-size: 14px;
-                width: 1%;
-            }
-
-            #bp-dashboard-right-now td.b a {
-                font-size: 18px;
-            }
-
-            #bp-dashboard-right-now td.b a:hover {
-                color: #d54e21;
-            }
-
-            #bp-dashboard-right-now .t {
-                font-size: 12px;
-
-                <?php if ( is_rtl() ) : ?>
-
-                    padding-left: 12px;
-
-                <?php else : ?>
-
-                    padding-right: 12px;
-
-                <?php endif; ?>
-
-                padding-top: 6px;
-                color: #777;
-            }
-
-            #bp-dashboard-right-now .t a {
-                white-space: nowrap;
-            }
-
-            #bp-dashboard-right-now .spam {
-                color: red;
-            }
-
-            #bp-dashboard-right-now .waiting {
-                color: #e66f00;
-            }
-
-            #bp-dashboard-right-now .approved {
-                color: green;
-            }
-
-            #bp-dashboard-right-now .versions {
-                padding: 6px 10px 12px;
-                clear: both;
-            }
-
-            #bp-dashboard-right-now .versions .b {
-                font-weight: bold;
-            }
-
-            #bp-dashboard-right-now a.button {
-
-                <?php if ( is_rtl() ) : ?>
-
-                    float: left;
-                    clear: left;
-
-                <?php else : ?>
-
-                    float: right;
-                    clear: right;
-
-                <?php endif; ?>
-
-                position: relative;
-                top: -5px;
-            }
-
-        /*]]>*/
-        </style>
-
-        <?php
-
-        // Add extra actions to BuddyPress admin header area
+     */
+    public function admin_head() { }
+
+    /**
+     * Add some general styling to the admin area
+     *
+     * @since BuddyPress (1.6)
+     */
+    public function enqueue_scripts() {
+
+        $maybe_dev = '';
+        if ( defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG )
+            $maybe_dev = '.dev';
+
+        $file = $this->css_url . "common{$maybe_dev}.css";
+        $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{$maybe_dev}.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{$maybe_dev}.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' );
     }
@@ -673 +561 @@
         // Load the admin CSS styling
         //wp_admin_css_color( 'buddypress', __( 'Green', 'buddypress' ), $css_file, array( '#222222', '#006600', '#deece1', '#6eb469' ) );
+    }
+
+    /**
+     * 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' ), $url );
+                break;
+
+            // First install text
+            case 'install' : default :
+                $msg = sprintf( __( 'BuddyPress was successfully activated! Please run the <a href="%s">installation wizard</a>.', 'buddypress' ), $url );
+                break;
+        } ?>
+
+        <div class="update-nag"><?php echo $msg; ?></div>
+
+        <?php
     }
 }

trunk/bp-forums/bp-forums-admin.php

@@ -4 +4 @@
 
 function bp_forums_add_admin_menu() {
-    global $bp;
 
     if ( ! bp_current_user_can( 'bp_moderate' ) )
@@ -13 +12 @@
     $hook = add_submenu_page( $page, __( 'BuddyPress Forums', 'buddypress' ), __( 'BuddyPress Forums', 'buddypress' ), 'manage_options', 'bb-forums-setup', 'bp_forums_bbpress_admin' );
 
-    // Add a hook for common BP admin CSS/JS scripts
-    add_action( "admin_print_styles-$hook", 'bp_core_add_admin_menu_styles' );
-
     // Fudge the highlighted subnav item when on a BuddyPress admin page
     add_action( "admin_head-$hook", 'bp_core_modify_admin_menu_highlight' );
@@ -22 +18 @@
 
 function bp_forums_bbpress_admin() {
-    global $bp;
 
     $action = bp_get_admin_url( 'admin.php?page=bb-forums-setup&reinstall=1' ); ?>
@@ -209 +204 @@
 
 function bp_forums_configure_existing_install() {
-    global $wpdb, $bbdb;
 
     check_admin_referer( 'bp_forums_existing_install_init' );
@@ -232 +226 @@
 
 function bp_forums_bbpress_install() {
-    global $wpdb, $bbdb, $bp;
+    global $wpdb, $bp;
 
     check_admin_referer( 'bp_forums_new_install_init' );

trunk/bp-loader.php

@@ -315 +315 @@
      * @uses plugin_dir_url()
      */
-    public function constants() {
+    private function constants() {
 
         // Define the BuddyPress version
@@ -475 +475 @@
             // The installation process requires a few BuddyPress core libraries
             if ( !empty( $this->maintenance_mode ) ) {
-                require( $this->plugin_dir . 'bp-core/bp-core-functions.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'      );
-                require( $this->plugin_dir . 'bp-core/admin/bp-core-update.php' );
+                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'   );
+
+                // Load up BuddyPress's admin
+                add_action( 'plugins_loaded', 'bp_admin' );
             }
         }

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

@@ -28 +28 @@
         return false;
 
-    $hook = add_users_page( __( 'Profile Fields', 'buddypress' ), __( 'Profile Fields', 'buddypress' ), 'manage_options', 'bp-profile-setup', 'xprofile_admin' );
-
-    add_action( "admin_print_styles-$hook", 'bp_core_add_admin_menu_styles' );
+    add_users_page( __( 'Profile Fields', 'buddypress' ), __( 'Profile Fields', 'buddypress' ), 'manage_options', 'bp-profile-setup', 'xprofile_admin' );
 }
 add_action( bp_core_admin_hook(), 'xprofile_add_admin_menu' );

trunk/bp-xprofile/bp-xprofile-cssjs.php

@@ -27 +27 @@
     }
 }
-add_action( bp_core_admin_hook(), 'xprofile_add_admin_css' );
+add_action( 'admin_enqueue_scripts', 'xprofile_add_admin_css' );
 
 /**
@@ -52 +52 @@
     }
 }
-add_action( bp_core_admin_hook(), 'xprofile_add_admin_js', 1 );
+add_action( 'admin_enqueue_scripts', 'xprofile_add_admin_js', 1 );
 
 ?>