Changeset 3917 for trunk/bp-xprofile/bp-xprofile-loader.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-xprofile/bp-xprofile-loader.php (modified) (9 diffs)

trunk/bp-xprofile/bp-xprofile-loader.php

@@ -19 +19 @@
      */
     function BP_XProfile_Component() {
-        parent::start( 'profile', __( 'Extended Profiles', 'buddypress' ) );
+        parent::start(
+            'xprofile',
+            __( 'Extended Profiles', 'buddypress' ),
+            BP_PLUGIN_DIR
+        );
+    }
+
+    /**
+     * Include files
+     */
+    function _includes() {
+        $includes = array(
+            'cssjs',
+            'actions',
+            'screens',
+            'classes',
+            'filters',
+            'template',
+            'functions'
+        );
+
+        if ( is_admin() )
+            $includes[] = 'admin';
+
+        parent::_includes( $includes );
     }
 
@@ -43 +67 @@
         define ( 'BP_XPROFILE_FULLNAME_FIELD_NAME', stripslashes( $bp->site_options['bp-xprofile-fullname-field-name'] ) );
 
-        // Do some slug checks
-        $this->slug      = BP_XPROFILE_SLUG;
-        $this->root_slug = isset( $bp->pages->xprofile->slug ) ? $bp->pages->xprofile->slug : $this->slug;
-
-        // Tables
-        $this->table_name_data   = $bp->table_prefix . 'bp_xprofile_data';
-        $this->table_name_groups = $bp->table_prefix . 'bp_xprofile_groups';
-        $this->table_name_fields = $bp->table_prefix . 'bp_xprofile_fields';
-        $this->table_name_meta   = $bp->table_prefix . 'bp_xprofile_meta';
-
-        // Notifications
-        $this->notification_callback = 'xprofile_format_notifications';
-
-        // Register this in the active components array
-        $bp->active_components[$this->id] = $this->id;
-
         // Set the support field type ids
         $this->field_types = apply_filters( 'xprofile_field_types', array(
@@ -69 +77 @@
             'datebox'
         ) );
-    }
 
-    /**
-     * Include files
-     */
-    function _includes() {
-        require_once( BP_PLUGIN_DIR . '/bp-xprofile/bp-xprofile-cssjs.php'     );
-        require_once( BP_PLUGIN_DIR . '/bp-xprofile/bp-xprofile-admin.php'     );
-        require_once( BP_PLUGIN_DIR . '/bp-xprofile/bp-xprofile-actions.php'   );
-        require_once( BP_PLUGIN_DIR . '/bp-xprofile/bp-xprofile-screens.php'   );
-        require_once( BP_PLUGIN_DIR . '/bp-xprofile/bp-xprofile-classes.php'   );
-        require_once( BP_PLUGIN_DIR . '/bp-xprofile/bp-xprofile-filters.php'   );
-        require_once( BP_PLUGIN_DIR . '/bp-xprofile/bp-xprofile-template.php'  );
-        require_once( BP_PLUGIN_DIR . '/bp-xprofile/bp-xprofile-functions.php' );
+        // Tables
+        $global_tables = array(
+            'table_name_data'   => $bp->table_prefix . 'bp_xprofile_data',
+            'table_name_groups' => $bp->table_prefix . 'bp_xprofile_groups',
+            'table_name_fields' => $bp->table_prefix . 'bp_xprofile_fields',
+            'table_name_meta'   => $bp->table_prefix . 'bp_xprofile_meta',
+        );
+
+        $globals = array(
+            'slug'                  => BP_XPROFILE_SLUG,
+            'root_slug'             => isset( $bp->pages->xprofile->slug ) ? $bp->pages->xprofile->slug : BP_XPROFILE_SLUG,
+            'notification_callback' => 'xprofile_format_notifications',
+            'global_tables'         => $global_tables
+        );
+
+        parent::_setup_globals( $globals );
     }
 
@@ -94 +105 @@
 
         // Add 'Profile' to the main navigation
-        bp_core_new_nav_item( array(
+        $main_nav = array(
             'name'                => __( 'Profile', 'buddypress' ),
             'slug'                => $this->slug,
@@ -101 +112 @@
             'default_subnav_slug' => 'public',
             'item_css_id'         => $this->id
-        ) );
+        );
 
         $profile_link = trailingslashit( $bp->loggedin_user->domain . $this->slug );
 
         // Add the subnav items to the profile
-        bp_core_new_subnav_item( array(
+        $sub_nav[] = array(
             'name'            => __( 'Public', 'buddypress' ),
             'slug'            => 'public',
@@ -113 +124 @@
             'screen_function' => 'xprofile_screen_display_profile',
             'position'        => 10
-        ) );
+        );
 
         // Edit Profile
-        bp_core_new_subnav_item( array(
+        $sub_nav[] = array(
             'name'            => __( 'Edit Profile', 'buddypress' ),
             'slug'            => 'edit',
@@ -123 +134 @@
             'screen_function' => 'xprofile_screen_edit_profile',
             'position'        => 20
-        ) );
+        );
 
         // Change Avatar
-        bp_core_new_subnav_item( array(
+        $sub_nav[] = array(
             'name'            => __( 'Change Avatar', 'buddypress' ),
             'slug'            => 'change-avatar',
@@ -133 +144 @@
             'screen_function' => 'xprofile_screen_change_avatar',
             'position'        => 30
-        ) );
+        );
 
-        if ( $bp->current_component == $this->id ) {
+        parent::_setup_nav( $main_nav, $sub_nav );
+    }
+
+    /**
+     * Sets up the title for pages and <title>
+     *
+     * @global obj $bp
+     */
+    function _setup_title() {
+        global $bp;
+
+        if ( bp_is_profile_component() ) {
             if ( bp_is_my_profile() ) {
                 $bp->bp_options_title = __( 'My Profile', 'buddypress' );
@@ -146 +168 @@
             }
         }
+
+        parent::_setup_title();
     }
 }