diff --git src/bp-templates/bp-legacy/buddypress/members/register.php src/bp-templates/bp-legacy/buddypress/members/register.php index 4e8418e7f..8393834d3 100644 --- src/bp-templates/bp-legacy/buddypress/members/register.php +++ src/bp-templates/bp-legacy/buddypress/members/register.php @@ -183,41 +183,41 @@ */ do_action( 'bp_custom_profile_edit_fields_pre_visibility' ); - if ( bp_current_user_can( 'bp_xprofile_change_field_visibility' ) ) : ?> -

- ' . bp_get_the_profile_field_visibility_level_label() . '' - ); - ?> - - -

- -
-
- - - - -
- - -
- -

- ' . bp_get_the_profile_field_visibility_level_label() . '' - ); - ?> -

- - - +

+ ' . bp_get_the_profile_field_visibility_level_label() . '' + ); + ?> + + +

+
+
+ + +
+ +
+ +

+ ' . bp_get_the_profile_field_visibility_level_label() . '' + ); + ?> +

+ + + - - -

- ' . bp_get_the_profile_field_visibility_level_label() . '' - ); - ?> - - -

- -
-
- - - - -
- -
- -
- ' . bp_get_the_profile_field_visibility_level_label() . '' - ); - ?> -
- - +

+ ' . bp_get_the_profile_field_visibility_level_label() . '' + ); + ?> + + +

+ +
+
+ + + + +
+ +
+ +
+ ' . bp_get_the_profile_field_visibility_level_label() . '' + ); + ?> +
+ + + - + diff --git src/bp-templates/bp-nouveau/buddypress/members/single/parts/profile-visibility.php src/bp-templates/bp-nouveau/buddypress/members/single/parts/profile-visibility.php index 24d9b43db..bba640059 100644 --- src/bp-templates/bp-nouveau/buddypress/members/single/parts/profile-visibility.php +++ src/bp-templates/bp-nouveau/buddypress/members/single/parts/profile-visibility.php @@ -9,6 +9,11 @@ if ( empty( $GLOBALS['profile_template'] ) ) { return; } + +if ( 'checkbox_acceptance' === bp_get_the_profile_field_type() ) { + return; +} + ?> diff --git src/bp-templates/bp-nouveau/buddypress/members/single/profile/profile-loop.php src/bp-templates/bp-nouveau/buddypress/members/single/profile/profile-loop.php index 2edf47815..1523481b7 100644 --- src/bp-templates/bp-nouveau/buddypress/members/single/profile/profile-loop.php +++ src/bp-templates/bp-nouveau/buddypress/members/single/profile/profile-loop.php @@ -17,7 +17,7 @@ + ?> @@ -34,7 +34,11 @@ + + if ( 'checkbox_acceptance' === bp_get_the_profile_field_type() ) { + continue; + } + ?> diff --git src/bp-xprofile/bp-xprofile-functions.php src/bp-xprofile/bp-xprofile-functions.php index 9764102f4..47b8c0a7c 100644 --- src/bp-xprofile/bp-xprofile-functions.php +++ src/bp-xprofile/bp-xprofile-functions.php @@ -149,18 +149,19 @@ function xprofile_update_field_group_position( $field_group_id = 0, $position = */ function bp_xprofile_get_field_types() { $fields = array( - 'checkbox' => 'BP_XProfile_Field_Type_Checkbox', - 'datebox' => 'BP_XProfile_Field_Type_Datebox', - 'multiselectbox' => 'BP_XProfile_Field_Type_Multiselectbox', - 'number' => 'BP_XProfile_Field_Type_Number', - 'url' => 'BP_XProfile_Field_Type_URL', - 'radio' => 'BP_XProfile_Field_Type_Radiobutton', - 'selectbox' => 'BP_XProfile_Field_Type_Selectbox', - 'textarea' => 'BP_XProfile_Field_Type_Textarea', - 'textbox' => 'BP_XProfile_Field_Type_Textbox', - 'telephone' => 'BP_XProfile_Field_Type_Telephone', - 'wp-biography' => 'BP_XProfile_Field_Type_WordPress_Biography', - 'wp-textbox' => 'BP_XProfile_Field_Type_WordPress_Textbox', + 'checkbox' => 'BP_XProfile_Field_Type_Checkbox', + 'datebox' => 'BP_XProfile_Field_Type_Datebox', + 'multiselectbox' => 'BP_XProfile_Field_Type_Multiselectbox', + 'number' => 'BP_XProfile_Field_Type_Number', + 'url' => 'BP_XProfile_Field_Type_URL', + 'radio' => 'BP_XProfile_Field_Type_Radiobutton', + 'selectbox' => 'BP_XProfile_Field_Type_Selectbox', + 'textarea' => 'BP_XProfile_Field_Type_Textarea', + 'textbox' => 'BP_XProfile_Field_Type_Textbox', + 'telephone' => 'BP_XProfile_Field_Type_Telephone', + 'wp-biography' => 'BP_XProfile_Field_Type_WordPress_Biography', + 'wp-textbox' => 'BP_XProfile_Field_Type_WordPress_Textbox', + 'checkbox_acceptance' => 'BP_XProfile_Field_Type_Checkbox_Acceptance', ); /** diff --git src/bp-xprofile/classes/class-bp-xprofile-field-type-checkbox-acceptance.php src/bp-xprofile/classes/class-bp-xprofile-field-type-checkbox-acceptance.php new file mode 100644 index 000000000..3e26551e1 --- /dev/null +++ src/bp-xprofile/classes/class-bp-xprofile-field-type-checkbox-acceptance.php @@ -0,0 +1,297 @@ + false, + 'required' => false, + 'do_autolink' => false, + 'allow_custom_visibility' => false, + ); + + /** + * Constructor for the Checkbox Acceptance field type. + * + * @since 8.0.0 + */ + public function __construct() { + parent::__construct(); + + $this->name = _x( 'Checkbox Acceptance', 'xprofile field type', 'buddypress' ); + $this->category = _x( 'Single Fields', 'xprofile field type category', 'buddypress' ); + + $this->supports_options = false; + $this->do_settings_section = true; + + $this->set_format( '/^.+$/', 'replace' ); + + /** + * Fires inside __construct() method for bp_xprofile_field_type_checkbox_acceptance class. + * + * @since 8.0.0 + * + * @param BP_XProfile_Field_Type_Checkbox_Acceptance $this Current instance of the Checkbox Acceptance field type. + */ + do_action( 'bp_xprofile_field_type_checkbox_acceptance', $this ); + } + + + /** + * Output the edit field HTML for this field type. + * + * Must be used inside the {@link bp_profile_fields()} template loop. + * + * @since 8.0.0 + * + * @param array $raw_properties Optional key/value array of + * {@link http://dev.w3.org/html5/markup/textarea.html permitted attributes} + * that you want to add. + */ + public function edit_field_html( array $raw_properties = array() ) { + $user_id = bp_displayed_user_id(); + + if ( isset( $raw_properties['user_id'] ) ) { + $user_id = (int) $raw_properties['user_id']; + unset( $raw_properties['user_id'] ); + } + + // HTML5 required attribute. + if ( bp_get_the_profile_field_is_required() ) { + $raw_properties['required'] = 'required'; + $required = true; + } else { + $raw_properties['required'] = 'required'; + $required = true; + } + ?> + + + + + + + + $user_id, + 'required' => $required, + ) + ); + ?> + + +

+ User->Profile Fields screen. + * + * @since 8.0.0 + * + * @param array $raw_properties properties. + */ + public function admin_field_html( array $raw_properties = array() ) { + + $bp_xprofile_tos_page = bp_xprofile_get_meta( bp_get_the_profile_field_id(), 'field', 'bp_xprofile_tos_page', true ); + + $raw_properties['required'] = 'required'; + $required = true; + $html = $this->get_edit_field_html_elements( + array_merge( + array( 'type' => 'checkbox' ), + $raw_properties + ) + ); + ?> + + type != $type ? 'display: none;' : ''; + $bp_xprofile_tos_page = bp_xprofile_get_meta( $current_field->id, 'field', 'bp_xprofile_tos_page', true ); + + ?> +
+

+
+

+ 'bp_xprofile_tos_page', + 'echo' => false, + 'show_option_none' => __( '- None -', 'buddypress' ), + 'selected' => ! empty( $bp_xprofile_tos_page ) ? $bp_xprofile_tos_page : false, + ) + ); + ?> + + + + + + + + + +

+
+
+ field_obj->id, $args['user_id'] ) ); + + if ( ! empty( $_POST[ 'field_' . $this->field_obj->id ] ) ) { + $new_checkbox_acceptance = sanitize_text_field( wp_unslash( $_POST[ 'field_' . $this->field_obj->id ] ) ); + $checkbox_acceptance = ( $checkbox_acceptance != $new_checkbox_acceptance ) ? $new_checkbox_acceptance : $checkbox_acceptance; + } + + $checkbox_acceptance = absint( $checkbox_acceptance ); + + $atts = array( + 'type' => 'checkbox', + 'name' => bp_get_the_profile_field_input_name(), + 'id' => bp_get_the_profile_field_input_name(), + 'value' => 1, + 'class' => 'bp-xprofile-tos-checkbox', + 'required' => 'required', + ); + + if ( 1 === $checkbox_acceptance ) { + $atts['checked'] = 'checked'; + $atts['readonly'] = 'readonly'; + $atts['onclick'] = 'return false;'; + } + + $bp_xprofile_tos_page = bp_xprofile_get_meta( bp_get_the_profile_field_id(), 'field', 'bp_xprofile_tos_page', true ); + + $html = '
get_edit_field_html_elements( $atts ) . ' />'; + // we should most probably avoid kses on output. + $html .= sprintf( + /* translators: %s: search term */ + __( 'I agree to %s ', 'buddypress' ), + '' . esc_html( get_the_title( $bp_xprofile_tos_page ) ) . '' ); + + $html .= '
'; + echo apply_filters( 'bp_get_the_profile_field_checkbox_acceptance', $html, $args['type'], $this->field_obj->id, $checkbox_acceptance ); + } + + /** + * Check if field is valid? + * + * @since 8.0.0 + * + * @param string|int $values value. + * @return bool + */ + public function is_valid( $value ) { + + if ( empty( $value ) || '1' === $value ) { + return true; + } + + return false; + } + + /** + * Modify the appearance of value. + * + * @since 8.0.0 + * + * @param string $field_value Original value of field. + * @param int $field_id field id. + * + * @return string Value formatted + */ + public static function display_filter( $field_value, $field_id = 0 ) { + return empty( $field_value ) ? __( 'No', 'buddypress' ) : __( 'Yes', 'buddypress' ); + } + + + /** + * Gte the field value by user id + * + * @param int $user_id User id whose field value to be get + * @param integer $field_id + * @return void + */ + public function get_field_value( $user_id, $field_id = 0 ) { + return $user_id; + } +} diff --git src/bp-xprofile/classes/class-bp-xprofile-user-admin.php src/bp-xprofile/classes/class-bp-xprofile-user-admin.php index ef71072c5..7eff5f446 100644 --- src/bp-xprofile/classes/class-bp-xprofile-user-admin.php +++ src/bp-xprofile/classes/class-bp-xprofile-user-admin.php @@ -273,7 +273,7 @@ class BP_XProfile_User_Admin { $r = bp_parse_args( $args['args'], array( 'profile_group_id' => 0, 'user_id' => $user->ID, - 'hide_field_types' => array( 'wp-textbox', 'wp-biography' ), + 'hide_field_types' => array( 'wp-textbox', 'wp-biography', 'checkbox_acceptance' ), ), 'bp_xprofile_user_admin_profile_loop_args' ); // We really need these args.