Changeset 2798

Timestamp:

03/03/2010 06:53:59 AM (16 years ago)

Author:

johnjamesjacoby

Message:

Allow xprofile field groups to be reordered. Also swept through xprofile files and cleaned up code formatting.

Location:

trunk

Files:

• bp-xprofile.php (modified) (10 diffs)
• bp-xprofile/admin/css/admin.css (modified) (1 diff)
• bp-xprofile/admin/js/admin.js (modified) (7 diffs)
• bp-xprofile/bp-xprofile-admin.php (modified) (5 diffs)
• bp-xprofile/bp-xprofile-classes.php (modified) (38 diffs)
• bp-xprofile/bp-xprofile-cssjs.php (modified) (1 diff)
• bp-xprofile/bp-xprofile-templatetags.php (modified) (5 diffs)

trunk/bp-xprofile.php

@@ -1 +1 @@
 <?php
-define ( 'BP_XPROFILE_DB_VERSION', '1850' );
+define ( 'BP_XPROFILE_DB_VERSION', '1950' );
 
 /* Define the slug for the component */
@@ -38 +38 @@
                           name varchar(150) NOT NULL,
                           description mediumtext NOT NULL,
+                          group_order bigint(20) NOT NULL DEFAULT '0',
                           can_delete tinyint(1) NOT NULL,
                           KEY can_delete (can_delete)
@@ -86 +87 @@
 
         require_once( ABSPATH . 'wp-admin/upgrade-functions.php' );
-        dbDelta($sql);
+        dbDelta( $sql );
 
         do_action( 'xprofile_install' );
@@ -153 +154 @@
 
         /* Add the administration tab under the "Site Admin" tab for site administrators */
-        add_submenu_page( 'bp-general-settings', __("Profile Field Setup", 'buddypress'), __("Profile Field Setup", 'buddypress'), 'manage_options', 'bp-profile-setup', "xprofile_admin" );
+        add_submenu_page( 'bp-general-settings', __( 'Profile Field Setup', 'buddypress' ), __( 'Profile Field Setup', 'buddypress' ), 'manage_options', 'bp-profile-setup', 'xprofile_admin' );
 
         /* Need to check db tables exist, activate hook no-worky in mu-plugins folder. */
@@ -215 +216 @@
         /* Don't show this menu to non site admins or if you're viewing your own profile */
         if ( !is_site_admin() || bp_is_my_profile() )
-                return false;
-        ?>
+                return false; ?>
+
         <li id="bp-adminbar-adminoptions-menu">
                 <a href=""><?php _e( 'Admin Options', 'buddypress' ) ?></a>
@@ -223 +224 @@
                         <li><a href="<?php echo $bp->displayed_user->domain . $bp->profile->slug ?>/edit/"><?php printf( __( "Edit %s's Profile", 'buddypress' ), attribute_escape( $bp->displayed_user->fullname ) ) ?></a></li>
                         <li><a href="<?php echo $bp->displayed_user->domain . $bp->profile->slug ?>/change-avatar/"><?php printf( __( "Edit %s's Avatar", 'buddypress' ), attribute_escape( $bp->displayed_user->fullname ) ) ?></a></li>
-
-                        <?php if ( !bp_core_is_user_spammer( $bp->displayed_user->id ) ) : ?>
-                                <li><a href="<?php echo wp_nonce_url( $bp->displayed_user->domain . 'admin/mark-spammer/', 'mark-unmark-spammer' ) ?>" class="confirm"><?php _e( "Mark as Spammer", 'buddypress' ) ?></a></li>
-                        <?php else : ?>
-                                <li><a href="<?php echo wp_nonce_url( $bp->displayed_user->domain . 'admin/unmark-spammer/', 'mark-unmark-spammer' ) ?>" class="confirm"><?php _e( "Not a Spammer", 'buddypress' ) ?></a></li>
-                        <?php endif; ?>
+<?php if ( !bp_core_is_user_spammer( $bp->displayed_user->id ) ) : ?>
+
+                        <li><a href="<?php echo wp_nonce_url( $bp->displayed_user->domain . 'admin/mark-spammer/', 'mark-unmark-spammer' ) ?>" class="confirm"><?php _e( "Mark as Spammer", 'buddypress' ) ?></a></li>
+<?php else : ?>
+
+                        <li><a href="<?php echo wp_nonce_url( $bp->displayed_user->domain . 'admin/unmark-spammer/', 'mark-unmark-spammer' ) ?>" class="confirm"><?php _e( "Not a Spammer", 'buddypress' ) ?></a></li>
+<?php endif; ?>
 
                         <li><a href="<?php echo wp_nonce_url( $bp->displayed_user->domain . 'admin/delete-user/', 'delete-user' ) ?>" class="confirm"><?php printf( __( "Delete %s", 'buddypress' ), attribute_escape( $bp->displayed_user->fullname ) ) ?></a></li>
-
-                        <?php do_action( 'xprofile_adminbar_menu_items' ) ?>
+<?php do_action( 'xprofile_adminbar_menu_items' ) ?>
+
                 </ul>
         </li>
-        <?php
+<?php
 }
 add_action( 'bp_adminbar_menus', 'xprofile_setup_adminbar_menu', 20 );
@@ -578 +580 @@
         $field_group = new BP_XProfile_Group( $field_group_id );
         return $field_group->delete();
+}
+
+function xprofile_update_field_group_position( $field_group_id, $position ) {
+        return BP_XProfile_Group::update_position( $field_group_id, $position );
 }
 
@@ -851 +857 @@
 
 function xprofile_update_field_position( $field_id, $position ) {
-        return BP_XProfile_Field::update_position( $field_id, $position);
+        return BP_XProfile_Field::update_position( $field_id, $position );
 }
 
@@ -953 +959 @@
         BP_XProfile_ProfileData::delete_data_for_user( $user_id );
 
-        // delete any avatar files.
+        /* delete any avatar files. */
         @unlink( get_usermeta( $user_id, 'bp_core_avatar_v1_path' ) );
         @unlink( get_usermeta( $user_id, 'bp_core_avatar_v2_path' ) );
 
-        // unset the usermeta for avatars from the usermeta table.
+        /* unset the usermeta for avatars from the usermeta table. */
         delete_usermeta( $user_id, 'bp_core_avatar_v1' );
         delete_usermeta( $user_id, 'bp_core_avatar_v1_path' );
@@ -995 +1001 @@
 }
 
-// List actions to clear object caches on
+/* List actions to clear object caches on */
 add_action( 'xprofile_groups_deleted_group', 'xprofile_clear_profile_groups_object_cache' );
 add_action( 'xprofile_groups_saved_group', 'xprofile_clear_profile_groups_object_cache' );
 add_action( 'xprofile_updated_profile', 'xprofile_clear_profile_data_object_cache' );
 
-// List actions to clear super cached pages on, if super cache is installed
+/* List actions to clear super cached pages on, if super cache is installed */
 add_action( 'xprofile_updated_profile', 'bp_core_clear_cache' );
 

trunk/bp-xprofile/admin/css/admin.css

@@ +1 @@
+
+div.sortable {
+        margin-bottom: 20px;
+}
+
+table.field-group {
+        margin-bottom: 20px;
+}
+table.field-group.ui-sortable-helper {
+        filter: alpha(opacity=50);
+        opacity: 0.5;
+}
+table.field-group.ui-sortable-placeholder {
+        border: 2px dashed #ddd;
+        visibility: visible !important;
+        margin-bottom: 22px;
+        background-color: transparent;
+}
+
+table.field-group thead tr.grabber {
+        cursor: move;
+}
+
 table.field-group tbody {
         cursor: move;

trunk/bp-xprofile/admin/js/admin.js

@@ -37 +37 @@
         
         toDeleteText = document.createTextNode('[x]');
+
         toDelete.setAttribute('href',"javascript:hide('" + forWhat + '_div' + theId + "')");
-        
         toDelete.setAttribute('class','delete');
-
         toDelete.appendChild(toDeleteText);
 
@@ -50 +49 @@
         newDiv.appendChild(toDelete);   
         holder.appendChild(newDiv);
-        
         
         theId++
@@ -62 +60 @@
         document.getElementById("checkbox").style.display = "none";
         
-        if(forWhat == "radio") {
+        if(forWhat == "radio")
                 document.getElementById("radio").style.display = "";
-        }
         
-        if(forWhat == "selectbox") {
+        if(forWhat == "selectbox")
                 document.getElementById("selectbox").style.display = "";                                                
-        }
         
-        if(forWhat == "multiselectbox") {
+        if(forWhat == "multiselectbox")
                 document.getElementById("multiselectbox").style.display = "";                                           
-        }
         
-        if(forWhat == "checkbox") {
+        if(forWhat == "checkbox")
                 document.getElementById("checkbox").style.display = "";                                         
-        }
 }
 
 function hide(id) {
-        if ( !document.getElementById(id) ) return false;
+        if ( !document.getElementById(id) ) return;
         
         document.getElementById(id).style.display = "none";
@@ -86 +80 @@
 }
 
-// Set up deleting options ajax
+/* Set up deleting options ajax */
 jQuery(document).ready( function() {
-        
         jQuery("a.ajax-option-delete").click( 
                 function() {
@@ -98 +91 @@
                                 'cookie': encodeURIComponent(document.cookie),
                                 '_wpnonce': jQuery("input#_wpnonce").val(),
-                                
                                 'option_id': theId
                         },
-                        function(response)
-                        {});
+                        function(response){});
                 }
-        );                              
+        );
 });
 
@@ -115 +106 @@
 
 jQuery(document).ready( function() {
+        jQuery("form#profile-field-form div#field-groups").sortable( {
+                cursor: 'move',
+                axis: 'y',
+                helper: fixHelper,
+                distance: 1,
+                cancel: 'table.nodrag',
+                update: function() {
+                        jQuery.post( ajaxurl, {
+                                action: 'xprofile_reorder_groups',
+                                'cookie': encodeURIComponent(document.cookie),
+                                '_wpnonce_reorder_groups': jQuery("input#_wpnonce_reorder_groups").val(),
+                                'group_order': jQuery(this).sortable('serialize')
+                        },
+                        function(response){});
+                }
+        });
+
         jQuery("table.field-group tbody").sortable( {
                 cursor: 'move',
@@ -126 +134 @@
                                 'cookie': encodeURIComponent(document.cookie),
                                 '_wpnonce_reorder_fields': jQuery("input#_wpnonce_reorder_fields").val(),
-                                
                                 'field_order': jQuery(this).sortable('serialize')
                         },
-                        function(response)
-                        {});
-
+                        function(response){});
                 }
         });

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

@@ -1 +1 @@
 <?php
-
 
 /**************************************************************************
@@ -16 +15 @@
         $groups = BP_XProfile_Group::get( array(
                 'fetch_fields' => true
-        ) );
-
-        if ( isset($_GET['mode']) && isset($_GET['group_id']) && 'add_field' == $_GET['mode'] ) {
-                xprofile_admin_manage_field($_GET['group_id']);
-        } else if ( isset($_GET['mode']) && isset($_GET['group_id']) && isset($_GET['field_id']) && 'edit_field' == $_GET['mode'] ) {
-                xprofile_admin_manage_field($_GET['group_id'], $_GET['field_id']);
-        } else if ( isset($_GET['mode']) && isset($_GET['field_id']) && 'delete_field' == $_GET['mode'] ) {
+        ));
+
+        if ( isset( $_GET['mode'] ) && isset( $_GET['group_id'] ) && 'add_field' == $_GET['mode'] )
+                xprofile_admin_manage_field( $_GET['group_id'] );
+
+        else if ( isset( $_GET['mode'] ) && isset( $_GET['group_id'] ) && isset( $_GET['field_id'] ) && 'edit_field' == $_GET['mode'] )
+                xprofile_admin_manage_field($_GET['group_id'], $_GET['field_id'] );
+
+        else if ( isset( $_GET['mode'] ) && isset( $_GET['field_id'] ) && 'delete_field' == $_GET['mode'] )
                 xprofile_admin_delete_field($_GET['field_id'], 'field');
-        } else if ( isset($_GET['mode']) && isset($_GET['option_id']) && 'delete_option' == $_GET['mode'] ) {
-                xprofile_admin_delete_field($_GET['option_id'], 'option');
-        } else if ( isset($_GET['mode']) && 'add_group' == $_GET['mode'] ) {
+
+        else if ( isset( $_GET['mode'] ) && isset( $_GET['option_id'] ) && 'delete_option' == $_GET['mode'] )
+                xprofile_admin_delete_field( $_GET['option_id'], 'option' );
+
+        else if ( isset( $_GET['mode'] ) && 'add_group' == $_GET['mode'] )
                 xprofile_admin_manage_group();
-        } else if ( isset($_GET['mode']) && isset($_GET['group_id']) && 'delete_group' == $_GET['mode'] ) {
-                xprofile_admin_delete_group($_GET['group_id']);
-        } else if ( isset($_GET['mode']) && isset($_GET['group_id']) && 'edit_group' == $_GET['mode'] ) {
-                xprofile_admin_manage_group($_GET['group_id']);
-        } else {
+
+        else if ( isset( $_GET['mode'] ) && isset( $_GET['group_id'] ) && 'delete_group' == $_GET['mode'] )
+                xprofile_admin_delete_group( $_GET['group_id'] );
+
+        else if ( isset( $_GET['mode'] ) && isset( $_GET['group_id'] ) && 'edit_group' == $_GET['mode'] )
+                xprofile_admin_manage_group( $_GET['group_id'] );
+
+        else {
 ?>
         <div class="wrap">
-
                 <h2><?php _e( 'Profile Field Setup', 'buddypress') ?></h2>
-                <br />
                 <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 _e('NOTE: Any fields in the first group will appear on the signup page.', 'buddypress'); ?></p>
 
                 <form action="" id="profile-field-form" method="post">
-
                         <?php wp_nonce_field( 'bp_reorder_fields', '_wpnonce_reorder_fields' ); ?>
 
-                        <?php
-                                if ( $message != '' ) {
-                                        $type = ( $type == 'error' ) ? 'error' : 'updated';
-                        ?>
+                        <?php wp_nonce_field( 'bp_reorder_groups', '_wpnonce_reorder_groups', false );
+
+                        if ( $message != '' ) :
+                                $type = ( $type == 'error' ) ? 'error' : 'updated';
+?>
+
                                 <div id="message" class="<?php echo $type; ?> fade">
                                         <p><?php echo wp_specialchars( attribute_escape( $message ) ); ?></p>
                                 </div>
-                        <?php }
-
-                        if ( $groups ) { ?>
-                                <?php
-                                for ( $i = 0; $i < count($groups); $i++ ) { // TODO: foreach
-                                ?>
-                                        <p>
-                                        <table id="group_<?php echo $groups[$i]->id;?>" class="widefat field-group">
-                                                <thead>
-                                                    <tr>
-                                                                <th scope="col" width="10">&nbsp;</th>
-                                                        <th scope="col" colspan="<?php if ( $groups[$i]->can_delete ) { ?>3<?php } else { ?>5<?php } ?>"><?php echo attribute_escape( $groups[$i]->name ); ?></th>
-                                                                <?php if ( $groups[$i]->can_delete ) { ?>
-                                                                        <th scope="col"><a class="edit" href="admin.php?page=bp-profile-setup&amp;mode=edit_group&amp;group_id=<?php echo attribute_escape( $groups[$i]->id ); ?>"><?php _e( 'Edit', 'buddypress' ) ?></a></th>
-                                                                <th scope="col"><a class="delete" href="admin.php?page=bp-profile-setup&amp;mode=delete_group&amp;group_id=<?php echo attribute_escape( $groups[$i]->id ); ?>"><?php _e( 'Delete', 'buddypress' ) ?></a></th>
-                                                                <?php } ?>
-                                                        </tr>
-                                                        <tr class="header">
-                                                                <td>&nbsp;</td>
-                                                        <td><?php _e( 'Field Name', 'buddypress' ) ?></td>
-                                                        <td width="14%"><?php _e( 'Field Type', 'buddypress' ) ?></td>
-                                                        <td width="6%"><?php _e( 'Required?', 'buddypress' ) ?></td>
-                                                        <td colspan="2" width="10%" style="text-align:center;"><?php _e( 'Action', 'buddypress' ) ?></td>
-                                                    </tr>
-                                                </thead>
-                                                <tbody id="the-list">
-
-                                                  <?php if ( $groups[$i]->fields ) { ?>
-
-                                                        <?php for ( $j = 0; $j < count($groups[$i]->fields); $j++ ) { ?>
-
-                                                                        <?php if ( 0 == $j % 2 ) { $class = ""; } else { $class = "alternate"; } ?>
-                                                                        <?php $field = new BP_XProfile_Field($groups[$i]->fields[$j]->id); ?>
-                                                                        <?php if ( !$field->can_delete ) { $class .= ' core'; } ?>
-
-                                                                        <tr id="field_<?php echo attribute_escape( $field->id ); ?>" class="sortable<?php if ( $class ) { echo ' ' . $class; } ?>">
-                                                                        <td width="10"><img src="<?php echo BP_PLUGIN_URL ?>/bp-xprofile/admin/images/move.gif" alt="<?php _e( 'Drag', 'buddypress' ) ?>" /></td>
-                                                                                <td><span title="<?php echo $field->description; ?>"><?php echo attribute_escape( $field->name ); ?> <?php if(!$field->can_delete) { ?> <?php _e( '(Core Field)', 'buddypress' ) ?><?php } ?></span></td>
-                                                                        <td><?php echo attribute_escape( $field->type ); ?></td>
-                                                                        <td style="text-align:center;"><?php if ( $field->is_required ) { echo '<img src="' . BP_PLUGIN_URL . '/bp-xprofile/admin/images/tick.gif" alt="' . __( 'Yes', 'buddypress' ) . '" />'; } else { ?>--<?php } ?></td>
-                                                                        <td style="text-align:center;"><?php if ( !$field->can_delete ) { ?><strike><?php _e( 'Edit', 'buddypress' ) ?></strike><?php } else { ?><a class="edit" href="admin.php?page=bp-profile-setup&amp;group_id=<?php echo attribute_escape( $groups[$i]->id ); ?>&amp;field_id=<?php echo attribute_escape( $field->id ); ?>&amp;mode=edit_field"><?php _e( 'Edit', 'buddypress' ) ?></a><?php } ?></td>
-                                                                        <td style="text-align:center;"><?php if ( !$field->can_delete ) { ?><strike><?php _e( 'Delete', 'buddypress' ) ?></strike><?php } else { ?><a class="delete" href="admin.php?page=bp-profile-setup&amp;field_id=<?php echo attribute_escape( $field->id ); ?>&amp;mode=delete_field"><?php _e( 'Delete', 'buddypress' ) ?></a><?php } ?></td>
-                                                                    </tr>
-
-                                                                <?php } ?>
-
-                                                        <?php } else { ?>
-
+<?php           endif; ?>
+
+                        <div id="field-groups">
+<?php
+                        if ( $groups ) :
+                                foreach ( $groups as $group ) { ?>
+
+                                                <table id="group_<?php echo $group->id;?>" class="widefat field-group sortable">
+                                                        <thead>
+                                                                <tr class="grabber">
+                                                                        <th scope="col" width="10">&nbsp;</th>
+                                                                        <th scope="col" colspan="<?php if ( $group->can_delete ) { ?>3<?php } else { ?>5<?php } ?>"><?php echo attribute_escape( $group->name ); ?></th>
+<?php
+                                                                        if ( $group->can_delete ) :
+?>
+                                                                                <th scope="col"><a class="edit" href="admin.php?page=bp-profile-setup&amp;mode=edit_group&amp;group_id=<?php echo attribute_escape( $group->id ); ?>"><?php _e( 'Edit', 'buddypress' ) ?></a></th>
+                                                                        <th scope="col"><a class="delete" href="admin.php?page=bp-profile-setup&amp;mode=delete_group&amp;group_id=<?php echo attribute_escape( $group->id ); ?>"><?php _e( 'Delete', 'buddypress' ) ?></a></th>
+<?php 
+                                                                        endif;
+?>
+
+                                                                </tr>
+                                                                <tr class="header">
+                                                                        <td>&nbsp;</td>
+                                                                        <td><?php _e( 'Field Name', 'buddypress' ) ?></td>
+                                                                        <td width="14%"><?php _e( 'Field Type', 'buddypress' ) ?></td>
+                                                                        <td width="6%"><?php _e( 'Required?', 'buddypress' ) ?></td>
+                                                                        <td colspan="2" width="10%" style="text-align:center;"><?php _e( 'Action', 'buddypress' ) ?></td>
+                                                                </tr>
+                                                        </thead>
+
+                                                        <tfoot>
                                                                 <tr class="nodrag">
-                                                                        <td colspan="6"><?php _e( 'There are no fields in this group.', 'buddypress' ) ?></td>
+                                                                        <td colspan="6"><a href="admin.php?page=bp-profile-setup&amp;group_id=<?php echo attribute_escape( $group->id ); ?>&amp;mode=add_field"><?php _e( 'Add New Field', 'buddypress' ) ?></a></td>
                                                                 </tr>
-
-                                                        <?php } ?>
-
-                                                </tbody>
-
-                                                <tfoot>
-
-                                                                <tr class="nodrag">
-                                                                        <td colspan="6"><a href="admin.php?page=bp-profile-setup&amp;group_id=<?php echo attribute_escape( $groups[$i]->id ); ?>&amp;mode=add_field"><?php _e( 'Add New Field', 'buddypress' ) ?></a></td>
-                                                                </tr>
-
-                                                </tfoot>
-
-                                        </table>
-                                        </p>
-
-                                <?php } /* End For */ ?>
-
+                                                        </tfoot>
+
+                                                        <tbody id="the-list">
+ <?php 
+                                                                if ( $group->fields ) :
+                                                                        foreach ( $group->fields as $field ) {
+                                                                                if ( 0 == $j % 2 )
+                                                                                        $class = '';
+                                                                                else
+                                                                                        $class = 'alternate';
+
+                                                                                $field = new BP_XProfile_Field( $field->id );
+                                                                                if ( !$field->can_delete )
+                                                                                        $class .= ' core';
+?>
+
+                                                                                <tr id="field_<?php echo attribute_escape( $field->id ); ?>" class="sortable<?php if ( $class ) { echo ' ' . $class; } ?>">
+                                                                                        <td width="10"><img src="<?php echo BP_PLUGIN_URL ?>/bp-xprofile/admin/images/move.gif" alt="<?php _e( 'Drag', 'buddypress' ) ?>" /></td>
+                                                                                        <td><span title="<?php echo $field->description; ?>"><?php echo attribute_escape( $field->name ); ?> <?php if(!$field->can_delete) { ?> <?php _e( '(Core Field)', 'buddypress' ) ?><?php } ?></span></td>
+                                                                                        <td><?php echo attribute_escape( $field->type ); ?></td>
+                                                                                        <td style="text-align:center;"><?php if ( $field->is_required ) { echo '<img src="' . BP_PLUGIN_URL . '/bp-xprofile/admin/images/tick.gif" alt="' . __( 'Yes', 'buddypress' ) . '" />'; } else { ?>--<?php } ?></td>
+                                                                                        <td style="text-align:center;"><?php if ( !$field->can_delete ) { ?><strike><?php _e( 'Edit', 'buddypress' ) ?></strike><?php } else { ?><a class="edit" href="admin.php?page=bp-profile-setup&amp;group_id=<?php echo attribute_escape( $group->id ); ?>&amp;field_id=<?php echo attribute_escape( $field->id ); ?>&amp;mode=edit_field"><?php _e( 'Edit', 'buddypress' ) ?></a><?php } ?></td>
+                                                                                        <td style="text-align:center;"><?php if ( !$field->can_delete ) { ?><strike><?php _e( 'Delete', 'buddypress' ) ?></strike><?php } else { ?><a class="delete" href="admin.php?page=bp-profile-setup&amp;field_id=<?php echo attribute_escape( $field->id ); ?>&amp;mode=delete_field"><?php _e( 'Delete', 'buddypress' ) ?></a><?php } ?></td>
+                                                                                </tr>
+<?php
+                                                                        } /* end for */
+
+                                                                else : /* !$group->fields */
+?>
+
+                                                                        <tr class="nodrag">
+                                                                                <td colspan="6"><?php _e( 'There are no fields in this group.', 'buddypress' ) ?></td>
+                                                                        </tr>
+<?php
+                                                                endif; /* end $group->fields */
+?>
+
+                                                        </tbody>
+                                                </table>
+<?php
+                                } /* End For */ ?>
+                                        </div>
                                         <p>
                                                 <a class="button" href="admin.php?page=bp-profile-setup&amp;mode=add_group"><?php _e( 'Add New Field Group', 'buddypress' ) ?></a>
                                         </p>
-
-                        <?php } else { ?>
+<?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 } ?>
+<?php
+                                endif;
+?>
 
                 </form>
-
         </div>
 <?php
         }
 }
-
 
 /**************************************************************************
@@ -184 +199 @@
         global $message, $type;
 
-        $group = new BP_XProfile_Group($group_id);
+        $group = new BP_XProfile_Group( $group_id );
 
         if ( !$group->delete() ) {
-                $message = __('There was an error deleting the group. Please try again', 'buddypress');
+                $message = __( 'There was an error deleting the group. Please try again', 'buddypress' );
                 $type = 'error';
         } else {
-                $message = __('The group was deleted successfully.', 'buddypress');
+                $message = __( 'The group was deleted successfully.', 'buddypress' );
                 $type = 'success';
 
@@ -196 +211 @@
         }
 
-        unset($_GET['mode']); // TODO: wtf?
+        unset( $_GET['mode'] ); /* TODO: wtf? */
         xprofile_admin( $message, $type );
 }
@@ -293 +308 @@
                 return false;
 
-        parse_str($_POST['field_order'], $order );
-
-        foreach ( (array) $order['field'] as $position => $field_id ) {
+        parse_str( $_POST['field_order'], $order );
+
+        foreach ( (array) $order['field'] as $position => $field_id )
                 xprofile_update_field_position( (int) $field_id, (int) $position );
-        }
+
 }
 add_action( 'wp_ajax_xprofile_reorder_fields', 'xprofile_ajax_reorder_fields' );
+
+function xprofile_ajax_reorder_field_groups() {
+        global $bp;
+
+        /* Check the nonce */
+        check_admin_referer( 'bp_reorder_groups', '_wpnonce_reorder_groups' );
+
+        if ( empty( $_POST['group_order'] ) )
+                return false;
+
+        parse_str( $_POST['group_order'], $order );
+
+        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' );

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

@@ -61 +61 @@
                         return false;
 
-                $sql = $wpdb->prepare( "DELETE FROM {$bp->profile->table_name_groups} WHERE id = %d", $this->id );
-
-                if ( !$wpdb->query($sql) ) {
-                        return false;
-                } else {
-                        // Now the group is deleted, remove the group's fields.
-                        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++ ) {
-                                        BP_XProfile_ProfileData::delete_for_field($this->fields[$i]->id);
-                                }
+                /* 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. */
+                        if ( BP_XProfile_Field::delete_for_group( $this->id ) ) {
+                                /* Remove profile data for the groups fields */
+                                foreach ( $this->fields as $field )
+                                        BP_XProfile_ProfileData::delete_for_field( $field->id );
+
                         }
 
@@ -98 +97 @@
 
                 if ( $hide_empty_groups )
-                        $groups = $wpdb->get_results( $wpdb->prepare( "SELECT DISTINCT g.* FROM {$bp->profile->table_name_groups} g INNER JOIN {$bp->profile->table_name_fields} f ON g.id = f.group_id {$group_id_sql} ORDER BY g.id ASC" ) );
+                        $groups = $wpdb->get_results( $wpdb->prepare( "SELECT DISTINCT g.* FROM {$bp->profile->table_name_groups} g INNER JOIN {$bp->profile->table_name_fields} f ON g.id = f.group_id {$group_id_sql} ORDER BY g.group_order ASC" ) );
                 else
-                        $groups = $wpdb->get_results( $wpdb->prepare( "SELECT DISTINCT g.* FROM {$bp->profile->table_name_groups} g {$group_id_sql} ORDER BY g.id ASC" ) );
+                        $groups = $wpdb->get_results( $wpdb->prepare( "SELECT DISTINCT g.* FROM {$bp->profile->table_name_groups} g {$group_id_sql} ORDER BY g.group_order ASC" ) );
 
                 if ( !$fetch_fields )
@@ -154 +153 @@
                 global $message;
 
-                // Validate Form
+                /* Validate Form */
                 if ( empty( $_POST['group_name'] ) ) {
                         $message = __('Please make sure you give the group a name.', 'buddypress');
@@ -163 +162 @@
         }
 
-        // ADMIN AREA HTML. TODO: Get this out of here.
+        function update_position( $field_group_id, $position ) {
+                global $wpdb, $bp;
+
+                if ( !is_numeric( $position ) )
+                        return false;
+
+                return $wpdb->query( $wpdb->prepare( "UPDATE {$bp->profile->table_name_groups} SET group_order = %d WHERE id = %d", $position, $field_group_id ) );
+        }
+
+        /* ADMIN AREA HTML. TODO: Get this out of here. */
 
         function render_admin_form() {
@@ -175 +183 @@
                         $action = "admin.php?page=bp-profile-setup&amp;mode=edit_group&amp;group_id=" . $this->id;
                 }
-        ?>
+?>
                 <div class="wrap">
 
@@ -206 +214 @@
                 </div>
 
-                <?php
+<?php
         }
 }
@@ -230 +238 @@
 
         function bp_xprofile_field( $id = null, $user_id = null, $get_data = true ) {
-                if ( $id ) {
+                if ( $id )
                         $this->populate( $id, $user_id, $get_data );
-                }
         }
 
@@ -238 +245 @@
                 global $wpdb, $userdata, $bp;
 
-                if ( is_null($user_id) ) {
+                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) ) {
+                if ( $field = $wpdb->get_row( $sql ) ) {
                         $this->id = $field->id;
                         $this->group_id = $field->group_id;
@@ -258 +264 @@
                         $this->is_default_option = $field->is_default_option;
 
-                        if ( $get_data ) {
+                        if ( $get_data )
                                 $this->data = $this->get_field_data($user_id);
-                        }
+
                 }
         }
@@ -268 +274 @@
 
                 if ( !$this->id ||
-                        // Prevent deletion by url when can_delete is false.
+                        /* Prevent deletion by url when can_delete is false. */
                         !$this->can_delete ||
-                        // Prevent deletion of option 1 since this invalidates fields with options.
+                        /* Prevent deletion of option 1 since this invalidates fields with options. */
                         ( $this->parent_id && $this->option_order == 1 ) )
                         return false;
@@ -277 +283 @@
                         return false;
 
-                // delete the data in the DB for this field
-                BP_XProfile_ProfileData::delete_for_field($this->id);
+                /* delete the data in the DB for this field */
+                BP_XProfile_ProfileData::delete_for_field( $this->id );
 
                 return true;
@@ -300 +306 @@
 
                 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);
+                        $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
-                        $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, 0, %s, %s, %s, %d, %s, %d )", $this->group_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 ) {
+                        $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, 0, %s, %s, %s, %d, %s, %d )", $this->group_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 )
@@ -313 +321 @@
                                 $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.
-                                // This stops orphan options if the user changes a
-                                // field from a radio button field to a text box.
+                                /*
+                                 * Remove any radio or dropdown options for this
+                                 * 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.
+                                 */
                                 $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.
+                        /*
+                         * 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 ( $this->id )
                                         $parent_id = $this->id;
-                                } else {
+                                else
                                         $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'];
@@ -358 +365 @@
                                                 $is_default = 0;
 
-                                                if ( is_array($defaults) ) {
-                                                        if ( isset($defaults[$option_key]) )
+                                                if ( is_array( $defaults ) ) {
+                                                        if ( isset( $defaults[$option_key] ) )
                                                                 $is_default = 1;
                                                 } else {
@@ -367 +374 @@
 
                                                 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;
                                                 }
@@ -387 +394 @@
         }
 
-        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 ) {
+        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 )
                         $sort_sql = 'ORDER BY name ASC';
-                } else if ( 'desc' == $this->order_by && !$for_editing ) {
+                else if ( 'desc' == $this->order_by && !$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 ) {
+
+                /* This eliminates a problem with getting all fields when there is no id for the object */
+                if ( !$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 );
@@ -426 +431 @@
         }
 
-        // Static Functions
+        /* Static Functions */
 
         function get_type( $field_id ) {
@@ -434 +439 @@
                         $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;
 
@@ -449 +454 @@
                         $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;
@@ -477 +481 @@
         }
 
-        // ADMIN AREA HTML. TODO: Get this out of here.
-
+        /* ADMIN AREA HTML. TODO: Get this out of here. */
+
+        /* This function populates the items for radio buttons checkboxes and drop down boxes */
         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' );
 
@@ -486 +490 @@
                         $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;">
                                 <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>
@@ -501 +503 @@
                                                 <option value="desc" <?php if ( 'desc' == $this->order_by ) {?> selected="selected"<?php } ?>><?php _e( 'Name - Descending', 'buddypress' ) ?></option>
                                         </select>
-
-                                <?php
+<?php
                                 if ( !$options = $this->get_children(true) ) {
                                         $i = 1;
@@ -520 +521 @@
                                 }
 
-                                if ( !empty($options) ) {
+                                if ( !empty( $options ) ) {
                                         for ( $i = 0; $i < count($options); $i++ ) {
                                                 $j = $i + 1;
@@ -526 +527 @@
                                                 if ( 'multiselectbox' == $type || 'checkbox' == $type )
                                                         $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 attribute_escape( $options[$i]->name ) ?>" />
@@ -533 +534 @@
                                                                 $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>
                                                 </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 ?>" />
 
@@ -546 +547 @@
                                         <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>
                                 <p><a href="javascript:add_option('<?php echo $type ?>')"><?php _e('Add Another Option', 'buddypress') ?></a></p>
@@ -556 +557 @@
         function render_admin_form( $message = '' ) {
                 if ( !$this->id ) {
-                        $title = __('Add Field', 'buddypress');
-                        $action = "admin.php?page=bp-profile-setup&amp;group_id=" . $this->group_id . "&amp;mode=add_field";
+                        $title                          = __('Add Field', 'buddypress');
+                        $action                         = "admin.php?page=bp-profile-setup&amp;group_id=" . $this->group_id . "&amp;mode=add_field";
 
                         $this->name                     = $_POST['title'];
@@ -565 +566 @@
                         $this->order_by         = $_POST["sort_order_{$this->type}"];
                 } 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;
+                        $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;
                 }
         ?>
@@ -623 +624 @@
 
                                 <p class="submit">
-                                                &nbsp;<input type="submit" value="<?php _e("Save", 'buddypress') ?> &rarr;" 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>
+                                        &nbsp;<input type="submit" value="<?php _e("Save", 'buddypress') ?> &rarr;" 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>
+
                         <div class="clear"></div>
 
-                        <?php if ( function_exists('wp_nonce_field') )
-                                wp_nonce_field('xprofile_delete_option');
-                        ?>
+                        <?php if ( function_exists( 'wp_nonce_field' ) ) wp_nonce_field( 'xprofile_delete_option' ); ?>
 
                 </form>
         </div>
 
-        <?php
+<?php
         }
 
@@ -642 +643 @@
                 global $message;
 
-                // Validate Form
+                /* Validate Form */
                 if ( '' == $_POST['title'] || '' == $_POST['required'] || '' == $_POST['fieldtype'] ) {
-                        $message = __('Please make sure you fill out all required fields.', 'buddypress');
+                        $message = __( 'Please make sure you fill out all required fields.', 'buddypress' );
                         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');
+                        $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');
+                        $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');
+                        $message = __( 'Checkbox field types require at least one option. Please add options below.', 'buddypress' );
                         return false;
                 } else {
@@ -673 +674 @@
 
         function bp_xprofile_profiledata( $field_id = null, $user_id = null ) {
-                if ( $field_id ) {
+                if ( $field_id )
                         $this->populate( $field_id, $user_id );
-                }
         }
 
@@ -683 +683 @@
                 $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) ) {
-
+                if ( $profiledata = $wpdb->get_row( $sql ) ) {
                         $this->id = $profiledata->id;
                         $this->user_id = $profiledata->user_id;
@@ -696 +695 @@
                 global $wpdb, $bp;
 
-                // check to see if there is data already for the user.
+                /* 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) )
+                if ( !$wpdb->get_row( $sql ) )
                         return false;
 
@@ -708 +707 @@
                 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) )
+                /* 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;
 
@@ -728 +727 @@
 
                 if ( $this->is_valid_field() ) {
-                        if ( $this->exists() && !empty( $this->value ) && strlen( trim( $this->value ) ) ) {
+                        if ( $this->exists() && !empty( $this->value ) && strlen( trim( $this->value ) ) )
                                 $result = $wpdb->query( $wpdb->prepare( "UPDATE {$bp->profile->table_name_data} SET value = %s, last_updated = %s WHERE user_id = %d AND field_id = %d", $this->value, $this->last_updated, $this->user_id, $this->field_id ) );
-                        } else if ( $this->exists() && empty( $this->value ) ) {
-                                // Data removed, delete the entry.
+
+                        /* Data removed, delete the entry. */
+                        else if ( $this->exists() && empty( $this->value ) )
                                 $result = $this->delete();
-                        } else {
+
+                        else
                                 $result = $wpdb->query( $wpdb->prepare("INSERT INTO {$bp->profile->table_name_data} (user_id, field_id, value, last_updated) VALUES (%d, %d, %s, %s)", $this->user_id, $this->field_id, $this->value, $this->last_updated ) );
-                        }
 
                         if ( !$result )
@@ -800 +800 @@
                         $user_ids = implode( ',', (array)$user_ids );
                         $data = $wpdb->get_results( $wpdb->prepare( "SELECT user_id, value FROM {$bp->profile->table_name_data} WHERE field_id = %d AND user_id IN ({$user_ids})", $field_id ) );
-                } else
+                } else {
                         $data = $wpdb->get_var( $wpdb->prepare( "SELECT value FROM {$bp->profile->table_name_data} WHERE field_id = %d AND user_id = %d", $field_id, $user_ids ) );
+                }
 
                 return $data;
@@ -835 +836 @@
                 $sql = $wpdb->prepare( "SELECT d.value, f.name FROM {$bp->profile->table_name_data} d, {$bp->profile->table_name_fields} f WHERE d.field_id = f.id AND d.user_id = %d AND f.parent_id = 0 $field_sql", $user_id );
 
-                if ( !$values = $wpdb->get_results($sql) )
+                if ( !$values = $wpdb->get_results( $sql ) )
                         return false;
 
                 $new_values = array();
 
-                if ( is_array($fields) ) {
-                        for ( $i = 0; $i < count($values); $i++ ) {
-                                for ( $j = 0; $j < count($fields); $j++ ) {
+                if ( is_array( $fields ) ) {
+                        for ( $i = 0; $i < count( $values ); $i++ ) {
+                                for ( $j = 0; $j < count( $fields ); $j++ ) {
                                         if ( $values[$i]->name == $fields[$j] ) {
                                                 $new_values[$fields[$j]] = $values[$i]->value;
@@ -900 +901 @@
         }
 }
+
 ?>

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

@@ -8 +8 @@
 function xprofile_add_admin_js() {
         if ( strpos( $_GET['page'], 'bp-profile-setup' ) !== false ) {
-                wp_enqueue_script( array( "jquery-ui-sortable" ) );
-                wp_enqueue_script( 'xprofile-admin-js', BP_PLUGIN_URL . '/bp-xprofile/admin/js/admin.js', array( 'jquery' ) );
+                wp_enqueue_script( 'jquery-ui-sortable' );
+                wp_enqueue_script( 'xprofile-admin-js', BP_PLUGIN_URL . '/bp-xprofile/admin/js/admin.js', array( 'jquery', 'jquery-ui-sortable' ) );
         }
 }

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

@@ -61 +61 @@
                 } elseif ( $this->current_group + 1 == $this->group_count ) {
                         do_action('xprofile_template_loop_end');
-                        // Do some cleaning up after the loop
+                        /* Do some cleaning up after the loop */
                         $this->rewind_groups();
                 }
@@ -75 +75 @@
                 $group = $this->next_group();
 
-                if ( 0 == $this->current_group ) // loop has just started
+                if ( 0 == $this->current_group ) /* loop has just started */
                         do_action('xprofile_template_loop_start');
         }
@@ -116 +116 @@
                         return true;
                 } elseif ( $this->current_field + 1 == $this->field_count ) {
-                        // Do some cleaning up after the loop
+                        /* Do some cleaning up after the loop */
                         $this->rewind_fields();
                 }
@@ -547 +547 @@
         function bp_get_profile_field_data( $args = '' ) {
                 $defaults = array(
-                        'field' => false, // Field name or ID.
+                        'field' => false, /* Field name or ID. */
                         'user_id' => $bp->displayed_user->id
-                        );
+                );
 
                 $r = wp_parse_args( $args, $defaults );
@@ -657 +657 @@
                         $profile_group_id = 1;
 
-                return apply_filters( 'bp_get_current_profile_group_id', $profile_group_id ); // admin/profile/edit/[group-id]
+                /* admin/profile/edit/[group-id] */
+                return apply_filters( 'bp_get_current_profile_group_id', $profile_group_id ); 
         }