Index: bp-xprofile/bp-xprofile-templatetags.php =================================================================== --- bp-xprofile/bp-xprofile-templatetags.php (revision 3647) +++ bp-xprofile/bp-xprofile-templatetags.php (working copy) @@ -187,10 +187,10 @@ if ( $class ) $css_classes[] = sanitize_title( esc_attr( $class ) ); - /* Set a class with the field ID */ + // Set a class with the field ID $css_classes[] = 'field_' . $profile_template->field->id; - /* Set a class with the field name (sanitized) */ + // Set a class with the field name (sanitized) $css_classes[] = 'field_' . sanitize_title( $profile_template->field->name ); if ( $profile_template->current_field % 2 == 1 ) @@ -359,9 +359,36 @@ return apply_filters( 'bp_get_the_profile_field_input_name', 'field_' . $field->id . $array_box ); } +/** + * bp_the_profile_field_options() + * + * Displays field options HTML for field types of 'selectbox', 'multiselectbox', + * 'radio', 'checkbox', and 'datebox'. + * + * @package BuddyPress Xprofile + * @since 1.1 + * + * @uses bp_get_the_profile_field_options() + * + * @param array $args Specify type for datebox. Allowed 'day', 'month', 'year'. + */ function bp_the_profile_field_options( $args = '' ) { echo bp_get_the_profile_field_options( $args ); } + /** + * bp_get_the_profile_field_options() + * + * Retrieves field options HTML for field types of 'selectbox', 'multiselectbox', + * 'radio', 'checkbox', and 'datebox'. + * + * @package BuddyPress Xprofile + * @since 1.1 + * + * @uses BP_XProfile_Field::get_children() + * @uses BP_XProfile_ProfileData::get_value_byid() + * + * @param array $args Specify type for datebox. Allowed 'day', 'month', 'year'. + */ function bp_get_the_profile_field_options( $args = '' ) { global $field; @@ -377,6 +404,10 @@ $options = $field->get_children(); + // Setup some defaults + $html = ''; + $selected = ''; + switch ( $field->type ) { case 'selectbox': case 'multiselectbox': @@ -384,46 +415,50 @@ $html .= ''; for ( $k = 0; $k < count($options); $k++ ) { - $option_values = maybe_unserialize( BP_XProfile_ProfileData::get_value_byid( $options[$k]->parent_id ) ); - $option_values = (array)$option_values; + $original_option_values = maybe_unserialize( BP_XProfile_ProfileData::get_value_byid( $options[$k]->parent_id ) ); + $option_values = (array) $original_option_values; - /* Check for updated posted values, but errors preventing them from being saved first time */ - foreach( (array)$option_values as $i => $option_value ) { + // Check for updated posted values, but errors preventing them from being saved first time + foreach( $option_values as $i => $option_value ) { if ( isset( $_POST['field_' . $field->id] ) && $_POST['field_' . $field->id] != $option_value ) { if ( !empty( $_POST['field_' . $field->id] ) ) $option_values[$i] = $_POST['field_' . $field->id]; } } - if ( in_array( $options[$k]->name, (array)$option_values ) || $options[$k]->is_default_option ) { + $selected = ''; + + // First, check to see whether the user-entered value + // matches + if ( in_array( $options[$k]->name, (array) $option_values ) ) $selected = ' selected="selected"'; - } else { - $selected = ''; - } - $html .= apply_filters( 'bp_get_the_profile_field_options_select', '' . stripslashes( esc_attr( $options[$k]->name ) ) . '', $options[$k] ); + // Then, if the user has not provided a value, check for + // defaults + if ( !is_array( $original_option_values ) && empty( $option_values ) & $options[$k]->is_default_option ) + $selected = ' selected="selected"'; + + $html .= apply_filters( 'bp_get_the_profile_field_options_select', '' . esc_attr( stripslashes( $options[$k]->name ) ) . '', $options[$k] ); } break; case 'radio': - $html = '
'; + $html .= '
'; for ( $k = 0; $k < count($options); $k++ ) { $option_value = BP_XProfile_ProfileData::get_value_byid($options[$k]->parent_id); - /* Check for updated posted values, but errors preventing them from being saved first time */ + // Check for updated posted values, but errors preventing them from being saved first time if ( isset( $_POST['field_' . $field->id] ) && $option_value != $_POST['field_' . $field->id] ) { if ( !empty( $_POST['field_' . $field->id] ) ) $option_value = $_POST['field_' . $field->id]; } - - if ( $option_value == $options[$k]->name || $value == $options[$k]->name || ( empty( $option_value ) && $options[$k]->is_default_option ) ) { + + $selected = ''; + if ( $option_value == $options[$k]->name || !empty( $value ) && $value == $options[$k]->name || ( empty( $option_value ) && $options[$k]->is_default_option ) ) $selected = ' checked="checked"'; - } else { - $selected = ''; - } - $html .= apply_filters( 'bp_get_the_profile_field_options_radio', '', $options[$k] ); + $html .= apply_filters( 'bp_get_the_profile_field_options_radio', '', $options[$k] ); } $html .= '
'; @@ -432,39 +467,51 @@ case 'checkbox': $option_values = BP_XProfile_ProfileData::get_value_byid($options[0]->parent_id); - /* Check for updated posted values, but errors preventing them from being saved first time */ + // Check for updated posted values, but errors preventing them from being saved first time if ( isset( $_POST['field_' . $field->id] ) && $option_values != maybe_serialize( $_POST['field_' . $field->id] ) ) { if ( !empty( $_POST['field_' . $field->id] ) ) $option_values = $_POST['field_' . $field->id]; } $option_values = maybe_unserialize($option_values); - - $html = ''; + for ( $k = 0; $k < count($options); $k++ ) { $selected = ''; + + // First, check to see whether the user's saved values + // match the option for ( $j = 0; $j < count($option_values); $j++ ) { - if ( $option_values[$j] == $options[$k]->name || @in_array( $options[$k]->name, $value ) || $options[$k]->is_default_option ) { + if ( $option_values[$j] == $options[$k]->name || @in_array( $options[$k]->name, $value ) ) { $selected = ' checked="checked"'; break; } } + + // If the user has not yet supplied a value for this field, + // check to see whether there is a default value available + if ( !is_array( $option_values ) && empty( $option_values ) && !$selected && $options[$k]->is_default_option) { + $selected = ' checked="checked"'; + } - $html .= apply_filters( 'bp_get_the_profile_field_options_checkbox', '', $options[$k] ); - $selected = ''; + $html .= apply_filters( 'bp_get_the_profile_field_options_checkbox', '', $options[$k] ); } break; case 'datebox': + $date = BP_XProfile_ProfileData::get_value_byid( $field->id ); - if ( !empty( $field->data->value ) ) { - $day = date("j", $field->data->value); - $month = date("F", $field->data->value); - $year = date("Y", $field->data->value); - $default_select = ' selected="selected"'; + // Set day, month, year defaults + $day = ''; + $month = ''; + $year = ''; + + if ( !empty( $date ) ) { + $day = date( 'j', $date ); + $month = date( 'F', $date ); + $year = date( 'Y', $date ); } - /* Check for updated posted values, but errors preventing them from being saved first time */ + // Check for updated posted values, but errors preventing them from being saved first time if ( !empty( $_POST['field_' . $field->id . '_day'] ) ) { if ( $day != $_POST['field_' . $field->id . '_day'] ) $day = $_POST['field_' . $field->id . '_day']; @@ -482,15 +529,10 @@ switch ( $type ) { case 'day': - $html .= ''; + $html .= ''; for ( $i = 1; $i < 32; $i++ ) { - if ( $day == $i ) { - $selected = ' selected = "selected"'; - } else { - $selected = ''; - } - $html .= ''; + $html .= ''; } break; @@ -503,35 +545,23 @@ __( 'October', 'buddypress' ), __( 'November', 'buddypress' ), __( 'December', 'buddypress' ) ); - $html .= ''; + $html .= ''; for ( $i = 0; $i < 12; $i++ ) { - if ( $month == $eng_months[$i] ) { - $selected = ' selected = "selected"'; - } else { - $selected = ''; - } - - $html .= ''; + $html .= ''; } break; case 'year': - $html .= ''; + $html .= ''; - for ( $i = date( 'Y', time() ); $i > 1899; $i-- ) { - if ( $year == $i ) { - $selected = ' selected = "selected"'; - } else { - $selected = ''; - } - - $html .= ''; + for ( $i = date( 'Y' ); $i > 1899; $i-- ) { + $html .= ''; } break; } - apply_filters( 'bp_get_the_profile_field_datebox', $html, $day, $month, $year, $default_select ); + $html = apply_filters( 'bp_get_the_profile_field_datebox', $html, $type, $day, $month, $year ); break; } Index: bp-xprofile.php =================================================================== --- bp-xprofile.php (revision 3647) +++ bp-xprofile.php (working copy) @@ -225,7 +225,7 @@ foreach ( (array)$posted_field_ids as $field_id ) { if ( !isset( $_POST['field_' . $field_id] ) ) { - if ( is_numeric( $_POST['field_' . $field_id . '_day'] ) ) { + if ( !empty( $_POST['field_' . $field_id . '_day'] ) && is_numeric( $_POST['field_' . $field_id . '_day'] ) ) { /* Concatenate the values. */ $date_value = $_POST['field_' . $field_id . '_day'] . ' ' . $_POST['field_' . $field_id . '_month'] . ' ' . @@ -250,10 +250,17 @@ /* Now we've checked for required fields, lets save the values. */ foreach ( (array)$posted_field_ids as $field_id ) { - if ( !xprofile_set_field_data( $field_id, $bp->displayed_user->id, $_POST['field_' . $field_id], $is_required[$field_id] ) ) + + // Certain types of fields (checkboxes, multiselects) may come through empty. Save them as an empty array so that they don't get overwritten by the default on the next edit. + if ( empty( $_POST['field_' . $field_id] ) ) + $value = array(); + else + $value = $_POST['field_' . $field_id]; + + if ( !xprofile_set_field_data( $field_id, $bp->displayed_user->id, $value, $is_required[$field_id] ) ) $errors = true; else - do_action( 'xprofile_profile_field_data_updated', $field_id, $_POST['field_' . $field_id] ); + do_action( 'xprofile_profile_field_data_updated', $field_id, $value ); } do_action( 'xprofile_updated_profile', $bp->displayed_user->id, $posted_field_ids, $errors ); @@ -667,14 +674,15 @@ if ( $is_required && ( empty( $value ) || !is_array( $value ) && !strlen( trim( $value ) ) ) ) return false; - /* If the value is empty, then delete any field data that exists */ - if ( empty( $value ) ) { + $field = new BP_XProfile_Field( $field_id ); + + // If the value is empty, then delete any field data that exists, unless the field is of a + // type where null values are semantically meaningful + if ( empty( $value ) && 'checkbox' != $field->type && 'multiselectbox' != $field->type ) { xprofile_delete_field_data( $field_id, $user_id ); return true; } - $field = new BP_XProfile_Field( $field_id ); - /* Check the value is an acceptable value */ if ( 'checkbox' == $field->type || 'radio' == $field->type || 'selectbox' == $field->type || 'multiselectbox' == $field->type ) { $options = $field->get_children(); @@ -688,9 +696,6 @@ unset( $value[$i] ); } - if ( empty( $value ) ) - return false; - /* Reset the keys by merging with an empty array */ $value = array_merge( array(), $value ); } else {