Changeset 3790

Timestamp:

01/21/2011 11:03:05 AM (14 years ago)

Author:

johnjamesjacoby

Message:

Rename internal references to 'xprofile' component to 'profile' for object consistency and proper fallback support for when XProfile is disabled and the WP profile steps in. Move more code out of core and into Users and XProfile components. Split bp-xprofile-loader up into smaller files and convert to BP_Component.

Location:

trunk

Files:

• bp-activity/bp-activity-classes.php (modified) (11 diffs)
• bp-core/admin/bp-core-admin.php (modified) (2 diffs)
• bp-core/bp-core-catchuri.php (modified) (1 diff)
• bp-core/bp-core-classes.php (modified) (4 diffs)
• bp-core/bp-core-loader.php (modified) (1 diff)
• bp-core/bp-core-template.php (modified) (6 diffs)
• bp-forums/bp-forums-loader.php (modified) (2 diffs)
• bp-friends/bp-friends-classes.php (modified) (4 diffs)
• bp-groups/bp-groups-classes.php (modified) (1 diff)
• bp-themes/bp-default/members/index.php (modified) (1 diff)
• bp-themes/bp-default/members/single/home.php (modified) (3 diffs)
• bp-themes/bp-default/members/single/profile/profile-loop.php (modified) (1 diff)
• bp-themes/bp-default/page-members.php (modified) (1 diff)
• bp-themes/bp-default/registration/register.php (modified) (2 diffs)
• bp-users/bp-users-functions.php (modified) (1 diff)
• bp-users/bp-users-template.php (modified) (1 diff)
• bp-xprofile/bp-xprofile-admin.php (modified) (16 diffs)
• bp-xprofile/bp-xprofile-loader.php (modified) (1 diff)
• bp-xprofile/bp-xprofile-template.php (modified) (1 diff)

trunk/bp-activity/bp-activity-classes.php

@@ -19 +19 @@
         global $bp;
 
-        if ( $id ) {
+        if ( !empty( $id ) ) {
             $this->id = $id;
             $this->populate();
@@ -28 +28 @@
         global $wpdb, $bp;
 
-        $row = $wpdb->get_row( $wpdb->prepare( "SELECT * FROM {$bp->activity->table_name} WHERE id = %d", $this->id ) );
-        if ( $row ) {
-            $this->id = $row->id;
-            $this->item_id = $row->item_id;
+        if ( $row = $wpdb->get_row( $wpdb->prepare( "SELECT * FROM {$bp->activity->table_name} WHERE id = %d", $this->id ) ) ) {
+            $this->id                = $row->id;
+            $this->item_id           = $row->item_id;
             $this->secondary_item_id = $row->secondary_item_id;
-            $this->user_id = $row->user_id;
-            $this->primary_link = $row->primary_link;
-            $this->component = $row->component;
-            $this->type = $row->type;
-            $this->action = $row->action;
-            $this->content = $row->content;
-            $this->date_recorded = $row->date_recorded;
-            $this->hide_sitewide = $row->hide_sitewide;
-            $this->mptt_left = $row->mptt_left;
-            $this->mptt_right = $row->mptt_right;
+            $this->user_id           = $row->user_id;
+            $this->primary_link      = $row->primary_link;
+            $this->component         = $row->component;
+            $this->type              = $row->type;
+            $this->action            = $row->action;
+            $this->content           = $row->content;
+            $this->date_recorded     = $row->date_recorded;
+            $this->hide_sitewide     = $row->hide_sitewide;
+            $this->mptt_left         = $row->mptt_left;
+            $this->mptt_right        = $row->mptt_right;
         }
     }
@@ -51 +50 @@
         do_action( 'bp_activity_before_save', &$this );
 
-        $this->id = apply_filters( 'bp_activity_id_before_save', $this->id, &$this );
-        $this->item_id = apply_filters( 'bp_activity_item_id_before_save', $this->item_id, &$this );
+        $this->id                = apply_filters( 'bp_activity_id_before_save',                $this->id,                &$this );
+        $this->item_id           = apply_filters( 'bp_activity_item_id_before_save',           $this->item_id,           &$this );
         $this->secondary_item_id = apply_filters( 'bp_activity_secondary_item_id_before_save', $this->secondary_item_id, &$this );
-        $this->user_id = apply_filters( 'bp_activity_user_id_before_save', $this->user_id, &$this );
-        $this->primary_link = apply_filters( 'bp_activity_primary_link_before_save', $this->primary_link, &$this );
-        $this->component = apply_filters( 'bp_activity_component_before_save', $this->component, &$this );
-        $this->type = apply_filters( 'bp_activity_type_before_save', $this->type, &$this );
-        $this->action = apply_filters( 'bp_activity_action_before_save', $this->action, &$this );
-        $this->content = apply_filters( 'bp_activity_content_before_save', $this->content, &$this );
-        $this->date_recorded = apply_filters( 'bp_activity_date_recorded_before_save', $this->date_recorded, &$this );
-        $this->hide_sitewide = apply_filters( 'bp_activity_hide_sitewide_before_save', $this->hide_sitewide, &$this );
-        $this->mptt_left = apply_filters( 'bp_activity_mptt_left_before_save', $this->mptt_left, &$this );
-        $this->mptt_right = apply_filters( 'bp_activity_mptt_right_before_save', $this->mptt_right, &$this );
+        $this->user_id           = apply_filters( 'bp_activity_user_id_before_save',           $this->user_id,           &$this );
+        $this->primary_link      = apply_filters( 'bp_activity_primary_link_before_save',      $this->primary_link,      &$this );
+        $this->component         = apply_filters( 'bp_activity_component_before_save',         $this->component,         &$this );
+        $this->type              = apply_filters( 'bp_activity_type_before_save',              $this->type,              &$this );
+        $this->action            = apply_filters( 'bp_activity_action_before_save',            $this->action,            &$this );
+        $this->content           = apply_filters( 'bp_activity_content_before_save',           $this->content,           &$this );
+        $this->date_recorded     = apply_filters( 'bp_activity_date_recorded_before_save',     $this->date_recorded,     &$this );
+        $this->hide_sitewide     = apply_filters( 'bp_activity_hide_sitewide_before_save',     $this->hide_sitewide,     &$this );
+        $this->mptt_left         = apply_filters( 'bp_activity_mptt_left_before_save',         $this->mptt_left,         &$this );
+        $this->mptt_right        = apply_filters( 'bp_activity_mptt_right_before_save',        $this->mptt_right,        &$this );
 
         if ( !$this->component || !$this->type )
@@ -129 +128 @@
         }
 
-        // Alter the query based on whether we want to show activity item comments in the stream like normal comments or threaded below the activity
-        if ( !$display_comments || 'threaded' == $display_comments ) {
+        // Alter the query based on whether we want to show activity item
+        // comments in the stream like normal comments or threaded below
+        // the activity.
+        if ( !$display_comments || 'threaded' == $display_comments )
             $where_conditions[] = "a.type != 'activity_comment'";
-        }
 
         $where_sql = 'WHERE ' . join( ' AND ', $where_conditions );
@@ -148 +148 @@
 
         // Get the fullnames of users so we don't have to query in the loop
-        if ( bp_is_active( 'xprofile' ) && $activities ) {
+        if ( bp_is_active( 'profile' ) && $activities ) {
             foreach ( (array)$activities as $activity ) {
                 if ( (int)$activity->user_id )
@@ -246 +246 @@
 
         $defaults = array(
-            'id' => false,
-            'action' => false,
-            'content' => false,
-            'component' => false,
-            'type' => false,
-            'primary_link' => false,
-            'user_id' => false,
-            'item_id' => false,
+            'id'                => false,
+            'action'            => false,
+            'content'           => false,
+            'component'         => false,
+            'type'              => false,
+            'primary_link'      => false,
+            'user_id'           => false,
+            'item_id'           => false,
             'secondary_item_id' => false,
-            'date_recorded' => false,
-            'hide_sitewide' => false
+            'date_recorded'     => false,
+            'hide_sitewide'     => false
         );
 
@@ -299 +299 @@
             return false;
 
-        /* Fetch the activity IDs so we can delete any comments for this activity item */
+        // Fetch the activity IDs so we can delete any comments for this activity item
         $activity_ids = $wpdb->get_col( $wpdb->prepare( "SELECT id FROM {$bp->activity->table_name} {$where_sql}" ) );
 
@@ -360 +360 @@
 
         if ( !$comments = wp_cache_get( 'bp_activity_comments_' . $activity_id ) ) {
-            /* Select the user's fullname with the query so we don't have to fetch it for each comment */
-            if ( bp_is_active( 'xprofile' ) ) {
+            // Select the user's fullname with the query so we don't have to
+            // fetch it for each comment
+            if ( bp_is_active( 'profile' ) ) {
                 $fullname_select = ", pd.value as user_fullname";
                 $fullname_from = ", {$bp->profile->table_name_data} pd ";
@@ -367 +368 @@
             }
 
-            /* Retrieve all descendants of the $root node */
+            // Retrieve all descendants of the $root node
             $descendants = $wpdb->get_results( apply_filters( 'bp_activity_comments_user_join_filter', $wpdb->prepare( "SELECT a.*, u.user_email, u.user_nicename, u.user_login, u.display_name{$fullname_select} FROM {$bp->activity->table_name} a, {$wpdb->users} u{$fullname_from} WHERE u.ID = a.user_id {$fullname_where} AND a.type = 'activity_comment' AND a.item_id = %d AND a.mptt_left BETWEEN %d AND %d ORDER BY a.date_recorded ASC", $activity_id, $left, $right ), $activity_id, $left, $right ) );
 
-            /* Loop descendants and build an assoc array */
+            // Loop descendants and build an assoc array
             foreach ( (array)$descendants as $d ) {
-                $d->children = array();
-
-                /* If we have a reference on the parent */
-                if ( isset( $ref[ $d->secondary_item_id ] ) ) {
-                    $ref[ $d->secondary_item_id ]->children[ $d->id ] = $d;
-                    $ref[ $d->id ] =& $ref[ $d->secondary_item_id ]->children[ $d->id ];
-
-                /* If we don't have a reference on the parent, put in the root level */
-                } else {
-                    $comments[ $d->id ] = $d;
-                    $ref[ $d->id ] =& $comments[ $d->id ];
-                }
+                $d->children = array();
+
+                // If we have a reference on the parent
+                if ( isset( $ref[ $d->secondary_item_id ] ) ) {
+                    $ref[ $d->secondary_item_id ]->children[ $d->id ] = $d;
+                    $ref[ $d->id ] =& $ref[ $d->secondary_item_id ]->children[ $d->id ];
+
+                // If we don't have a reference on the parent, put in the root level
+                } else {
+                    $comments[ $d->id ] = $d;
+                    $ref[ $d->id ] =& $comments[ $d->id ];
+                }
             }
             wp_cache_set( 'bp_activity_comments_' . $activity_id, $comments, 'bp' );
@@ -394 +395 @@
         global $wpdb, $bp;
 
-        /* The right value of this node is the left value + 1 */
+        // The right value of this node is the left value + 1
         $right = $left + 1;
 
-        /* Get all descendants of this node */
+        // Get all descendants of this node
         $descendants = BP_Activity_Activity::get_child_comments( $parent_id );
 
-        /* Loop the descendants and recalculate the left and right values */
+        // Loop the descendants and recalculate the left and right values
         foreach ( (array)$descendants as $descendant )
             $right = BP_Activity_Activity::rebuild_activity_comment_tree( $descendant->id, $right );
 
-        /* We've got the left value, and now that we've processed the children of this node we also know the right value */
+        // We've got the left value, and now that we've processed the children
+        // of this node we also know the right value
         if ( 1 == $left )
             $wpdb->query( $wpdb->prepare( "UPDATE {$bp->activity->table_name} SET mptt_left = %d, mptt_right = %d WHERE id = %d", $left, $right, $parent_id ) );
@@ -410 +412 @@
             $wpdb->query( $wpdb->prepare( "UPDATE {$bp->activity->table_name} SET mptt_left = %d, mptt_right = %d WHERE type = 'activity_comment' AND id = %d", $left, $right, $parent_id ) );
 
-        /* Return the right value of this node + 1 */
+        // Return the right value of this node + 1
         return $right + 1;
     }

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

@@ -101 +101 @@
         foreach ( (array)$_POST['bp-admin'] as $key => $value ) {
 
-            if ( bp_is_active( 'xprofile' ) ) {
+            if ( bp_is_active( 'profile' ) ) {
                 if ( 'bp-xprofile-base-group-name' == $key )
                     $wpdb->query( $wpdb->prepare( "UPDATE {$bp->profile->table_name_groups} SET name = %s WHERE id = 1", stripslashes( $value ) ) );
@@ -130 +130 @@
                 <tbody>
 
-                    <?php if ( bp_is_active( 'xprofile' ) ) : ?>
+                    <?php if ( bp_is_active( 'profile' ) ) : ?>
 
                         <tr>

trunk/bp-core/bp-core-catchuri.php

@@ -289 +289 @@
     global $bp;
 
-    if ( !bp_is_active( 'xprofile' ) )
+    if ( !bp_is_active( 'profile' ) )
         bp_core_load_template( apply_filters( 'bp_core_template_display_profile', 'members/single/home' ) );
 }

trunk/bp-core/bp-core-classes.php

@@ -56 +56 @@
      */
     function populate() {
-        if ( bp_is_active( 'xprofile' ) )
+        if ( bp_is_active( 'profile' ) )
             $this->profile_data = $this->get_profile_data();
 
@@ -125 +125 @@
         $sql['from'] = "FROM " . CUSTOM_USER_TABLE . " u LEFT JOIN " . CUSTOM_USER_META_TABLE . " um ON um.user_id = u.ID";
 
-        if ( $search_terms && bp_is_active( 'xprofile' ) || 'alphabetical' == $type )
+        if ( $search_terms && bp_is_active( 'profile' ) || 'alphabetical' == $type )
             $sql['join_profiledata'] = "LEFT JOIN {$bp->profile->table_name_data} pd ON u.ID = pd.user_id";
 
@@ -167 +167 @@
         }
 
-        if ( $search_terms && bp_is_active( 'xprofile' ) ) {
+        if ( $search_terms && bp_is_active( 'profile' ) ) {
             $search_terms = like_escape( $wpdb->escape( $search_terms ) );
             $sql['where_searchterms'] = "AND pd.value LIKE '%%$search_terms%%'";
@@ -348 +348 @@
 
         /* Fetch the user's full name */
-        if ( bp_is_active( 'xprofile' ) && 'alphabetical' != $type ) {
+        if ( bp_is_active( 'profile' ) && 'alphabetical' != $type ) {
             /* Ensure xprofile globals are set */
             if ( !defined( 'BP_XPROFILE_FULLNAME_FIELD_NAME' ) )

trunk/bp-core/bp-core-loader.php

@@ -110 +110 @@
      * built in WordPress profile information
      */
-    if ( !bp_is_active( 'xprofile' ) ) {
+    if ( !bp_is_active( 'profile' ) ) {
 
         // Fallback values if xprofile is disabled

trunk/bp-core/bp-core-template.php

@@ -351 +351 @@
  */
 function bp_search_form_enabled() {
-    if ( bp_is_active( 'xprofile' )
+    if ( bp_is_active( 'profile' )
          || bp_is_active( 'groups' )
          || ( bp_is_active( 'blogs' ) && is_multisite() )
@@ -382 +382 @@
     $options = array();
 
-    if ( bp_is_active( 'xprofile' ) )
+    if ( bp_is_active( 'profile' ) )
         $options['members'] = __( 'Members', 'buddypress' );
 
@@ -866 +866 @@
 
 function bp_is_profile_component() {
-    if ( bp_is_current_component( 'xprofile' ) )
+    if ( bp_is_current_component( 'profile' ) )
         return true;
 
@@ -954 +954 @@
     global $bp;
 
-    if ( bp_is_current_component( 'xprofile' ) )
+    if ( bp_is_current_component( 'profile' ) )
         return true;
 
@@ -963 +963 @@
     global $bp;
 
-    if ( bp_is_current_component( 'xprofile' ) && 'edit' == $bp->current_action )
+    if ( bp_is_current_component( 'profile' ) && 'edit' == $bp->current_action )
         return true;
 
@@ -972 +972 @@
     global $bp;
 
-    if ( bp_is_current_component( 'xprofile' ) && 'change-avatar' == $bp->current_action )
+    if ( bp_is_current_component( 'profile' ) && 'change-avatar' == $bp->current_action )
         return true;
 

trunk/bp-forums/bp-forums-loader.php

@@ -432 +432 @@
 
     // Fetch fullname for the topic's last poster
-    if ( bp_is_active( 'xprofile' ) ) {
+    if ( bp_is_active( 'profile' ) ) {
         $poster_names = $wpdb->get_results( $wpdb->prepare( "SELECT t.topic_id, pd.value FROM {$bp->profile->table_name_data} pd, {$bbdb->topics} t WHERE pd.user_id = t.topic_last_poster AND pd.field_id = 1 AND t.topic_id IN ( {$topic_ids} )" ) );
         for ( $i = 0; $i < count( $topics ); $i++ ) {
@@ -550 +550 @@
 
     // Fetch fullname for each poster.
-    if ( bp_is_active( 'xprofile' ) ) {
+    if ( bp_is_active( 'profile' ) ) {
         $poster_names = $wpdb->get_results( $wpdb->prepare( "SELECT pd.user_id, pd.value FROM {$bp->profile->table_name_data} pd WHERE pd.user_id IN ( {$user_ids} )" ) );
         for ( $i = 0; $i < count( $posts ); $i++ ) {

trunk/bp-friends/bp-friends-classes.php

@@ -159 +159 @@
 
         // filter the user_ids based on the search criteria.
-        if ( bp_is_active( 'xprofile' ) ) {
+        if ( bp_is_active( 'profile' ) ) {
             $sql = "SELECT DISTINCT user_id FROM {$bp->profile->table_name_data} WHERE user_id IN ($fids) AND value LIKE '$filter%%' {$pag_sql}";
             $total_sql = "SELECT COUNT(DISTINCT user_id) FROM {$bp->profile->table_name_data} WHERE user_id IN ($fids) AND value LIKE '$filter%%'";
@@ -225 +225 @@
 
         // filter the user_ids based on the search criteria.
-        if ( bp_is_active( 'xprofile' ) ) {
+        if ( bp_is_active( 'profile' ) ) {
             $sql = $wpdb->prepare( "SELECT DISTINCT d.user_id as id FROM {$bp->profile->table_name_data} d, $users_table u WHERE d.user_id = u.id AND d.value LIKE '$filter%%' ORDER BY d.value DESC $pag_sql" );
         } else {
@@ -248 +248 @@
 
         // filter the user_ids based on the search criteria.
-        if ( bp_is_active( 'xprofile' ) ) {
+        if ( bp_is_active( 'profile' ) ) {
             $sql = $wpdb->prepare( "SELECT COUNT(DISTINCT d.user_id) FROM {$bp->profile->table_name_data} d, $users_table u WHERE d.user_id = u.id AND d.value LIKE '$filter%%'" );
         } else {
@@ -265 +265 @@
         global $wpdb, $bp;
 
-        if ( !bp_is_active( 'xprofile' ) )
+        if ( !bp_is_active( 'profile' ) )
             return false;
 

trunk/bp-groups/bp-groups-classes.php

@@ -1022 +1022 @@
             $exclude_sql = $wpdb->prepare( " AND m.user_id NOT IN ({$exclude})" );
 
-        if ( bp_is_active( 'xprofile' ) )
+        if ( bp_is_active( 'profile' ) )
             $members = $wpdb->get_results( $wpdb->prepare( "SELECT m.user_id, m.date_modified, m.is_banned, u.user_login, u.user_nicename, u.user_email, pd.value as display_name FROM {$bp->groups->table_name_members} m, {$wpdb->users} u, {$bp->profile->table_name_data} pd WHERE u.ID = m.user_id AND u.ID = pd.user_id AND pd.field_id = 1 AND group_id = %d AND is_confirmed = 1 {$banned_sql} {$exclude_admins_sql} {$exclude_sql} ORDER BY m.date_modified DESC {$pag_sql}", $group_id ) );
         else

trunk/bp-themes/bp-default/members/index.php

@@ -31 +31 @@
                             <option value="newest"><?php _e( 'Newest Registered', 'buddypress' ) ?></option>
 
-                            <?php if ( bp_is_active( 'xprofile' ) ) : ?>
+                            <?php if ( bp_is_active( 'profile' ) ) : ?>
                                 <option value="alphabetical"><?php _e( 'Alphabetical', 'buddypress' ) ?></option>
                             <?php endif; ?>

trunk/bp-themes/bp-default/members/single/home.php

@@ -7 +7 @@
 
             <div id="item-header" role="complementary">
-                <?php locate_template( array( 'members/single/member-header.php' ), true ) ?>
+
+                <?php locate_template( array( 'members/single/member-header.php' ), true ); ?>
+
             </div><!-- #item-header -->
 
@@ -13 +15 @@
                 <div class="item-list-tabs no-ajax" id="object-nav" role="navigation">
                     <ul>
+
                         <?php bp_get_displayed_user_nav() ?>
 
                         <?php do_action( 'bp_member_options_nav' ) ?>
+
                     </ul>
                 </div>
@@ -21 +25 @@
 
             <div id="item-body">
-                <?php do_action( 'bp_before_member_body' ) ?>
+                <?php do_action( 'bp_before_member_body' ); ?>
 
                 <?php if ( bp_is_user_activity() || !bp_current_component() ) : ?>
-                    <?php locate_template( array( 'members/single/activity.php' ), true ) ?>
+                    <?php locate_template( array( 'members/single/activity.php' ), true ); ?>
 
                 <?php elseif ( bp_is_user_blogs() ) : ?>
-                    <?php locate_template( array( 'members/single/blogs.php' ), true ) ?>
+                    <?php locate_template( array( 'members/single/blogs.php' ), true ); ?>
 
                 <?php elseif ( bp_is_user_friends() ) : ?>
-                    <?php locate_template( array( 'members/single/friends.php' ), true ) ?>
+                    <?php locate_template( array( 'members/single/friends.php' ), true ); ?>
 
                 <?php elseif ( bp_is_user_groups() ) : ?>
-                    <?php locate_template( array( 'members/single/groups.php' ), true ) ?>
+                    <?php locate_template( array( 'members/single/groups.php' ), true ); ?>
 
                 <?php elseif ( bp_is_user_messages() ) : ?>
-                    <?php locate_template( array( 'members/single/messages.php' ), true ) ?>
+                    <?php locate_template( array( 'members/single/messages.php' ), true ); ?>
 
                 <?php elseif ( bp_is_user_profile() ) : ?>
-                    <?php locate_template( array( 'members/single/profile.php' ), true ) ?>
+                    <?php locate_template( array( 'members/single/profile.php' ), true ); ?>
 
                 <?php else : ?>
                     <?php
-                        /* If nothing sticks, just load a member front template if one exists. */
+                        // If nothing sticks, load a generic template
                         locate_template( array( 'members/single/front.php' ), true );
                     ?>
                 <?php endif; ?>
 
-                <?php do_action( 'bp_after_member_body' ) ?>
+                <?php do_action( 'bp_after_member_body' ); ?>
 
             </div><!-- #item-body -->
 
-            <?php do_action( 'bp_after_member_home_content' ) ?>
+            <?php do_action( 'bp_after_member_home_content' ); ?>
 
         </div><!-- .padder -->
     </div><!-- #content -->
 
-    <?php get_sidebar() ?>
-
+<?php get_sidebar(); ?>
 <?php get_footer() ?>

trunk/bp-themes/bp-default/members/single/profile/profile-loop.php

@@ -1 +1 @@
 <?php do_action( 'bp_before_profile_loop_content' ) ?>
 
-<?php if ( bp_is_active( 'xprofile' ) ) : ?>
+<?php if ( bp_is_active( 'profile' ) ) : ?>
 
     <?php if ( bp_has_profile() ) : ?>

trunk/bp-themes/bp-default/page-members.php

@@ -46 +46 @@
                             <option value="newest"><?php _e( 'Newest Registered', 'buddypress' ) ?></option>
 
-                            <?php if ( bp_is_active( 'xprofile' ) ) : ?>
+                            <?php if ( bp_is_active( 'profile' ) ) : ?>
 
                                 <option value="alphabetical"><?php _e( 'Alphabetical', 'buddypress' ) ?></option>

trunk/bp-themes/bp-default/registration/register.php

@@ -48 +48 @@
                 <?php /***** Extra Profile Details ******/ ?>
 
-                <?php if ( bp_is_active( 'xprofile' ) ) : ?>
+                <?php if ( bp_is_active( 'profile' ) ) : ?>
 
                     <?php do_action( 'bp_before_signup_profile_fields' ) ?>
@@ -57 +57 @@
 
                         <?php /* Use the profile field loop to render input fields for the 'base' profile field group */ ?>
-                        <?php if ( bp_is_active( 'xprofile' ) ) : if ( bp_has_profile( 'profile_group_id=1' ) ) : while ( bp_profile_groups() ) : bp_the_profile_group(); ?>
+                        <?php if ( bp_is_active( 'profile' ) ) : if ( bp_has_profile( 'profile_group_id=1' ) ) : while ( bp_profile_groups() ) : bp_the_profile_group(); ?>
 
                         <?php while ( bp_profile_fields() ) : bp_the_profile_field(); ?>

trunk/bp-users/bp-users-functions.php

@@ -393 +393 @@
 
     if ( !$fullname = wp_cache_get( 'bp_user_fullname_' . $user_id, 'bp' ) ) {
-        if ( bp_is_active( 'xprofile' ) ) {
+        if ( bp_is_active( 'profile' ) ) {
             $fullname = xprofile_get_field_data( stripslashes( $bp->site_options['bp-xprofile-fullname-field-name'] ), $user_id );
 

trunk/bp-users/bp-users-template.php

@@ -403 +403 @@
         global $members_template;
 
-        if ( !bp_is_active( 'xprofile' ) )
+        if ( !bp_is_active( 'profile' ) )
             return false;
 

trunk/bp-xprofile/bp-xprofile-admin.php

@@ -1 +1 @@
 <?php
 
-/**************************************************************************
- xprofile_admin()
-
- Handles all actions for the admin area for creating, editing and deleting
- profile groups and fields.
- **************************************************************************/
-
+/**
+ * Creates the administration interface menus and checks to see if the DB
+ * tables are set up.
+ *
+ * @package BuddyPress XProfile
+ * @global $bp The global BuddyPress settings variable created in bp_core_setup_globals()
+ * @global $wpdb WordPress DB access object.
+ * @uses is_super_admin() returns true if the current user is a site admin, false if not
+ * @uses bp_xprofile_install() runs the installation of DB tables for the xprofile component
+ * @uses wp_enqueue_script() Adds a JS file to the JS queue ready for output
+ * @uses add_submenu_page() Adds a submenu tab to a top level tab in the admin area
+ * @uses xprofile_install() Runs the DB table installation function
+ * @return
+ */
+function xprofile_add_admin_menu() {
+    global $wpdb, $bp;
+
+    if ( !is_super_admin() )
+        return false;
+
+    // Add the administration tab under the "Site Admin" tab for site administrators
+    add_submenu_page( 'bp-general-settings', __( 'Profile Field Setup', 'buddypress' ), __( 'Profile Field Setup', 'buddypress' ), 'manage_options', 'bp-profile-setup', 'xprofile_admin' );
+}
+add_action( is_multisite() ? 'network_admin_menu' : 'admin_menu', 'xprofile_add_admin_menu' );
+
+/**
+ * Adds an admin bar menu to any profile page providing site admin options
+ * for that user.
+ *
+ * @package BuddyPress XProfile
+ * @global $bp BuddyPress
+ */
+function xprofile_setup_adminbar_menu() {
+    global $bp;
+
+    if ( !$bp->displayed_user->id )
+        return false;
+
+    // Don't show this menu to non site admins or if you're viewing your own profile
+    if ( !is_super_admin() || bp_is_my_profile() )
+        return false; ?>
+
+    <li id="bp-adminbar-adminoptions-menu">
+        <a href=""><?php _e( 'Admin Options', 'buddypress' ) ?></a>
+
+        <ul>
+            <li><a href="<?php echo $bp->displayed_user->domain . $bp->profile->slug ?>/edit/"><?php printf( __( "Edit %s's Profile", 'buddypress' ), esc_attr( $bp->displayed_user->fullname ) ) ?></a></li>
+            <li><a href="<?php echo $bp->displayed_user->domain . $bp->profile->slug ?>/change-avatar/"><?php printf( __( "Edit %s's Avatar", 'buddypress' ), esc_attr( $bp->displayed_user->fullname ) ) ?></a></li>
+
+            <?php if ( !bp_core_is_user_spammer( $bp->displayed_user->id ) ) : ?>
+
+                <li><a href="<?php echo wp_nonce_url( $bp->displayed_user->domain . 'admin/mark-spammer/', 'mark-unmark-spammer' ) ?>" class="confirm"><?php _e( "Mark as Spammer", 'buddypress' ) ?></a></li>
+
+            <?php else : ?>
+
+                <li><a href="<?php echo wp_nonce_url( $bp->displayed_user->domain . 'admin/unmark-spammer/', 'mark-unmark-spammer' ) ?>" class="confirm"><?php _e( "Not a Spammer", 'buddypress' ) ?></a></li>
+
+            <?php endif; ?>
+
+            <li><a href="<?php echo wp_nonce_url( $bp->displayed_user->domain . 'admin/delete-user/', 'delete-user' ) ?>" class="confirm"><?php printf( __( "Delete %s", 'buddypress' ), esc_attr( $bp->displayed_user->fullname ) ) ?></a></li>
+
+            <?php do_action( 'xprofile_adminbar_menu_items' ) ?>
+
+        </ul>
+    </li>
+
+    <?php
+}
+add_action( 'bp_adminbar_menus', 'xprofile_setup_adminbar_menu', 20 );
+
+/**
+ * Handles all actions for the admin area for creating, editing and deleting
+ * profile groups and fields.
+ */
 function xprofile_admin( $message = '', $type = 'error' ) {
     global $bp;
@@ -44 +111 @@
         <div class="icon32" id="icon-tools"><br></div>
         <h2>
+
             <?php _e( 'Profile Field Setup', 'buddypress'); ?>
+
             <a id="add_group" class="button add-new-h2" href="admin.php?page=bp-profile-setup&amp;mode=add_group"><?php _e( 'Add New Group', 'buddypress' ); ?></a>
         </h2>
+
         <p><?php _e( 'Your users will distinguish themselves through their profile page. You must give them profile fields that allow them to describe themselves in a way that is relevant to the theme of your social network.', 'buddypress'); ?></p>
         <p><?php echo sprintf( __( 'NOTE: Any fields in the "%s" group will appear on the signup page.', 'buddypress' ), esc_html( stripslashes( get_site_option( 'bp-xprofile-base-group-name' ) ) ) ) ?></p>
 
         <form action="" id="profile-field-form" method="post">
+
             <?php wp_nonce_field( 'bp_reorder_fields', '_wpnonce_reorder_fields' ); ?>
 
             <?php wp_nonce_field( 'bp_reorder_groups', '_wpnonce_reorder_groups', false );
 
-            if ( $message != '' ) :
+            if ( !empty( $message ) ) :
                 $type = ( $type == 'error' ) ? 'error' : 'updated'; ?>
 
@@ -61 +132 @@
                     <p><?php echo esc_html( esc_attr( $message ) ); ?></p>
                 </div>
+
 <?php       endif; ?>
 
@@ -66 +138 @@
                 <ul id="field-group-tabs">
 <?php
-            if ( $groups ) :
+            if ( !empty( $groups ) ) :
                 foreach ( $groups as $group ) { ?>
+
                     <li id="group_<?php echo $group->id; ?>"><a href="#tabs-<?php echo $group->id; ?>" class="ui-tab"><?php echo esc_attr( $group->name ); ?><?php if ( !$group->can_delete ) : ?> <?php _e( '(Core)', 'buddypress'); endif; ?></a></li>
+
 <?php           }
             endif; ?>
+
                 </ul>
 
-<?php       if ( $groups ) :
+<?php       if ( !empty( $groups ) ) :
                 foreach ( $groups as $group ) { ?>
+
                     <noscript>
-                        <h3><?php echo esc_attr( $group->name ) ?></h3>
+                        <h3><?php echo esc_attr( $group->name ); ?></h3>
                     </noscript>
+
                     <div id="tabs-<?php echo $group->id; ?>" class="tab-wrapper">
                         <div class="tab-toolbar">
@@ -83 +160 @@
                                 <a class="button" href="admin.php?page=bp-profile-setup&amp;group_id=<?php echo esc_attr( $group->id ); ?>&amp;mode=add_field"><?php _e( 'Add New Field', 'buddypress' ); ?></a>
                                 <a class="button edit" href="admin.php?page=bp-profile-setup&amp;mode=edit_group&amp;group_id=<?php echo esc_attr( $group->id ); ?>"><?php _e( 'Edit Group', 'buddypress' ); ?></a>
+
 <?php               if ( $group->can_delete ) : ?>
+
                                 <a class="button delete" href="admin.php?page=bp-profile-setup&amp;mode=delete_group&amp;group_id=<?php echo esc_attr( $group->id ); ?>"><?php _e( 'Delete Group', 'buddypress' ); ?></a>
+
 <?php               endif; ?>
+
                             </div>
                         </div>
 
                         <fieldset id="<?php echo $group->id; ?>" class="connectedSortable field-group">
+
 <?php               if( $group->description ) : ?>
+
                             <legend><?php echo esc_attr( $group->description ) ?></legend>
+
 <?php               endif;
 
@@ -97 +181 @@
                         foreach ( $group->fields as $field ) {
 
-                            /* Load the field */
+                            // Load the field
                             $field = new BP_XProfile_Field( $field->id );
 
@@ -109 +193 @@
                             xprofile_admin_field( $field, $group, $class );
 
-                        } /* end for */
-
-                    else : /* !$group->fields */
+                        } // end for
+
+                    else : // !$group->fields
 ?>
 
                             <p class="nodrag nofields"><?php _e( 'There are no fields in this group.', 'buddypress' ); ?></p>
-<?php
-                                endif; /* end $group->fields */
+
+<?php
+                    endif; // end $group->fields
 ?>
+
                         </fieldset>
                     </div>
-<?php
-                    } /* End For */ ?>
+
+<?php
+                    } // End For ?>
+
                 </div>
 <?php
                 else :
 ?>
+
                 <div id="message" class="error"><p><?php _e( 'You have no groups.', 'buddypress' ); ?></p></div>
                 <p><a href="admin.php?page=bp-profile-setup&amp;mode=add_group"><?php _e( 'Add New Group', 'buddypress' ); ?></a></p>
+
 <?php
                 endif;
@@ -155 +245 @@
             if ( !$group->save() ) {
                 $message = __( 'There was an error saving the group. Please try again', 'buddypress' );
-                $type = 'error';
+                $type    = 'error';
             } else {
                 $message = __( 'The group was saved successfully.', 'buddypress' );
-                $type = 'success';
+                $type    = 'success';
 
                 do_action( 'xprofile_groups_saved_group', $group );
@@ -187 +277 @@
     if ( !$group->delete() ) {
         $message = __( 'There was an error deleting the group. Please try again', 'buddypress' );
-        $type = 'error';
+        $type    = 'error';
     } else {
         $message = __( 'The group was deleted successfully.', 'buddypress' );
-        $type = 'success';
+        $type    = 'success';
 
         do_action( 'xprofile_groups_deleted_group', $group );
@@ -214 +304 @@
     if ( isset( $_POST['saveField'] ) ) {
         if ( BP_XProfile_Field::admin_validate() ) {
-            $field->name = wp_filter_kses( $_POST['title'] );
+            $field->name        = wp_filter_kses( $_POST['title'] );
             $field->description = wp_filter_kses( $_POST['description'] );
             $field->is_required = wp_filter_kses( $_POST['required'] );
-            $field->type = wp_filter_kses( $_POST['fieldtype'] );
+            $field->type        = wp_filter_kses( $_POST['fieldtype'] );
+
             if ( !empty( $_POST["sort_order_{$field->type}"] ) )
                 $field->order_by = wp_filter_kses( $_POST["sort_order_{$field->type}"] );
 
             $field->field_order = $wpdb->get_var( $wpdb->prepare( "SELECT field_order FROM {$bp->profile->table_name_fields} WHERE id = %d", $field_id ) );
+
             if ( !$field->field_order ) {
                 $field->field_order = (int) $wpdb->get_var( $wpdb->prepare( "SELECT max(field_order) FROM {$bp->profile->table_name_fields} WHERE group_id = %d", $group_id ) );
@@ -289 +381 @@
     global $bp;
 
-    /* Check the nonce */
+    // Check the nonce
     check_admin_referer( 'bp_reorder_fields', '_wpnonce_reorder_fields' );
 
@@ -312 +404 @@
     global $bp;
 
-    /* Check the nonce */
+    // Check the nonce
     check_admin_referer( 'bp_reorder_groups', '_wpnonce_reorder_groups' );
 
@@ -334 +426 @@
     global $field;
 
-    $field = $admin_field;
-?>
+    $field = $admin_field; ?>
+
                         <fieldset id="field_<?php echo esc_attr( $field->id ); ?>" class="sortable<?php echo ' ' . $field->type; if ( $class ) echo ' ' . $class; ?>">
                             <legend><?php bp_the_profile_field_name(); ?> <?php if( !$field->can_delete ) : ?> <?php _e( '(Core)', 'buddypress' ); endif; ?> <?php if ( bp_get_the_profile_field_is_required() ) : ?><?php _e( '(required)', 'buddypress' ) ?><?php endif; ?></legend>
                             <div class="field-wrapper">
+
 <?php
     switch ( $field->type ) {
@@ -344 +437 @@
 
                                 <input type="text" name="<?php bp_the_profile_field_input_name() ?>" id="<?php bp_the_profile_field_input_name() ?>" value="" />
+
 <?php       break; case 'textarea' : ?>
 
                                 <textarea rows="5" cols="40" name="<?php bp_the_profile_field_input_name() ?>" id="<?php bp_the_profile_field_input_name() ?>"></textarea>
+
 <?php       break; case 'selectbox' : ?>
 
@@ -368 +463 @@
 
                                 <a class="clear-value" href="javascript:clear( '<?php bp_the_profile_field_input_name() ?>' );"><?php _e( 'Clear', 'buddypress' ) ?></a>
+
 <?php           endif; ?>
 
@@ -401 +497 @@
 
                                 </div>
+
 <?php if ( $field->description ) : ?>
+
                                 <p class="description"><?php echo esc_attr( $field->description ); ?></p>
+
 <?php endif; ?>
+
                             </div>
                         </fieldset>

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

@@ -1 +1 @@
 <?php
 
-// Required files
-require ( BP_PLUGIN_DIR . '/bp-xprofile/bp-xprofile-cssjs.php'    );
-require ( BP_PLUGIN_DIR . '/bp-xprofile/bp-xprofile-admin.php'    );
-require ( BP_PLUGIN_DIR . '/bp-xprofile/bp-xprofile-classes.php'  );
-require ( BP_PLUGIN_DIR . '/bp-xprofile/bp-xprofile-filters.php'  );
-require ( BP_PLUGIN_DIR . '/bp-xprofile/bp-xprofile-template.php' );
+/**
+ * BuddyPress XProfile Loader
+ *
+ * An extended profile component for users. This allows site admins to create
+ * groups of fields for users to enter information about themselves.
+ *
+ * @package BuddyPress
+ * @subpackage XProfile Core
+ */
 
-/**
- * Add the profile globals to the $bp global for use across the installation
- *
- * @package BuddyPress XProfile
- * @global $bp The global BuddyPress settings variable created in bp_core_setup_globals()
- * @global $wpdb WordPress DB access object.
- * @uses site_url() Returns the site URL
- */
-function xprofile_setup_globals() {
-    global $bp, $wpdb;
+class BP_XProfile_Component extends BP_Component {
 
-    if ( isset( $bp->profile->id ) )
-        return;
+    /**
+     * Start the xprofile component creation process
+     *
+     * @since BuddyPress {unknown}
+     */
+    function BP_XProfile_Component() {
+        parent::start( 'profile', __( 'Extended Profiles', 'buddypress' ) );
+    }
 
-    if ( !defined( 'BP_XPROFILE_SLUG' ) )
-        define ( 'BP_XPROFILE_SLUG', 'profile' );
+    /**
+     * Setup globals
+     *
+     * The BP_XPROFILE_SLUG constant is deprecated, and only used here for
+     * backwards compatibility.
+     *
+     * @since BuddyPress {unknown}
+     * @global obj $bp
+     */
+    function _setup_globals() {
+        global $bp;
 
-    // Assign the base group and fullname field names to constants to use
-    // in SQL statements
-    define ( 'BP_XPROFILE_BASE_GROUP_NAME', stripslashes( $bp->site_options['bp-xprofile-base-group-name'] ) );
-    define ( 'BP_XPROFILE_FULLNAME_FIELD_NAME', stripslashes( $bp->site_options['bp-xprofile-fullname-field-name'] ) );
+        // Define a slug, if necessary
+        if ( !defined( 'BP_XPROFILE_SLUG' ) )
+            define( 'BP_XPROFILE_SLUG', 'profile' );
 
-    // For internal identification
-    $bp->profile->id = 'profile';
+        // Assign the base group and fullname field names to constants to use
+        // in SQL statements
+        define ( 'BP_XPROFILE_BASE_GROUP_NAME',     stripslashes( $bp->site_options['bp-xprofile-base-group-name']     ) );
+        define ( 'BP_XPROFILE_FULLNAME_FIELD_NAME', stripslashes( $bp->site_options['bp-xprofile-fullname-field-name'] ) );
 
-    // Slug
-    $bp->profile->slug = BP_XPROFILE_SLUG;
+        // Do some slug checks
+        $this->slug      = BP_XPROFILE_SLUG;
+        $this->root_slug = isset( $bp->pages->xprofile->slug ) ? $bp->pages->xprofile->slug : $this->slug;
 
-    // Tables
-    $bp->profile->table_name_data   = $bp->table_prefix . 'bp_xprofile_data';
-    $bp->profile->table_name_groups = $bp->table_prefix . 'bp_xprofile_groups';
-    $bp->profile->table_name_fields = $bp->table_prefix . 'bp_xprofile_fields';
-    $bp->profile->table_name_meta   = $bp->table_prefix . 'bp_xprofile_meta';
+        // 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
-    $bp->profile->notification_callback = 'xprofile_format_notifications';
+        // Notifications
+        $this->notification_callback = 'xprofile_format_notifications';
 
-    // Register this in the active components array
-    $bp->active_components[$bp->profile->slug] = $bp->profile->id;
+        // Register this in the active components array
+        $bp->active_components[$this->id] = $this->id;
 
-    // Set the support field type ids
-    $bp->profile->field_types = apply_filters( 'xprofile_field_types', array( 'textbox', 'textarea', 'radio', 'checkbox', 'selectbox', 'multiselectbox', 'datebox' ) );
+        // Set the support field type ids
+        $this->field_types = apply_filters( 'xprofile_field_types', array(
+            'textbox',
+            'textarea',
+            'radio',
+            'checkbox',
+            'selectbox',
+            'multiselectbox',
+            'datebox'
+        ) );
+    }
 
-    do_action( 'xprofile_setup_globals' );
-}
-add_action( 'bp_setup_globals', 'xprofile_setup_globals' );
+    /**
+     * 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' );
+    }
 
-/**
- * Creates the administration interface menus and checks to see if the DB
- * tables are set up.
- *
- * @package BuddyPress XProfile
- * @global $bp The global BuddyPress settings variable created in bp_core_setup_globals()
- * @global $wpdb WordPress DB access object.
- * @uses is_super_admin() returns true if the current user is a site admin, false if not
- * @uses bp_xprofile_install() runs the installation of DB tables for the xprofile component
- * @uses wp_enqueue_script() Adds a JS file to the JS queue ready for output
- * @uses add_submenu_page() Adds a submenu tab to a top level tab in the admin area
- * @uses xprofile_install() Runs the DB table installation function
- * @return
- */
-function xprofile_add_admin_menu() {
-    global $wpdb, $bp;
+    /**
+     * Setup BuddyBar navigation
+     *
+     * @global obj $bp
+     */
+    function _setup_nav() {
+        global $bp;
 
-    if ( !is_super_admin() )
-        return false;
+        // Add 'Profile' to the main navigation
+        bp_core_new_nav_item( array(
+            'name'                => __( 'Profile', 'buddypress' ),
+            'slug'                => $this->slug,
+            'position'            => 20,
+            'screen_function'     => 'xprofile_screen_display_profile',
+            'default_subnav_slug' => 'public',
+            'item_css_id'         => $this->id
+        ) );
 
-    // Add the administration tab under the "Site Admin" tab for site administrators
-    add_submenu_page( 'bp-general-settings', __( 'Profile Field Setup', 'buddypress' ), __( 'Profile Field Setup', 'buddypress' ), 'manage_options', 'bp-profile-setup', 'xprofile_admin' );
-}
-add_action( is_multisite() ? 'network_admin_menu' : 'admin_menu', 'xprofile_add_admin_menu' );
+        $profile_link = trailingslashit( $bp->loggedin_user->domain . $this->slug );
 
-/**
- * Sets up the navigation items for the xprofile component
- *
- * @package BuddyPress XProfile
- * @global $bp The global BuddyPress settings variable created in bp_core_setup_globals()
- * @uses bp_core_new_nav_item() Adds a navigation item to the top level buddypress navigation
- * @uses bp_core_new_subnav_item() Adds a sub navigation item to a nav item
- * @uses bp_is_my_profile() Returns true if the current user being viewed is equal the logged in user
- * @uses bp_core_fetch_avatar() Returns the either the thumb or full avatar URL for the user_id passed
- */
-function xprofile_setup_nav() {
-    global $bp;
+        // Add the subnav items to the profile
+        bp_core_new_subnav_item( array(
+            'name'            => __( 'Public', 'buddypress' ),
+            'slug'            => 'public',
+            'parent_url'      => $profile_link,
+            'parent_slug'     => $this->slug,
+            'screen_function' => 'xprofile_screen_display_profile',
+            'position'        => 10
+        ) );
 
-    // Add 'Profile' to the main navigation
-    bp_core_new_nav_item( array( 'name' => __( 'Profile', 'buddypress' ), 'slug' => $bp->profile->slug, 'position' => 20, 'screen_function' => 'xprofile_screen_display_profile', 'default_subnav_slug' => 'public', 'item_css_id' => $bp->profile->id ) );
+        // Edit Profile
+        bp_core_new_subnav_item( array(
+            'name'            => __( 'Edit Profile', 'buddypress' ),
+            'slug'            => 'edit',
+            'parent_url'      => $profile_link,
+            'parent_slug'     => $this->slug,
+            'screen_function' => 'xprofile_screen_edit_profile',
+            'position'        => 20
+        ) );
 
-    $profile_link = $bp->loggedin_user->domain . $bp->profile->slug . '/';
+        // Change Avatar
+        bp_core_new_subnav_item( array(
+            'name'            => __( 'Change Avatar', 'buddypress' ),
+            'slug'            => 'change-avatar',
+            'parent_url'      => $profile_link,
+            'parent_slug'     => $this->slug,
+            'screen_function' => 'xprofile_screen_change_avatar',
+            'position'        => 30
+        ) );
 
-    // Add the subnav items to the profile
-    bp_core_new_subnav_item( array( 'name' => __( 'Public', 'buddypress' ), 'slug' => 'public', 'parent_url' => $profile_link, 'parent_slug' => $bp->profile->slug, 'screen_function' => 'xprofile_screen_display_profile', 'position' => 10 ) );
-    bp_core_new_subnav_item( array( 'name' => __( 'Edit Profile', 'buddypress' ), 'slug' => 'edit', 'parent_url' => $profile_link, 'parent_slug' => $bp->profile->slug, 'screen_function' => 'xprofile_screen_edit_profile', 'position' => 20 ) );
-    bp_core_new_subnav_item( array( 'name' => __( 'Change Avatar', 'buddypress' ), 'slug' => 'change-avatar', 'parent_url' => $profile_link, 'parent_slug' => $bp->profile->slug, 'screen_function' => 'xprofile_screen_change_avatar', 'position' => 30 ) );
-
-    if ( $bp->current_component == $bp->profile->slug ) {
-        if ( bp_is_my_profile() ) {
-            $bp->bp_options_title = __( 'My Profile', 'buddypress' );
-        } else {
-            $bp->bp_options_avatar = bp_core_fetch_avatar( array( 'item_id' => $bp->displayed_user->id, 'type' => 'thumb' ) );
-            $bp->bp_options_title = $bp->displayed_user->fullname;
+        if ( $bp->current_component == $this->id ) {
+            if ( bp_is_my_profile() ) {
+                $bp->bp_options_title = __( 'My Profile', 'buddypress' );
+            } else {
+                $bp->bp_options_avatar = bp_core_fetch_avatar( array(
+                    'item_id' => $bp->displayed_user->id,
+                    'type'    => 'thumb'
+                ) );
+                $bp->bp_options_title = $bp->displayed_user->fullname;
+            }
         }
     }
-
-    do_action( 'xprofile_setup_nav' );
 }
-add_action( 'bp_setup_nav', 'xprofile_setup_nav' );
-
-/**
- * Adds an admin bar menu to any profile page providing site admin options for that user.
- *
- * @package BuddyPress XProfile
- * @global $bp The global BuddyPress settings variable created in bp_core_setup_globals()
- */
-function xprofile_setup_adminbar_menu() {
-    global $bp;
-
-    if ( !$bp->displayed_user->id )
-        return false;
-
-    // Don't show this menu to non site admins or if you're viewing your own profile
-    if ( !is_super_admin() || bp_is_my_profile() )
-        return false; ?>
-
-    <li id="bp-adminbar-adminoptions-menu">
-        <a href=""><?php _e( 'Admin Options', 'buddypress' ) ?></a>
-
-        <ul>
-            <li><a href="<?php echo $bp->displayed_user->domain . $bp->profile->slug ?>/edit/"><?php printf( __( "Edit %s's Profile", 'buddypress' ), esc_attr( $bp->displayed_user->fullname ) ) ?></a></li>
-            <li><a href="<?php echo $bp->displayed_user->domain . $bp->profile->slug ?>/change-avatar/"><?php printf( __( "Edit %s's Avatar", 'buddypress' ), esc_attr( $bp->displayed_user->fullname ) ) ?></a></li>
-
-            <?php if ( !bp_core_is_user_spammer( $bp->displayed_user->id ) ) : ?>
-
-                <li><a href="<?php echo wp_nonce_url( $bp->displayed_user->domain . 'admin/mark-spammer/', 'mark-unmark-spammer' ) ?>" class="confirm"><?php _e( "Mark as Spammer", 'buddypress' ) ?></a></li>
-
-            <?php else : ?>
-
-                <li><a href="<?php echo wp_nonce_url( $bp->displayed_user->domain . 'admin/unmark-spammer/', 'mark-unmark-spammer' ) ?>" class="confirm"><?php _e( "Not a Spammer", 'buddypress' ) ?></a></li>
-
-            <?php endif; ?>
-
-            <li><a href="<?php echo wp_nonce_url( $bp->displayed_user->domain . 'admin/delete-user/', 'delete-user' ) ?>" class="confirm"><?php printf( __( "Delete %s", 'buddypress' ), esc_attr( $bp->displayed_user->fullname ) ) ?></a></li>
-
-            <?php do_action( 'xprofile_adminbar_menu_items' ) ?>
-
-        </ul>
-    </li>
-
-    <?php
-}
-add_action( 'bp_adminbar_menus', 'xprofile_setup_adminbar_menu', 20 );
-
-/********************************************************************************
- * Screen Functions
- *
- * Screen functions are the controllers of BuddyPress. They will execute when their
- * specific URL is caught. They will first save or manipulate data using business
- * functions, then pass on the user to a template file.
- */
-
-/**
- * Handles the display of the profile page by loading the correct template file.
- *
- * @package BuddyPress Xprofile
- * @uses bp_core_load_template() Looks for and loads a template file within the current member theme (folder/filename)
- */
-function xprofile_screen_display_profile() {
-    global $bp;
-
-    if ( isset( $_GET['new'] ) )
-        $new = $_GET['new'];
-    else
-        $new = '';
-
-    do_action( 'xprofile_screen_display_profile', $new );
-    bp_core_load_template( apply_filters( 'xprofile_template_display_profile', 'members/single/home' ) );
-}
-
-/**
- * Handles the display of the profile edit page by loading the correct template file.
- * Also checks to make sure this can only be accessed for the logged in users profile.
- *
- * @package BuddyPress Xprofile
- * @uses bp_is_my_profile() Checks to make sure the current user being viewed equals the logged in user
- * @uses bp_core_load_template() Looks for and loads a template file within the current member theme (folder/filename)
- */
-function xprofile_screen_edit_profile() {
-    global $bp;
-
-    if ( !bp_is_my_profile() && !is_super_admin() )
-        return false;
-
-    // Make sure a group is set.
-    if ( empty( $bp->action_variables[1] ) )
-        bp_core_redirect( $bp->displayed_user->domain . BP_XPROFILE_SLUG . '/edit/group/1' );
-
-    // Check the field group exists
-    if ( !xprofile_get_field_group( $bp->action_variables[1] ) )
-        bp_core_redirect( $bp->root_domain );
-
-    // Check to see if any new information has been submitted
-    if ( isset( $_POST['field_ids'] ) ) {
-
-        // Check the nonce
-        check_admin_referer( 'bp_xprofile_edit' );
-
-        // Check we have field ID's
-        if ( empty( $_POST['field_ids'] ) )
-            bp_core_redirect( $bp->displayed_user->domain . BP_XPROFILE_SLUG . '/edit/group/' . $bp->action_variables[1] . '/' );
-
-        // Explode the posted field IDs into an array so we know which
-        // fields have been submitted
-        $posted_field_ids = explode( ',', $_POST['field_ids'] );
-
-        $is_required = array();
-
-        // Loop through the posted fields formatting any datebox values
-        // then validate the field
-        foreach ( (array)$posted_field_ids as $field_id ) {
-            if ( !isset( $_POST['field_' . $field_id] ) ) {
-
-                if ( !empty( $_POST['field_' . $field_id . '_day'] ) && is_numeric( $_POST['field_' . $field_id . '_day'] ) ) {
-                    // Concatenate the values
-                    $date_value =   $_POST['field_' . $field_id . '_day'] . ' ' .
-                                    $_POST['field_' . $field_id . '_month'] . ' ' .
-                                    $_POST['field_' . $field_id . '_year'];
-
-                    // Turn the concatenated value into a timestamp
-                    $_POST['field_' . $field_id] = strtotime( $date_value );
-                }
-
-            }
-
-            $is_required[$field_id] = xprofile_check_is_required_field( $field_id );
-            if ( $is_required[$field_id] && empty( $_POST['field_' . $field_id] ) )
-                $errors = true;
-        }
-
-        if ( !empty( $errors ) )
-            bp_core_add_message( __( 'Please make sure you fill in all required fields in this profile field group before saving.', 'buddypress' ), 'error' );
-        else {
-            // Reset the errors var
-            $errors = false;
-
-            // Now we've checked for required fields, lets save the values.
-            foreach ( (array)$posted_field_ids as $field_id ) {
-
-                // Certain types of fields (checkboxes, multiselects) may come through empty. Save them as an empty array so that they don't get overwritten by the default on the next edit.
-                if ( empty( $_POST['field_' . $field_id] ) )
-                    $value = array();
-                else
-                    $value = $_POST['field_' . $field_id];
-
-                if ( !xprofile_set_field_data( $field_id, $bp->displayed_user->id, $value, $is_required[$field_id] ) )
-                    $errors = true;
-                else
-                    do_action( 'xprofile_profile_field_data_updated', $field_id, $value );
-            }
-
-            do_action( 'xprofile_updated_profile', $bp->displayed_user->id, $posted_field_ids, $errors );
-
-            // Set the feedback messages
-            if ( $errors )
-                bp_core_add_message( __( 'There was a problem updating some of your profile information, please try again.', 'buddypress' ), 'error' );
-            else
-                bp_core_add_message( __( 'Changes saved.', 'buddypress' ) );
-
-            // Redirect back to the edit screen to display the updates and message
-            bp_core_redirect( $bp->displayed_user->domain . BP_XPROFILE_SLUG . '/edit/group/' . $bp->action_variables[1] . '/' );
-        }
-    }
-
-    do_action( 'xprofile_screen_edit_profile' );
-    bp_core_load_template( apply_filters( 'xprofile_template_edit_profile', 'members/single/home' ) );
-}
-
-/**
- * Handles the uploading and cropping of a user avatar. Displays the change avatar page.
- *
- * @package BuddyPress Xprofile
- * @uses bp_is_my_profile() Checks to make sure the current user being viewed equals the logged in user
- * @uses bp_core_load_template() Looks for and loads a template file within the current member theme (folder/filename)
- */
-function xprofile_screen_change_avatar() {
-    global $bp;
-
-    if ( !bp_is_my_profile() && !is_super_admin() )
-        return false;
-
-    $bp->avatar_admin->step = 'upload-image';
-
-    if ( !empty( $_FILES ) ) {
-
-        // Check the nonce
-        check_admin_referer( 'bp_avatar_upload' );
-
-        // Pass the file to the avatar upload handler
-        if ( bp_core_avatar_handle_upload( $_FILES, 'xprofile_avatar_upload_dir' ) ) {
-            $bp->avatar_admin->step = 'crop-image';
-
-            // Make sure we include the jQuery jCrop file for image cropping
-            add_action( 'wp_print_scripts', 'bp_core_add_jquery_cropper' );
-        }
-    }
-
-    // If the image cropping is done, crop the image and save a full/thumb version
-    if ( isset( $_POST['avatar-crop-submit'] ) ) {
-
-        // Check the nonce
-        check_admin_referer( 'bp_avatar_cropstore' );
-
-        if ( !bp_core_avatar_handle_crop( array( 'item_id' => $bp->displayed_user->id, 'original_file' => $_POST['image_src'], 'crop_x' => $_POST['x'], 'crop_y' => $_POST['y'], 'crop_w' => $_POST['w'], 'crop_h' => $_POST['h'] ) ) )
-            bp_core_add_message( __( 'There was a problem cropping your avatar, please try uploading it again', 'buddypress' ), 'error' );
-        else {
-            bp_core_add_message( __( 'Your new avatar was uploaded successfully!', 'buddypress' ) );
-            do_action( 'xprofile_avatar_uploaded' );
-        }
-    }
-
-    do_action( 'xprofile_screen_change_avatar' );
-
-    bp_core_load_template( apply_filters( 'xprofile_template_change_avatar', 'members/single/home' ) );
-}
-
-/********************************************************************************
- * Action Functions
- *
- * Action functions are exactly the same as screen functions, however they do not
- * have a template screen associated with them. Usually they will send the user
- * back to the default screen after execution.
- */
-
-/**
- * This function runs when an action is set for a screen:
- * example.com/members/andy/profile/change-avatar/ [delete-avatar]
- *
- * The function will delete the active avatar for a user.
- *
- * @package BuddyPress Xprofile
- * @global $bp The global BuddyPress settings variable created in bp_core_setup_globals()
- * @uses bp_core_delete_avatar() Deletes the active avatar for the logged in user.
- * @uses add_action() Runs a specific function for an action when it fires.
- * @uses bp_core_load_template() Looks for and loads a template file within the current member theme (folder/filename)
- */
-function xprofile_action_delete_avatar() {
-    global $bp;
-
-    if ( $bp->profile->slug != $bp->current_component || 'change-avatar' != $bp->current_action || !isset( $bp->action_variables[0] ) || 'delete-avatar' != $bp->action_variables[0] )
-        return false;
-
-    // Check the nonce
-    check_admin_referer( 'bp_delete_avatar_link' );
-
-    if ( !bp_is_my_profile() && !is_super_admin() )
-        return false;
-
-    if ( bp_core_delete_existing_avatar( array( 'item_id' => $bp->displayed_user->id ) ) )
-        bp_core_add_message( __( 'Your avatar was deleted successfully!', 'buddypress' ) );
-    else
-        bp_core_add_message( __( 'There was a problem deleting that avatar, please try again.', 'buddypress' ), 'error' );
-
-    bp_core_redirect( wp_get_referer() );
-}
-add_action( 'wp', 'xprofile_action_delete_avatar', 3 );
-
-/********************************************************************************
- * Activity & Notification Functions
- *
- * These functions handle the recording, deleting and formatting of activity and
- * notifications for the user and for this specific component.
- */
-
-function xprofile_register_activity_actions() {
-    global $bp;
-
-    if ( !function_exists( 'bp_activity_set_action' ) )
-        return false;
-
-    // Register the activity stream actions for this component
-    bp_activity_set_action( $bp->profile->id, 'new_member',      __( 'New member registered', 'buddypress' ) );
-    bp_activity_set_action( $bp->profile->id, 'updated_profile', __( 'Updated Profile',       'buddypress' ) );
-
-    do_action( 'xprofile_register_activity_actions' );
-}
-add_action( 'bp_register_activity_actions', 'xprofile_register_activity_actions' );
-
-/**
- * Records activity for the logged in user within the profile component so that
- * it will show in the users activity stream (if installed)
- *
- * @package BuddyPress XProfile
- * @param $args Array containing all variables used after extract() call
- * @global $bp The global BuddyPress settings variable created in bp_core_setup_globals()
- * @uses bp_activity_record() Adds an entry to the activity component tables for a specific activity
- */
-function xprofile_record_activity( $args = true ) {
-    global $bp;
-
-    if ( !function_exists( 'bp_activity_add' ) )
-        return false;
-
-    $defaults = array (
-        'user_id'           => $bp->loggedin_user->id,
-        'action'            => '',
-        'content'           => '',
-        'primary_link'      => '',
-        'component'         => $bp->profile->id,
-        'type'              => false,
-        'item_id'           => false,
-        'secondary_item_id' => false,
-        'recorded_time'     => bp_core_current_time(),
-        'hide_sitewide'     => false
-    );
-
-    $r = wp_parse_args( $args, $defaults );
-    extract( $r, EXTR_SKIP );
-
-    return bp_activity_add( array( 'user_id' => $user_id, 'action' => $action, 'content' => $content, 'primary_link' => $primary_link, 'component' => $component, 'type' => $type, 'item_id' => $item_id, 'secondary_item_id' => $secondary_item_id, 'recorded_time' => $recorded_time, 'hide_sitewide' => $hide_sitewide ) );
-}
-
-/**
- * Deletes activity for a user within the profile component so that
- * it will be removed from the users activity stream and sitewide stream (if installed)
- *
- * @package BuddyPress XProfile
- * @param $args Array containing all variables used after extract() call
- * @global $bp The global BuddyPress settings variable created in bp_core_setup_globals()
- * @uses bp_activity_delete() Deletes an entry to the activity component tables for a specific activity
- */
-function xprofile_delete_activity( $args = '' ) {
-    global $bp;
-
-    if ( function_exists('bp_activity_delete_by_item_id') ) {
-        extract( $args );
-        bp_activity_delete_by_item_id( array( 'item_id' => $item_id, 'component' => $bp->profile->id, 'type' => $type, 'user_id' => $user_id, 'secondary_item_id' => $secondary_item_id ) );
-    }
-}
-
-function xprofile_register_activity_action( $key, $value ) {
-    global $bp;
-
-    if ( !function_exists( 'bp_activity_set_action' ) )
-        return false;
-
-    return apply_filters( 'xprofile_register_activity_action', bp_activity_set_action( $bp->profile->id, $key, $value ), $key, $value );
-}
-
-
-/********************************************************************************
- * Business Functions
- *
- * Business functions are where all the magic happens in BuddyPress. They will
- * handle the actual saving or manipulation of information. Usually they will
- * hand off to a database class for data access, then return
- * true or false on success or failure.
- */
-
-/*** Field Group Management **************************************************/
-
-function xprofile_insert_field_group( $args = '' ) {
-    $defaults = array(
-        'field_group_id' => false,
-        'name'           => false,
-        'description'    => '',
-        'can_delete'     => true
-    );
-
-    $r = wp_parse_args( $args, $defaults );
-    extract( $r, EXTR_SKIP );
-
-    if ( !$name )
-        return false;
-
-    $field_group              = new BP_XProfile_Group( $field_group_id );
-    $field_group->name        = $name;
-    $field_group->description = $description;
-    $field_group->can_delete  = $can_delete;
-
-    return $field_group->save();
-}
-
-function xprofile_get_field_group( $field_group_id ) {
-    $field_group = new BP_XProfile_Group( $field_group_id );
-
-    if ( empty( $field_group->id ) )
-        return false;
-
-    return $field_group;
-}
-
-function xprofile_delete_field_group( $field_group_id ) {
-    $field_group = new BP_XProfile_Group( $field_group_id );
-    return $field_group->delete();
-}
-
-function xprofile_update_field_group_position( $field_group_id, $position ) {
-    return BP_XProfile_Group::update_position( $field_group_id, $position );
-}
-
-
-/*** Field Management *********************************************************/
-
-function xprofile_insert_field( $args = '' ) {
-    global $bp;
-
-    extract( $args );
-
-    /**
-     * Possible parameters (pass as assoc array):
-     *  'field_id'
-     *  'field_group_id'
-     *  'parent_id'
-     *  'type'
-     *  'name'
-     *  'description'
-     *  'is_required'
-     *  'can_delete'
-     *  'field_order'
-     *  'order_by'
-     *  'is_default_option'
-     *  'option_order'
-     */
-
-    // Check we have the minimum details
-    if ( !$field_group_id )
-        return false;
-
-    // Check this is a valid field type
-    if ( !in_array( $type, (array) $bp->profile->field_types ) )
-        return false;
-
-    // Instantiate a new field object
-    if ( $field_id )
-        $field = new BP_XProfile_Field( $field_id );
-    else
-        $field = new BP_XProfile_Field;
-
-    $field->group_id = $field_group_id;
-
-    if ( !empty( $parent_id ) )
-        $field->parent_id = $parent_id;
-
-    if ( !empty( $type ) )
-        $field->type = $type;
-
-    if ( !empty( $name ) )
-        $field->name = $name;
-
-    if ( !empty( $description ) )
-        $field->description = $description;
-
-    if ( !empty( $is_required ) )
-        $field->is_required = $is_required;
-
-    if ( !empty( $can_delete ) )
-        $field->can_delete = $can_delete;
-
-    if ( !empty( $field_order ) )
-        $field->field_order = $field_order;
-
-    if ( !empty( $order_by ) )
-        $field->order_by = $order_by;
-
-    if ( !empty( $is_default_option ) )
-        $field->is_default_option = $is_default_option;
-
-    if ( !empty( $option_order ) )
-        $field->option_order = $option_order;
-
-    if ( !$field->save() )
-        return false;
-
-    return true;
-}
-
-function xprofile_get_field( $field_id ) {
-    return new BP_XProfile_Field( $field_id );
-}
-
-function xprofile_delete_field( $field_id ) {
-    $field = new BP_XProfile_Field( $field_id );
-    return $field->delete();
-}
-
-
-/*** Field Data Management *****************************************************/
-
-/**
- * Fetches profile data for a specific field for the user.
- *
- * When the field value is serialized, this function unserializes and filters each item in the array
- * that results.
- *
- * @package BuddyPress Core
- * @param mixed $field The ID of the field, or the $name of the field.
- * @param int $user_id The ID of the user
- * @global $bp The global BuddyPress settings variable created in bp_core_setup_globals()
- * @uses BP_XProfile_ProfileData::get_value_byid() Fetches the value based on the params passed.
- * @return mixed The profile field data.
- */
-function xprofile_get_field_data( $field, $user_id = 0 ) {
-    global $bp;
-
-    // This is required because of a call to bp_core_get_user_displayname() in bp_core_setup_globals()
-    if ( !isset( $bp->profile->id ) )
-        xprofile_setup_globals();
-
-    if ( empty( $user_id ) )
-        $user_id = $bp->displayed_user->id;
-
-    if ( empty( $user_id ) )
-        return false;
-
-    if ( is_numeric( $field ) )
-        $field_id = $field;
-    else
-        $field_id = xprofile_get_field_id_from_name( $field );
-
-    if ( empty( $field_id ) )
-        return false;
-
-    $values = maybe_unserialize( BP_XProfile_ProfileData::get_value_byid( $field_id, $user_id ) );
-
-    if ( is_array( $values ) ) {
-        $data = array();
-        foreach( (array)$values as $value ) {
-            $data[] = apply_filters( 'xprofile_get_field_data', $value );
-        }
-    } else {
-        $data = apply_filters( 'xprofile_get_field_data', $values );
-    }
-
-    return $data;
-}
-
-/**
- * A simple function to set profile data for a specific field for a specific user.
- *
- * @package BuddyPress Core
- * @param $field The ID of the field, or the $name of the field.
- * @param $user_id The ID of the user
- * @param $value The value for the field you want to set for the user.
- * @global $bp The global BuddyPress settings variable created in bp_core_setup_globals()
- * @uses xprofile_get_field_id_from_name() Gets the ID for the field based on the name.
- * @return true on success, false on failure.
- */
-function xprofile_set_field_data( $field, $user_id, $value, $is_required = false ) {
-    if ( is_numeric( $field ) )
-        $field_id = $field;
-    else
-        $field_id = xprofile_get_field_id_from_name( $field );
-
-    if ( empty( $field_id ) )
-        return false;
-
-    if ( $is_required && ( empty( $value ) || !is_array( $value ) && !strlen( trim( $value ) ) ) )
-        return false;
-
-    $field = new BP_XProfile_Field( $field_id );
-
-    // If the value is empty, then delete any field data that exists, unless the field is of a
-    // type where null values are semantically meaningful
-    if ( empty( $value ) && 'checkbox' != $field->type && 'multiselectbox' != $field->type ) {
-        xprofile_delete_field_data( $field_id, $user_id );
-        return true;
-    }
-
-    // Check the value is an acceptable value
-    if ( 'checkbox' == $field->type || 'radio' == $field->type || 'selectbox' == $field->type || 'multiselectbox' == $field->type ) {
-        $options = $field->get_children();
-
-        foreach( $options as $option )
-            $possible_values[] = $option->name;
-
-        if ( is_array( $value ) ) {
-            foreach( $value as $i => $single ) {
-                if ( !in_array( $single, (array)$possible_values ) )
-                    unset( $value[$i] );
-            }
-
-            // Reset the keys by merging with an empty array
-            $value = array_merge( array(), $value );
-        } else {
-            if ( !in_array( $value, (array)$possible_values ) )
-                return false;
-        }
-    }
-
-    $field           = new BP_XProfile_ProfileData();
-    $field->field_id = $field_id;
-    $field->user_id  = $user_id;
-    $field->value    = maybe_serialize( $value );
-
-    return $field->save();
-}
-
-function xprofile_delete_field_data( $field, $user_id ) {
-    if ( is_numeric( $field ) )
-        $field_id = $field;
-    else
-        $field_id = xprofile_get_field_id_from_name( $field );
-
-    if ( empty( $field_id ) || empty( $user_id ) )
-        return false;
-
-    $field = new BP_XProfile_ProfileData( $field_id, $user_id );
-    return $field->delete();
-}
-
-function xprofile_check_is_required_field( $field_id ) {
-    $field = new BP_Xprofile_Field( $field_id );
-
-    if ( (int)$field->is_required )
-        return true;
-
-    return false;
-}
-
-/**
- * Returns the ID for the field based on the field name.
- *
- * @package BuddyPress Core
- * @param $field_name The name of the field to get the ID for.
- * @return int $field_id on success, false on failure.
- */
-function xprofile_get_field_id_from_name( $field_name ) {
-    return BP_Xprofile_Field::get_id_from_name( $field_name );
-}
-
-/**
- * Fetches a random piece of profile data for the user.
- *
- * @package BuddyPress Core
- * @param $user_id User ID of the user to get random data for
- * @param $exclude_fullname whether or not to exclude the full name field as random data.
- * @global $bp The global BuddyPress settings variable created in bp_core_setup_globals()
- * @global $wpdb WordPress DB access object.
- * @global $current_user WordPress global variable containing current logged in user information
- * @uses xprofile_format_profile_field() Formats profile field data so it is suitable for display.
- * @return $field_data The fetched random data for the user.
- */
-function xprofile_get_random_profile_data( $user_id, $exclude_fullname = true ) {
-    $field_data           = BP_XProfile_ProfileData::get_random( $user_id, $exclude_fullname );
-    $field_data[0]->value = xprofile_format_profile_field( $field_data[0]->type, $field_data[0]->value );
-
-    if ( !$field_data[0]->value || empty( $field_data[0]->value ) )
-        return false;
-
-    return apply_filters( 'xprofile_get_random_profile_data', $field_data );
-}
-
-/**
- * Formats a profile field according to its type. [ TODO: Should really be moved to filters ]
- *
- * @package BuddyPress Core
- * @param $field_type The type of field: datebox, selectbox, textbox etc
- * @param $field_value The actual value
- * @uses bp_format_time() Formats a time value based on the WordPress date format setting
- * @return $field_value The formatted value
- */
-function xprofile_format_profile_field( $field_type, $field_value ) {
-    if ( !isset( $field_value ) || empty( $field_value ) )
-        return false;
-
-    $field_value = bp_unserialize_profile_field( $field_value );
-
-    if ( 'datebox' == $field_type ) {
-        $field_value = bp_format_time( $field_value, true );
-    } else {
-        $content = $field_value;
-        $field_value = str_replace( ']]>', ']]&gt;', $content );
-    }
-
-    return stripslashes_deep( $field_value );
-}
-
-function xprofile_update_field_position( $field_id, $position, $field_group_id ) {
-    return BP_XProfile_Field::update_position( $field_id, $position, $field_group_id );
-}
-
-/**
- * Setup the avatar upload directory for a user.
- *
- * @package BuddyPress Core
- * @param $directory The root directory name
- * @param $user_id The user ID.
- * @return array() containing the path and URL plus some other settings.
- */
-function xprofile_avatar_upload_dir( $directory = false, $user_id = 0 ) {
-    global $bp;
-
-    if ( empty( $user_id ) )
-        $user_id = $bp->displayed_user->id;
-
-    if ( empty( $directory ) )
-        $directory = 'avatars';
-
-    $path    = BP_AVATAR_UPLOAD_PATH . '/avatars/' . $user_id;
-    $newbdir = $path;
-
-    if ( !file_exists( $path ) )
-        @wp_mkdir_p( $path );
-
-    $newurl    = BP_AVATAR_URL . '/avatars/' . $user_id;
-    $newburl   = $newurl;
-    $newsubdir = '/avatars/' . $user_id;
-
-    return apply_filters( 'xprofile_avatar_upload_dir', array( 'path' => $path, 'url' => $newurl, 'subdir' => $newsubdir, 'basedir' => $newbdir, 'baseurl' => $newburl, 'error' => false ) );
-}
-
-/**
- * Syncs Xprofile data to the standard built in WordPress profile data.
- *
- * @package BuddyPress Core
- */
-function xprofile_sync_wp_profile( $user_id = 0 ) {
-    global $bp, $wpdb;
-
-    if ( !empty( $bp->site_options['bp-disable-profile-sync'] ) && (int)$bp->site_options['bp-disable-profile-sync'] )
-        return true;
-
-    if ( empty( $user_id ) )
-        $user_id = $bp->loggedin_user->id;
-
-    if ( empty( $user_id ) )
-        return false;
-
-    $fullname = xprofile_get_field_data( BP_XPROFILE_FULLNAME_FIELD_NAME, $user_id );
-    $space = strpos( $fullname, ' ' );
-
-    if ( false === $space ) {
-        $firstname = $fullname;
-        $lastname = '';
-    } else {
-        $firstname = substr( $fullname, 0, $space );
-        $lastname = trim( substr( $fullname, $space, strlen( $fullname ) ) );
-    }
-
-    update_user_meta( $user_id, 'nickname',   $fullname  );
-    update_user_meta( $user_id, 'first_name', $firstname );
-    update_user_meta( $user_id, 'last_name',  $lastname  );
-
-    $wpdb->query( $wpdb->prepare( "UPDATE {$wpdb->users} SET display_name = %s WHERE ID = %d", $fullname, $user_id ) );
-    $wpdb->query( $wpdb->prepare( "UPDATE {$wpdb->users} SET user_url = %s WHERE ID = %d", bp_core_get_user_domain( $user_id ), $user_id ) );
-}
-add_action( 'xprofile_updated_profile', 'xprofile_sync_wp_profile' );
-add_action( 'bp_core_signup_user', 'xprofile_sync_wp_profile' );
-
-
-/**
- * Syncs the standard built in WordPress profile data to XProfile.
- *
- * @since 1.2.4
- * @package BuddyPress Core
- */
-function xprofile_sync_bp_profile( &$errors, $update, &$user ) {
-    global $bp;
-
-    if ( ( !empty( $bp->site_options['bp-disable-profile-sync'] ) && (int)$bp->site_options['bp-disable-profile-sync'] ) || !$update || $errors->get_error_codes() )
-        return;
-
-    xprofile_set_field_data( BP_XPROFILE_FULLNAME_FIELD_NAME, $user->ID, $user->display_name );
-}
-add_action( 'user_profile_update_errors', 'xprofile_sync_bp_profile', 10, 3 );
-
-
-/**
- * When a user is deleted, we need to clean up the database and remove all the
- * profile data from each table. Also we need to clean anything up in the usermeta table
- * that this component uses.
- *
- * @package BuddyPress XProfile
- * @param $user_id The ID of the deleted user
- * @uses get_user_meta() Get a user meta value based on meta key from wp_usermeta
- * @uses delete_user_meta() Delete user meta value based on meta key from wp_usermeta
- * @uses delete_data_for_user() Removes all profile data from the xprofile tables for the user
- */
-function xprofile_remove_data( $user_id ) {
-    BP_XProfile_ProfileData::delete_data_for_user( $user_id );
-
-    // delete any avatar files.
-    @unlink( get_user_meta( $user_id, 'bp_core_avatar_v1_path', true ) );
-    @unlink( get_user_meta( $user_id, 'bp_core_avatar_v2_path', true ) );
-
-    // unset the usermeta for avatars from the usermeta table.
-    delete_user_meta( $user_id, 'bp_core_avatar_v1'      );
-    delete_user_meta( $user_id, 'bp_core_avatar_v1_path' );
-    delete_user_meta( $user_id, 'bp_core_avatar_v2'      );
-    delete_user_meta( $user_id, 'bp_core_avatar_v2_path' );
-}
-add_action( 'wpmu_delete_user',  'xprofile_remove_data' );
-add_action( 'delete_user',       'xprofile_remove_data' );
-add_action( 'bp_make_spam_user', 'xprofile_remove_data' );
-
-/*** XProfile Meta ****************************************************/
-
-function bp_xprofile_delete_meta( $object_id, $object_type, $meta_key = false, $meta_value = false ) {
-    global $wpdb, $bp;
-
-    $object_id = (int) $object_id;
-
-    if ( !$object_id )
-        return false;
-
-    if ( !isset( $object_type ) )
-        return false;
-
-    if ( !in_array( $object_type, array( 'group', 'field', 'data' ) ) )
-        return false;
-
-    $meta_key = preg_replace( '|[^a-z0-9_]|i', '', $meta_key );
-
-    if ( is_array( $meta_value ) || is_object( $meta_value ) )
-        $meta_value = serialize( $meta_value );
-
-    $meta_value = trim( $meta_value );
-
-    if ( !$meta_key )
-        $wpdb->query( $wpdb->prepare( "DELETE FROM " . $bp->profile->table_name_meta . " WHERE object_id = %d AND object_type = %s", $object_id, $object_type ) );
-    else if ( $meta_value )
-        $wpdb->query( $wpdb->prepare( "DELETE FROM " . $bp->profile->table_name_meta . " WHERE object_id = %d AND object_type = %s AND meta_key = %s AND meta_value = %s", $object_id, $object_type, $meta_key, $meta_value ) );
-    else
-        $wpdb->query( $wpdb->prepare( "DELETE FROM " . $bp->profile->table_name_meta . " WHERE object_id = %d AND object_type = %s AND meta_key = %s", $object_id, $object_type, $meta_key ) );
-
-    // Delete the cached object
-    wp_cache_delete( 'bp_xprofile_meta_' . $object_type . '_' . $object_id . '_' . $meta_key, 'bp' );
-
-    return true;
-}
-
-function bp_xprofile_get_meta( $object_id, $object_type, $meta_key = '') {
-    global $wpdb, $bp;
-
-    $object_id = (int) $object_id;
-
-    if ( !$object_id )
-        return false;
-
-    if ( !isset( $object_type ) )
-        return false;
-
-    if ( !in_array( $object_type, array( 'group', 'field', 'data' ) ) )
-        return false;
-
-    if ( !empty( $meta_key ) ) {
-        $meta_key = preg_replace( '|[^a-z0-9_]|i', '', $meta_key );
-
-        if ( !$metas = wp_cache_get( 'bp_xprofile_meta_' . $object_type . '_' . $object_id . '_' . $meta_key, 'bp' ) ) {
-            $metas = $wpdb->get_col( $wpdb->prepare( "SELECT meta_value FROM " . $bp->profile->table_name_meta . " WHERE object_id = %d AND object_type = %s AND meta_key = %s", $object_id, $object_type, $meta_key ) );
-            wp_cache_set( 'bp_xprofile_meta_' . $object_type . '_' . $object_id . '_' . $meta_key, $metas, 'bp' );
-        }
-    } else {
-        $metas = $wpdb->get_col( $wpdb->prepare( "SELECT meta_value FROM " . $bp->profile->table_name_meta . " WHERE object_id = %d AND object_type = %s", $object_id, $object_type ) );
-    }
-
-    if ( empty( $metas ) ) {
-        if ( empty( $meta_key ) ) {
-            return array();
-        } else {
-            return '';
-        }
-    }
-
-    $metas = array_map( 'maybe_unserialize', (array)$metas );
-
-    if ( 1 == count( $metas ) )
-        return $metas[0];
-    else
-        return $metas;
-}
-
-function bp_xprofile_update_meta( $object_id, $object_type, $meta_key, $meta_value ) {
-    global $wpdb, $bp;
-
-    $object_id = (int) $object_id;
-
-    if ( !$object_id )
-        return false;
-
-    if ( !isset( $object_type ) )
-        return false;
-
-    if ( !in_array( $object_type, array( 'group', 'field', 'data' ) ) )
-        return false;
-
-    $meta_key = preg_replace( '|[^a-z0-9_]|i', '', $meta_key );
-
-    if ( is_string( $meta_value ) )
-        $meta_value = stripslashes( $wpdb->escape( $meta_value ) );
-
-    $meta_value = maybe_serialize( $meta_value );
-
-    if ( empty( $meta_value ) )
-        return bp_xprofile_delete_meta( $object_id, $object_type, $meta_key );
-
-    $cur = $wpdb->get_row( $wpdb->prepare( "SELECT * FROM " . $bp->profile->table_name_meta . " WHERE object_id = %d AND object_type = %s AND meta_key = %s", $object_id, $object_type, $meta_key ) );
-
-    if ( !$cur )
-        $wpdb->query( $wpdb->prepare( "INSERT INTO " . $bp->profile->table_name_meta . " ( object_id, object_type, meta_key, meta_value ) VALUES ( %d, %s, %s, %s )", $object_id, $object_type,  $meta_key, $meta_value ) );
-    else if ( $cur->meta_value != $meta_value )
-        $wpdb->query( $wpdb->prepare( "UPDATE " . $bp->profile->table_name_meta . " SET meta_value = %s WHERE object_id = %d AND object_type = %s AND meta_key = %s", $meta_value, $object_id, $object_type, $meta_key ) );
-    else
-        return false;
-
-    // Update the cached object and recache
-    wp_cache_set( 'bp_xprofile_meta_' . $object_type . '_' . $object_id . '_' . $meta_key, $meta_value, 'bp' );
-
-    return true;
-}
-
-function bp_xprofile_update_fieldgroup_meta( $field_group_id, $meta_key, $meta_value ) {
-    return bp_xprofile_update_meta( $field_group_id, 'group', $meta_key, $meta_value );
-}
-
-function bp_xprofile_update_field_meta( $field_id, $meta_key, $meta_value ) {
-    return bp_xprofile_update_meta( $field_id, 'field', $meta_key, $meta_value );
-}
-
-function bp_xprofile_update_fielddata_meta( $field_data_id, $meta_key, $meta_value ) {
-    return bp_xprofile_update_meta( $field_data_id, 'data', $meta_key, $meta_value );
-}
-
-/********************************************************************************
- * Caching
- *
- * Caching functions handle the clearing of cached objects and pages on specific
- * actions throughout BuddyPress.
- */
-
-function xprofile_clear_profile_groups_object_cache( $group_obj ) {
-    wp_cache_delete( 'xprofile_groups_inc_empty', 'bp' );
-    wp_cache_delete( 'xprofile_group_' . $group_obj->id );
-}
-
-function xprofile_clear_profile_data_object_cache( $group_id ) {
-    global $bp;
-    wp_cache_delete( 'bp_user_fullname_' . $bp->loggedin_user->id, 'bp' );
-}
-
-// List actions to clear object caches on
-add_action( 'xprofile_groups_deleted_group', 'xprofile_clear_profile_groups_object_cache' );
-add_action( 'xprofile_groups_saved_group',   'xprofile_clear_profile_groups_object_cache' );
-add_action( 'xprofile_updated_profile',      'xprofile_clear_profile_data_object_cache'   );
-
-// List actions to clear super cached pages on, if super cache is installed
-add_action( 'xprofile_updated_profile', 'bp_core_clear_cache' );
+// Create the xprofile component
+if ( !isset( $bp->profile->id ) )
+    $bp->profile = new BP_XProfile_Component();
 
 ?>

trunk/bp-xprofile/bp-xprofile-template.php

@@ -739 +739 @@
     bp_button( array (
         'id'                => 'edit_profile',
-        'component'         => 'xprofile',
+        'component'         => 'profile',
         'must_be_logged_in' => true,
         'block_self'        => true,