Changeset 3917 for trunk/bp-core/bp-core-component.php

Timestamp:

01/25/2011 08:58:56 PM (14 years ago)

Author:

johnjamesjacoby

Message:

Rename new 'bp-users' component to 'bp-members' for consistency through-out project.
Core, Messages, and Friends Components now use the BP_Component class.
Split Friends and Messages components into smaller files.
Change references to 'profile' to 'xprofile' through-out project for consistency.
Introduce 'bp_actions' and 'bp_screens' standard hooks to replace the usage of 'wp' through-out project.
Move component loader sequence into bp-core-bootstrap.php,
Move old root_component action into 1.3 deprecated file.

File:

• trunk/bp-core/bp-core-component.php (modified) (9 diffs)

trunk/bp-core/bp-core-component.php

@@ -34 +34 @@
 
     /**
+     * @var string The path to the plugins files
+     */
+    var $path;
+
+    /**
      * @var WP_Query The loop for this component
      */
@@ -63 +68 @@
      * @uses bp_Component::_setup_actions() Setup the hooks and actions
      */
-    function start( $id, $name ) {
+    function start( $id, $name, $path ) {
         // Internal identifier of component
         $this->id   = $id;
@@ -70 +75 @@
         $this->name = $name;
 
-        $this->_setup_actions ();
+        // Path for includes
+        $this->path = $path;
+
+        // Move on to the next step
+        $this->_setup_actions();
     }
 
@@ -90 +99 @@
 
         $defaults = array(
-            'slug'      => '',
-            'root_slug' => ''
+            'slug'                  => '',
+            'root_slug'             => '',
+            'notification_callback' => '',
+            'global_tables'         => ''
         );
         $r = wp_parse_args( $args, $defaults );
@@ -101 +112 @@
         $this->root_slug = apply_filters( 'bp_' . $this->id . '_root_slug', $r['root_slug'] );
 
+        // Notifications callback
+        $this->notification_callback = 'bp_' . $this->id . '_notification_callback';
+
+        // Setup global table names
+        if ( !empty( $r['global_tables'] ) )
+            foreach ( $r['global_tables'] as $global_name => $table_name )
+                $this->$global_name = $table_name;
+
         /** BuddyPress ********************************************************/
 
-        // Avoid syntactical errors
-        $component_id = $this->id;
-
         // Register this component in the active components array
-        $bp->active_components[$bp->$component_id->slug] = $this->id;
-
-        // Notifications callback
-        $bp->$component_id->notification_callback = apply_filters( 'bp_' . $this->id . '_format_notifications', 'bp_' . $this->id . '_format_notifications' );
+        $bp->active_components[$this->slug] = $this->id;
+
+        // Call action
+        do_action( 'bp_' . $this->id . '_setup_globals' );
     }
 
@@ -121 +137 @@
      * @uses do_action() Calls 'bp_{@link bp_Component::name}_includes'
      */
-    function _includes() {
+    function _includes( $includes = '' ) {
+        if ( empty( $includes ) )
+            return;
+
+        // Loop through files to be included
+        foreach ( $includes as $file ) {
+
+            // Check path + file
+            if ( file_exists( $this->path . '/' . $file ) )
+                require_once( $this->path . '/' . $file );
+
+            // Check path + /bp-component/ + file
+            elseif ( file_exists( $this->path . '/bp-' . $this->id . '/' . $file ) )
+                require_once( $this->$path . '/bp-' . $this->id . '/' . $file );
+
+            // Check buddypress/bp-component/bp-component-$file.php
+            elseif ( file_exists( $this->path . '/bp-' . $this->id . '/bp-' . $this->id . '-' . $file  . '.php' ) )
+                require_once( $this->path . '/bp-' . $this->id . '/bp-' . $this->id . '-' . $file . '.php' );
+
+        }
+
+        // Call action
         do_action( 'bp_' . $this->id . '_includes' );
     }
@@ -145 +182 @@
 
         // Register post types
+        add_action( 'bp_setup_title',              array ( $this, '_setup_title'             ), 10 );
+
+        // Register post types
         add_action( 'bp_register_post_types',      array ( $this, 'register_post_types'      ), 10 );
 
@@ -161 +201 @@
 
     /**
+     * Setup the navigation
+     *
+     * @param arr $main_nav
+     * @param arr $sub_nav
+     */
+    function _setup_nav( $main_nav, $sub_nav ) {
+        bp_core_new_nav_item( $main_nav );
+
+        foreach( $sub_nav as $nav )
+            bp_core_new_subnav_item( $nav );
+
+        // Call action
+        do_action( 'bp_' . $this->id . '_setup_nav' );
+    }
+
+
+    function _setup_title( ) {
+        
+    }
+
+    /**
      * Setup the component post types
      *
@@ -204 +265 @@
     }
 }
-endif; // bp_Component
+endif; // BP_Component
+
+?>