Changeset 2320

Timestamp:

01/17/2010 07:42:57 PM (17 years ago)

Author:

apeatling

Message:

Improved profile page performance.

Location:

trunk/bp-xprofile

Files:

• bp-xprofile-admin.php (modified) (1 diff)
• bp-xprofile-classes.php (modified) (4 diffs)
• bp-xprofile-filters.php (modified) (2 diffs)
• bp-xprofile-templatetags.php (modified) (4 diffs)

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

@@ -14 +14 @@
         $type = preg_replace( '|[^a-z]|i', '', $type );
 
-        $groups = BP_XProfile_Group::get_all();
+        $groups = BP_XProfile_Group::get( array(
+                'fetch_fields' => true
+        ) );
 
         if ( isset($_GET['mode']) && isset($_GET['group_id']) && 'add_field' == $_GET['mode'] ) {

trunk/bp-xprofile/bp-xprofile-classes.php

@@ -26 +26 @@
                         $this->description = $group->description;
                         $this->can_delete = $group->can_delete;
-
-                        // get the fields for this group.
-                        $this->fields = $this->get_fields();
                 }
 
@@ -78 +75 @@
         }
 
-        function get_fields() {
-                global $wpdb, $bp;
-
-                /* Find the max value for field_order, if it is zero, order by field_id instead -- provides backwards compat ordering */
-                if ( !(int) $wpdb->get_var( $wpdb->prepare( "SELECT MAX(field_order) FROM {$bp->profile->table_name_fields} WHERE group_id = %d", $this->id ) ) )
-                        $order_sql = "ORDER BY id";
+        /** Static Functions **/
+
+        function get( $args = '' ) {
+                global $wpdb, $bp;
+
+                $defaults = array(
+                        'profile_group_id' => false,
+                        'user_id' => $bp->displayed_user->id,
+                        'hide_empty_groups' => false,
+                        'fetch_fields' => false,
+                        'fetch_field_data' => false
+                );
+
+                $r = wp_parse_args( $args, $defaults );
+                extract( $r, EXTR_SKIP );
+
+                if ( $profile_group_id )
+                        $group_id_sql = $wpdb->prepare( 'WHERE g.id = %d', $profile_group_id );
+
+                if ( $hide_empty_groups )
+                        $groups = $wpdb->get_results( $wpdb->prepare( "SELECT DISTINCT g.* FROM {$bp->profile->table_name_groups} g INNER JOIN {$bp->profile->table_name_fields} f ON g.id = f.group_id {$group_id_sql} ORDER BY g.id ASC" ) );
                 else
-                        $order_sql = "ORDER BY field_order";
-
-                // Get field ids for the current group.
-                if ( !$fields = $wpdb->get_results( $wpdb->prepare("SELECT id, type FROM {$bp->profile->table_name_fields} WHERE group_id = %d AND parent_id = 0 {$order_sql}", $this->id ) ) )
-                        return false;
-
-                return $fields;
-        }
-
-        /** Static Functions **/
-
-        function get_all( $hide_empty = false ) {
-                global $wpdb, $bp;
-
-                if ( $hide_empty ) {
-                        $sql = $wpdb->prepare( "SELECT DISTINCT g.id FROM {$bp->profile->table_name_groups} g INNER JOIN {$bp->profile->table_name_fields} f ON g.id = f.group_id ORDER BY g.id ASC" );
-                } else {
-                        $sql = $wpdb->prepare( "SELECT id FROM {$bp->profile->table_name_groups} ORDER BY id ASC" );
-                }
-
-                if ( !$groups_temp = $wpdb->get_results($sql) )
-                        return false;
-
-                for ( $i = 0; $i < count($groups_temp); $i++ ) {
-                        $group = new BP_XProfile_Group($groups_temp[$i]->id);
-                        $groups[] = $group;
+                        $groups = $wpdb->get_results( $wpdb->prepare( "SELECT DISTINCT g.* FROM {$bp->profile->table_name_groups} g {$group_id_sql} ORDER BY g.id ASC" ) );
+
+                if ( !$fetch_fields )
+                        return $groups;
+
+                /* Get the group ids */
+                foreach( (array)$groups as $group )
+                        $group_ids[] = $group->id;
+
+                $group_ids = implode( ',', (array) $group_ids );
+
+                if ( empty( $group_ids ) )
+                        return $groups;
+
+                /* Fetch the fields */
+                $fields = $wpdb->get_results( $wpdb->prepare( "SELECT id, name, type, group_id FROM {$bp->profile->table_name_fields} WHERE group_id IN ( {$group_ids} ) AND parent_id = 0 ORDER BY field_order" ) );
+
+                if ( empty( $fields ) )
+                        return $groups;
+
+                if ( $fetch_field_data ) {
+                        /* Fetch the field data for the user. */
+                        foreach( (array)$fields as $field )
+                                $field_ids[] = $field->id;
+
+                        $field_ids = implode( ',', (array) $field_ids );
+
+                        if ( !empty( $field_ids ) )
+                                $field_data = $wpdb->get_results( $wpdb->prepare( "SELECT field_id, value FROM {$bp->profile->table_name_data} WHERE field_id IN ( {$field_ids} ) AND user_id = %d", $user_id ) );
+
+                        if ( !empty( $field_data ) ) {
+                                foreach( (array)$fields as $field_key => $field ) {
+                                        foreach( (array)$field_data as $data ) {
+                                                if ( $field->id == $data->field_id )
+                                                        $fields[$field_key]->data->value = $data->value;
+                                        }
+                                }
+                        }
+                }
+
+                /* Merge the field array back in with the group array */
+                foreach( (array)$groups as $group_key => $group ) {
+                        foreach( (array)$fields as $field ) {
+                                if ( $group->id == $field->group_id )
+                                        $groups[$group_key]->fields[] = $field;
+                        }
                 }
 
@@ -727 +759 @@
                 global $wpdb, $bp;
 
-                $results = $wpdb->get_results( $wpdb->prepare( "SELECT g.name as field_group_name, f.name as field_name, f.type as field_type, d.value as field_data, u.user_login, u.user_nicename, u.user_email FROM {$bp->profile->table_name_groups} g LEFT JOIN {$bp->profile->table_name_fields} f ON g.id = f.group_id INNER JOIN {$bp->profile->table_name_data} d ON f.id = d.field_id LEFT JOIN {$wpdb->users} u ON d.user_id = u.ID WHERE d.user_id = %d AND d.value != ''", $user_id ) );
+                $results = $wpdb->get_results( $wpdb->prepare( "SELECT g.id as field_group_id, g.name as field_group_name, f.id as field_id, f.name as field_name, f.type as field_type, d.value as field_data, u.user_login, u.user_nicename, u.user_email FROM {$bp->profile->table_name_groups} g LEFT JOIN {$bp->profile->table_name_fields} f ON g.id = f.group_id INNER JOIN {$bp->profile->table_name_data} d ON f.id = d.field_id LEFT JOIN {$wpdb->users} u ON d.user_id = u.ID WHERE d.user_id = %d AND d.value != ''", $user_id ) );
 
                 if ( $results ) {
@@ -735 +767 @@
 
                         foreach( (array) $results as $field ) {
-                                $profile_data[$field->field_name] = array( 'field_group' => $field->field_group_name, 'field_type' => $field->field_type, 'field_data' => $field->field_data );
+                                $profile_data[$field->field_name] = array(
+                                        'field_group_id' => $field->field_group_id,
+                                        'field_group_name' => $field->field_group_name,
+                                        'field_id' => $field->field_id,
+                                        'field_type' => $field->field_type,
+                                        'field_data' => $field->field_data
+                                );
                         }
                 }

trunk/bp-xprofile/bp-xprofile-filters.php

@@ -3 +3 @@
 /* Apply WordPress defined filters */
 add_filter( 'bp_get_the_profile_field_value', 'wp_filter_kses', 1 );
+add_filter( 'bp_get_the_profile_field_name', 'wp_filter_kses', 1 );
+
 add_filter( 'bp_get_the_site_member_profile_data', 'wp_filter_kses', 1 );
 add_filter( 'xprofile_get_field_data', 'wp_filter_kses', 1 );
@@ -33 +35 @@
 add_filter( 'bp_get_the_profile_field_edit_value', 'stripslashes' );
 add_filter( 'bp_get_the_profile_field_value', 'stripslashes' );
+add_filter( 'bp_get_the_profile_field_name', 'stripslashes' );
 add_filter( 'xprofile_get_field_data', 'stripslashes' );
 add_filter( 'bp_get_the_profile_field_description', 'stripslashes' );

trunk/bp-xprofile/bp-xprofile-templatetags.php

@@ -20 +20 @@
 
         function bp_xprofile_data_template( $user_id, $profile_group_id ) {
-
-                if ( !$profile_group_id ) {
-                        if ( !$this->groups = wp_cache_get( 'xprofile_groups', 'bp' ) ) {
-                                $this->groups = BP_XProfile_Group::get_all(true);
-                                wp_cache_set( 'xprofile_groups', $this->groups, 'bp' );
-                        }
-                } else {
-                        if ( !$this->groups = wp_cache_get( 'xprofile_group_' . $profile_group_id, 'bp' ) ) {
-                                $this->groups = new BP_XProfile_Group( $profile_group_id );
-                                wp_cache_set( 'xprofile_group_' . $profile_group_id, 'bp' );
-                        }
-
-                        /* We need to put this single group into the same format as multiple group (an array) */
-                        $this->groups = array( $this->groups );
-                }
+                $this->groups = BP_XProfile_Group::get( array(
+                        'profile_group_id' => $profile_group_id,
+                        'user_id' => $user_id,
+                        'hide_empty_groups' => true,
+                        'fetch_fields' => true,
+                        'fetch_field_data' => true
+                ) );
 
                 $this->group_count = count($this->groups);
@@ -51 +43 @@
 
                 $this->group = $this->groups[$this->current_group];
-
-                if ( !$fields = wp_cache_get( 'xprofile_fields_' . $this->group->id . '_' . $this->user_id, 'bp' ) ) {
-                        for ( $i = 0; $i < count($this->group->fields); $i++ ) {
-                                /* Don't try and fetch any existing profile data if we are using this loop on the registration page */
-                                $get_data = ( !bp_is_register_page() ) ? true : false;
-
-                                $field = new BP_XProfile_Field( $this->group->fields[$i]->id, $this->user_id, $get_data );
-                                $fields[$i] = $field;
-                        }
-
-                        wp_cache_set( 'xprofile_fields_' . $this->group->id . '_' . $this->user_id, $fields, 'bp' );
-                }
-
-                $this->group->fields = apply_filters( 'xprofile_group_fields', $fields, $this->group->id );
+                $this->group->fields = apply_filters( 'xprofile_group_fields', $this->group->fields, $this->group->id );
                 $this->field_count = count( $this->group->fields );
 
@@ -386 +365 @@
                 $r = wp_parse_args( $args, $defaults );
                 extract( $r, EXTR_SKIP );
+
+                if ( !method_exists( $field, 'get_children' ) )
+                        $field = new BP_XProfile_Field( $field->id );
 
                 $options = $field->get_children();
@@ -584 +566 @@
 
         if ( !$groups = wp_cache_get( 'xprofile_groups_inc_empty', 'bp' ) ) {
-                $groups = BP_XProfile_Group::get_all();
+                $groups = BP_XProfile_Group::get( array( 'fetch_fields' => true ) );
                 wp_cache_set( 'xprofile_groups_inc_empty', $groups, 'bp' );
         }