← All changes | classes/models/fields/FrmFieldCombo.php +5 -62 6.26.1 → 6.13 View file →

		@@ -2,9 +2,8 @@
2	2	/**
3	3	* Combo field - Field contains sub fields
4	4	*
5	5	* @package Formidable
6		- *
7	6	* @since 4.11
8	7	*/
9	8
10	9	if ( ! defined( 'ABSPATH' ) ) {
		@@ -16,9 +15,8 @@
16	15	/**
17	16	* Does the html for this field label need to include "for"?
18	17	*
19	18	* @var bool
20		- *
21	19	* @since 3.0
22	20	*/
23	21	protected $has_for_label = false;
24	22
		@@ -79,24 +77,8 @@
79	77	}//end foreach
80	78	}
81	79
82	80	/**
83		- * Set the aria-invalid attribute for subfields.
84		- *
85		- * @since 6.16.3
86		- *
87		- * @param array $shortcode_atts
88		- * @param array $args
89		- *
90		- * @return void
91		- */
92		- public function set_aria_invalid_error( &$shortcode_atts, $args ) {
93		- foreach ( $this->get_sub_fields() as $sub_field ) {
94		- $shortcode_atts[ 'aria-invalid-' . $sub_field['name'] ] = isset( $args['errors'][ 'field' . $this->field_id . '-' . $sub_field['name'] ] ) ? 'true' : 'false';
95		- }
96		- }
97		-
98		- /**
99	81	* Gets default sub field.
100	82	*
101	83	* @return array
102	84	*/
		@@ -164,9 +146,8 @@
164	146
165	147	foreach ( $this->sub_fields as $name => $sub_field ) {
166	148	$sub_field['name'] = $name;
167	149	$wrapper_classes = 'frm_grid_container frm_sub_field_options frm_sub_field_options-' . $sub_field['name'];
168		-
169	150	if ( ! isset( $processed_sub_fields[ $name ] ) ) {
170	151	// Options for this subfield should be hidden.
171	152	$wrapper_classes .= ' frm_hidden';
172	153	}
		@@ -269,9 +250,8 @@
269	250	* Shows field in the frontend.
270	251	*
271	252	* @param array $args Arguments.
272	253	* @param array $shortcode_atts Shortcode attributes.
273		- *
274	254	* @return string
275	255	*/
276	256	public function front_field_input( $args, $shortcode_atts ) {
277	257	$field = (array) $this->field;
		@@ -276,9 +256,8 @@
276	256	public function front_field_input( $args, $shortcode_atts ) {
277	257	$field = (array) $this->field;
278	258
279	259	$field['default_value'] = $this->get_default_value();
280		-
281	260	if ( empty( $field['value'] ) ) {
282	261	$field['value'] = $field['default_value'];
283	262	}
284	263
		@@ -379,9 +358,8 @@
379	358
380	359	// Placeholder.
381	360	if ( in_array( 'placeholder', $sub_field['options'], true ) ) {
382	361	$placeholders = FrmField::get_option( $field, 'placeholder' );
383		-
384	362	if ( ! empty( $placeholders[ $sub_field['name'] ] ) ) {
385	363	$field['placeholder'] = $placeholders[ $sub_field['name'] ];
386	364	}
387	365	}
		@@ -386,10 +364,9 @@
386	364	}
387	365	}
388	366
389	367	// Add optional class.
390		- $classes = $sub_field['classes'] ?? '';
391		-
	368	+ $classes = isset( $sub_field['classes'] ) ? $sub_field['classes'] : '';
392	369	if ( is_array( $classes ) ) {
393	370	$classes = implode( ' ', $classes );
394	371	}
395	372
		@@ -403,11 +380,8 @@
403	380
404	381	// Fake it to avoid printing frm-val attribute.
405	382	$field['default_value'] = '';
406	383
407		- if ( ! empty( $sub_field['name'] ) ) {
408		- $field['subfield_name'] = $sub_field['name'];
409		- }
410	384	do_action( 'frm_field_input_html', $field );
411	385
412	386	// Print custom attributes.
413	387	if ( ! empty( $sub_field['atts'] ) && is_array( $sub_field['atts'] ) ) {
		@@ -420,13 +394,12 @@
420	394	/**
421	395	* Validate field.
422	396	*
423	397	* @param array $args Arguments. Includes `errors`, `value`.
424		- *
425	398	* @return array Errors array.
426	399	*/
427	400	public function validate( $args ) {
428		- $errors = $args['errors'] ?? array();
	401	+ $errors = isset( $args['errors'] ) ? $args['errors'] : array();
429	402
430	403	if ( ! $this->field->required ) {
431	404	return $errors;
432	405	}
		@@ -460,13 +433,12 @@
460	433	* @return array
461	434	*/
462	435	public function get_export_headings() {
463	436	$headings = array();
464		- $field_id = $this->field->id ?? $this->field['id'];
465		- $field_name = $this->field->name ?? $this->field['name'];
466		- $field_key = $this->field->field_key ?? $this->field['field_key'];
	437	+ $field_id = isset( $this->field->id ) ? $this->field->id : $this->field['id'];
	438	+ $field_name = isset( $this->field->name ) ? $this->field->name : $this->field['name'];
	439	+ $field_key = isset( $this->field->field_key ) ? $this->field->field_key : $this->field['field_key'];
467	440	$sub_fields = $this->get_processed_sub_fields();
468		-
469	441	foreach ( $sub_fields as $name => $sub_field ) {
470	442	$headings[ $field_id . '_' . $name ] = $field_name . ' (' . $field_key . ') - ' . $sub_field['label'];
471	443	}
472	444
		@@ -511,35 +483,6 @@
511	483	return array(
512	484	'class' => 'frm_combo_inputs_container',
513	485	'id' => 'frm_combo_inputs_container_' . $this->field_id,
514	486	);
515		- }
516		-
517		- /**
518		- * Gets subfield input attributes.
519		- *
520		- * @since 6.26
521		- *
522		- * @param array $sub_field Subfield data.
523		- * @param array $args Field output args. See {@see FrmFieldCombo::load_field_output()}.
524		- *
525		- * @return array
526		- */
527		- protected function get_sub_field_input_attrs( $sub_field, $args ) {
528		- $attrs = array(
529		- 'type' => $sub_field['type'],
530		- 'id' => $args['html_id'] . '_' . $sub_field['name'],
531		- 'value' => '',
532		- );
533		-
534		- if ( ! empty( $args['field']['value'][ $sub_field['name'] ] ) ) {
535		- $attrs['value'] = $args['field']['value'][ $sub_field['name'] ];
536		- $attrs['data-frmval'] = $args['field']['value'][ $sub_field['name'] ];
537		- }
538		-
539		- if ( empty( $args['remove_names'] ) ) {
540		- $attrs['name'] = $args['field_name'] . '[' . $sub_field['name'] . ']';
541		- }
542		-
543		- return $attrs;
544	487	}
545	488	}