Changeset 6558 for trunk/bp-core/admin/bp-core-functions.php

Timestamp:

12/04/2012 12:16:42 PM (13 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...)

File:

• trunk/bp-core/admin/bp-core-functions.php (modified) (4 diffs)

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' );