Changeset 5699

Timestamp:

02/11/2012 02:14:07 AM (13 years ago)

Author:

johnjamesjacoby

Message:

Remove unneeded globals and clean up some code in XProfile component. See #3989.

Location:

trunk/bp-xprofile

Files:

• bp-xprofile-actions.php (modified) (3 diffs)
• bp-xprofile-activity.php (modified) (7 diffs)
• bp-xprofile-admin.php (modified) (16 diffs)
• bp-xprofile-buddybar.php (modified) (1 diff)
• bp-xprofile-cache.php (modified) (2 diffs)
• bp-xprofile-classes.php (modified) (45 diffs)
• bp-xprofile-cssjs.php (modified) (1 diff)
• bp-xprofile-filters.php (modified) (4 diffs)
• bp-xprofile-functions.php (modified) (11 diffs)
• bp-xprofile-loader.php (modified) (3 diffs)
• bp-xprofile-screens.php (modified) (5 diffs)
• bp-xprofile-template.php (modified) (19 diffs)

trunk/bp-xprofile/bp-xprofile-actions.php

@@ -1 +1 @@
 <?php
-/*******************************************************************************
- * 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.
+
+/**
+ * BuddyPress XProfile Actions
+ *
+ * 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.
+ *
+ * @package BuddyPress
+ * @subpackage XProfileActions
  */
 
@@ -16 +22 @@
  *
  * @package BuddyPress Xprofile
- * @global object $bp Global BuddyPress settings object
  * @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.
@@ -22 +27 @@
  */
 function xprofile_action_delete_avatar() {
-    global $bp;
 
     if ( !bp_is_user_change_avatar() || !bp_is_action_variable( 'delete-avatar', 0 ) )

trunk/bp-xprofile/bp-xprofile-activity.php

@@ -1 +1 @@
 <?php
+
 /**
  * BuddyPress XProfile Activity & Notification Functions
@@ -7 +8 @@
  *
  * @package BuddyPress
- * @subpackage XProfile
+ * @subpackage XProfileActivity
  */
 
@@ -29 +30 @@
  * it will show in the users activity stream (if installed)
  *
- * @package BuddyPress XProfile
+ * @package BuddyPress
+ * @subpackage XProfileActivity
  * @param $args Array containing all variables used after extract() call
  * @global $bp The global BuddyPress settings variable created in bp_core_current_times()
@@ -35 +37 @@
  */
 function xprofile_record_activity( $args = '' ) {
-    global $bp;
 
     if ( !bp_is_active( 'activity' ) )
         return false;
+
+    global $bp;
 
     $defaults = array (
@@ -80 +83 @@
  */
 function xprofile_delete_activity( $args = '' ) {
+
+    if ( ! bp_is_active( 'activity' ) )
+        return false;
+
     global $bp;
 
-    if ( bp_is_active( 'activity' ) ) {
+    extract( $args );
 
-        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
-        ) );
-    }
+    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
+    ) );
 }
 
@@ -113 +117 @@
  */
 function bp_xprofile_new_avatar_activity() {
-    global $bp;
 
     if ( !bp_is_active( 'activity' ) )
@@ -130 +133 @@
 }
 add_action( 'xprofile_avatar_uploaded', 'bp_xprofile_new_avatar_activity' );
+
 ?>

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

@@ -1 +1 @@
 <?php
+
+/**
+ * BuddyPress XProfile Admin
+ *
+ * @package BuddyPress
+ * @subpackage XProfileAdmin
+ */
+
 // Exit if accessed directly
 if ( !defined( 'ABSPATH' ) ) exit;
@@ -8 +16 @@
  *
  * @package BuddyPress XProfile
- * @global object $bp Global BuddyPress settings object
- * @global $wpdb WordPress DB access object.
  * @uses bp_current_user_can() 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
@@ -18 +24 @@
  */
 function xprofile_add_admin_menu() {
-    global $wpdb, $bp;
 
     if ( !bp_current_user_can( 'bp_moderate' ) )
@@ -34 +39 @@
  */
 function xprofile_admin( $message = '', $type = 'error' ) {
-    global $bp;
 
     $type = preg_replace( '|[^a-z]|i', '', $type );
@@ -40 +44 @@
     $groups = BP_XProfile_Group::get( array(
         'fetch_fields' => true
-    ));
+    ) );
 
     if ( isset( $_GET['mode'] ) && isset( $_GET['group_id'] ) && 'add_field' == $_GET['mode'] )
@@ -63 +67 @@
         xprofile_admin_manage_group( $_GET['group_id'] );
 
-    else {
-?>
+    else { ?>
 
     <div class="wrap">
@@ -71 +74 @@
 
         <h2>
-
             <?php _e( 'Profile Fields', 'buddypress'); ?>
-
-            <a id="add_group" class="add-new-h2" href="admin.php?page=bp-profile-setup&amp;mode=add_group"><?php _e( 'Add New Group', 'buddypress' ); ?></a>
+            <a id="add_group" class="add-new-h2" href="admin.php?page=bp-profile-setup&amp;mode=add_group"><?php _e( 'Add New Field 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( bp_get_option( 'bp-xprofile-base-group-name' ) ) ) ) ?></p>
+        <p><?php echo sprintf( __( 'Fields in the "%s" group will appear on the signup page.', 'buddypress' ), esc_html( stripslashes( bp_get_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 );
+            <?php
+            
+            wp_nonce_field( 'bp_reorder_fields', '_wpnonce_reorder_fields'        );
+            wp_nonce_field( 'bp_reorder_groups', '_wpnonce_reorder_groups', false );
 
             if ( !empty( $message ) ) :
@@ -93 +94 @@
                 </div>
 
-<?php       endif; ?>
+            <?php endif; ?>
 
             <div id="tabs">
                 <ul id="field-group-tabs">
-<?php
-            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( '(Primary)', 'buddypress'); endif; ?></a></li>
-
-<?php           }
-            endif; ?>
+
+                    <?php 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( '(Primary)', 'buddypress'); endif; ?></a></li>
+
+                    <?php endforeach; endif; ?>
 
                 </ul>
 
-<?php       if ( !empty( $groups ) ) :
-                foreach ( $groups as $group ) { ?>
+                <?php if ( !empty( $groups ) ) : foreach ( $groups as $group ) : ?>
 
                     <noscript>
@@ -121 +119 @@
                                 <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="submitdelete deletion ajax-option-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; ?>
+                                <?php if ( $group->can_delete ) : ?>
+
+                                    <a class="submitdelete deletion ajax-option-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>
@@ -132 +130 @@
                         <fieldset id="<?php echo $group->id; ?>" class="connectedSortable field-group">
 
-<?php               if( $group->description ) : ?>
-
-                            <legend><?php echo esc_attr( $group->description ) ?></legend>
-
-<?php               endif;
-
-                    if ( !empty( $group->fields ) ) :
-                        foreach ( $group->fields as $field ) {
-
-                            // Load the field
-                            $field = new BP_XProfile_Field( $field->id );
-
-                            $class = '';
-                            if ( !$field->can_delete )
-                                $class = ' core nodrag';
-
-                            /* This function handles the WYSIWYG profile field
-                             * display for the xprofile admin setup screen
-                             */
-                            xprofile_admin_field( $field, $group, $class );
-
-                        } // 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 if ( $group->description ) : ?>
+
+                                <legend><?php echo esc_attr( $group->description ) ?></legend>
+
+                            <?php endif;
+
+                            if ( !empty( $group->fields ) ) :
+                                foreach ( $group->fields as $field ) {
+
+                                    // Load the field
+                                    $field = new BP_XProfile_Field( $field->id );
+
+                                    $class = '';
+                                    if ( !$field->can_delete )
+                                        $class = ' core nodrag';
+
+                                    /* This function handles the WYSIWYG profile field
+                                    * display for the xprofile admin setup screen
+                                    */
+                                    xprofile_admin_field( $field, $group, $class );
+
+                                } // 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 ?>
 
                         </fieldset>
                     </div>
 
+                <?php endforeach; 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; ?>
+
+                <div id="tabs-bottom">&nbsp;</div>
+            </div>
+        </form>
+    </div>
+
 <?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;
-?>
-                <div id="tabs-bottom">
-                    &nbsp;
-                </div>
-            </form>
-        </div>
-<?php
-    }
-}
-
-/**************************************************************************
- xprofile_admin_manage_group()
-
- Handles the adding or editing of groups.
- **************************************************************************/
-
+    }
+}
+
+/**
+ * Handles the adding or editing of groups.
+ */
 function xprofile_admin_manage_group( $group_id = null ) {
     global $message, $type;
@@ -230 +215 @@
 }
 
-/**************************************************************************
- xprofile_admin_delete_group()
-
- Handles the deletion of profile data groups.
- **************************************************************************/
-
+/**
+ * Handles the deletion of profile data groups.
+ */
 function xprofile_admin_delete_group( $group_id ) {
     global $message, $type;
@@ -255 +237 @@
 }
 
-
-/**************************************************************************
- xprofile_admin_manage_field()
-
- Handles the adding or editing of profile field data for a user.
- **************************************************************************/
-
+/**
+ * Handles the adding or editing of profile field data for a user.
+ */
 function xprofile_admin_manage_field( $group_id, $field_id = null ) {
     global $bp, $wpdb, $message, $groups;
 
-    $field = new BP_XProfile_Field( $field_id );
+    $field           = new BP_XProfile_Field( $field_id );
     $field->group_id = $group_id;
 
@@ -329 +307 @@
     // @todo trust this param
     $field_type  = ( 'field' == $field_type ) ? __( 'field', 'buddypress' ) : __( 'option', 'buddypress' );
-
-    $field = new BP_XProfile_Field( $field_id );
+    $field       = new BP_XProfile_Field( $field_id );
 
     if ( !$field->delete( (bool) $delete_data ) ) {
@@ -346 +323 @@
 }
 
-/**************************************************************************
- xprofile_ajax_reorder_fields()
-
- Handles the ajax reordering of fields within a group
-**************************************************************************/
+/**
+ * Handles the ajax reordering of fields within a group
+ */
 function xprofile_ajax_reorder_fields() {
-    global $bp;
 
     // Check the nonce
@@ -361 +335 @@
 
     parse_str( $_POST['field_order'], $order );
+
     $field_group_id = $_POST['field_group_id'];
 
-    foreach ( (array) $order['field'] as $position => $field_id )
+    foreach ( (array) $order['field'] as $position => $field_id ) {
         xprofile_update_field_position( (int) $field_id, (int) $position, (int) $field_group_id );
-
+    }
 }
 add_action( 'wp_ajax_xprofile_reorder_fields', 'xprofile_ajax_reorder_fields' );
 
-/**************************************************************************
- xprofile_ajax_reorder_field_groups()
-
- Handles the reordering of field groups
-**************************************************************************/
+/**
+ * Handles the reordering of field groups
+ */
 function xprofile_ajax_reorder_field_groups() {
-    global $bp;
 
     // Check the nonce
@@ -385 +357 @@
     parse_str( $_POST['group_order'], $order );
 
-    foreach ( (array) $order['group'] as $position => $field_group_id )
+    foreach ( (array) $order['group'] as $position => $field_group_id ) {
         xprofile_update_field_group_position( (int) $field_group_id, (int) $position );
-
+    }
 }
 add_action( 'wp_ajax_xprofile_reorder_groups', 'xprofile_ajax_reorder_field_groups' );
 
-/**************************************************************************
- xprofile_admin_field()
-
- Handles the WYSIWYG display of each profile field on the edit screen
-**************************************************************************/
-function xprofile_admin_field( $admin_field, $admin_group, $class='' ) {
+/**
+ * Handles the WYSIWYG display of each profile field on the edit screen
+ */
+function xprofile_admin_field( $admin_field, $admin_group, $class = '' ) {
     global $field;
 
     $field = $admin_field; ?>
-                        <fieldset id="field_<?php echo esc_attr( $field->id ); ?>" class="sortable<?php echo ' ' . $field->type; if ( $class ) echo ' ' . $class; ?>">
-                            <legend><span><?php bp_the_profile_field_name(); ?> <?php if( !$field->can_delete ) : ?> <?php _e( '(Primary)', 'buddypress' ); endif; ?> <?php if ( bp_get_the_profile_field_is_required() ) : ?><?php _e( '(Required)', 'buddypress' ) ?><?php endif; ?></span></legend>
-                            <div class="field-wrapper">
+
+    <fieldset id="field_<?php echo esc_attr( $field->id ); ?>" class="sortable<?php echo ' ' . $field->type; if ( !empty( $class ) ) echo ' ' . $class; ?>">
+        <legend><span><?php bp_the_profile_field_name(); ?> <?php if( !$field->can_delete ) : ?> <?php _e( '(Primary)', 'buddypress' ); endif; ?> <?php if ( bp_get_the_profile_field_is_required() ) : ?><?php _e( '(Required)', 'buddypress' ) ?><?php endif; ?></span></legend>
+        <div class="field-wrapper">
+
+            <?php switch ( $field->type ) : case 'textbox' : ?>
+
+                <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' : ?>
+
+                <select name="<?php bp_the_profile_field_input_name() ?>" id="<?php bp_the_profile_field_input_name() ?>">
+
+                    <?php bp_the_profile_field_options() ?>
+
+                </select>
+
+            <?php break; case 'multiselectbox' : ?>
+
+                <select name="<?php bp_the_profile_field_input_name() ?>" id="<?php bp_the_profile_field_input_name() ?>" multiple="multiple">
+
+                    <?php bp_the_profile_field_options() ?>
+
+                </select>
+
+            <?php break; case 'radio' : ?>
+
+                <?php bp_the_profile_field_options() ?>
+
+                <?php if ( !bp_get_the_profile_field_is_required() ) : ?>
+
+                    <a class="clear-value" href="javascript:clear( '<?php bp_the_profile_field_input_name() ?>' );"><?php _e( 'Clear', 'buddypress' ) ?></a>
+
+                <?php endif; ?>
+
+            <?php break; case 'checkbox' : ?>
+
+                <?php bp_the_profile_field_options(); ?>
+
+            <?php break; case 'datebox' : ?>
+
+                <select name="<?php bp_the_profile_field_input_name(); ?>_day" id="<?php bp_the_profile_field_input_name(); ?>_day">
+
+                    <?php bp_the_profile_field_options( 'type=day' ); ?>
+
+                </select>
+
+                <select name="<?php bp_the_profile_field_input_name(); ?>_month" id="<?php bp_the_profile_field_input_name(); ?>_month">
+
+                    <?php bp_the_profile_field_options( 'type=month' ); ?>
+
+                </select>
+
+                <select name="<?php bp_the_profile_field_input_name(); ?>_year" id="<?php bp_the_profile_field_input_name(); ?>_year">
+
+                    <?php bp_the_profile_field_options( 'type=year' ); ?>
+
+                </select>
+
+            <?php break; default : ?>
+
+            <?php do_action( 'xprofile_admin_field', $field, 1 ); ?>
+
+            <?php endswitch; ?>
+
+            <?php if ( $field->description ) : ?>
+
+                <p class="description"><?php echo esc_attr( $field->description ); ?></p>
+
+            <?php endif; ?>
+
+            <div class="actions">
+                <a class="button edit" href="admin.php?page=bp-profile-setup&amp;group_id=<?php echo esc_attr( $admin_group->id ); ?>&amp;field_id=<?php echo esc_attr( $field->id ); ?>&amp;mode=edit_field"><?php _e( 'Edit', 'buddypress' ); ?></a>
+
+                <?php if ( $field->can_delete ) : ?>
+
+                    <a class="submit-delete deletion" href="admin.php?page=bp-profile-setup&amp;field_id=<?php echo esc_attr( $field->id ); ?>&amp;mode=delete_field"><?php _e( 'Delete', 'buddypress' ); ?></a>
+
+                <?php endif; ?>
+            </div>
+        </div>
+    </fieldset>
 
 <?php
-    switch ( $field->type ) {
-        case 'textbox' : ?>
-
-                                <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' : ?>
-
-                                <select name="<?php bp_the_profile_field_input_name() ?>" id="<?php bp_the_profile_field_input_name() ?>">
-                                    <?php bp_the_profile_field_options() ?>
-
-                                </select>
-
-<?php       break; case 'multiselectbox' : ?>
-
-                                <select name="<?php bp_the_profile_field_input_name() ?>" id="<?php bp_the_profile_field_input_name() ?>" multiple="multiple">
-                                    <?php bp_the_profile_field_options() ?>
-
-                                </select>
-
-<?php       break; case 'radio' : ?>
-
-                                <?php bp_the_profile_field_options() ?>
-
-<?php           if ( !bp_get_the_profile_field_is_required() ) : ?>
-
-                                <a class="clear-value" href="javascript:clear( '<?php bp_the_profile_field_input_name() ?>' );"><?php _e( 'Clear', 'buddypress' ) ?></a>
-
-<?php           endif; ?>
-
-<?php       break; case 'checkbox' : ?>
-
-<?php bp_the_profile_field_options(); ?>
-
-<?php       break; case 'datebox' : ?>
-
-                                <select name="<?php bp_the_profile_field_input_name(); ?>_day" id="<?php bp_the_profile_field_input_name(); ?>_day">
-                                    <?php bp_the_profile_field_options( 'type=day' ); ?>
-
-                                </select>
-
-                                <select name="<?php bp_the_profile_field_input_name(); ?>_month" id="<?php bp_the_profile_field_input_name(); ?>_month">
-                                    <?php bp_the_profile_field_options( 'type=month' ); ?>
-
-                                </select>
-
-                                <select name="<?php bp_the_profile_field_input_name(); ?>_year" id="<?php bp_the_profile_field_input_name(); ?>_year">
-                                    <?php bp_the_profile_field_options( 'type=year' ); ?>
-
-                                </select>
-
-<?php       break; default : ?>
-
-<?php   do_action( 'xprofile_admin_field', $field, 1 ); ?>
-
-<?php } ?>
-
-<?php if ( $field->description ) : ?>
-
-                                <p class="description"><?php echo esc_attr( $field->description ); ?></p>
-
-<?php endif; ?>
-
-                                <div class="actions">
-                                    <a class="button edit" href="admin.php?page=bp-profile-setup&amp;group_id=<?php echo esc_attr( $admin_group->id ); ?>&amp;field_id=<?php echo esc_attr( $field->id ); ?>&amp;mode=edit_field"><?php _e( 'Edit', 'buddypress' ); ?></a>
-
-                                    <?php if ( $field->can_delete ) : ?>
-
-                                        <a class="submit-delete deletion" href="admin.php?page=bp-profile-setup&amp;field_id=<?php echo esc_attr( $field->id ); ?>&amp;mode=delete_field"><?php _e( 'Delete', 'buddypress' ); ?></a>
-
-                                    <?php endif; ?>
-                                </div>
-                            </div>
-                        </fieldset>
-<?php
-}
+}
+
+?>

trunk/bp-xprofile/bp-xprofile-buddybar.php

@@ -1 +1 @@
 <?php
+
 // Exit if accessed directly
 if ( !defined( 'ABSPATH' ) ) exit;
+
 ?>

trunk/bp-xprofile/bp-xprofile-cache.php

@@ -1 +1 @@
 <?php
-/********************************************************************************
- * Caching
+
+/**
+ * BuddyPress XProfile Template Tags
  *
  * Caching functions handle the clearing of cached objects and pages on specific
  * actions throughout BuddyPress.
+ *
+ * @package BuddyPress
+ * @subpackage XProfileTemplate
  */
 
@@ -11 +15 @@
 
 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 );
+    wp_cache_delete( 'xprofile_groups_inc_empty',        'bp' );
+    wp_cache_delete( 'xprofile_group_' . $group_obj->id, 'bp' );
 }
 
 function xprofile_clear_profile_data_object_cache( $group_id ) {
-    global $bp;
     wp_cache_delete( 'bp_user_fullname_' . bp_loggedin_user_id(), 'bp' );
 }

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

@@ -1 +1 @@
 <?php
+
+/**
+ * BuddyPress XProfile Classes
+ *
+ * @package BuddyPress
+ * @subpackage XProfileClasses
+ */
+
 // Exit if accessed directly
 if ( !defined( 'ABSPATH' ) ) exit;
@@ -11 +19 @@
     var $fields;
 
-    function bp_xprofile_group( $id = null ) {
-        $this->__construct( $id );
-    }
-
     function __construct( $id = null ) {
-        global $bp, $wpdb;
-
-        if ( $id )
+        if ( !empty( $id ) )
             $this->populate( $id );
-
     }
 
@@ -46 +47 @@
         do_action_ref_array( 'xprofile_group_before_save', array( $this ) );
 
-        if ( $this->id )
+        if ( !empty( $this->id ) )
             $sql = $wpdb->prepare( "UPDATE {$bp->profile->table_name_groups} SET name = %s, description = %s WHERE id = %d", $this->name, $this->description, $this->id );
         else
@@ -56 +57 @@
         do_action_ref_array( 'xprofile_group_after_save', array( $this ) );
 
-        if ( $this->id )
+        if ( !empty( $this->id ) )
             return $this->id;
         else
@@ -65 +66 @@
         global $wpdb, $bp;
 
-        if ( !$this->can_delete )
-            return false;
-
-        /* Delete field group */
+        if ( empty( $this->can_delete ) )
+            return false;
+
+        // Delete field group
         if ( !$wpdb->query( $wpdb->prepare( "DELETE FROM {$bp->profile->table_name_groups} WHERE id = %d", $this->id ) ) ) {
             return false;
         } else {
-            /* Remove the group's fields. */
+
+            // Remove the group's fields.
             if ( BP_XProfile_Field::delete_for_group( $this->id ) ) {
-                /* Remove profile data for the groups fields */
+
+                // Remove profile data for the groups fields
                 for ( $i = 0, $count = count( $this->fields ); $i < $count; ++$i ) {
                     BP_XProfile_ProfileData::delete_for_field( $this->fields[$i]->id );
@@ -84 +87 @@
     }
 
-    /** Static Functions **/
+    /** Static Methods ********************************************************/
 
     /**
@@ -126 +129 @@
         $where_sql = '';
 
-        if ( $profile_group_id )
+        if ( !empty( $profile_group_id ) )
             $where_sql = $wpdb->prepare( 'WHERE g.id = %d', $profile_group_id );
         elseif ( $exclude_groups )
             $where_sql = $wpdb->prepare( "WHERE g.id NOT IN ({$exclude_groups})");
 
-        if ( $hide_empty_groups )
+        if ( !empty( $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 {$where_sql} ORDER BY g.group_order ASC" ) );
         else
             $groups = $wpdb->get_results( $wpdb->prepare( "SELECT DISTINCT g.* FROM {$bp->profile->table_name_groups} g {$where_sql} ORDER BY g.group_order ASC" ) );
 
-        if ( !$fetch_fields )
+        if ( empty( $fetch_fields ) )
             return $groups;
 
@@ -151 +154 @@
 
         $exclude_fields_sql = '';
-        if ( $exclude_fields )
+        if ( !empty( $exclude_fields ) )
             $exclude_fields_sql = $wpdb->prepare( "AND id NOT IN ({$exclude_fields})" );
 
@@ -160 +163 @@
             return $groups;
 
-        if ( $fetch_field_data ) {
+        if ( !empty( $fetch_field_data ) ) {
+
             // Fetch the field data for the user.
-            foreach( (array)$fields as $field )
+            foreach( (array) $fields as $field ) {
                 $field_ids[] = $field->id;
+            }
 
             $field_ids_sql = implode( ',', (array) $field_ids );
@@ -171 +176 @@
 
             // Remove data-less fields, if necessary
-            if ( $hide_empty_fields ) {
+            if ( !empty( $hide_empty_fields ) ) {
 
                 // Loop through the results and find the fields that have data.
                 foreach( (array)$field_data as $data ) {
+
                     // Empty fields may contain a serialized empty array
                     $maybe_value = maybe_unserialize( $data->value );
@@ -220 +226 @@
 
             foreach( (array) $fields as $field ) {
-                if ( $group->id == $field->group_id )
+                if ( $group->id == $field->group_id ) {
                     $groups[$index]->fields[] = $field;
+                }
             }
 
@@ -265 +272 @@
         global $message;
 
-        if ( !$this->id ) {
+        if ( empty( $this->id ) ) {
             $title  = __( 'Add New Field Group', 'buddypress' );
             $action = "admin.php?page=bp-profile-setup&amp;mode=add_group";
@@ -273 +280 @@
             $action = "admin.php?page=bp-profile-setup&amp;mode=edit_group&amp;group_id=" . $this->id;
             $button = __( 'Save Changes', 'buddypress' );
-        }
-?>
+        } ?>
+
         <div class="wrap">
 
@@ -282 +289 @@
             <p><?php _e( 'Fields marked * are required', 'buddypress' ) ?></p>
 
-<?php if ( $message != '' ) :
-        $type = ( 'error' == $type ) ? 'error' : 'updated'; ?>
+            <?php if ( !empty( $message ) ) :
+                    $type = ( 'error' == $type ) ? 'error' : 'updated'; ?>
+
                 <div id="message" class="<?php echo $type; ?> fade">
                     <p><?php echo $message; ?></p>
                 </div>
-<?php endif; ?>
+
+            <?php endif; ?>
+
             <div id="poststuff">
                 <form action="<?php echo esc_attr( $action ); ?>" method="post">
@@ -297 +307 @@
                     </div>
 
-<?php if ( '0' != $this->can_delete ) : ?>
-                    <div id="titlediv">
-                        <h3><label for="description"><?php _e( "Group Description", 'buddypress' ); ?></label></h3>
-                        <div id="titlewrap">
-                            <textarea name="group_description" id="group_description" rows="8" cols="60"><?php echo htmlspecialchars( $this->description ); ?></textarea>
+                    <?php if ( '0' != $this->can_delete ) : ?>
+
+                        <div id="titlediv">
+                            <h3><label for="description"><?php _e( "Group Description", 'buddypress' ); ?></label></h3>
+                            <div id="titlewrap">
+                                <textarea name="group_description" id="group_description" rows="8" cols="60"><?php echo htmlspecialchars( $this->description ); ?></textarea>
+                            </div>
                         </div>
-                    </div>
-<?php endif; ?>
+
+                    <?php endif; ?>
 
                     <p class="submit">
@@ -314 +326 @@
             </div>
         </div>
+
 <?php
     }
 }
-
 
 class BP_XProfile_Field {
@@ -337 +349 @@
     var $message_type = 'err';
 
-    function bp_xprofile_field( $id = null, $user_id = null, $get_data = true ) {
-        $this->__construct( $id, $user_id, $get_data );
-    }
-
     function __construct( $id = null, $user_id = null, $get_data = true ) {
-        if ( $id )
+        if ( !empty( $id ) )
             $this->populate( $id, $user_id, $get_data );
     }
@@ -349 +357 @@
         global $wpdb, $userdata, $bp;
 
+        // @todo Why are we nooping the user_id ?
         $user_id = 0;
         if ( is_null( $user_id ) )
@@ -369 +378 @@
             $this->is_default_option = $field->is_default_option;
 
-            if ( $get_data && $user_id )
-                $this->data            = $this->get_field_data( $user_id );
+            if ( $get_data && $user_id ) {
+                $this->data          = $this->get_field_data( $user_id );
+            }
         }
     }
@@ -380 +390 @@
         // Prevent deletion by url when can_delete is false.
         // Prevent deletion of option 1 since this invalidates fields with options.
-        if ( !$this->id || !$this->can_delete || ( $this->parent_id && $this->option_order == 1 ) )
+        if ( empty( $this->id ) || empty( $this->can_delete ) || ( $this->parent_id && $this->option_order == 1 ) )
             return false;
 
@@ -396 +406 @@
         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 );
-        $this->type    = apply_filters( 'xprofile_field_type_before_save',        $this->type,        $this->id );
-        $this->name    = apply_filters( 'xprofile_field_name_before_save',        $this->name,        $this->id );
+        $this->type        = apply_filters( 'xprofile_field_type_before_save',        $this->type,        $this->id );
+        $this->name        = apply_filters( 'xprofile_field_name_before_save',        $this->name,        $this->id );
         $this->description = apply_filters( 'xprofile_field_description_before_save', $this->description, $this->id );
         $this->is_required = apply_filters( 'xprofile_field_is_required_before_save', $this->is_required, $this->id );
@@ -409 +417 @@
         do_action_ref_array( 'xprofile_field_before_save', array( $this ) );
 
-        if ( $this->id != null )
+        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 );
-        else
+        } else {
             $sql = $wpdb->prepare( "INSERT INTO {$bp->profile->table_name_fields} (group_id, parent_id, type, name, description, is_required, order_by, field_order ) VALUES (%d, %d, %s, %s, %s, %d, %s, %d )", $this->group_id, $this->parent_id, $this->type, $this->name, $this->description, $this->is_required, $this->order_by, $this->field_order );
-
-        /*
+        }
+
+        /**
          * Check for null so field options can be changed without changing any other part of the field.
          * The described situation will return 0 here.
          */
         if ( $wpdb->query( $sql ) !== null ) {
-            if ( $this->id )
+
+            if ( !empty( $this->id ) ) {
                 $field_id = $this->id;
-            else
+            } else {
                 $field_id = $wpdb->insert_id;
-
-            /* Only do this if we are editing an existing field */
+            }
+
+            // Only do this if we are editing an existing field
             if ( $this->id != null ) {
-                /*
+
+                /**
                  * Remove any radio or dropdown options for this
                  * field. They will be re-added if needed.
@@ -435 +447 @@
             }
 
-            /*
+            /**
              * Check to see if this is a field with child options.
              * We need to add the options to the db, if it is.
              */
             if ( 'radio' == $this->type || 'selectbox' == $this->type || 'checkbox' == $this->type || 'multiselectbox' == $this->type ) {
-                if ( $this->id )
+
+                if ( !empty( $this->id ) ) {
                     $parent_id = $this->id;
-                else
+                } else {
                     $parent_id = $wpdb->insert_id;
+                }
 
                 if ( 'radio' == $this->type ) {
@@ -452 +466 @@
                     $defaults   = apply_filters( 'xprofile_field_default_before_save', $post_default, 'radio' );
 
-                } else if ( 'selectbox' == $this->type ) {
+                } elseif ( 'selectbox' == $this->type ) {
                     $post_option  = !empty( $_POST['selectbox_option']           ) ? $_POST['selectbox_option']           : '';
                     $post_default = !empty( $_POST['isDefault_selectbox_option'] ) ? $_POST['isDefault_selectbox_option'] : '';
@@ -459 +473 @@
                     $defaults   = apply_filters( 'xprofile_field_default_before_save', $post_default, 'selectbox' );
 
-                } else if ( 'multiselectbox' == $this->type ) {
+                } elseif ( 'multiselectbox' == $this->type ) {
                     $post_option  = !empty( $_POST['multiselectbox_option']           ) ? $_POST['multiselectbox_option']           : '';
                     $post_default = !empty( $_POST['isDefault_multiselectbox_option'] ) ? $_POST['isDefault_multiselectbox_option'] : '';
@@ -466 +480 @@
                     $defaults   = apply_filters( 'xprofile_field_default_before_save', $post_default, 'multiselectbox' );
 
-                } else if ( 'checkbox' == $this->type ) {
+                } elseif ( 'checkbox' == $this->type ) {
                     $post_option  = !empty( $_POST['checkbox_option']           ) ? $_POST['checkbox_option']           : '';
                     $post_default = !empty( $_POST['isDefault_checkbox_option'] ) ? $_POST['isDefault_checkbox_option'] : '';
@@ -475 +489 @@
 
                 $counter = 1;
-                if ( $options ) {
+                if ( !empty( $options ) ) {
                     foreach ( (array)$options as $option_key => $option_value ) {
                         $is_default = 0;
@@ -488 +502 @@
 
                         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 ) ) )
+                            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;
+                            }
                         }
 
@@ -513 +528 @@
 
         // This is done here so we don't have problems with sql injection
-        if ( 'asc' == $this->order_by && !$for_editing )
+        if ( 'asc' == $this->order_by && empty( $for_editing ) ) {
             $sort_sql = 'ORDER BY name ASC';
-        else if ( 'desc' == $this->order_by && !$for_editing )
+        } elseif ( 'desc' == $this->order_by && empty( $for_editing ) ) {
             $sort_sql = 'ORDER BY name DESC';
-        else
+        } else {
             $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 )
+        if ( empty( $this->id ) ) {
             $parent_id = -1;
-        else
+        } else {
             $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 );
@@ -547 +564 @@
         global $wpdb, $bp;
 
-        if ( $field_id ) {
+        if ( !empty( $field_id ) ) {
             $sql = $wpdb->prepare( "SELECT type FROM {$bp->profile->table_name_fields} WHERE id = %d", $field_id );
 
-            if ( !$field_type = $wpdb->get_var( $sql ) )
+            if ( !$field_type = $wpdb->get_var( $sql ) ) {
                 return false;
+            }
 
             return $field_type;
@@ -562 +580 @@
         global $wpdb, $bp;
 
-        if ( $group_id ) {
+        if ( !empty( $group_id ) ) {
             $sql = $wpdb->prepare( "DELETE FROM {$bp->profile->table_name_fields} WHERE group_id = %d", $group_id );
 
-            if ( $wpdb->get_var( $sql ) === false )
+            if ( $wpdb->get_var( $sql ) === false ) {
                 return false;
+            }
 
             return true;
@@ -589 +608 @@
             return false;
 
-        /* Update $field_id with new $position and $field_group_id */
+        // Update $field_id with new $position and $field_group_id
         if ( $parent = $wpdb->query( $wpdb->prepare( "UPDATE {$bp->profile->table_name_fields} SET field_order = %d, group_id = %d WHERE id = %d", $position, $field_group_id, $field_id ) ) ) {;
-            /* Update any children of this $field_id */
+
+            // Update any children of this $field_id
             $children = $wpdb->query( $wpdb->prepare( "UPDATE {$bp->profile->table_name_fields} SET group_id = %d WHERE parent_id = %d", $field_group_id, $field_id ) );
 
@@ -608 +628 @@
         $input_types = array( 'checkbox', 'selectbox', 'multiselectbox', 'radio' );
 
-        foreach ($input_types as $type) {
+        foreach ( $input_types as $type ) {
             $default_name = '';
 
-            if ( 'multiselectbox' == $type || 'checkbox' == $type )
+            if ( ( 'multiselectbox' == $type ) || ( 'checkbox' == $type ) ) {
                 $default_input = 'checkbox';
-            else
+            } else {
                 $default_input = 'radio';
-?>
-            <div id="<?php echo $type; ?>" class="options-box" style="<?php if ( $this->type != $type ) { ?>display: none;<?php } ?> margin-left: 15px;">
+            }
+
+            if ( $this->type != $type ) { 
+                $class = 'display: none;';
+            }
+
+            ?>
+
+            <div id="<?php echo $type; ?>" class="options-box" style="<?php echo $class; ?> margin-left: 15px;">
                 <h4><?php _e( 'Please enter options for this Field:', 'buddypress' ); ?></h4>
                 <p><label for="sort_order_<?php echo $type; ?>"><?php _e( 'Order By:', 'buddypress' ); ?></label>
@@ -624 +651 @@
                         <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 ) ) {
+
+                <?php if ( !$options = $this->get_children( true ) ) {
+
                     $i = 1;
                     while ( isset( $_POST[$type . '_option'][$i] ) ) {
                         (array) $options[] = (object) array(
-                            'id' => -1,
-                            'name' => $_POST[$type . '_option'][$i],
-                            'is_default_option' => ( 'multiselectbox' != $type &&
-                                'checkbox' != $type &&
-                                $_POST["isDefault_{$type}_option"] == $i ) ?
-                                    1 :
-                                    $_POST["isDefault_{$type}_option"][$i]
+                            'id'                => -1,
+                            'name'              => $_POST[$type . '_option'][$i],
+                            'is_default_option' => ( ( 'multiselectbox' != $type ) && ( 'checkbox' != $type ) && ( $_POST["isDefault_{$type}_option"] == $i ) ) ? 1 : $_POST["isDefault_{$type}_option"][$i]
                         );
 
@@ -647 +671 @@
 
                         if ( 'multiselectbox' == $type || 'checkbox' == $type )
-                            $default_name = '[' . $j . ']';
-?>
-                        <p><?php _e('Option', 'buddypress'); ?> <?php echo $j; ?>:
+                            $default_name = '[' . $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 stripslashes( esc_attr( $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' ); ?>
-<?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; ?>
+
+                            <?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>
-<?php               } /* end for */ ?>
+
+                    <?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]';
-?>
+                        $default_name = '[1]'; ?>
 
                     <p><?php _e( 'Option', 'buddypress' ); ?> 1: <input type="text" name="<?php echo $type; ?>_option[1]" id="<?php echo $type; ?>_option1" />
@@ -670 +698 @@
                     <input type="hidden" name="<?php echo $type; ?>_option_number" id="<?php echo $type; ?>_option_number" value="2" />
 
-<?php           } /* end if */ ?>
+                <?php } /* end if */ ?>
 
                 <div id="<?php echo $type; ?>_more"></div>
@@ -680 +708 @@
 
     function render_admin_form( $message = '' ) {
-        if ( !$this->id ) {
+        if ( empty( $this->id ) ) {
             $title              = __( 'Add Field', 'buddypress' );
             $action             = "admin.php?page=bp-profile-setup&amp;group_id=" . $this->group_id . "&amp;mode=add_field#tabs-" . $this->group_id;
 
             if ( !empty( $_POST['saveField'] ) ) {
-                $this->name     = $_POST['title'];
-                $this->description  = $_POST['description'];
-                $this->is_required  = $_POST['required'];
-                $this->type     = $_POST['fieldtype'];
-                $this->order_by     = $_POST["sort_order_{$this->type}"];
-                $this->field_order  = $_POST['field_order'];
-            }
-        } 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 . "#tabs-" . $this->group_id;
-        }
-?>
-    <div class="wrap">
-        <div id="icon-users" class="icon32"><br /></div>
-        <h2><?php echo $title; ?></h2>
-        <p><?php _e( 'Fields marked * are required', 'buddypress' ) ?></p>
-
-<?php
-        if ( $message != '' ) {
-?>
-            <div id="message" class="error fade">
-                <p><?php echo $message; ?></p>
-            </div>
-<?php   } ?>
-
-        <form action="<?php echo $action; ?>" method="post">
-            <div id="poststuff">
-                <div id="titlediv">
-                    <h3><label for="title"><?php _e( 'Field Title', 'buddypress' ); ?> *</label></h3>
-                    <div id="titlewrap">
-                        <input type="text" name="title" id="title" value="<?php echo esc_attr( $this->name ); ?>" style="width:50%" />
+                $this->name        = $_POST['title'];
+                $this->description = $_POST['description'];
+                $this->is_required = $_POST['required'];
+                $this->type        = $_POST['fieldtype'];
+                $this->order_by    = $_POST["sort_order_{$this->type}"];
+                $this->field_order = $_POST['field_order'];
+            }
+        } 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 . "#tabs-" . $this->group_id;
+        } ?>
+
+        <div class="wrap">
+            <div id="icon-users" class="icon32"><br /></div>
+            <h2><?php echo $title; ?></h2>
+            <p><?php _e( 'Fields marked * are required', 'buddypress' ) ?></p>
+
+            <?php if ( !empty( $message ) ) : ?>
+
+                <div id="message" class="error fade">
+                    <p><?php echo $message; ?></p>
+                </div>
+
+            <?php endif; ?>
+
+            <form action="<?php echo $action; ?>" method="post">
+                <div id="poststuff">
+                    <div id="titlediv">
+                        <h3><label for="title"><?php _e( 'Field Title', 'buddypress' ); ?> *</label></h3>
+                        <div id="titlewrap">
+                            <input type="text" name="title" id="title" value="<?php echo esc_attr( $this->name ); ?>" style="width:50%" />
+                        </div>
                     </div>
+
+                    <div id="titlediv">
+                        <h3><label for="description"><?php _e("Field Description", 'buddypress'); ?></label></h3>
+                        <div id="titlewrap">
+                            <textarea name="description" id="description" rows="8" cols="60"><?php echo htmlspecialchars( $this->description ); ?></textarea>
+                        </div>
+                    </div>
+
+                    <?php if ( '0' != $this->can_delete ) { ?>
+
+                        <div id="titlediv">
+                            <h3><label for="required"><?php _e( "Is This Field Required?", 'buddypress' ); ?> *</label></h3>
+                            <select name="required" id="required" style="width: 30%">
+                                <option value="0"<?php if ( $this->is_required == '0' ) { ?> selected="selected"<?php } ?>><?php _e( 'Not Required', 'buddypress' ); ?></option>
+                                <option value="1"<?php if ( $this->is_required == '1' ) { ?> selected="selected"<?php } ?>><?php _e( 'Required', 'buddypress' ); ?></option>
+                            </select>
+                        </div>
+
+                        <div id="titlediv">
+                            <h3><label for="fieldtype"><?php _e("Field Type", 'buddypress'); ?> *</label></h3>
+                            <select name="fieldtype" id="fieldtype" onchange="show_options(this.value)" style="width: 30%">
+                                <option value="textbox"<?php if ( $this->type == 'textbox' ) {?> selected="selected"<?php } ?>><?php _e( 'Text Box', 'buddypress' ); ?></option>
+                                <option value="textarea"<?php if ( $this->type == 'textarea' ) {?> selected="selected"<?php } ?>><?php _e( 'Multi-line Text Box', 'buddypress' ); ?></option>
+                                <option value="datebox"<?php if ( $this->type == 'datebox' ) {?> selected="selected"<?php } ?>><?php _e( 'Date Selector', 'buddypress' ); ?></option>
+                                <option value="radio"<?php if ( $this->type == 'radio' ) {?> selected="selected"<?php } ?>><?php _e( 'Radio Buttons', 'buddypress' ); ?></option>
+                                <option value="selectbox"<?php if ( $this->type == 'selectbox' ) {?> selected="selected"<?php } ?>><?php _e( 'Drop Down Select Box', 'buddypress' ); ?></option>
+                                <option value="multiselectbox"<?php if ( $this->type == 'multiselectbox' ) {?> selected="selected"<?php } ?>><?php _e( 'Multi Select Box', 'buddypress' ); ?></option>
+                                <option value="checkbox"<?php if ( $this->type == 'checkbox' ) {?> selected="selected"<?php } ?>><?php _e( 'Checkboxes', 'buddypress' ); ?></option>
+                            </select>
+                        </div>
+
+                        <?php do_action_ref_array( 'xprofile_field_additional_options', array( $this ) ); ?>
+
+                        <?php $this->render_admin_form_children(); ?>
+
+                    <?php } else { ?>
+
+                        <input type="hidden" name="required" id="required" value="1" />
+                        <input type="hidden" name="fieldtype" id="fieldtype" value="textbox" />
+
+                    <?php } ?>
+
+                    <p class="submit">
+                        <input type="hidden" name="field_order" id="field_order" value="<?php echo esc_attr( $this->field_order ); ?>" />
+                        <input type="submit" value="<?php _e( 'Save', 'buddypress' ); ?>" name="saveField" id="saveField" style="font-weight: bold" class="button-primary" />
+                        <?php _e( 'or', 'buddypress' ); ?> <a href="admin.php?page=bp-profile-setup" class="deletion"><?php _e( 'Cancel', 'buddypress' ); ?></a>
+                    </p>
+
                 </div>
 
-                <div id="titlediv">
-                    <h3><label for="description"><?php _e("Field Description", 'buddypress'); ?></label></h3>
-                    <div id="titlewrap">
-                        <textarea name="description" id="description" rows="8" cols="60"><?php echo htmlspecialchars( $this->description ); ?></textarea>
-                    </div>
-                </div>
-
-<?php
-        if ( '0' != $this->can_delete ) {
-?>
-                <div id="titlediv">
-                    <h3><label for="required"><?php _e( "Is This Field Required?", 'buddypress' ); ?> *</label></h3>
-                    <select name="required" id="required" style="width: 30%">
-                        <option value="0"<?php if ( $this->is_required == '0' ) { ?> selected="selected"<?php } ?>><?php _e( 'Not Required', 'buddypress' ); ?></option>
-                        <option value="1"<?php if ( $this->is_required == '1' ) { ?> selected="selected"<?php } ?>><?php _e( 'Required', 'buddypress' ); ?></option>
-                    </select>
-                </div>
-
-                <div id="titlediv">
-                    <h3><label for="fieldtype"><?php _e("Field Type", 'buddypress'); ?> *</label></h3>
-                    <select name="fieldtype" id="fieldtype" onchange="show_options(this.value)" style="width: 30%">
-                        <option value="textbox"<?php if ( $this->type == 'textbox' ) {?> selected="selected"<?php } ?>><?php _e( 'Text Box', 'buddypress' ); ?></option>
-                        <option value="textarea"<?php if ( $this->type == 'textarea' ) {?> selected="selected"<?php } ?>><?php _e( 'Multi-line Text Box', 'buddypress' ); ?></option>
-                        <option value="datebox"<?php if ( $this->type == 'datebox' ) {?> selected="selected"<?php } ?>><?php _e( 'Date Selector', 'buddypress' ); ?></option>
-                        <option value="radio"<?php if ( $this->type == 'radio' ) {?> selected="selected"<?php } ?>><?php _e( 'Radio Buttons', 'buddypress' ); ?></option>
-                        <option value="selectbox"<?php if ( $this->type == 'selectbox' ) {?> selected="selected"<?php } ?>><?php _e( 'Drop Down Select Box', 'buddypress' ); ?></option>
-                        <option value="multiselectbox"<?php if ( $this->type == 'multiselectbox' ) {?> selected="selected"<?php } ?>><?php _e( 'Multi Select Box', 'buddypress' ); ?></option>
-                        <option value="checkbox"<?php if ( $this->type == 'checkbox' ) {?> selected="selected"<?php } ?>><?php _e( 'Checkboxes', 'buddypress' ); ?></option>
-                    </select>
-                </div>
-
-                <?php do_action_ref_array( 'xprofile_field_additional_options', array( $this ) ); ?>
-
-                <?php $this->render_admin_form_children(); ?>
-<?php   } else { ?>
-                <input type="hidden" name="required" id="required" value="1" />
-                <input type="hidden" name="fieldtype" id="fieldtype" value="textbox" />
-<?php   } ?>
-                <p class="submit">
-                    <input type="hidden" name="field_order" id="field_order" value="<?php echo esc_attr( $this->field_order ); ?>" />
-                    <input type="submit" value="<?php _e( 'Save', 'buddypress' ); ?>" name="saveField" id="saveField" style="font-weight: bold" class="button-primary" />
-                    <?php _e( 'or', 'buddypress' ); ?> <a href="admin.php?page=bp-profile-setup" class="deletion"><?php _e( 'Cancel', 'buddypress' ); ?></a>
-                </p>
-
-            </div>
-
-            <?php wp_nonce_field( 'xprofile_delete_option' ); ?>
-
-        </form>
-    </div>
+                <?php wp_nonce_field( 'xprofile_delete_option' ); ?>
+
+            </form>
+        </div>
 
 <?php
@@ -776 +807 @@
         global $message;
 
-        /* Validate Form */
+        // Validate Form
         if ( '' == $_POST['title'] || '' == $_POST['required'] || '' == $_POST['fieldtype'] ) {
             $message = __( 'Please make sure you fill out all required fields.', 'buddypress' );
@@ -806 +837 @@
     var $last_updated;
 
-    function bp_xprofile_profiledata( $field_id = null, $user_id = null ) {
-        $this->__construct( $field_id, $user_id );
-    }
-
     function __construct( $field_id = null, $user_id = null ) {
-        if ( $field_id )
+        if ( !empty( $field_id ) )
             $this->populate( $field_id, $user_id );
     }
@@ -923 +950 @@
         $profile_data = array();
 
-        if ( $results ) {
+        if ( !empty( $results ) ) {
             $profile_data['user_login']     = $results[0]->user_login;
             $profile_data['user_nicename']  = $results[0]->user_nicename;
@@ -945 +972 @@
         global $wpdb, $bp;
 
-        if ( !$user_ids )
+        if ( empty( $user_ids ) )
             $user_ids = bp_displayed_user_id();
 
@@ -961 +988 @@
         global $bp, $wpdb;
 
-        if ( !$fields )
-            return false;
-
-        if ( !$user_id )
+        if ( empty( $fields ) )
+            return false;
+
+        if ( empty( $user_id ) )
             $user_id = bp_displayed_user_id();
 
@@ -1006 +1033 @@
 
     function delete_for_field( $field_id ) {
-        global $wpdb, $userdata, $bp;
+        global $wpdb, $bp;
 
         if ( !$wpdb->query( $wpdb->prepare( "DELETE FROM {$bp->profile->table_name_data} WHERE field_id = %d", $field_id ) ) )
@@ -1031 +1058 @@
         global $wpdb, $bp;
 
-        if ( $exclude_fullname )
+        if ( !empty( $exclude_fullname ) )
             $exclude_sql = $wpdb->prepare( " AND pf.id != 1" );
 
@@ -1038 +1065 @@
 
     function get_fullname( $user_id = 0 ) {
-        global $bp;
-
-        if ( !$user_id )
+
+        if ( empty( $user_id ) )
             $user_id = bp_displayed_user_id();
 

trunk/bp-xprofile/bp-xprofile-cssjs.php

@@ -1 +1 @@
 <?php
+
+/**
+ * BuddyPress XProfile CSS and JS
+ *
+ * @package BuddyPress
+ * @subpackage XProfileScripts
+ */
 
 // Exit if accessed directly

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

@@ -1 +1 @@
 <?php
+
+/**
+ * BuddyPress XProfile Filters
+ *
+ * Apply WordPress defined filters
+ *
+ * @package BuddyPress
+ * @subpackage XProfileFilters
+ */
+
 // Exit if accessed directly
 if ( !defined( 'ABSPATH' ) ) exit;
 
-/* Apply WordPress defined filters */
-
-add_filter( 'bp_get_the_profile_group_name',          'wp_filter_kses',       1 );
-add_filter( 'bp_get_the_profile_group_description',   'wp_filter_kses',       1 );
-add_filter( 'bp_get_the_profile_field_value',         'xprofile_filter_kses', 1 );
-add_filter( 'bp_get_the_profile_field_name',          'wp_filter_kses',       1 );
-add_filter( 'bp_get_the_profile_field_edit_value',    'wp_filter_kses',       1 );
-add_filter( 'bp_get_the_profile_field_description',   'wp_filter_kses',       1 );
-
-add_filter( 'bp_get_the_profile_field_value',         'wptexturize'        );
-add_filter( 'bp_get_the_profile_field_value',         'convert_smilies', 2 );
-add_filter( 'bp_get_the_profile_field_value',         'convert_chars'      );
-add_filter( 'bp_get_the_profile_field_value',         'wpautop'            );
-add_filter( 'bp_get_the_profile_field_value',         'make_clickable', 8  );
-add_filter( 'bp_get_the_profile_field_value',         'force_balance_tags' );
-
-add_filter( 'bp_get_the_profile_field_edit_value',    'force_balance_tags' );
-add_filter( 'bp_get_the_profile_field_edit_value',    'esc_html'           );
-
-add_filter( 'bp_get_the_profile_group_name',          'stripslashes' );
-add_filter( 'bp_get_the_profile_group_description',   'stripslashes' );
-add_filter( 'bp_get_the_profile_field_value',         'stripslashes' );
-add_filter( 'bp_get_the_profile_field_edit_value',    'stripslashes' );
-add_filter( 'bp_get_the_profile_field_name',          'stripslashes' );
-add_filter( 'bp_get_the_profile_field_description',   'stripslashes' );
-
-add_filter( 'xprofile_get_field_data',                'wp_filter_kses', 1 );
-add_filter( 'xprofile_field_name_before_save',        'wp_filter_kses', 1 );
-add_filter( 'xprofile_field_description_before_save', 'wp_filter_kses', 1 );
-
-add_filter( 'xprofile_get_field_data',                'force_balance_tags' );
-add_filter( 'xprofile_field_name_before_save',        'force_balance_tags' );
-add_filter( 'xprofile_field_description_before_save', 'force_balance_tags' );
-
-add_filter( 'xprofile_get_field_data',                'stripslashes' );
-
-/* Custom BuddyPress filters */
-
-add_filter( 'bp_get_the_profile_field_value',         'xprofile_filter_format_field_value', 1, 2 );
-add_filter( 'bp_get_the_site_member_profile_data',    'xprofile_filter_format_field_value', 1, 2 );
-add_filter( 'bp_get_the_profile_field_value',         'xprofile_filter_link_profile_data', 9, 2 );
-
-add_filter( 'xprofile_data_value_before_save',        'xprofile_sanitize_data_value_before_save', 1, 2 );
+add_filter( 'bp_get_the_profile_group_name',            'wp_filter_kses',       1 );
+add_filter( 'bp_get_the_profile_group_description',     'wp_filter_kses',       1 );
+add_filter( 'bp_get_the_profile_field_value',           'xprofile_filter_kses', 1 );
+add_filter( 'bp_get_the_profile_field_name',            'wp_filter_kses',       1 );
+add_filter( 'bp_get_the_profile_field_edit_value',      'wp_filter_kses',       1 );
+add_filter( 'bp_get_the_profile_field_description',     'wp_filter_kses',       1 );
+
+add_filter( 'bp_get_the_profile_field_value',           'wptexturize'        );
+add_filter( 'bp_get_the_profile_field_value',           'convert_smilies', 2 );
+add_filter( 'bp_get_the_profile_field_value',           'convert_chars'      );
+add_filter( 'bp_get_the_profile_field_value',           'wpautop'            );
+add_filter( 'bp_get_the_profile_field_value',           'make_clickable', 8  );
+add_filter( 'bp_get_the_profile_field_value',           'force_balance_tags' );
+
+add_filter( 'bp_get_the_profile_field_edit_value',      'force_balance_tags' );
+add_filter( 'bp_get_the_profile_field_edit_value',      'esc_html'           );
+
+add_filter( 'bp_get_the_profile_group_name',            'stripslashes' );
+add_filter( 'bp_get_the_profile_group_description',     'stripslashes' );
+add_filter( 'bp_get_the_profile_field_value',           'stripslashes' );
+add_filter( 'bp_get_the_profile_field_edit_value',      'stripslashes' );
+add_filter( 'bp_get_the_profile_field_name',            'stripslashes' );
+add_filter( 'bp_get_the_profile_field_description',     'stripslashes' );
+
+add_filter( 'xprofile_get_field_data',                  'wp_filter_kses', 1 );
+add_filter( 'xprofile_field_name_before_save',          'wp_filter_kses', 1 );
+add_filter( 'xprofile_field_description_before_save',   'wp_filter_kses', 1 );
+
+add_filter( 'xprofile_get_field_data',                  'force_balance_tags' );
+add_filter( 'xprofile_field_name_before_save',          'force_balance_tags' );
+add_filter( 'xprofile_field_description_before_save',   'force_balance_tags' );
+
+add_filter( 'xprofile_get_field_data',                  'stripslashes' );
+
+add_filter( 'bp_get_the_profile_field_value',           'xprofile_filter_format_field_value', 1, 2 );
+add_filter( 'bp_get_the_site_member_profile_data',      'xprofile_filter_format_field_value', 1, 2 );
+add_filter( 'bp_get_the_profile_field_value',           'xprofile_filter_link_profile_data', 9, 2 );
+
+add_filter( 'xprofile_data_value_before_save',          'xprofile_sanitize_data_value_before_save', 1, 2 );
 add_filter( 'xprofile_filtered_data_value_before_save', 'trim', 2 );
 
@@ -101 +107 @@
         }
 
-        if ( $reserialize )
+        if ( !empty( $reserialize ) )
             $filtered_field_value = serialize( $filtered_values );
         else
@@ -132 +138 @@
 
         // If Unix timestamp
-        if ( is_numeric( $field_value ) )
+        if ( is_numeric( $field_value ) ) {
             $field_value = bp_format_time( $field_value, true, false );
 
         // If MySQL timestamp
-        else
+        } else {
             $field_value = bp_format_time( strtotime( $field_value ), true, false );
+        }
 
     } else {
@@ -155 +162 @@
     $values = explode( ',', $field_value );
 
-    if ( $values ) {
+    if ( !empty( $values ) ) {
         foreach ( (array)$values as $value ) {
             $value = trim( $value );

trunk/bp-xprofile/bp-xprofile-functions.php

@@ -1 +1 @@
 <?php
-/********************************************************************************
- * Business Functions
+
+/**
+ * BuddyPress XProfile Filters
  *
  * Business functions are where all the magic happens in BuddyPress. They will
@@ -7 +8 @@
  * hand off to a database class for data access, then return
  * true or false on success or failure.
+ *
+ * @package BuddyPress
+ * @subpackage XProfileFilters
  */
 
@@ -25 +29 @@
     extract( $r, EXTR_SKIP );
 
-    if ( !$name )
+    if ( empty( $name ) )
         return false;
 
@@ -79 +83 @@
 
     // Check we have the minimum details
-    if ( !$field_group_id )
+    if ( empty( $field_group_id ) )
         return false;
 
@@ -87 +91 @@
 
     // Instantiate a new field object
-    if ( $field_id )
+    if ( !empty( $field_id ) )
         $field = new BP_XProfile_Field( $field_id );
     else
@@ -148 +152 @@
  * @param mixed $field The ID of the field, or the $name of the field.
  * @param int $user_id The ID of the user
- * @global object $bp Global BuddyPress settings object
  * @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;
 
     if ( empty( $user_id ) )
@@ -216 +218 @@
     }
 
+    $possible_values = array();
+
     // Check the value is an acceptable value
     if ( 'checkbox' == $field->type || 'radio' == $field->type || 'selectbox' == $field->type || 'multiselectbox' == $field->type ) {
@@ -225 +229 @@
         if ( is_array( $value ) ) {
             foreach( $value as $i => $single ) {
-                if ( !in_array( $single, (array)$possible_values ) ) {
+                if ( !in_array( $single, $possible_values ) ) {
                     unset( $value[$i] );
                 }
@@ -233 +237 @@
             $value = array_merge( array(), $value );
         } else {
-            if ( !in_array( $value, (array)$possible_values ) ) {
+            if ( !in_array( $value, $possible_values ) ) {
                 return false;
             }
@@ -301 +305 @@
  */
 function xprofile_get_random_profile_data( $user_id, $exclude_fullname = true ) {
-    $field_data           = BP_XProfile_ProfileData::get_random( $user_id, $exclude_fullname );
-
-    if ( !$field_data )
+    $field_data = BP_XProfile_ProfileData::get_random( $user_id, $exclude_fullname );
+
+    if ( empty( $field_data ) )
         return false;
 
     $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 ) )
+    if ( empty( $field_data[0]->value ) )
         return false;
 
@@ -352 +356 @@
  */
 function xprofile_avatar_upload_dir( $directory = false, $user_id = 0 ) {
-    global $bp;
 
     if ( empty( $user_id ) )

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

@@ -1 +1 @@
 <?php
+
 /**
  * BuddyPress XProfile Loader
@@ -7 +8 @@
  *
  * @package BuddyPress
- * @subpackage XProfile Core
+ * @subpackage XProfileLoader
  */
 
@@ -109 +110 @@
         global $bp;
 
+        $sub_nav = array();
+
         // Add 'Profile' to the main navigation
         $main_nav = array(

trunk/bp-xprofile/bp-xprofile-screens.php

@@ -1 +1 @@
 <?php
-/*******************************************************************************
+
+/**
+ * BuddyPress XProfile Screens
+ *
  * 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.
+ *
+ * @package BuddyPress
+ * @subpackage XProfileScreens
  */
 
@@ -46 +52 @@
     }
 
+    // No errors
+    $errors = false;
+
     // Check to see if any new information has been submitted
     if ( isset( $_POST['field_ids'] ) ) {
@@ -77 +86 @@
 
             $is_required[$field_id] = xprofile_check_is_required_field( $field_id );
-            if ( $is_required[$field_id] && empty( $_POST['field_' . $field_id] ) )
+            if ( $is_required[$field_id] && empty( $_POST['field_' . $field_id] ) ) {
                 $errors = true;
+            }
         }
 
@@ -87 +97 @@
         // No errors
         } else {
+
             // Reset the errors var
             $errors = false;
@@ -108 +119 @@
 
             // Set the feedback messages
-            if ( $errors )
+            if ( !empty( $errors ) )
                 bp_core_add_message( __( 'There was a problem updating some of your profile information, please try again.', 'buddypress' ), 'error' );
             else

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

@@ -1 +1 @@
 <?php
-/***************************************************************************
- * XProfile Data Display Template Tags
- **/
+
+/**
+ * BuddyPress XProfile Template Tags
+ *
+ * @package BuddyPress
+ * @subpackage XProfileTemplate
+ */
 
 // Exit if accessed directly
@@ -20 +24 @@
     var $in_the_loop;
     var $user_id;
-
-    function bp_xprofile_data_template( $user_id, $profile_group_id, $hide_empty_groups = false, $fetch_fields = false, $fetch_field_data = false, $exclude_groups = false, $exclude_fields = false, $hide_empty_fields = false ) {
-        $this->__construct( $user_id, $profile_group_id, $hide_empty_groups, $fetch_fields, $fetch_field_data, $exclude_groups, $exclude_fields, $hide_empty_fields );
-    }
 
     function __construct( $user_id, $profile_group_id, $hide_empty_groups = false, $fetch_fields = false, $fetch_field_data = false, $exclude_groups = false, $exclude_fields = false, $hide_empty_fields = false ) {
@@ -152 +152 @@
 
 function bp_has_profile( $args = '' ) {
-    global $bp, $profile_template;
+    global $profile_template;
 
     // Only show empty fields if we're on the Dashboard, or we're on a user's profile edit page,
@@ -411 +411 @@
         global $field;
 
+        // Generally a required dropdown field will not get a blank value at
+        // the top. Set 'null_on_required' to true if you want this blank value
+        // even on required fields.
         $defaults = array(
-            'type'         => false,
-            'null_on_required' => false // Generally, a required dropdown field will not
-                            // get a blank value at the top. Set to true if
-                            // you want this blank value even on
-                            // required fields
+            'type'             => false,
+            'null_on_required' => false 
         );
 
@@ -433 +433 @@
         switch ( $field->type ) {
             case 'selectbox':
-                if ( !$field->is_required || $null_on_required )
+
+                if ( !$field->is_required || $null_on_required ) {
                     $html .= '<option value="">' . /* translators: no option picked in select box */ __( '----', 'buddypress' ) . '</option>';
+                }
 
                 $original_option_values = '';
                 $original_option_values = maybe_unserialize( BP_XProfile_ProfileData::get_value_byid( $field->id ) );
 
-                if ( empty( $original_option_values ) && !empty( $_POST['field_' . $field->id] ) )
+                if ( empty( $original_option_values ) && !empty( $_POST['field_' . $field->id] ) ) {
                     $original_option_values = $_POST['field_' . $field->id];
+                }
 
                 $option_values = (array) $original_option_values;
 
                 for ( $k = 0, $count = count( $options ); $k < $count; ++$k ) {
+
                     // Check for updated posted values, but errors preventing them from being saved first time
                     foreach( $option_values as $i => $option_value ) {
                         if ( isset( $_POST['field_' . $field->id] ) && $_POST['field_' . $field->id] != $option_value ) {
-                            if ( !empty( $_POST['field_' . $field->id] ) )
+                            if ( !empty( $_POST['field_' . $field->id] ) ) {
                                 $option_values[$i] = $_POST['field_' . $field->id];
+                            }
                         }
                     }
+
                     $selected = '';
 
@@ -458 +464 @@
 
                     // First, check to see whether the user-entered value matches
-                    if ( in_array( $allowed_options, (array) $option_values ) )
+                    if ( in_array( $allowed_options, (array) $option_values ) ) {
                         $selected = ' selected="selected"';
+                    }
 
                     // Then, if the user has not provided a value, check for defaults
-                    if ( !is_array( $original_option_values ) && empty( $option_values ) && $options[$k]->is_default_option )
+                    if ( !is_array( $original_option_values ) && empty( $option_values ) && $options[$k]->is_default_option ) {
                         $selected = ' selected="selected"';
+                    }
 
                     $html .= apply_filters( 'bp_get_the_profile_field_options_select', '<option' . $selected . ' value="' . esc_attr( stripslashes( $options[$k]->name ) ) . '">' . esc_attr( stripslashes( $options[$k]->name ) ) . '</option>', $options[$k], $field->id, $selected, $k );
@@ -473 +481 @@
                 $original_option_values = maybe_unserialize( BP_XProfile_ProfileData::get_value_byid( $field->id ) );
 
-                if ( empty( $original_option_values ) && !empty( $_POST['field_' . $field->id] ) )
+                if ( empty( $original_option_values ) && !empty( $_POST['field_' . $field->id] ) ) {
                     $original_option_values = $_POST['field_' . $field->id];
+                }
 
                 $option_values = (array) $original_option_values;
 
                 for ( $k = 0, $count = count( $options ); $k < $count; ++$k ) {
+
                     // Check for updated posted values, but errors preventing them from being saved first time
                     foreach( $option_values as $i => $option_value ) {
                         if ( isset( $_POST['field_' . $field->id] ) && $_POST['field_' . $field->id][$i] != $option_value ) {
-                            if ( !empty( $_POST['field_' . $field->id][$i] ) )
+                            if ( !empty( $_POST['field_' . $field->id][$i] ) ) {
                                 $option_values[] = $_POST['field_' . $field->id][$i];
+                            }
                         }
                     }
@@ -492 +503 @@
 
                     // First, check to see whether the user-entered value matches
-                    if ( in_array( $allowed_options, (array) $option_values ) )
+                    if ( in_array( $allowed_options, (array) $option_values ) ) {
                         $selected = ' selected="selected"';
+                    }
 
                     // Then, if the user has not provided a value, check for defaults
-                    if ( !is_array( $original_option_values ) && empty( $option_values ) && $options[$k]->is_default_option )
+                    if ( !is_array( $original_option_values ) && empty( $option_values ) && !empty( $options[$k]->is_default_option ) ) {
                         $selected = ' selected="selected"';
+                    }
 
                     $html .= apply_filters( 'bp_get_the_profile_field_options_multiselect', '<option' . $selected . ' value="' . esc_attr( stripslashes( $options[$k]->name ) ) . '">' . esc_attr( stripslashes( $options[$k]->name ) ) . '</option>', $options[$k], $field->id, $selected, $k );
@@ -508 +521 @@
 
                 for ( $k = 0, $count = count( $options ); $k < $count; ++$k ) {
+
                     // Check for updated posted values, but errors preventing them from being saved first time
                     if ( isset( $_POST['field_' . $field->id] ) && $option_value != $_POST['field_' . $field->id] ) {
-                        if ( !empty( $_POST['field_' . $field->id] ) )
+                        if ( !empty( $_POST['field_' . $field->id] ) ) {
                             $option_value = $_POST['field_' . $field->id];
+                        }
                     }
 
@@ -517 +532 @@
                     // filter, so we'll be sure to get a match
                     $allowed_options = xprofile_sanitize_data_value_before_save( $options[$k]->name, false, false );
-
-                    $selected = '';
-                    if ( $option_value == $allowed_options || !empty( $value ) && $value == $allowed_options || ( empty( $option_value ) && $options[$k]->is_default_option ) )
+                    $selected        = '';
+
+                    // @todo $value is never created
+                    if ( $option_value == $allowed_options || !empty( $value ) && $value == $allowed_options || ( empty( $option_value ) && !empty( $options[$k]->is_default_option ) ) )
                         $selected = ' checked="checked"';
 
@@ -549 +565 @@
                         $allowed_options = xprofile_sanitize_data_value_before_save( $options[$k]->name, false, false );
 
+                        // @todo $value is never created
                         if ( $option_values[$j] == $allowed_options || @in_array( $allowed_options, $value ) ) {
                             $selected = ' checked="checked"';
@@ -557 +574 @@
                     // If the user has not yet supplied a value for this field,
                     // check to see whether there is a default value available
-                    if ( !is_array( $option_values ) && empty( $option_values ) && !$selected && $options[$k]->is_default_option) {
+                    if ( !is_array( $option_values ) && empty( $option_values ) && empty( $selected ) && !empty( $options[$k]->is_default_option ) ) {
                         $selected = ' checked="checked"';
                     }
@@ -574 +591 @@
 
                 if ( !empty( $date ) ) {
+
                     // If Unix timestamp
                     if ( is_numeric( $date ) ) {
@@ -588 +606 @@
                 }
 
-                // Check for updated posted values, but errors preventing them from being saved first time
+                // Check for updated posted values, and errors preventing
+                // them from being saved first time.
                 if ( !empty( $_POST['field_' . $field->id . '_day'] ) ) {
-                    if ( $day != $_POST['field_' . $field->id . '_day'] )
+                    if ( $day != $_POST['field_' . $field->id . '_day'] ) {
                         $day = $_POST['field_' . $field->id . '_day'];
+                    }
                 }
 
                 if ( !empty( $_POST['field_' . $field->id . '_month'] ) ) {
-                    if ( $month != $_POST['field_' . $field->id . '_month'] )
+                    if ( $month != $_POST['field_' . $field->id . '_month'] ) {
                         $month = $_POST['field_' . $field->id . '_month'];
+                    }
                 }
 
                 if ( !empty( $_POST['field_' . $field->id . '_year'] ) ) {
-                    if ( $year != date( "j", $_POST['field_' . $field->id . '_year'] ) )
+                    if ( $year != date( "j", $_POST['field_' . $field->id . '_year'] ) ) {
                         $year = $_POST['field_' . $field->id . '_year'];
-                }
-
+                    }
+                }
+
+                // $type will be passed by calling function when needed
                 switch ( $type ) {
                     case 'day':
@@ -689 +712 @@
 }
     function bp_get_profile_field_data( $args = '' ) {
-        global $bp;
 
         $defaults = array(
@@ -765 +787 @@
 
 function bp_profile_last_updated() {
-    global $bp;
 
     $last_updated = bp_get_profile_last_updated();
@@ -776 +797 @@
 }
     function bp_get_profile_last_updated() {
-        global $bp;
 
         $last_updated = bp_get_user_meta( bp_displayed_user_id(), 'profile_last_updated', true );
@@ -806 +826 @@
 
 function bp_get_user_has_avatar() {
-    global $bp;
 
     if ( !bp_core_fetch_avatar( array( 'item_id' => bp_displayed_user_id(), 'no_grav' => true ) ) )
@@ -828 +847 @@
     ) );
 }
+
 ?>