Changeset 2076 for branches/1.1/bp-xprofile/bp-xprofile-classes.php

Timestamp:

11/02/2009 06:56:42 PM (17 years ago)

Author:

apeatling

Message:

Merging last few trunk changes and stripping all whitespace.

File:

• branches/1.1/bp-xprofile/bp-xprofile-classes.php (modified) (52 diffs)

branches/1.1/bp-xprofile/bp-xprofile-classes.php

@@ -7 +7 @@
         var $can_delete;
         var $fields;
-        
+
         function bp_xprofile_group( $id = null ) {
                 global $bp, $wpdb;
@@ -15 +15 @@
                 }
         }
-        
+
         function populate( $id ) {
                 global $wpdb, $bp;
-                
+
                 $sql = $wpdb->prepare("SELECT * FROM {$bp->profile->table_name_groups} WHERE id = %d", $id);
 
@@ -26 +26 @@
                         $this->description = $group->description;
                         $this->can_delete = $group->can_delete;
-                        
+
                         // get the fields for this group.
                         $this->fields = $this->get_fields();
@@ -35 +35 @@
         function save() {
                 global $wpdb, $bp;
-                
+
                 $this->name = apply_filters( 'xprofile_group_name_before_save', $this->name, $this->id );
                 $this->description = apply_filters( 'xprofile_group_description_before_save', $this->description, $this->id );
@@ -44 +44 @@
                         $sql = $wpdb->prepare( "UPDATE {$bp->profile->table_name_groups} SET name = %s, description = %s WHERE id = %d", $this->name, $this->description, $this->id );
                 } else {
-                        $sql = $wpdb->prepare( "INSERT INTO {$bp->profile->table_name_groups} (name, description, can_delete) VALUES (%s, %s, 1)", $this->name, $this->description );           
-                }
-                
+                        $sql = $wpdb->prepare( "INSERT INTO {$bp->profile->table_name_groups} (name, description, can_delete) VALUES (%s, %s, 1)", $this->name, $this->description );
+                }
+
                 if ( !$wpdb->query($sql) )
                         return false;
 
                 do_action( 'xprofile_group_after_save', $this );
-                
+
                 return true;
         }
-        
+
         function delete() {
                 global $wpdb, $bp;
-                
+
                 if ( !$this->can_delete )
                         return false;
-                
+
                 $sql = $wpdb->prepare( "DELETE FROM {$bp->profile->table_name_groups} WHERE id = %d", $this->id );
 
@@ -69 +69 @@
                         if ( BP_XProfile_Field::delete_for_group($this->id) ) {
                                 // Now delete all the profile data for the groups fields
-                                for ( $i = 0; $i < count($this->fields); $i++ ) {       
+                                for ( $i = 0; $i < count($this->fields); $i++ ) {
                                         BP_XProfile_ProfileData::delete_for_field($this->fields[$i]->id);
                                 }
                         }
-                        
+
                         return true;
                 }
         }
-        
+
         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 ) ) )
@@ -90 +90 @@
                 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;
@@ -107 +107 @@
                 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);
@@ -115 +115 @@
                 return $groups;
         }
-        
+
         function admin_validate() {
                 global $message;
-                
+
                 // Validate Form
                 if ( empty( $_POST['group_name'] ) ) {
@@ -127 +127 @@
                 }
         }
-        
+
         // ADMIN AREA HTML. TODO: Get this out of here.
 
@@ -138 +138 @@
                 } else {
                         $title = __('Edit Field Group', 'buddypress');
-                        $action = "admin.php?page=bp-profile-setup&amp;mode=edit_group&amp;group_id=" . $this->id;                      
+                        $action = "admin.php?page=bp-profile-setup&amp;mode=edit_group&amp;group_id=" . $this->id;
                 }
         ?>
                 <div class="wrap">
-                
+
                         <h2><?php echo $title; ?></h2>
                         <br />
-                        
+
                         <?php
                                 if ( $message != '' ) {
@@ -154 +154 @@
                                 </div>
                         <?php } ?>
-                        
+
                         <form action="<?php echo attribute_escape( $action ); ?>" method="post">
-                                
+
                                 <div id="titlediv">
                                         <label for="group_name"><?php _e( "Field Group Name", 'buddypress') ?></label>
@@ -163 +163 @@
                                         </div>
                                 </div>
-                                
+
                                 <p class="submit" style="text-align: left">
                                         <input type="submit" name="saveGroup" value="<?php echo attribute_escape( $title ); ?> &raquo;" />
                                 </p>
-                        
+
                         </form>
                 </div>
-                
+
                 <?php
         }
@@ -189 +189 @@
         var $order_by;
         var $is_default_option;
-        
+
         var $data;
         var $message = null;
@@ -199 +199 @@
                 }
         }
-        
+
         function populate( $id, $user_id, $get_data ) {
                 global $wpdb, $userdata, $bp;
-                
+
                 if ( is_null($user_id) ) {
                         $user_id = $userdata->ID;
                 }
-                
+
                 $sql = $wpdb->prepare( "SELECT * FROM {$bp->profile->table_name_fields} WHERE id = %d", $id );
-        
+
                 if ( $field = $wpdb->get_row($sql) ) {
                         $this->id = $field->id;
@@ -231 +231 @@
         function delete() {
                 global $wpdb, $bp;
-                
+
                 if ( !$this->id ||
                         // Prevent deletion by url when can_delete is false.
@@ -241 +241 @@
                 if ( !$wpdb->query( $wpdb->prepare( "DELETE FROM {$bp->profile->table_name_fields} WHERE id = %d OR parent_id = %d", $this->id, $this->id ) ) )
                         return false;
-                
+
                 // delete the data in the DB for this field
                 BP_XProfile_ProfileData::delete_for_field($this->id);
-                
+
                 return true;
         }
-        
+
         function save() {
                 global $wpdb, $bp;
-                
+
                 $error = false;
-                
+
                 $this->group_id = apply_filters( 'xprofile_field_group_id_before_save', $this->group_id, $this->id );
                 $this->parent_id = apply_filters( 'xprofile_field_parent_id_before_save', $this->parent_id, $this->id );
@@ -263 +263 @@
 
                 do_action( 'xprofile_field_before_save', $this );
-                
+
                 if ( $this->id != null )
                         $sql = $wpdb->prepare("UPDATE {$bp->profile->table_name_fields} SET group_id = %d, parent_id = 0, type = %s, name = %s, description = %s, is_required = %d, order_by = %s, field_order = %d WHERE id = %d", $this->group_id, $this->type, $this->name, $this->description, $this->is_required, $this->order_by, $this->field_order, $this->id);
@@ -272 +272 @@
                 // The described situation will return 0 here.
                 if ( $wpdb->query($sql) !== null ) {
-                        
+
                         // Only do this if we are editing an existing field
                         if ( $this->id != null ) {
@@ -278 +278 @@
                                 // field. They will be re-added if needed.
                                 // This stops orphan options if the user changes a
-                                // field from a radio button field to a text box. 
+                                // field from a radio button field to a text box.
                                 $this->delete_children();
                         }
-                        
+
                         // Check to see if this is a field with child options.
                         // We need to add the options to the db, if it is.
@@ -288 +288 @@
                                         $parent_id = $this->id;
                                 } else {
-                                        $parent_id = $wpdb->insert_id;  
+                                        $parent_id = $wpdb->insert_id;
                                 }
-                                
+
                                 if ( 'radio' == $this->type ) {
-                                        
+
                                         $options = $_POST['radio_option'];
                                         $defaults = $_POST['isDefault_radio_option'];
-                                        
+
                                 } else if ( 'selectbox' == $this->type ) {
-                                        
+
                                         $options = $_POST['selectbox_option'];
                                         $defaults = $_POST['isDefault_selectbox_option'];
-                                        
+
                                 } else if ( 'multiselectbox' == $this->type ) {
-                                        
+
                                         $options = $_POST['multiselectbox_option'];
                                         $defaults = $_POST['isDefault_multiselectbox_option'];
-                                        
+
                                 } else if ( 'checkbox' == $this->type ) {
-                                        
+
                                         $options = $_POST['checkbox_option'];
                                         $defaults = $_POST['isDefault_checkbox_option'];
-                                        
+
                                 }
-                                
+
                                 $counter = 1;
                                 if ( $options ) {
@@ -326 +326 @@
                                                 }
 
-                                                if ( '' != $option_value ) { 
+                                                if ( '' != $option_value ) {
                                                         if ( !$wpdb->query( $wpdb->prepare("INSERT INTO {$bp->profile->table_name_fields} (group_id, parent_id, type, name, description, is_required, option_order, is_default_option) VALUES (%d, %d, 'option', %s, '', 0, %d, %d)", $this->group_id, $parent_id, $option_value, $counter, $is_default ) ) )
                                                                 return false;
                                                 }
-                                        
+
                                                 $counter++;
-                                        }                                       
+                                        }
                                 }
                         }
@@ -338 +338 @@
                         $error = true;
                 }
-                
+
                 if ( !$error ) {
                         do_action( 'xprofile_field_after_save', $this );
@@ -346 +346 @@
                 }
         }
-                
+
         function get_field_data($user_id) {
                 return new BP_XProfile_ProfileData($this->id, $user_id);
         }
-        
+
          function get_children($for_editing = false) {
                 global $wpdb, $bp;
-                
+
                 // This is done here so we don't have problems with sql injection
                 if ( 'asc' == $this->order_by && !$for_editing ) {
@@ -362 +362 @@
                         $sort_sql = 'ORDER BY option_order ASC';
                 }
-                
+
                 //This eliminates a problem with getting all fields when there is no id for the object
                 if ( !$this->id ) {
@@ -369 +369 @@
                         $parent_id = $this->id;
                 }
-                
+
                 $sql = $wpdb->prepare( "SELECT * FROM {$bp->profile->table_name_fields} WHERE parent_id = %d AND group_id = %d $sort_sql", $parent_id, $this->group_id );
 
                 if ( !$children = $wpdb->get_results($sql) )
                         return false;
-                        
+
                 return $children;
-        } 
-        
+        }
+
         function delete_children() {
                 global $wpdb, $bp;
@@ -385 +385 @@
                 $wpdb->query($sql);
         }
-        
+
         // Static Functions
-                
+
         function get_type( $field_id ) {
                 global $wpdb, $bp;
@@ -396 +396 @@
                         if ( !$field_type = $wpdb->get_var($sql) )
                                 return false;
-                
+
                         return $field_type;
                 }
-                
+
                 return false;
         }
-        
+
         function delete_for_group( $group_id ) {
                 global $wpdb, $bp;
@@ -412 +412 @@
                                 return false;
                         }
-                        
+
                         return true;
                 }
-                
+
                 return false;
         }
-        
+
         function get_id_from_name( $field_name ) {
                 global $wpdb, $bp;
-                
+
                 if ( !$bp->profile->table_name_fields || !$field_name )
                         return false;
-                
+
                 return $wpdb->get_var( $wpdb->prepare( "SELECT id FROM {$bp->profile->table_name_fields} WHERE name = %s", $field_name ) );
         }
-        
+
         function update_position( $field_id, $position ) {
                 global $wpdb, $bp;
-                
+
                 if ( !is_numeric( $position ) )
                         return false;
-                
+
                 return $wpdb->query( $wpdb->prepare( "UPDATE {$bp->profile->table_name_fields} SET field_order = %d WHERE id = %d", $position, $field_id ) );
         }
-        
+
         // ADMIN AREA HTML. TODO: Get this out of here.
-        
+
         function render_admin_form_children() {
                 //This function populates the items for radio buttons checkboxes and drop down boxes
-                $input_types = array( 'checkbox', 'selectbox', 'multiselectbox', 'radio' );     
-                
-                foreach ($input_types as $type) { 
+                $input_types = array( 'checkbox', 'selectbox', 'multiselectbox', 'radio' );
+
+                foreach ($input_types as $type) {
                         $default_name = '';
-                        
+
                         if ( 'multiselectbox' == $type || 'checkbox' == $type ) {
                                 $default_input = 'checkbox';
@@ -455 +455 @@
                                 <h4><?php _e('Please enter options for this Field:', 'buddypress') ?></h4>
                                 <p><?php _e( 'Order By:', 'buddypress' ) ?>
-                                        
+
                                         <select name="sort_order_<?php echo $type ?>" id="sort_order_<?php echo $type ?>" >
                                                 <option value="default" <?php if ( 'default' == $this->order_by ) {?> selected="selected"<?php } ?> ><?php _e( 'Order Entered', 'buddypress' ) ?></option>
@@ -461 +461 @@
                                                 <option value="desc" <?php if ( 'desc' == $this->order_by ) {?> selected="selected"<?php } ?>><?php _e( 'Name - Descending', 'buddypress' ) ?></option>
                                         </select>
-        
+
                                 <?php
                                 if ( !$options = $this->get_children(true) ) {
@@ -481 +481 @@
 
                                 if ( !empty($options) ) {
-                                        for ( $i = 0; $i < count($options); $i++ ) { 
+                                        for ( $i = 0; $i < count($options); $i++ ) {
                                                 $j = $i + 1;
-                                                
+
                                                 if ( 'multiselectbox' == $type || 'checkbox' == $type )
                                                         $default_name = '[' . $j . ']';
                                         ?>
-                                                <p><?php _e('Option', 'buddypress') ?> <?php echo $j ?>: 
+                                                <p><?php _e('Option', 'buddypress') ?> <?php echo $j ?>:
                                                    <input type="text" name="<?php echo $type ?>_option[<?php echo $j ?>]" id="<?php echo $type ?>_option<?php echo $j ?>" value="<?php echo attribute_escape( $options[$i]->name ) ?>" />
-                                                   <input type="<?php echo $default_input ?>" name="isDefault_<?php echo $type ?>_option<?php echo $default_name ?>" <?php if ( (int) $options[$i]->is_default_option ) {?> checked="checked"<?php } ?> " value="<?php echo $j ?>" /> <?php _e( 'Default Value', 'buddypress' ) ?> 
+                                                   <input type="<?php echo $default_input ?>" name="isDefault_<?php echo $type ?>_option<?php echo $default_name ?>" <?php if ( (int) $options[$i]->is_default_option ) {?> checked="checked"<?php } ?> " value="<?php echo $j ?>" /> <?php _e( 'Default Value', 'buddypress' ) ?>
                                                         <?php if ( $j != 1 &&
                                                                 $options[$i]->id != -1 ) : ?><a href="admin.php?page=bp-profile-setup&amp;mode=delete_option&amp;option_id=<?php echo $options[$i]->id ?>" class="ajax-option-delete" id="delete-<?php echo $options[$i]->id ?>">[x]</a><?php endif ?></p>
@@ -495 +495 @@
                                         <?php } // end for ?>
                                         <input type="hidden" name="<?php echo $type ?>_option_number" id="<?php echo $type ?>_option_number" value="<?php echo $j + 1 ?>" />
-                                
-                                <?php 
-                                } else { 
+
+                                <?php
+                                } else {
                                         if ( 'multiselectbox' == $type || 'checkbox' == $type )
                                                 $default_name = '[1]';
                                 ?>
-                                        
+
                                         <p><?php _e('Option', 'buddypress') ?> 1: <input type="text" name="<?php echo $type ?>_option[1]" id="<?php echo $type ?>_option1" />
                                         <input type="<?php echo $default_input ?>" name="isDefault_<?php echo $type ?>_option<?php echo $default_name; ?>" id="isDefault_<?php echo $type ?>_option" value="1" /> <?php _e( 'Default Value', 'buddypress' ) ?>
                                         <input type="hidden" name="<?php echo $type ?>_option_number" id="<?php echo $type ?>_option_number" value="2" />
-                                
+
                                 <?php } // end if ?>
-                                <div id="<?php echo $type ?>_more"></div>                                       
+                                <div id="<?php echo $type ?>_more"></div>
                                 <p><a href="javascript:add_option('<?php echo $type ?>')"><?php _e('Add Another Option', 'buddypress') ?></a></p>
                         </div>
 
-                <?php } 
-        }
-                
+                <?php }
+        }
+
         function render_admin_form( $message = '' ) {
                 if ( !$this->id ) {
@@ -526 +526 @@
                 } else {
                         $title = __('Edit Field', 'buddypress');
-                        $action = "admin.php?page=bp-profile-setup&amp;mode=edit_field&amp;group_id=" . $this->group_id . "&amp;field_id=" . $this->id;                 
+                        $action = "admin.php?page=bp-profile-setup&amp;mode=edit_field&amp;group_id=" . $this->group_id . "&amp;field_id=" . $this->id;
                 }
         ?>
-        
+
         <div class="wrap">
-                
+
                 <h2><?php echo $title; ?></h2>
                 <br />
-                
+
                 <?php
                         if ( $message != '' ) {
@@ -542 +542 @@
                         </div>
                 <?php } ?>
-                
+
                 <form action="<?php echo $action ?>" method="post">
-                        <div id="poststuff">            
+                        <div id="poststuff">
                                 <div id="titlediv">
                                         <h3><label for="title"><?php _e("Field Title", 'buddypress') ?> *</label></h3>
@@ -551 +551 @@
                                         </div>
                                 </div>
-                        
+
                                 <div id="titlediv" class="inside">
                                         <h3><label for="description"><?php _e("Field Description", 'buddypress') ?></label></h3>
@@ -558 +558 @@
                                         </div>
                                 </div>
-        
+
                                 <div id="titlediv">
                                         <h3><label for="required"><?php _e("Is This Field Required?", 'buddypress') ?> *</label></h3>
@@ -580 +580 @@
                                 </div>
 
-                                <?php $this->render_admin_form_children() ?>                            
-        
+                                <?php $this->render_admin_form_children() ?>
+
                                 <p class="submit">
                                                 &nbsp;<input type="submit" value="<?php _e("Save", 'buddypress') ?> &raquo;" name="saveField" id="saveField" style="font-weight: bold" />
                                                  <?php _e('or', 'buddypress') ?> <a href="admin.php?page=bp-profile-setup" style="color: red"><?php _e( 'Cancel', 'buddypress' ) ?></a>
                                 </p>
-                        
+
                         <div class="clear"></div>
-                        
+
                         <?php if ( function_exists('wp_nonce_field') )
                                 wp_nonce_field('xprofile_delete_option');
                         ?>
-                        
-                </form> 
+
+                </form>
         </div>
-        
+
         <?php
         }
-        
+
         function admin_validate() {
                 global $message;
-                
+
                 // Validate Form
                 if ( '' == $_POST['title'] || '' == $_POST['required'] || '' == $_POST['fieldtype'] ) {
@@ -607 +607 @@
                         return false;
                 } else if ( empty($_POST['field_file']) && $_POST['fieldtype'] == 'radio' && empty($_POST['radio_option'][1]) ) {
-                        $message = __('Radio button field types require at least one option. Please add options below.', 'buddypress'); 
+                        $message = __('Radio button field types require at least one option. Please add options below.', 'buddypress');
                         return false;
                 } else if ( empty($_POST['field_file']) && $_POST['fieldtype'] == 'selectbox' && empty($_POST['selectbox_option'][1]) ) {
-                        $message = __('Select box field types require at least one option. Please add options below.', 'buddypress');   
-                        return false;   
+                        $message = __('Select box field types require at least one option. Please add options below.', 'buddypress');
+                        return false;
                 } else if ( empty($_POST['field_file']) && $_POST['fieldtype'] == 'multiselectbox' && empty($_POST['multiselectbox_option'][1]) ) {
-                        $message = __('Select box field types require at least one option. Please add options below.', 'buddypress');   
-                        return false;   
+                        $message = __('Select box field types require at least one option. Please add options below.', 'buddypress');
+                        return false;
                 } else if ( empty($_POST['field_file']) && $_POST['fieldtype'] == 'checkbox' && empty($_POST['checkbox_option'][1]) ) {
-                        $message = __('Checkbox field types require at least one option. Please add options below.', 'buddypress');     
-                        return false;           
+                        $message = __('Checkbox field types require at least one option. Please add options below.', 'buddypress');
+                        return false;
                 } else {
                         return true;
@@ -640 +640 @@
         function populate( $field_id, $user_id )  {
                 global $wpdb, $bp;
-                
+
                 $sql = $wpdb->prepare( "SELECT * FROM {$bp->profile->table_name_data} WHERE field_id = %d AND user_id = %d", $field_id, $user_id );
-                
+
                 if ( $profiledata = $wpdb->get_row($sql) ) {
-                        
+
                         $this->id = $profiledata->id;
                         $this->user_id = $profiledata->user_id;
@@ -652 +652 @@
                 }
         }
-        
+
         function exists() {
                 global $wpdb, $bp;
-                
+
                 // check to see if there is data already for the user.
                 $sql = $wpdb->prepare( "SELECT id FROM {$bp->profile->table_name_data} WHERE user_id = %d AND field_id = %d", $this->user_id, $this->field_id );
 
-                if ( !$wpdb->get_row($sql) ) 
-                        return false;
-
-                return true;            
-        }
-                
+                if ( !$wpdb->get_row($sql) )
+                        return false;
+
+                return true;
+        }
+
         function is_valid_field() {
                 global $wpdb, $bp;
-                
+
                 // check to see if this data is actually for a valid field.
                 $sql = $wpdb->prepare("SELECT id FROM {$bp->profile->table_name_fields} WHERE id = %d", $this->field_id );
 
-                if ( !$wpdb->get_row($sql) ) 
-                        return false;
-                
+                if ( !$wpdb->get_row($sql) )
+                        return false;
+
                 return true;
         }
@@ -684 +684 @@
                 $this->value = apply_filters( 'xprofile_data_value_before_save', $this->value, $this->id );
                 $this->last_updated = apply_filters( 'xprofile_data_last_updated_before_save', date( 'Y-m-d H:i:s' ), $this->id );
-                
+
                 do_action( 'xprofile_data_before_save', $this );
 
@@ -698 +698 @@
 
                         if ( !$result )
-                                return false; 
+                                return false;
 
                         do_action( 'xprofile_data_after_save', $this );
-                        
+
                         return true;
                 }
-                
+
                 return false;
         }
@@ -710 +710 @@
         function delete() {
                 global $wpdb, $bp;
-                
+
                 if ( !$wpdb->query( $wpdb->prepare( "DELETE FROM {$bp->profile->table_name_data} WHERE field_id = %d AND user_id = %d", $this->field_id, $this->user_id ) ) )
                         return false;
-                
+
                 return true;
         }
-        
+
         /** Static Functions **/
-        
+
         function get_value_byid( $field_id, $user_id = null ) {
                 global $wpdb, $bp;
@@ -724 +724 @@
                 if ( !$user_id )
                         $user_id = $bp->displayed_user->id;
-                        
+
                 if ( !$bp->profile )
                         xprofile_setup_globals();
@@ -736 +736 @@
                 }
         }
-        
+
         function get_value_byfieldname( $fields, $user_id = null ) {
                 global $bp, $wpdb;
@@ -745 +745 @@
                 if ( !$user_id )
                         $user_id = $bp->displayed_user->id;
-                
+
                 if ( !$bp->profile )
                         xprofile_setup_globals();
-                
+
                 $field_sql = '';
 
@@ -755 +755 @@
                                 if ( $i == 0 )
                                         $field_sql .= $wpdb->prepare( "AND ( f.name = %s ", $fields[$i] );
-                                else 
+                                else
                                         $field_sql .= $wpdb->prepare( "OR f.name = %s ", $fields[$i] );
                         }
-                        
+
                         $field_sql .= ')';
                 } else {
@@ -768 +768 @@
                 if ( !$values = $wpdb->get_results($sql) )
                         return false;
-                
+
                 $new_values = array();
-                
+
                 if ( is_array($fields) ) {
                         for ( $i = 0; $i < count($values); $i++ ) {
@@ -784 +784 @@
                         $new_values = $values[0]->value;
                 }
-                
+
                 return $new_values;
         }
-        
+
         function delete_for_field( $field_id ) {
                 global $wpdb, $userdata, $bp;
@@ -793 +793 @@
                 if ( !$wpdb->query( $wpdb->prepare( "DELETE FROM {$bp->profile->table_name_data} WHERE field_id = %d", $field_id ) ) )
                         return false;
-                
+
                 return true;
         }
-        
+
         function get_last_updated( $user_id ) {
                 global $wpdb, $bp;
-                
+
                 $last_updated = $wpdb->get_var( $wpdb->prepare( "SELECT last_updated FROM {$bp->profile->table_name_data} WHERE user_id = %d ORDER BY last_updated LIMIT 1", $user_id ) );
-                
+
                 return $last_updated;
         }
-        
+
         function delete_data_for_user( $user_id ) {
                 global $wpdb, $bp;
-                
-                return $wpdb->query( $wpdb->prepare( "DELETE FROM {$bp->profile->table_name_data} WHERE user_id = %d", $user_id ) );    
-        }
-        
+
+                return $wpdb->query( $wpdb->prepare( "DELETE FROM {$bp->profile->table_name_data} WHERE user_id = %d", $user_id ) );
+        }
+
         function get_random( $user_id, $exclude_fullname ) {
                 global $wpdb, $bp;
-                
+
                 if ( $exclude_fullname )
                         $exclude_sql = $wpdb->prepare( " AND pf.id != 1" );
-                                
-                return $wpdb->get_results( $wpdb->prepare( "SELECT pf.type, pf.name, pd.value FROM {$bp->profile->table_name_data} pd INNER JOIN {$bp->profile->table_name_fields} pf ON pd.field_id = pf.id AND pd.user_id = %d {$exclude_sql} ORDER BY RAND() LIMIT 1", $user_id ) );                 
-        }
-        
+
+                return $wpdb->get_results( $wpdb->prepare( "SELECT pf.type, pf.name, pd.value FROM {$bp->profile->table_name_data} pd INNER JOIN {$bp->profile->table_name_fields} pf ON pd.field_id = pf.id AND pd.user_id = %d {$exclude_sql} ORDER BY RAND() LIMIT 1", $user_id ) );
+        }
+
         function get_fullname( $user_id = false ) {
                 global $bp;
@@ -828 +828 @@
                 $data = xprofile_get_field_data( BP_XPROFILE_FULLNAME_FIELD_NAME, $user_id );
 
-                return $data[BP_XPROFILE_FULLNAME_FIELD_NAME];          
+                return $data[BP_XPROFILE_FULLNAME_FIELD_NAME];
         }
 }