Ticket #6347: 6347.alt.2.patch

src/bp-core/admin/bp-core-admin-functions.php

@@ -586 +586 @@
                         break;
 
                 case 'bp-profile-overview':
-                        $retval = __( 'Your users will distinguish themselves through their profile page. Create relevant profile fields that will show on each users profile.', 'buddypress' ) . '<br /><br />' . __( 'Note: Any fields in the first group will appear on the signup page.', 'buddypress' );
+                        $retval = __( 'Your users will distinguish themselves through their profile page. Create relevant profile fields that will show on each users profile.', 'buddypress' ) . '<br /><br />' . __( 'Note: Drag fields from other groups and drop them on the "Signup Fields" tab to include them into your registration form.', 'buddypress' );
                         break;
 
                 default:

src/bp-core/admin/bp-core-admin-schema.php

@@ -389 +389 @@
                 // Make sure the custom visibility is disabled for the default field.
                 if ( ! $wpdb->get_var( "SELECT id FROM {$bp_prefix}bp_xprofile_meta WHERE id = 1" ) ) {
                         $insert_sql[] = "INSERT INTO {$bp_prefix}bp_xprofile_meta ( object_id, object_type, meta_key, meta_value ) VALUES ( 1, 'field', 'allow_custom_visibility', 'disabled' );";
+                        $insert_sql[] = "INSERT INTO {$bp_prefix}bp_xprofile_meta ( object_id, object_type, meta_key, meta_value ) VALUES ( 1, 'field', 'signup_position', 1 );";
                 }
         }
 

src/bp-core/bp-core-update.php

@@ -598 +598 @@
  * 8.0.0 update routine.
  *
  * - Edit the `new_avatar` activity type's component to `members`.
+ * - Upgrade Primary xProfile Group's fields to signup fields.
  *
  * @since 8.0.0
  */
@@ -621 +622 @@
                         '%s',
                 )
         );
+
+        if ( bp_get_signup_allowed() ) {
+                // Get the Primary Group's fields.
+                $signup_fields = $wpdb->get_col( "SELECT id FROM {$bp_prefix}bp_xprofile_fields WHERE group_id = 1 ORDER BY field_order ASC" );
+
+                // Migrate potential signup fields.
+                if ( $signup_fields ) {
+                        $signup_position = 0;
+                        foreach ( $signup_fields as $signup_field_id ) {
+                                $signup_position += 1;
+
+                                $wpdb->insert(
+                                        $bp_prefix . 'bp_xprofile_meta',
+                                        array(
+                                                'object_id'   => $signup_field_id,
+                                                'object_type' => 'field',
+                                                'meta_key'    => 'signup_position',
+                                                'meta_value'  => $signup_position,
+                                        ),
+                                        array(
+                                                '%d',
+                                                '%s',
+                                                '%s',
+                                                '%d',
+                                        )
+                                );
+                        }
+                }
+        }
 }
 
 /**

src/bp-templates/bp-legacy/buddypress/members/register.php

@@ -165 +165 @@
                                         <h2><?php _e( 'Profile Details', 'buddypress' ); ?></h2>
 
                                         <?php /* Use the profile field loop to render input fields for the 'base' profile field group */ ?>
-                                        <?php if ( bp_is_active( 'xprofile' ) ) : if ( bp_has_profile( array( 'profile_group_id' => 1, 'fetch_field_data' => false ) ) ) : while ( bp_profile_groups() ) : bp_the_profile_group(); ?>
+                                        <?php if ( bp_is_active( 'xprofile' ) ) : if ( bp_has_profile( bp_xprofile_signup_args() ) ) : while ( bp_profile_groups() ) : bp_the_profile_group(); ?>
 
                                         <?php while ( bp_profile_fields() ) : bp_the_profile_field(); ?>
 

src/bp-templates/bp-nouveau/buddypress/members/register.php

@@ -3 +3 @@
  * BuddyPress - Members/Blogs Registration forms
  *
  * @since 3.0.0
- * @version 4.0.0
+ * @version 8.0.0
  */
 
 ?>
@@ -38 +38 @@
 
                                 <?php /***** Extra Profile Details ******/ ?>
 
-                                <?php if ( bp_is_active( 'xprofile' ) && bp_nouveau_base_account_has_xprofile() ) : ?>
+                                <?php if ( bp_is_active( 'xprofile' ) && bp_nouveau_has_signup_xprofile_fields( true ) ) : ?>
 
                                         <?php bp_nouveau_signup_hook( 'before', 'signup_profile' ); ?>
 

src/bp-templates/bp-nouveau/includes/template-tags.php

@@ -1515 +1515 @@
                 }
 
                 // Provide a class token to acknowledge additional extended profile fields added to default account reg screen
-                if ( 'register' === bp_current_component() && bp_is_active( 'xprofile' ) && bp_nouveau_base_account_has_xprofile()) {
+                if ( 'register' === bp_current_component() && bp_is_active( 'xprofile' ) && bp_nouveau_has_signup_xprofile_fields()) {
                         $classes[] = 'extended-default-reg';
                 }
 

src/bp-templates/bp-nouveau/includes/xprofile/template-tags.php

@@ -3 +3 @@
  * xProfile Template tags
  *
  * @since 3.0.0
- * @version 3.0.0
+ * @version 8.0.0
  */
 
 // Exit if accessed directly.
@@ -62 +62 @@
  * profile fields added to it for the registration screen.
  *
  * @since 3.0.0
+ * @deprecated 8.0.0
  */
 function bp_nouveau_base_account_has_xprofile() {
-        return (bool) bp_has_profile(
-                array(
-                        'profile_group_id' => 1,
-                        'fetch_field_data' => false,
-                )
-        );
+        _deprecated_function( __FUNCTION__, '8.0.0', 'bp_nouveau_has_signup_xprofile_fields()' );
+        return bp_nouveau_has_signup_xprofile_fields();
+}
+
+/**
+ * Checks whether there are signup profile fields to display.
+ *
+ * @since 8.0.0
+ *
+ * @param bool Whether to init an xProfile loop.
+ * @return bool True if there are signup profile fields to display. False otherwise.
+ */
+function bp_nouveau_has_signup_xprofile_fields( $do_loop = false ) {
+        $signup_fields = (array) bp_xprofile_get_signup_field_ids();
+
+        if ( ! $do_loop ) {
+                return 1 <= count( $signup_fields );
+        }
+
+        return bp_has_profile( bp_xprofile_signup_args() );
 }

src/bp-xprofile/admin/css/admin.css

@@ -62 +62 @@
         color: #000;
 }
 
+li#signup-group a:focus {
+        box-shadow: none;
+}
+
 /* Toolbar */
 .tab-toolbar {
         clear: left;

src/bp-xprofile/admin/js/admin.js

@@ -96 +96 @@
         }
 
         // Show/hides metaboxes according to selected field type supports.
-        jQuery( '#field-type-visibiliy-metabox, #field-type-required-metabox, #field-type-autolink-metabox, #field-type-member-types' ).show();
+        jQuery( '#field-type-visibiliy-metabox, #field-type-required-metabox, #field-type-autolink-metabox, #field-type-member-types, #field-signup-position-metabox' ).show();
         if ( -1 !== XProfileAdmin.hide_required_metabox.indexOf( forWhat ) ) {
                 jQuery( '#field-type-required-metabox' ).hide();
         }
 
+        if ( -1 !== XProfileAdmin.hide_signup_position_metabox.indexOf( forWhat ) ) {
+                jQuery( '#field-signup-position-metabox' ).hide();
+        }
+
         if ( -1 !== XProfileAdmin.hide_allow_custom_visibility_metabox.indexOf( forWhat ) ) {
                 jQuery( '#field-type-visibiliy-metabox' ).hide();
         }
@@ -207 +211 @@
 }
 
 jQuery( function() {
+        var isMovingToSignups = false;
 
         // Set focus in Field Title, if we're on the right page.
         jQuery( '#bp-xprofile-add-field #title' ).trigger( 'focus' );
@@ -248 +253 @@
                 cursor: 'move',
                 axis: 'x',
                 opacity: 1,
-                items: 'li',
+                items: 'li:not(.not-sortable)',
                 tolerance: 'intersect',
 
                 update: function() {
@@ -270 +275 @@
                 tolerance: 'pointer',
 
                 update: function() {
+                        if ( isMovingToSignups ) {
+                                return false;
+                        }
+
                         jQuery.post( ajaxurl, {
                                 action: 'xprofile_reorder_fields',
                                 'cookie': encodeURIComponent(document.cookie),
@@ -348 +357 @@
                         // When field is dropped on tab.
                         drop: function( ev, ui ) {
                                 var $item = jQuery(this), // The tab
-                                        $list = jQuery( $item.find( 'a' ).attr( 'href' ) ).find( '.connectedSortable' ); // The tab body
+                                        $list = jQuery( $item.find( 'a' ).attr( 'href' ) ).find( '.connectedSortable' ), // The tab body
+                                        dropInGroup = function( fieldId ) {
+                                                var fieldOrder, postData = {
+                                                        action: 'xprofile_reorder_fields',
+                                                        'cookie': encodeURIComponent(document.cookie),
+                                                        '_wpnonce_reorder_fields': jQuery( 'input#_wpnonce_reorder_fields' ).val(),
+                                                };
+
+                                                // Select new tab as current.
+                                                $tabs.tabs( 'option', 'active', $tab_items.index( $item ) );
+
+                                                // Refresh $list variable.
+                                                $list = jQuery( $item.find( 'a' ).attr( 'href' ) ).find( '.connectedSortable' );
+                                                jQuery($list).find( 'p.nofields' ).hide( 'slow' );
+
+                                                jQuery.extend( postData, {
+                                                        'field_group_id': jQuery( $list ).attr( 'id' ),
+                                                        'group_tab': jQuery( $item ).prop( 'id' )
+                                                } );
+
+                                                // Set serialized data
+                                                fieldOrder = jQuery( $list ).sortable( 'serialize' );
+
+                                                if ( fieldId ) {
+                                                        var serializedField = fieldId.replace( 'draggable_field_', 'draggable_signup_field[]=' );
+                                                        if ( fieldOrder ) {
+                                                                fieldOrder += '&' + serializedField;
+                                                        } else {
+                                                                fieldOrder = serializedField;
+                                                        }
+
+                                                        jQuery.extend( postData, {
+                                                                'new_signup_field_id': serializedField,
+                                                        } );
+                                                } else {
+                                                        // Show new placement.
+                                                        jQuery( this ).appendTo( $list ).show( 'slow' ).animate( { opacity: '1' }, 500 );
+
+                                                        // Refresh $list variable.
+                                                        $list = jQuery( $item.find( 'a' ).attr( 'href' ) ).find( '.connectedSortable' );
+
+                                                        // Reset serialized data.
+                                                        fieldOrder = jQuery( $list ).sortable( 'serialize' );
+
+                                                        jQuery.extend( postData, {
+                                                                'field_group_id': jQuery( $list ).attr( 'id' )
+                                                        } );
+                                                }
+
+                                                jQuery.extend( postData, {
+                                                        'field_order': fieldOrder,
+                                                } );
+
+                                                // Ajax update field locations and orders.
+                                                jQuery.post( ajaxurl, postData, function( response ) {
+                                                        if ( response.data && response.data.signup_field ) {
+                                                                jQuery( $list ).append( response.data.signup_field );
+
+                                                                if ( response.data.field_id ) {
+                                                                        jQuery( '#draggable_field_' + response.data.field_id + ' legend' ).append(
+                                                                                jQuery( '<span></span>' ).addClass( 'bp-signup-field-label' ).html( XProfileAdmin.signup_info )
+                                                                        );
+                                                                }
+                                                        }
+                                                }, 'json' ).always( function() {
+                                                        isMovingToSignups = false;
+                                                } );
+                                        };
 
                                 // Remove helper class.
                                 jQuery($item).removeClass( 'drop-candidate' );
 
-                                // Hide field, change selected tab, and show new placement.
-                                ui.draggable.hide( 'slow', function() {
-
-                                        // Select new tab as current.
-                                        $tabs.tabs( 'option', 'active', $tab_items.index( $item ) );
-
-                                        // Show new placement.
-                                        jQuery(this).appendTo($list).show( 'slow' ).animate( {opacity: '1'}, 500 );
-
-                                        // Refresh $list variable.
-                                        $list = jQuery( $item.find( 'a' ).attr( 'href' ) ).find( '.connectedSortable' );
-                                        jQuery($list).find( 'p.nofields' ).hide( 'slow' );
-
-                                        // Ajax update field locations and orders.
-                                        jQuery.post( ajaxurl, {
-                                                action: 'xprofile_reorder_fields',
-                                                'cookie': encodeURIComponent(document.cookie),
-                                                '_wpnonce_reorder_fields': jQuery( 'input#_wpnonce_reorder_fields' ).val(),
-                                                'field_order': jQuery( $list ).sortable( 'serialize' ),
-                                                'field_group_id': jQuery( $list ).attr( 'id' )
-                                        },
-                                        function() {} );
-                                });
+                                if ( 'signup-group' === jQuery( $item ).prop( 'id' ) ) {
+                                        // Simply add the field to signup ones.
+                                        dropInGroup( ui.draggable.prop( 'id' ) );
+
+                                } else if ( ! ui.draggable.prop( 'id' ).match( /draggable_signup_field_([0-9]+)/ ) ) {
+                                        // Hide field, change selected tab, and show new placement.
+                                        ui.draggable.hide( 'slow', dropInGroup );
+                                }
                         },
                         over: function() {
+                                isMovingToSignups = true;
                                 jQuery(this).addClass( 'drop-candidate' );
                         },
                         out: function() {
                                 jQuery(this).removeClass( 'drop-candidate' );
+                                isMovingToSignups = false;
                         }
                 });
         }
+
+        jQuery( '#signup-fields' ).on( 'click', '.removal', function( e ) {
+                e.preventDefault();
+
+                var fieldId = jQuery( e.target ).attr( 'href' ).replace( '#remove_field-', '' ),
+                    container = jQuery( e.target ).closest( '#draggable_signup_field_' + fieldId );
+
+                if ( ! fieldId ) {
+                        return false;
+                }
+
+                // Ajax update field locations and orders.
+                jQuery.post( ajaxurl, {
+                        action: 'xprofile_remove_signup_field',
+                        'cookie': encodeURIComponent(document.cookie),
+                        '_wpnonce_reorder_fields': jQuery( 'input#_wpnonce_reorder_fields' ).val(),
+                        'signup_field_id': fieldId
+                }, function( response ) {
+                        if ( response.success ) {
+                                jQuery( container ).remove();
+                                jQuery( '#draggable_field_' + fieldId + ' .bp-signup-field-label' ).remove();
+                        }
+                }, 'json' );
+        } );
 });

src/bp-xprofile/bp-xprofile-admin.php

@@ -188 +188 @@
 
                                         <?php endforeach; endif; ?>
 
+                                        <?php if ( bp_get_signup_allowed() ) : ?>
+                                                <li id="signup-group" class="not-sortable last">
+                                                        <a href="#tabs-signup-group" class="ui-tab">
+                                                                <?php esc_html_e( 'Signup Fields', 'buddypress' ); ?>
+                                                        </a>
+                                                </li>
+                                        <?php endif; ?>
+
                                 </ul>
 
                                 <?php if ( !empty( $groups ) ) : foreach ( $groups as $group ) :
@@ -294 +302 @@
 
                                                 </fieldset>
 
-                                                <?php if ( empty( $group->can_delete ) ) : ?>
-
-                                                        <p><?php esc_html_e( '* Fields in this group appear on the signup page.', 'buddypress' ); ?></p>
-
-                                                <?php endif; ?>
-
                                         </div>
 
                                 <?php endforeach; else : ?>
@@ -309 +311 @@
 
                                 <?php endif; ?>
 
+                                <?php
+                                // List fields to use into the signup form.
+                                if ( bp_get_signup_allowed() ) {
+                                        $signup_groups = bp_xprofile_get_groups(
+                                                array(
+                                                        'fetch_fields'       => true,
+                                                        'signup_fields_only' => true,
+                                                )
+                                        );
+                                        $has_signup_fields   = false;
+                                        $signup_fields       = array();
+                                        $signup_fields_order = bp_xprofile_get_signup_field_ids();
+                                        ?>
+                                        <div id="tabs-signup-group"" class="tab-wrapper">
+                                                <div class="tab-toolbar">
+                                                        <p class="description"><?php esc_html_e( 'Drag fields from other groups and drop them on the above tab to include them into your registration form.', 'buddypress' ); ?></a>
+                                                </div>
+                                                <fieldset id="signup-fields" class="connectedSortable field-group" aria-live="polite" aria-atomic="true" aria-relevant="all">
+                                                        <legend class="screen-reader-text">
+                                                                <?php esc_html_e( 'Fields to use into the registration form', 'buddypress' );?>
+                                                        </legend>
+
+                                                        <?php
+                                                        if ( ! empty( $signup_groups ) ) {
+                                                                foreach ( $signup_groups as $signup_group ) {
+                                                                        if ( ! empty( $signup_group->fields ) ) {
+                                                                                $has_signup_fields = true;
+
+                                                                                foreach ( $signup_group->fields as $signup_field ) {
+                                                                                        // Load the field.
+                                                                                        $_signup_field = xprofile_get_field( $signup_field, null, false );
+
+                                                                                        /**
+                                                                                         * This function handles the WYSIWYG profile field
+                                                                                         * display for the xprofile admin setup screen.
+                                                                                         */
+                                                                                        $signup_fields[ $_signup_field->id ] = bp_xprofile_admin_get_signup_field( $_signup_field, $signup_group, '' );
+                                                                                }
+                                                                        }
+                                                                }
+
+                                                                // Output signup fields according to their signup position.
+                                                                foreach ( $signup_fields_order as $ordered_signup_field_id ) {
+                                                                        if ( ! isset( $signup_fields[ $ordered_signup_field_id ] ) ) {
+                                                                                continue;
+                                                                        }
+
+                                                                        echo $signup_fields[ $ordered_signup_field_id ];
+                                                                }
+                                                        }
+
+                                                        if ( ! $has_signup_fields ) {
+                                                                ?>
+                                                                <p class="nodrag nofields"><?php esc_html_e( 'There are no registration fields set. The registration form uses the primary group by default.', 'buddypress' ); ?></p>
+                                                                <?php
+                                                        }
+                                                        ?>
+                                                </fieldset>
+
+                                                <p><?php esc_html_e( '* Fields in this group appear on the registration page.', 'buddypress' ); ?></p>
+                                        </div>
+                                        <?php
+                                }
+                                ?>
                         </div>
                 </form>
         </div>
-
 <?php
 }
 
@@ -575 +640 @@
                                 }
 
                                 // Validate signup.
-                                if ( ! empty( $_POST['signup-position'] ) ) {
-                                        bp_xprofile_update_field_meta( $field_id, 'signup_position', (int) $_POST['signup-position'] );
-                                } else {
-                                        bp_xprofile_delete_meta( $field_id, 'field', 'signup_position' );
+                                if ( $field->field_type_supports( 'signup_position' ) ) {
+                                        if ( ! empty( $_POST['signup-position'] ) ) {
+                                                bp_xprofile_update_field_meta( $field_id, 'signup_position', (int) $_POST['signup-position'] );
+                                        } else {
+                                                bp_xprofile_delete_meta( $field_id, 'field', 'signup_position' );
+                                        }
                                 }
 
                                 $do_autolink = '';
@@ -730 +797 @@
  * Handles the ajax reordering of fields within a group.
  *
  * @since 1.0.0
+ * @since 8.0.0 Returns a JSON object.
  */
 function xprofile_ajax_reorder_fields() {
-
         // Check the nonce.
         check_admin_referer( 'bp_reorder_fields', '_wpnonce_reorder_fields' );
 
         if ( empty( $_POST['field_order'] ) ) {
-                return false;
+                return wp_send_json_error();
         }
 
-        parse_str( $_POST['field_order'], $order );
-
         $field_group_id = $_POST['field_group_id'];
+        $group_tab      = '';
+
+        if ( isset( $_POST['group_tab'] ) && $_POST['group_tab'] ) {
+                $group_tab = wp_unslash( $_POST['group_tab'] );
+        }
+
+        if ( 'signup-fields' === $field_group_id ) {
+                parse_str( $_POST['field_order'], $order );
+                $fields = (array) $order['draggable_signup_field'];
+                $fields = array_map( 'intval', $fields );
+
+                if ( isset( $_POST['new_signup_field_id'] ) && $_POST['new_signup_field_id'] ) {
+                        parse_str( $_POST['new_signup_field_id'], $signup_field );
+                        $signup_fields = (array) $signup_field['draggable_signup_field'];
+                }
+
+                // Adding a new field to the registration form.
+                if ( 'signup-group' === $group_tab ) {
+                        $field_id = (int) reset( $signup_fields );
+
+                        // Load the field.
+                        $field = xprofile_get_field( $field_id, null, false );
+
+                        if ( $field instanceof BP_XProfile_Field ) {
+                                // The field doesn't support the feature, stop right away!
+                                if ( ! $field->field_type_supports( 'signup_position' ) ) {
+                                        wp_send_json_error(
+                                                array(
+                                                        'message' => __( 'This field cannot be inserted into the registration form.', 'buddypress' ),
+                                                )
+                                        );
+                                }
+
+                                $signup_position = bp_xprofile_get_meta( $field->id, 'field', 'signup_position' );
+
+                                if ( ! $signup_position ) {
+                                        $position = array_search( $field->id, $fields, true );
+                                        if ( false !== $position ) {
+                                                $position += 1;
+                                        } else {
+                                                $position = 1;
+                                        }
+
+                                        // Set the signup position.
+                                        bp_xprofile_update_field_meta( $field->id, 'signup_position', $position );
+
+                                        // Get the real Group object.
+                                        $group = xprofile_get_field_group( $field->id );
+
+                                        // Gets the HTML Output of the signup field.
+                                        $signup_field = bp_xprofile_admin_get_signup_field( $field, $group );
+
+                                        /**
+                                         * Fires once a signup field has been inserted.
+                                         *
+                                         * @since 8.0.0
+                                         */
+                                        do_action( 'bp_xprofile_inserted_signup_field' );
+
+                                        // Send the signup field to output.
+                                        wp_send_json_success(
+                                                array(
+                                                        'signup_field' => $signup_field,
+                                                        'field_id'     => $field->id,
+                                                )
+                                        );
+                                } else {
+                                        wp_send_json_error(
+                                                array(
+                                                        'message' => __( 'This field has been already added to the registration form.', 'buddypress' ),
+                                                )
+                                        );
+                                }
+
+                        } else {
+                                wp_send_json_error();
+                        }
+                } else {
+                        // it's a sort operation.
+                        foreach ( $fields as $position => $field_id ) {
+                                bp_xprofile_update_field_meta( (int) $field_id, 'signup_position', (int) $position + 1 );
+                        }
 
-        foreach ( (array) $order['draggable_field'] as $position => $field_id ) {
-                xprofile_update_field_position( (int) $field_id, (int) $position, (int) $field_group_id );
+                        /**
+                         * Fires once the signup fields have been reordered.
+                         *
+                         * @since 8.0.0
+                         */
+                        do_action( 'bp_xprofile_reordered_signup_fields' );
+
+                        wp_send_json_success();
+                }
+        } else {
+                /**
+                 * @todo there's something going wrong here.
+                 * moving a field to another tab when there's only the fullname field fails.
+                 */
+                parse_str( $_POST['field_order'], $order );
+                $fields = (array) $order['draggable_field'];
+
+                foreach ( $fields as $position => $field_id ) {
+                        xprofile_update_field_position( (int) $field_id, (int) $position, (int) $field_group_id );
+                }
+
+                wp_send_json_success();
         }
 }
 add_action( 'wp_ajax_xprofile_reorder_fields', 'xprofile_ajax_reorder_fields' );
 
+/**
+ * Removes a field from signup fields.
+ *
+ * @since 8.0.0
+ */
+function bp_xprofile_ajax_remove_signup_field() {
+        // Check the nonce.
+        check_admin_referer( 'bp_reorder_fields', '_wpnonce_reorder_fields' );
+
+        if ( ! isset( $_POST['signup_field_id'] ) || ! $_POST['signup_field_id'] ) {
+                return wp_send_json_error();
+        }
+
+        $signup_field_id = (int) wp_unslash( $_POST['signup_field_id'] );
+
+        // Validate the field ID.
+        $signup_position = bp_xprofile_get_meta( $signup_field_id, 'field', 'signup_position' );
+
+        if ( ! $signup_position ) {
+                wp_send_json_error();
+        }
+
+        bp_xprofile_delete_meta( $signup_field_id, 'field', 'signup_position' );
+
+        /**
+         * Fires when a signup field is removed from the signup form.
+         *
+         * @since 8.0.0
+         */
+        do_action( 'bp_xprofile_removed_signup_field' );
+
+        wp_send_json_success();
+}
+add_action( 'wp_ajax_xprofile_remove_signup_field', 'bp_xprofile_ajax_remove_signup_field' );
+
 /**
  * Handles the reordering of field groups.
  *
@@ -776 +978 @@
  * Handles the WYSIWYG display of each profile field on the edit screen.
  *
  * @since 1.5.0
+ * @since 8.0.0 Adds the `$is_signup` parameter.
  *
  * @param BP_XProfile_Field   $admin_field Admin field.
  * @param object $admin_group Admin group object.
  * @param string $class       Classes to append to output.
+ * @param bool   $is_signup   Whether the admin field output is made inside the signup group.
  */
-function xprofile_admin_field( $admin_field, $admin_group, $class = '' ) {
+function xprofile_admin_field( $admin_field, $admin_group, $class = '', $is_signup = false ) {
         global $field;
 
-        $field = $admin_field;
+        $field       = $admin_field;
+        $fieldset_id = sprintf( 'draggable_field_%d', $field->id );
 
         // Users admin URL.
         $url = bp_get_admin_url( 'users.php' );
@@ -804 +1009 @@
                         'mode'     => 'delete_field',
                         'field_id' => (int) $field->id
                 ), $url . '#tabs-' . (int) $field->group_id );
-        } ?>
+        }
+
+        // Avoid duplicate IDs into the signup group.
+        if ( $is_signup ) {
+                $fieldset_id = sprintf( 'draggable_signup_field_%d', $field->id );
+        }
+        ?>
 
-        <fieldset id="draggable_field_<?php echo esc_attr( $field->id ); ?>" class="sortable<?php echo ' ' . $field->type; if ( !empty( $class ) ) echo ' ' . $class; ?>">
+        <fieldset id="<?php echo esc_attr( $fieldset_id ); ?>" class="sortable<?php echo ' ' . $field->type; if ( !empty( $class ) ) echo ' ' . $class; ?>">
                 <legend>
                         <span>
                                 <?php bp_the_profile_field_name(); ?>
 
-                                <?php if ( empty( $field->can_delete )                                    ) : ?><?php esc_html_e( '(Primary)', 'buddypress' ); endif; ?>
+                                <?php if ( empty( $field->can_delete ) ) : ?><?php esc_html_e( '(Primary)', 'buddypress' ); endif; ?>
                                 <?php bp_the_profile_field_required_label(); ?>
-                                <?php if ( bp_xprofile_get_meta( $field->id, 'field', 'signup_position' ) ) : ?><?php esc_html_e( '(Sign-up)', 'buddypress' ); endif; ?>
+                                <?php if ( bp_get_signup_allowed() && $field->get_signup_position() ) : ?>
+                                        <span class="bp-signup-field-label"><?php esc_html_e( '(Sign-up)', 'buddypress' );?></span>
+                                <?php endif; ?>
                                 <?php if ( bp_get_member_types() ) : echo $field->get_member_type_label(); endif; ?>
 
                                 <?php
@@ -859 +1072 @@
                         <div class="actions">
                                 <a class="button edit" href="<?php echo esc_url( $field_edit_url ); ?>"><?php _ex( 'Edit', 'Edit field link', 'buddypress' ); ?></a>
 
-                                <?php if ( $field->can_delete ) : ?>
+                                <?php if ( $field->can_delete && ! $is_signup ) : ?>
 
                                         <div class="delete-button">
                                                 <a class="confirm submit-delete deletion" href="<?php echo esc_url( wp_nonce_url( $field_delete_url, 'bp_xprofile_delete_field-' . $field->id, 'bp_xprofile_delete_field' ) ); ?>"><?php _ex( 'Delete', 'Delete field link', 'buddypress' ); ?></a>
@@ -867 +1080 @@
 
                                 <?php endif; ?>
 
+                                <?php if ( $field->can_delete && $is_signup ) : ?>
+
+                                        <div class="delete-button">
+                                                <a class="submit-delete removal" href="<?php echo esc_attr( sprintf( '#remove_field-%d', $field->id ) ); ?>"><?php echo esc_html_x( 'Remove', 'Remove field link', 'buddypress' ); ?></a>
+                                        </div>
+
+                                <?php endif; ?>
+
                                 <?php
 
                                 /**
@@ -882 +1103 @@
                         </div>
                 </div>
         </fieldset>
-
 <?php
 }
 
+/**
+ * Handles the WYSIWYG display of signup profile fields on the edit screen.
+ *
+ * @since 8.0.0
+ *
+ * @param BP_XProfile_Field   $signup_field The field to use into the signup form.
+ * @param object $field_group The real field group object.
+ * @param string $class       Classes to append to output.
+ * @param bool   $echo        Whether to return or display the HTML output.
+ * @return string The HTML output.
+ */
+function bp_xprofile_admin_get_signup_field( $signup_field, $field_group = null, $class = '', $echo = false ) {
+        add_filter( 'bp_get_the_profile_field_input_name', 'bp_get_the_profile_signup_field_input_name' );
+
+        if ( ! $echo ) {
+                // Set up an output buffer.
+                ob_start();
+                xprofile_admin_field( $signup_field, $field_group, $class, true );
+                $output = ob_get_contents();
+                ob_end_clean();
+        } else {
+                xprofile_admin_field( $signup_field, $field_group, $class, true );
+        }
+
+        remove_filter( 'bp_get_the_profile_field_input_name', 'bp_get_the_profile_signup_field_input_name' );
+
+        if ( ! $echo ) {
+                return $output;
+        }
+}
+
 /**
  * Print <option> elements containing the xprofile field types.
  *

src/bp-xprofile/bp-xprofile-cache.php

@@ -314 +314 @@
         wp_cache_delete( $user_id, 'bp_user_mid' );
 }
 add_action( 'profile_update', 'bp_xprofile_reset_user_mid_cache', 10, 1 );
+
+/**
+ * Resets the signup field IDs cache.
+ *
+ * @since 8.0.0
+ */
+function bp_xprofile_reset_signup_field_cache() {
+        wp_cache_delete( 'signup_fields', 'bp_xprofile' );
+}
+add_action( 'bp_xprofile_inserted_signup_field', 'bp_xprofile_reset_signup_field_cache' );
+add_action( 'bp_xprofile_reordered_signup_fields', 'bp_xprofile_reset_signup_field_cache' );
+add_action( 'bp_xprofile_removed_signup_field', 'bp_xprofile_reset_signup_field_cache' );

src/bp-xprofile/bp-xprofile-cssjs.php

@@ -57 +57 @@
                         'hide_allow_custom_visibility_metabox' => array(),
                         'hide_required_metabox'                => array(),
                         'hide_member_types_metabox'            => array(),
+                        'hide_signup_position_metabox'         => array(),
                         'text'                                 => array(
                                 'defaultValue' => __( 'Default Value', 'buddypress' ),
                                 'deleteLabel'  => __( 'Delete', 'buddypress' ),
                         ),
+                        'signup_info'                          => _x( '(Sign-up)', 'xProfile Group Admin Screen Signup field information', 'buddypress' ),
                 );
 
                 foreach ( bp_xprofile_get_field_types() as $field_type => $field_type_class ) {

src/bp-xprofile/bp-xprofile-filters.php

@@ -691 +691 @@
 
         return $exporters;
 }
+
+/**
+ * Used to edit the field input name inside the xProfile Admin Screen
+ *
+ * @see bp_xprofile_admin_get_signup_field()
+ *
+ * @since 8.0.0
+ *
+ * @param string $field_selector The text to use as the input name/id attribute.
+ * @return string                The text to use as the input name/id attribute.
+ */
+function bp_get_the_profile_signup_field_input_name( $field_selector = '' ) {
+        global $field;
+
+        if ( isset( $field->id ) && $field->id ) {
+                $field_selector = sprintf( 'signup_field_%d', $field->id );
+        }
+
+        return $field_selector;
+}
+
+/**
+ * Provides Signup fields argument back compatibility for template overrides.
+ *
+ * @since 8.0.0
+ * @access private
+ *
+ * @param array $args The xProfile loop's signup arguments.
+ * @return array The xProfile loop's signup arguments.
+ */
+function _bp_xprofile_signup_do_backcompat( $args = array() ) {
+        $expected_args = bp_xprofile_signup_args();
+        $needed_args   = array_intersect_key( $args, $expected_args );
+
+        if ( 1 === $args['profile_group_id'] || array_diff_key( $expected_args, $needed_args ) ) {
+                _doing_it_wrong( 'bp_has_profile()', __( 'The argument of this function into your custom `members/register.php` template should be bp_xprofile_signup_args()', 'buddypress' ), '8.0.0' );
+                $args = $expected_args;
+        }
+
+        return $args;
+}
+
+/**
+ * Checks whether back compatibility is needed about xProfile loop's signup arguments.
+ *
+ * @since 8.0.0
+ * @access private
+ *
+ * @param string $template      The located path for registration template.
+ * @param string $template_name The needed template name.
+ */
+function _bp_xprofile_signup_check_backcompat( $template = '', $template_name = '' ) {
+        if ( 'members/register.php' !== $template_name ) {
+                return;
+        }
+
+        if ( 0 !== strpos( $template, buddypress()->theme_compat->theme->dir ) ) {
+                add_filter( 'bp_after_has_profile_parse_args', '_bp_xprofile_signup_do_backcompat', 100 );
+        }
+}
+
+/**
+ * Starts Signup fields back compatibility process only on the signup's page.
+ *
+ * @since 8.0.0
+ * @access private
+ */
+function _bp_xprofile_signup_start_backcompat() {
+        add_action( 'bp_locate_template', '_bp_xprofile_signup_check_backcompat', 10, 2 );
+}
+add_action( 'bp_core_screen_signup', '_bp_xprofile_signup_start_backcompat' );

src/bp-xprofile/bp-xprofile-functions.php

@@ -1420 +1420 @@
                 array_keys( wp_get_user_contact_methods() )
         );
 }
+
+/**
+ * Returns the signup field IDs.
+ *
+ * @since 8.0.0
+ *
+ * @return int[] The signup field IDs.
+ */
+function bp_xprofile_get_signup_field_ids() {
+        $signup_field_ids = wp_cache_get( 'signup_fields', 'bp_xprofile' );
+
+        if ( ! $signup_field_ids ) {
+                global $wpdb;
+                $bp = buddypress();
+
+                $signup_field_ids = $wpdb->get_col( "SELECT object_id FROM {$bp->profile->table_name_meta} WHERE object_type = 'field' AND meta_key = 'signup_position' ORDER BY meta_value ASC" );
+
+                wp_cache_set( 'signup_fields', $signup_field_ids, 'bp_xprofile' );
+        }
+
+        return array_map( 'intval', $signup_field_ids );
+}
+
+/**
+ * Returns xProfile loop's signup arguments.
+ *
+ * @since 8.0.0
+ *
+ * @param array $extra Optional extra arguments.
+ * @return array The xProfile loop's signup arguments.
+ */
+function bp_xprofile_signup_args( $extra = array() ) {
+        return array_merge(
+                array(
+                        'fetch_fields'       => true,
+                        'fetch_field_data'   => false,
+                        'signup_fields_only' => true,
+                ),
+                $extra
+        );
+}

src/bp-xprofile/bp-xprofile-template.php

@@ -15 +15 @@
  *
  * @since 1.0.0
  * @since 2.4.0 Introduced `$member_type` argument.
- * @since 8.0.0 Introduced `$hide_field_types` argument.
+ * @since 8.0.0 Introduced `$hide_field_types` & `$signup_fields_only` arguments.
  *
  * @global object $profile_template
  * @see BP_XProfile_Group::get() for full description of `$args` array.
@@ -36 +36 @@
  *     @type int[]|bool   $exclude_groups         Default: false.
  *     @type int[]|bool   $exclude_fields         Default: false.
  *     @type string[]     $hide_field_types       Default: empty array.
+ *     @type bool         $signup_fields_only     Default: false.
  *     @type bool         $update_meta_cache      Default: true.
  * }
  *
@@ -68 +69 @@
                 'exclude_groups'         => false, // Comma-separated list of profile field group IDs to exclude.
                 'exclude_fields'         => false, // Comma-separated list of profile field IDs to exclude.
                 'hide_field_types'       => array(), // List of field types to hide from profile fields loop.
+                'signup_fields_only'     => false, // Whether to only return signup fields.
                 'update_meta_cache'      => true,
         ), 'has_profile' );
 

src/bp-xprofile/classes/class-bp-xprofile-data-template.php

@@ -105 +105 @@
          *
          * @since 1.5.0
          * @since 2.4.0 Introduced `$member_type` argument.
-         * @since 8.0.0 Introduced `$hide_field_types` argument.
+         * @since 8.0.0 Introduced `$hide_field_types` & `$signup_fields_only` arguments.
          *
          * @param array|string $args {
          *     An array of arguments. All items are optional.
@@ -120 +120 @@
          *     @type array        $exclude_fields          Exclude these fields.
          *     @type int|bool     $hide_empty_fields       Should empty fields be skipped.
          *     @type int|bool     $fetch_visibility_level  Fetch visibility levels.
-         *     @type int|bool     $update_meta_cache       Should metadata cache be updated.
          *     @type string[]     $hide_field_types        List of field types to hide form loop. Default: empty array.
+         *     @type bool         $signup_fields_only      Whether to only return signup fields. Default: false.
+         *     @type int|bool     $update_meta_cache       Should metadata cache be updated.
          * }
          */
         public function __construct( $args = '' ) {
@@ -159 +160 @@
                         'exclude_groups'         => false,
                         'exclude_fields'         => false,
                         'hide_field_types'       => array(),
+                        'signup_fields_only'     => false,
                         'update_meta_cache'      => true
                 ) );
 
-                $this->groups      = bp_xprofile_get_groups( $r );
+                $groups = bp_xprofile_get_groups( $r );
+
+                if ( true === $r['signup_fields_only'] && bp_get_signup_allowed() ) {
+                        $signup_fields_order       = bp_xprofile_get_signup_field_ids();
+                        $signup_group              = new BP_XProfile_Group();
+                        $signup_group->id          = 0;
+                        $signup_group->name        = __( 'Signup Fields', 'buddypress' );
+                        $signup_group->description = '';
+                        $signup_group->can_delete  = 0;
+                        $signup_group->group_order = 0;
+                        $fields                    = array();
+                        $signup_group->fields      = array();
+
+                        // Get all group fields.
+                        foreach ( $groups as $group ) {
+                                if ( ! $group->fields ) {
+                                        continue;
+                                }
+
+                                // Populate fields using the field ID as key.
+                                foreach ( $group->fields as $signup_field ) {
+                                        $fields[ $signup_field->id ] = $signup_field;
+                                }
+                        }
+
+                        if ( $fields ) {
+                                // Reorder signup fields.
+                                foreach ( $signup_fields_order as $ordered_signup_field_id ) {
+                                        if ( ! isset( $fields[ $ordered_signup_field_id ] ) ) {
+                                                continue;
+                                        }
+
+                                        $signup_group->fields[] = $fields[ $ordered_signup_field_id ];
+                                }
+                        }
+
+                        // Override groups with the signup one.
+                        $groups = array( $signup_group );
+                }
+
+                $this->groups      = $groups;
                 $this->group_count = count( $this->groups );
                 $this->user_id     = $r['user_id'];
         }

src/bp-xprofile/classes/class-bp-xprofile-field-type-wordpress-textbox.php

@@ -144 +144 @@
                         $this->wp_user_key = self::get_field_settings( bp_get_the_profile_field_id() );
                 }
 
+                $field_value = '';
                 if ( 'user_url' === $this->wp_user_key ) {
                         if ( bp_displayed_user_id() ) {
                                 $field_value = bp_get_displayed_user()->userdata->{$this->wp_user_key};

src/bp-xprofile/classes/class-bp-xprofile-field-type-wordpress.php

@@ -56 +56 @@
                 'do_autolink'             => false,
                 'allow_custom_visibility' => false,
                 'member_types'            => false,
+                'signup_position'         => true,
         );
 
         /**

src/bp-xprofile/classes/class-bp-xprofile-field.php

@@ -139 +139 @@
          */
         public $do_autolink;
 
+        /**
+         * The signup position of the field into the signups form.
+         *
+         * @since 8.0.0
+         * @var int
+         */
+        public $signup_position;
+
         /**
          * Field type option.
          *
@@ -859 +867 @@
                 return $this->allow_custom_visibility;
         }
 
+        /**
+         * Get the field's signup position.
+         *
+         * @since 8.0.0
+         *
+         * @return int the field's signup position.
+         *             0 if the field has not been added to the signup form.
+         */
+        public function get_signup_position() {
+                if ( ! isset( $this->signup_position ) ) {
+                        $this->signup_position = (int) bp_xprofile_get_meta( $this->id, 'field', 'signup_position' );
+                }
+
+                return $this->signup_position;
+        }
+
         /**
          * Get whether the field values should be auto-linked to a directory search.
          *
@@ -1277 +1301 @@
                                                         // Output the required metabox.
                                                         $this->required_metabox();
 
+                                                        // Output signup position metabox.
+                                                        $this->signup_position_metabox();
+
                                                         // Output the Member Types metabox.
                                                         $this->member_type_metabox();
 
@@ -1345 +1372 @@
         public function get_field_type_supports() {
                 $supports = array(
                         'switch_fieldtype'        => true,
-                        'allow_required'          => true,
-                        'allow_autolink'          => true,
+                        'required'                => true,
+                        'do_autolink'             => true,
                         'allow_custom_visibility' => true,
                         'member_types'            => true,
+                        'signup_position'         => true,
                 );
 
                 if ( isset( $this->type_obj ) && $this->type_obj ) {
@@ -1502 +1530 @@
          * Private method used to output field Member Type metabox.
          *
          * @since 2.4.0
+         *
+         * @return void If default field or if the field does not support the feature.
          */
         private function member_type_metabox() {
 
                 // The primary field is for all, so bail.
-                if ( 1 === (int) $this->id || ! $this->field_type_supports( 'member_types' ) ) {
+                if ( true === $this->is_default_field() || ! $this->field_type_supports( 'member_types' ) ) {
                         return;
                 }
 
@@ -1556 +1586 @@
          *
          * @since 2.3.0
          *
-         * @return void If default field id 1.
+         * @return void If default field or if the field does not support the feature.
          */
         private function visibility_metabox() {
 
@@ -1605 +1635 @@
          *
          * @since 2.3.0
          *
-         * @return void If default field.
+         * @return void If default field or if the field does not support the feature.
          */
         private function required_metabox() {
 
@@ -1632 +1662 @@
          *
          * @since 2.5.0
          *
-         * @return void If default field id 1.
+         * @return void If the field does not support the feature.
          */
         private function autolink_metabox() {
 
@@ -1705 +1735 @@
         <?php
         }
 
+        /**
+         * Output the metabox for setting the field's position into the signup form.
+         *
+         * @since 8.0.0
+         *
+         * @return void If default field or if the field does not support the feature.
+         */
+        private function signup_position_metabox() {
+                // Field types not supporting the feature cannot be added to signups form.
+                if ( ! $this->field_type_supports( 'signup_position' ) || true === $this->is_default_field() ) {
+                        return;
+                }
+
+                $next_signup_position = 1;
+                $signup_position      = $this->get_signup_position();
+
+                if ( 0 === $signup_position ) {
+                        $signup_fields_order = bp_xprofile_get_signup_field_ids();
+                        $next_signup_position = count( $signup_fields_order ) + 1;
+                } else {
+                        $next_signup_position = $signup_position;
+                }
+                ?>
+
+                <div class="postbox" id="field-signup-position-metabox">
+                        <h2><label for="default-visibility"><?php esc_html_e( 'Signups', 'buddypress' ); ?></label></h2>
+                        <div class="inside">
+                                <div>
+                                        <ul>
+                                                <li>
+                                                        <input type="checkbox" id="has-signup-position" name="signup-position" value="<?php echo esc_attr( $next_signup_position ); ?>" <?php checked( $signup_position, $next_signup_position ); ?> />
+                                                        <label for="has-signup-position"><?php esc_html_e( 'Use the field into the registration form.', 'buddypress' ); ?></label>
+                                                </li>
+                                        </ul>
+                                </div>
+                        </div>
+                </div>
+                <?php
+        }
+
         /**
          * Output hidden fields used by default field.
          *
@@ -1754 +1824 @@
                                         'id'    => 'fieldtype',
                                         'value' => 'textbox',
                                 ),
+                                array(
+                                        'name'  => 'signup-position',
+                                        'id'    => 'has-signup-position',
+                                        'value' => $this->get_signup_position(),
+                                ),
                         );
                 }
 

src/bp-xprofile/classes/class-bp-xprofile-group.php

@@ -238 +238 @@
          *
          * @since 1.2.0
          * @since 2.4.0 Introduced `$member_type` argument.
-         * @since 8.0.0 Introduced `$hide_field_types` argument.
+         * @since 8.0.0 Introduced `$hide_field_types` & `$signup_fields_only` arguments.
          *
          * @global object $wpdb WordPress DB access object.
          *
          * @param array $args {
          *  Array of optional arguments:
-         *      @type int          $profile_group_id  Limit results to a single profile group.
-         *      @type int          $user_id           Required if you want to load a specific user's data.
-         *                                            Default: displayed user's ID.
-         *      @type array|string $member_type       Limit fields by those restricted to a given member type, or array of
-         *                                            member types. If `$user_id` is provided, the value of `$member_type`
-         *                                            will be overridden by the member types of the provided user. The
-         *                                            special value of 'any' will return only those fields that are
-         *                                            unrestricted by member type - i.e., those applicable to any type.
-         *      @type bool         $hide_empty_groups True to hide groups that don't have any fields. Default: false.
-         *      @type bool         $hide_empty_fields True to hide fields where the user has not provided data.
-         *                                            Default: false.
-         *      @type bool         $fetch_fields      Whether to fetch each group's fields. Default: false.
-         *      @type bool         $fetch_field_data  Whether to fetch data for each field. Requires a $user_id.
-         *                                            Default: false.
-         *      @type int[]|bool   $exclude_groups    Comma-separated list or array of group IDs to exclude.
-         *      @type int[]|bool   $exclude_fields    Comma-separated list or array of field IDs to exclude.
-         *      @type string[]     $hide_field_types  List of field types to hide form loop. Default: empty array.
-         *      @type bool         $update_meta_cache Whether to pre-fetch xprofilemeta for all retrieved groups, fields,
-         *                                            and data. Default: true.
+         *      @type int          $profile_group_id   Limit results to a single profile group.
+         *      @type int          $user_id            Required if you want to load a specific user's data.
+         *                                             Default: displayed user's ID.
+         *      @type array|string $member_type        Limit fields by those restricted to a given member type, or array of
+         *                                             member types. If `$user_id` is provided, the value of `$member_type`
+         *                                             will be overridden by the member types of the provided user. The
+         *                                             special value of 'any' will return only those fields that are
+         *                                             unrestricted by member type - i.e., those applicable to any type.
+         *      @type bool         $hide_empty_groups  True to hide groups that don't have any fields. Default: false.
+         *      @type bool         $hide_empty_fields  True to hide fields where the user has not provided data.
+         *                                             Default: false.
+         *      @type bool         $fetch_fields       Whether to fetch each group's fields. Default: false.
+         *      @type bool         $fetch_field_data   Whether to fetch data for each field. Requires a $user_id.
+         *                                             Default: false.
+         *      @type int[]|bool   $exclude_groups     Comma-separated list or array of group IDs to exclude.
+         *      @type int[]|bool   $exclude_fields     Comma-separated list or array of field IDs to exclude.
+         *      @type string[]     $hide_field_types   List of field types to hide form loop. Default: empty array.
+         *      @type bool         $signup_fields_only Whether to only return signup fields. Default: false.
+         *      @type bool         $update_meta_cache  Whether to pre-fetch xprofilemeta for all retrieved groups, fields,
+         *                                             and data. Default: true.
          * }
          * @return array $groups
          */
@@ -283 +284 @@
                         'exclude_fields'         => false,
                         'hide_field_types'       => array(),
                         'update_meta_cache'      => true,
+                        'signup_fields_only'     => false,
                 ) );
 
                 // Keep track of object IDs for cache-priming.
@@ -342 +344 @@
                 // Pull field objects from the cache.
                 $fields = array();
                 foreach ( $field_ids as $field_id ) {
+                        if ( true === $r['signup_fields_only'] && ! in_array( $field_id, bp_xprofile_get_signup_field_ids(), true ) ) {
+                                continue;
+                        }
+
                         $_field = xprofile_get_field( $field_id, null, false );
 
                         if ( in_array( $_field->type, $r['hide_field_types'], true ) ) {