Changeset 3463

Timestamp:

11/21/2010 04:06:48 PM (15 years ago)

Author:

boonebgorges

Message:

Adds Upgrade routine for WP MS activation. Fixes #2732. Moves site options loading functions to ensure that they're loaded at activation. Fixes #2717, props DJPaul. Modifies the way that bp-pages data is stored in and fetched from options tables on multisite. References #2518. The only thing this patch does not do is bake pie.

Location:

trunk

Files:

• bp-core.php (modified) (5 diffs)
• bp-core/admin/bp-core-upgrade.php (modified) (15 diffs)
• bp-loader.php (modified) (3 diffs)

trunk/bp-core.php

@@ -83 +83 @@
     // Set up the members id and active components entry
     $bp->members->id = 'members';
+
     $bp->members->slug = $bp->pages->members->slug;
     $bp->active_components[$bp->members->slug] = $bp->members->id;
@@ -212 +213 @@
 add_action( 'bp_setup_globals', 'bp_core_define_slugs' );
 
+
+/**
+ * bp_core_get_page_meta()
+ *
+ * Fetches BP pages from the meta table, depending on setup
+ *
+ * @package BuddyPress Core Core
+ */
+function bp_core_get_page_meta() {
+    if ( !defined( 'BP_ENABLE_MULTIBLOG' ) && is_multisite() )
+        $page_ids = get_blog_option( BP_ROOT_BLOG, 'bp-pages' );
+    else
+        $page_ids = get_option( 'bp-pages' );
+
+    return $page_ids;
+}
+
+/**
+ * bp_core_update_page_meta()
+ *
+ * Stores BP pages in the meta table, depending on setup
+ *
+ * @package BuddyPress Core Core
+ */
+function bp_core_update_page_meta( $page_ids ) {
+    if ( !defined( 'BP_ENABLE_MULTIBLOG' ) && is_multisite() )
+        update_blog_option( BP_ROOT_BLOG, 'bp-pages', $page_ids );
+    else
+        update_option( 'bp-pages', $page_ids );
+}
+
+
 function bp_core_get_page_names() {
-    global $wpdb, $current_blog;
-
-    if ( defined( 'BP_ENABLE_MULTIBLOG' ) )
-        $page_ids = get_blog_option( $current_blog->blog_id, 'bp-pages' );
-    else
-        $page_ids = get_blog_option( BP_ROOT_BLOG, 'bp-pages' );
+    global $wpdb;
+
+    $page_ids = bp_core_get_page_meta();
 
     if ( empty( $page_ids ) )
@@ -633 +663 @@
  *
  * @package BuddyPress Core
- * @global $current_blog WordPress global containing information and settings for the current blog being viewed.
  * @uses bp_core_get_userid_from_user_login() Returns the user id for the username passed
  * @return The user id for the user that is currently being displayed, return zero if this is not a user home and just a normal blog.
@@ -1553 +1582 @@
 
     return apply_filters( 'bp_core_get_site_path', $site_path );
-}
-
-/**
- * bp_core_get_site_options()
- *
- * BuddyPress uses site options to store configuration settings. Many of these settings are needed
- * at run time. Instead of fetching them all and adding many initial queries to each page load, let's fetch
- * them all in one go.
- *
- * @package BuddyPress Core
- */
-function bp_core_get_site_options() {
-    global $bp, $wpdb;
-
-    $options = apply_filters( 'bp_core_site_options', array(
-        'bp-deactivated-components',
-        'bp-blogs-first-install',
-        'bp-disable-blog-forum-comments',
-        'bp-xprofile-base-group-name',
-        'bp-xprofile-fullname-field-name',
-        'bp-disable-profile-sync',
-        'bp-disable-avatar-uploads',
-        'bp-disable-account-deletion',
-        'bp-disable-forum-directory',
-        'bp-disable-blogforum-comments',
-        'bb-config-location',
-        'hide-loggedout-adminbar',
-
-        // Useful WordPress settings used often
-        'avatar_default',
-        'tags_blog_id',
-        'registration',
-        'fileupload_maxk'
-    ) );
-
-    $meta_keys = "'" . implode( "','", (array)$options ) ."'";
-
-    if ( is_multisite() )
-        $meta = $wpdb->get_results( "SELECT meta_key AS name, meta_value AS value FROM {$wpdb->sitemeta} WHERE meta_key IN ({$meta_keys}) AND site_id = {$wpdb->siteid}" );
-    else
-        $meta = $wpdb->get_results( "SELECT option_name AS name, option_value AS value FROM {$wpdb->options} WHERE option_name IN ({$meta_keys})" );
-
-    $site_options = array();
-    if ( !empty( $meta ) ) {
-        foreach( (array)$meta as $meta_item )
-            $site_options[$meta_item->name] = $meta_item->value;
-    }
-
-    return apply_filters( 'bp_core_get_site_options', $site_options );
 }
 
@@ -2164 +2144 @@
         $new_page_ids[$slug] = wp_insert_post( array( 'post_title' => ucwords( $slug ), 'post_status' => 'publish', 'post_type' => 'page' ) );
 
-    $page_ids = get_site_option( 'bp-pages' );
+    $page_ids = bp_core_get_page_meta();
+
     $page_ids = (array) $page_ids;
     $page_ids = array_merge( (array) $new_page_ids, (array) $page_ids );
-    update_site_option( 'bp-pages', $page_ids );
+
+    bp_core_update_page_meta( $page_ids );
 }
 ?>

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

@@ -1 +1 @@
 <?php
 
+if ( !defined( 'BP_ROOT_BLOG' ) )
+    define( 'BP_ROOT_BLOG', 1 );
+
 require_once( dirname( dirname( __FILE__ ) ) . '/bp-core-wpabstraction.php' );
 
 register_theme_directory( WP_PLUGIN_DIR . '/buddypress/bp-themes' );
+
+// Install site options on activation
+bp_core_activate_site_options( array( 'bp-disable-account-deletion' => 0, 'bp-disable-avatar-uploads' => 0, 'bp-disable-blogforum-comments' => 0,  'bp-disable-forum-directory' => 0,  'bp-disable-profile-sync' => 0 ) );
+ 
+/**
+ * bp_core_activate_site_options()
+ *
+ * When switching from single to multisite we need to copy blog options to
+ * site options.
+ *
+ * @package BuddyPress Core
+ */
+function bp_core_activate_site_options( $keys = array() ) {
+    global $bp;
+
+    $bp->site_options = bp_core_get_site_options();
+
+    if ( !empty( $keys ) && is_array( $keys ) ) {
+        $errors = false;
+
+        foreach ( $keys as $key => $default ) {
+            if ( empty( $bp->site_options[ $key ] ) ) {
+                $bp->site_options[ $key ] = get_blog_option( BP_ROOT_BLOG, $key, $default );
+
+                if ( !update_site_option( $key, $bp->site_options[ $key ] ) )
+                    $errors = true;
+            }
+        }
+
+        if ( empty( $errors ) )
+            return true;
+    }
+
+    return false;
+}
 
 class BP_Core_Setup_Wizard {
@@ -10 +48 @@
 
     var $current_version;
+    var $is_network_activate;
     var $new_version;
     var $setup_type;
 
     function bp_core_setup_wizard() {
-        $this->current_version = get_site_option( 'bp-db-version' );
+        if ( !$this->current_version = get_site_option( 'bp-db-version' ) )
+            if ( $this->current_version = get_option( 'bp-db-version' ) )
+                $this->is_network_activate = true;
+        
         $this->new_version = constant( 'BP_DB_VERSION' );
         $this->setup_type = ( empty( $this->current_version ) && !(int)get_site_option( 'bp-core-db-version' ) ) ? 'new' : 'upgrade';
@@ -44 +86 @@
 
         if ( 'new' == $this->setup_type ) {
-            /* Setup wizard steps */
+            // Setup wizard steps
             $steps = array(
                 __( 'Components', 'buddypress' ),
@@ -61 +103 @@
             }
         } else {
-            /* Upgrade wizard steps */
-            $steps[] = __( 'Database Upgrade', 'buddypress' );
+            // Upgrade wizard steps
+            
+            if ( $this->is_network_activate )
+                $steps[] = __( 'Multisite Upgrade', 'buddypress' );
+            
+            if ( $this->current_version < $this->new_version )
+                $steps[] = __( 'Database Upgrade', 'buddypress' );
 
             if ( $this->current_version < 1225 )
@@ -78 +125 @@
             case 'db_upgrade': default:
                 $result = $this->step_db_upgrade_save();
+                break;
+            case 'ms_upgrade': default:
+                $result = $this->step_ms_upgrade_save();
+                break;
+            case 'ms_pages': default:
+                $result = $this->step_ms_upgrade_save();
                 break;
             case 'components': default:
@@ -139 +192 @@
                         case __( 'Database Upgrade', 'buddypress'):
                             $this->step_db_upgrade();
+                            break;
+                        case __( 'Multisite Upgrade', 'buddypress'):
+                            $this->step_ms_upgrade();
+                            break;
+                        case __( 'Blog Directory', 'buddypress'):
+                            $this->step_ms_upgrade();
                             break;
                         case __( 'Components', 'buddypress'):
@@ -184 +243 @@
     <?php
     }
+    
+    function step_ms_upgrade() {
+        if ( !current_user_can( 'activate_plugins' ) )
+            return false;
+
+        if ( defined( 'BP_BLOGS_SLUG' ) )
+            $blogs_slug = constant( 'BP_BLOGS_SLUG' );
+        else
+            $blogs_slug = __( 'blogs', 'buddypress' );
+        
+        if ( !defined( 'BP_ENABLE_MULTIBLOG' ) && is_multisite() )
+            $existing_pages = get_blog_option( BP_ROOT_BLOG, 'bp-pages' );
+        else
+            $existing_pages = get_option( 'bp-pages' );
+
+    ?>
+        <div class="prev-next submit clear">
+            <p><input type="submit" value="<?php _e( 'Save &amp; Next &rarr;', 'buddypress' ) ?>" name="submit" /></p>
+        </div>
+        
+        <p><?php printf( __( 'It looks like you have just activated WordPress Multisite mode, which allows members of your BuddyPress community to have their own WordPress blogs. You can enable or disable this feature at any time at <a href="%s">Network Options</a>.', 'buddypress' ), admin_url( 'ms-options.php' ) ); ?></p>
+        
+        <p><?php _e( "Please select the WordPress page you would like to use to display the blog directory. You can either choose an existing page or let BuddyPress auto-create a page for you. If you'd like to manually create pages, please go ahead and do that now, you can come back to this step once you are finished.", 'buddypress' ) ?></p>
+
+        <p><strong><?php _e( 'Please Note:', 'buddypress' ) ?></strong> <?php _e( "If you have manually added BuddyPress navigation links in your theme you may need to remove these from your header.php to avoid duplicate links.", 'buddypress' ) ?></p>
+
+        <table class="form-table">
+
+            <tr valign="top">
+                <th scope="row">
+                    <h5><?php _e( 'Blogs', 'buddypress' ) ?></h5>
+                    <p><?php _e( 'Displays individual groups as well as a directory of groups.', 'buddypress' ) ?></p>
+                </th>
+                <td>
+                    <p><input type="radio" name="bp_pages[blogs]" value="page" /> <?php _e( 'Use an existing page:', 'buddypress' ) ?> <?php echo wp_dropdown_pages("name=bp-blogs-page&echo=0&show_option_none=".__('- Select -')."&selected=" . $existing_pages['blogs'] ) ?></p>
+                    <p><input type="radio" name="bp_pages[blogs]" checked="checked" value="<?php echo $blogs_slug ?>" /> <?php _e( 'Automatically create a page at:', 'buddypress' ) ?> <?php echo site_url( $blogs_slug ) ?>/</p>
+                </td>
+            </tr>
+            
+        </table>
+        
+        <p><?php _e( 'Would you like to enable blog tracking, which tracks blog activity across your network?', 'buddypress' ); ?></p>
+        
+        <div class="left-col">
+            
+            <div class="component">
+                <h5><?php _e( "Blog Tracking", 'buddypress' ) ?></h5>
+
+                <div class="radio">
+                    <input type="radio" name="bp_components[bp-blogs.php]" value="1"<?php if ( !isset( $disabled_components['bp-blogs.php'] ) ) : ?> checked="checked" <?php endif; ?>/> <?php _e( 'Enabled', 'buddypress' ) ?> &nbsp;
+                    <input type="radio" name="bp_components[bp-blogs.php]" value="0"<?php if ( isset( $disabled_components['bp-blogs.php'] ) ) : ?> checked="checked" <?php endif; ?>/> <?php _e( 'Disabled', 'buddypress' ) ?>
+                </div>
+
+                <img src="<?php echo plugins_url( 'buddypress/screenshot-7.gif' ) ?>" alt="Activity Streams" />
+                    <p><?php _e( "Track new blogs, new posts and new comments across your entire blog network.", 'buddypress' ) ?></p>
+            </div>      
+        </div>
+        
+        <div class="submit clear">
+            <p><input type="submit" value="<?php _e( 'Save &amp; Next &rarr;', 'buddypress' ) ?>" name="submit" /></p>
+
+            <input type="hidden" name="save" value="ms_upgrade" />
+            <input type="hidden" name="step" value="<?php echo esc_attr( $this->current_step ) ?>" />
+            <?php wp_nonce_field( 'bpwizard_ms_upgrade' ) ?>
+        </div>
+        
+        <script type="text/javascript">
+            jQuery('select').click( function() {
+                jQuery(this).parent().children('input').attr( 'checked', 'checked' );
+            });
+        </script>
+    <?php
+    }
+
 
     function step_components() {
@@ -307 +440 @@
             return false;
 
-        $existing_pages = get_site_option( 'bp-pages' );
+        if ( !defined( 'BP_ENABLE_MULTIBLOG' ) && is_multisite() )
+            $existing_pages = get_blog_option( BP_ROOT_BLOG, 'bp-pages' );
+        else
+            $existing_pages = get_option( 'bp-pages' );
+
         $disabled_components = apply_filters( 'bp_deactivated_components', get_site_option( 'bp-deactivated-components' ) );
 
@@ -645 +782 @@
         <?php endif; ?>
 
-        <?php?>
         <p><?php printf( __( "You've now completed all of the %s steps and BuddyPress is ready to be activated. Please hit the 'Finish &amp; Activate' button to complete the %s procedure.", 'buddypress' ), $type, $type ) ?></p>
 
@@ -676 +812 @@
         return false;
     }
+
+    function step_ms_upgrade_save() {
+        global $current_blog;
+
+        if ( isset( $_POST['submit'] ) ) {
+            check_admin_referer( 'bpwizard_ms_upgrade' );
+
+            if ( !$disabled = get_option( 'bp-deactivated-components' ) )
+                $disabled = array();
+
+            // Transfer important settings from blog options to site options
+            $options = array(
+                'bp-db-version' => $this->current_version,
+                'bp-deactivated-components' => $disabled
+            );
+            bp_core_activate_site_options( $options );
+
+            if ( !(int) $_POST['bp_components']['bp-blogs.php'] ) {
+                if ( !$disabled )
+                    $disabled = array();
+                $disabled['bp-blogs.php'] = 1;
+            } else {
+                // Make sure that the pages are created on the BP_ROOT_BLOG, no matter which Dashboard the setup is being run on
+                if ( $current_blog->blog_id != BP_ROOT_BLOG && !defined( 'BP_ENABLE_MULTIBLOG' ) )
+                    switch_to_blog( BP_ROOT_BLOG );
+    
+                $existing_pages = get_option( 'bp-pages' );
+
+                $bp_pages = $this->setup_pages( (array)$_POST['bp_pages'] );
+                
+                $bp_pages = array_merge( (array)$existing_pages, (array)$bp_pages );
+    
+                update_option( 'bp-pages', $bp_pages );
+
+                if ( $current_blog->blog_id != BP_ROOT_BLOG )
+                    restore_current_blog();
+            
+                unset( $disabled['bp-blogs.php'] );
+                
+                bp_core_install( $disabled );
+            }
+            
+            update_site_option( 'bp-deactivated-components', $disabled );
+
+            return true;
+        }
+
+        return false;
+    }
+
 
     function step_components_save() {
@@ -698 +884 @@
 
     function step_pages_save() {
+        global $current_blog;
+
         if ( isset( $_POST['submit'] ) && isset( $_POST['bp_pages'] ) ) {
             check_admin_referer( 'bpwizard_pages' );
 
-            /* Delete any existing pages */
-            $existing_pages = get_site_option( 'bp-pages' );
+            // Make sure that the pages are created on the BP_ROOT_BLOG, no matter which Dashboard the setup is being run on
+            if ( $current_blog->blog_id != BP_ROOT_BLOG && !defined( 'BP_ENABLE_MULTIBLOG' ) )
+                switch_to_blog( BP_ROOT_BLOG );
+
+            // Delete any existing pages
+            $existing_pages = get_option( 'bp-pages' );
 
             foreach ( (array)$existing_pages as $page_id )
                 wp_delete_post( $page_id, true );
 
-            // Settings form submitted, now save the settings.
-            foreach ( (array)$_POST['bp_pages'] as $key => $value ) {
-                if ( 'page' == $value ) {
-                    /* Check for the selected page */
-                    if ( !empty( $_POST['bp-' . $key . '-page'] ) )
-                        $bp_pages[$key] = (int)$_POST['bp-' . $key . '-page'];
-                    else
-                        $bp_pages[$key] = wp_insert_post( array( 'post_title' => ucwords( $key ), 'post_status' => 'publish', 'post_type' => 'page' ) );
-                } else {
-                    /* Create a new page */
-                    $bp_pages[$key] = wp_insert_post( array( 'post_title' => ucwords( $value ), 'post_status' => 'publish', 'post_type' => 'page' ) );
-                }
-            }
-            update_site_option( 'bp-pages', $bp_pages );
+            $bp_pages = $this->setup_pages( (array)$_POST['bp_pages'] );
+
+            update_option( 'bp-pages', $bp_pages );
+
+            if ( $current_blog->blog_id != BP_ROOT_BLOG )
+                restore_current_blog();
 
             return true;
@@ -851 +1035 @@
 
             /* Redirect to the BuddyPress dashboard */
-            wp_redirect( site_url( 'wp-admin/admin.php?page=bp-general-settings' ) );
+            wp_redirect( admin_url( 'admin.php?page=bp-general-settings' ) );
 
             return true;
@@ -857 +1041 @@
 
         return false;
+    }
+    
+    function setup_pages( $pages ) {
+        foreach ( $pages as $key => $value ) {
+            if ( 'page' == $value ) {
+                /* Check for the selected page */
+                if ( !empty( $_POST['bp-' . $key . '-page'] ) )
+                    $bp_pages[$key] = (int)$_POST['bp-' . $key . '-page'];
+                else
+                    $bp_pages[$key] = wp_insert_post( array( 'post_title' => ucwords( $key ), 'post_status' => 'publish', 'post_type' => 'page' ) );
+            } else {
+                /* Create a new page */
+                $bp_pages[$key] = wp_insert_post( array( 'post_title' => ucwords( $value ), 'post_status' => 'publish', 'post_type' => 'page' ) );
+            }
+        }
+        
+        return $bp_pages;
     }
 
@@ -1052 +1253 @@
         return false;
 
-    if ( '' == get_site_option( 'bp-db-version' ) && !(int)get_site_option( 'bp-core-db-version' ) )
+    if ( '' == get_site_option( 'bp-db-version' ) && !(int)get_site_option( 'bp-core-db-version' ) && !$bp_wizard->is_network_activate )
         $status = __( 'Setup', 'buddypress' );
     else
@@ -1085 +1286 @@
 <?php
 }
-
 ?>

trunk/bp-loader.php

@@ -77 +77 @@
 }
 
+/**
+ * bp_core_get_site_options()
+ *
+ * BuddyPress uses site options to store configuration settings. Many of these settings are needed
+ * at run time. Instead of fetching them all and adding many initial queries to each page load, let's fetch
+ * them all in one go.
+ *
+ * @package BuddyPress Core
+ */
+function bp_core_get_site_options() {
+    global $bp, $wpdb;
+
+    $options = apply_filters( 'bp_core_site_options', array(
+        'bp-deactivated-components',
+        'bp-blogs-first-install',
+        'bp-disable-blog-forum-comments',
+        'bp-xprofile-base-group-name',
+        'bp-xprofile-fullname-field-name',
+        'bp-disable-profile-sync',
+        'bp-disable-avatar-uploads',
+        'bp-disable-account-deletion',
+        'bp-disable-forum-directory',
+        'bp-disable-blogforum-comments',
+        'bb-config-location',
+        'hide-loggedout-adminbar',
+
+        /* Useful WordPress settings used often */
+        'user-avatar-default',
+        'tags_blog_id',
+        'registration',
+        'fileupload_maxk'
+    ) );
+
+    $meta_keys = "'" . implode( "','", (array)$options ) ."'";
+
+    if ( is_multisite() )
+        $meta = $wpdb->get_results( "SELECT meta_key AS name, meta_value AS value FROM {$wpdb->sitemeta} WHERE meta_key IN ({$meta_keys}) AND site_id = {$wpdb->siteid}" );
+    else
+        $meta = $wpdb->get_results( "SELECT option_name AS name, option_value AS value FROM {$wpdb->options} WHERE option_name IN ({$meta_keys})" );
+
+    $site_options = array();
+    if ( !empty( $meta ) ) {
+        foreach( (array)$meta as $meta_item )
+            $site_options[$meta_item->name] = $meta_item->value;
+    }
+
+    return apply_filters( 'bp_core_get_site_options', $site_options );
+}
+
 /* Activation Function */
 function bp_loader_activate() {
@@ -85 +134 @@
     if ( 'bp-sn-parent' == get_blog_option( BP_ROOT_BLOG, 'template' ) && 'bp-default' == get_blog_option( BP_ROOT_BLOG, 'stylesheet' ) )
         switch_theme( 'bp-default', 'bp-default' );
-
-    /* Install site options on activation */
-    //TODO: Find where to put this back. Here is no good because bp-core.php isn't loaded on new installation.
-    //bp_core_activate_site_options( array( 'bp-disable-account-deletion' => 0, 'bp-disable-avatar-uploads' => 0, 'bp-disable-blogforum-comments' => 0,  'bp-disable-forum-directory' => 0,  'bp-disable-profile-sync' => 0 ) );
 
     do_action( 'bp_loader_activate' );
@@ -108 +153 @@
     delete_site_option( 'bp-deactivated-components' );
     delete_site_option( 'bp-blogs-first-install' );
-    delete_site_option( 'bp-pages' );
 
     do_action( 'bp_loader_deactivate' );