Changeset 4920 for trunk/bp-core/bp-core-functions.php

Timestamp:

08/03/2011 09:03:41 PM (15 years ago)

Author:

johnjamesjacoby

Message:

Add bp-pages admin interface for all components. Rename bp-pages related functions to match existing nomenclature. Introduce 'has_directory' variable in BP_Component class to assist in pairing page slugs to component directories. Set 'path' variable in components that were missing them. Clean up white space where tabs were used instead of spaces. See #3428. Props boonebgorges.

File:

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

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

@@ -79 +79 @@
  *       people running trunk installations. Leave for a version or two, then remove.
  */
-function bp_core_get_page_meta() {
+function bp_core_get_directory_page_ids() {
     $page_ids = bp_get_option( 'bp-pages' );
 
@@ -93 +93 @@
     }
 
-    return apply_filters( 'bp_core_get_page_meta', $page_ids );
+    foreach( $page_ids as $component_name => $page_id ) {
+        if ( empty( $component_name ) || empty( $page_id ) ) {
+            unset( $page_ids[$component_name] );
+        }
+    }
+
+    return apply_filters( 'bp_core_get_directory_page_ids', $page_ids );
 }
 
@@ -107 +113 @@
  * @param array $blog_page_ids The IDs of the WP pages corresponding to BP component directories
  */
-function bp_core_update_page_meta( $blog_page_ids ) {
+function bp_core_update_directory_page_ids( $blog_page_ids ) {
     bp_update_option( 'bp-pages', $blog_page_ids );
 }
@@ -119 +125 @@
  * @return obj $pages Page names, IDs, and slugs
  */
-function bp_core_get_page_names() {
+function bp_core_get_directory_pages() {
     global $wpdb, $bp;
 
-    // Set pages as standard class
-    $pages = new stdClass;
-
     // Get pages and IDs
-    if ( $page_ids = bp_core_get_page_meta() ) {
+    if ( $page_ids = bp_core_get_directory_page_ids() ) {
+
+        // Set pages as standard class
+        $pages = new stdClass;
 
         $posts_table_name = bp_is_multiblog_mode() ? $wpdb->get_blog_prefix( bp_get_root_blog_id() ) . 'posts' : $wpdb->posts;
@@ -132 +138 @@
         $page_names       = $wpdb->get_results( $wpdb->prepare( "SELECT ID, post_name, post_parent, post_title FROM {$posts_table_name} WHERE ID IN ({$page_ids_sql}) AND post_status = 'publish' " ) );
 
-        foreach ( (array)$page_ids as $key => $page_id ) {
+        foreach ( (array)$page_ids as $component_id => $page_id ) {
             foreach ( (array)$page_names as $page_name ) {
                 if ( $page_name->ID == $page_id ) {
-                    $pages->{$key}->name  = $page_name->post_name;
-                    $pages->{$key}->id    = $page_name->ID;
-                    $pages->{$key}->title = $page_name->post_title;
-                    $slug[]               = $page_name->post_name;
+                    $pages->{$component_id}->name  = $page_name->post_name;
+                    $pages->{$component_id}->id    = $page_name->ID;
+                    $pages->{$component_id}->title = $page_name->post_title;
+                    $slug[]                        = $page_name->post_name;
 
                     // Get the slug
@@ -147 +153 @@
                     }
 
-                    $pages->{$key}->slug = implode( '/', array_reverse( (array)$slug ) );
+                    $pages->{$component_id}->slug = implode( '/', array_reverse( (array)$slug ) );
                 }
 
@@ -155 +161 @@
     }
 
-    return apply_filters( 'bp_core_get_page_names', $pages );
+    return apply_filters( 'bp_core_get_directory_pages', $pages );
 }
 
@@ -392 +398 @@
 
             $orphaned_pages[] = array(
-                'id'    => $page_data->ID,
-                'title' => $page_data->post_title
+                'id'    => $page_data->ID,
+                'title' => $page_data->post_title
             );
         }
@@ -420 +426 @@
     $wp_page_components  = array();
 
-    // Only some BP components require a WP page to function - those with a non-empty root_slug
-    foreach( $bp->active_components as $component_id => $is_active ) {
-        if ( !empty( $bp->{$component_id}->root_slug ) ) {
+    // Only components with 'has_directory' require a WP page to function
+    foreach( $bp->loaded_components as $component_id => $is_active ) {
+        if ( !empty( $bp->{$component_id}->has_directory ) ) {
             $wp_page_components[] = array(
-                'id'    => $component_id,
-                'name'  => $bp->{$component_id}->name
+                'id'   => $component_id,
+                'name' => isset( $bp->{$component_id}->name ) ? $bp->{$component_id}->name : ucwords( $bp->{$component_id}->id )
             );
         }
@@ -434 +440 @@
     if ( isset( $bp->site_options['registration'] ) && ( 'user' == $bp->site_options['registration'] || ( 'all' == $bp->site_options['registration'] ) ) ) {
         $wp_page_components[] = array(
-            'id'    => 'activate',
-            'name'  => __( 'Activate', 'buddypress' )
+            'id'   => 'activate',
+            'name' => __( 'Activate', 'buddypress' )
         );
 
         $wp_page_components[] = array(
-            'id'    => 'register',
-            'name'  => __( 'Register', 'buddypress' )
+            'id'   => 'register',
+            'name' => __( 'Register', 'buddypress' )
         );
     }
@@ -1000 +1006 @@
     if ( is_multisite() ) {
         $network_options = apply_filters( 'bp_core_network_options', array(
-            'tags_blog_id'    => '0',
+            'tags_blog_id'    => '0',
             'registration'    => '0',
             'fileupload_maxk' => '1500'
@@ -1068 +1074 @@
 
     if ( empty( $bp->pages ) )
-        $bp->pages = bp_core_get_page_names();
+        $bp->pages = bp_core_get_directory_pages();
 
     $match = false;
@@ -1081 +1087 @@
     if ( empty( $match ) ) {
         $bp->add_root[] = $slug;
-        add_action( 'bp_init', 'bp_core_create_root_component_page' );
+    }
+    
+    // Make sure that this component is registered as requiring a top-level directory
+    if ( isset( $bp->{$slug} ) ) {
+        $bp->loaded_components[$bp->{$slug}->slug] = $bp->{$slug}->id;
+        $bp->{$slug}->has_directory = true;
     }
 }
@@ -1093 +1104 @@
         $new_page_ids[$slug] = wp_insert_post( array( 'comment_status' => 'closed', 'ping_status' => 'closed', 'post_title' => ucwords( $slug ), 'post_status' => 'publish', 'post_type' => 'page' ) );
 
-    $page_ids = array_merge( (array) $new_page_ids, (array) bp_core_get_page_meta() );
-    bp_core_update_page_meta( $page_ids );
+    $page_ids = array_merge( (array) $new_page_ids, (array) bp_core_get_directory_page_ids() );
+    bp_core_update_directory_page_ids( $page_ids );
 }