← All changes | classes/models/fields/FrmFieldName.php +17 -92 6.29 → 6.21 View file →

		@@ -2,9 +2,8 @@
2	2	/**
3	3	* Name field
4	4	*
5	5	* @package Formidable
6		- *
7	6	* @since 4.11
8	7	*/
9	8
10	9	if ( ! defined( 'ABSPATH' ) ) {
		@@ -13,19 +12,11 @@
13	12
14	13	class FrmFieldName extends FrmFieldCombo {
15	14
16	15	/**
17		- * Track the first name field ID in forms.
18		- *
19		- * @var array Array with keys are form ID and values are name field IDs.
20		- */
21		- private static $first_name_field_ids = array();
22		-
23		- /**
24	16	* Field name.
25	17	*
26	18	* @var string
27		- *
28	19	* @since 3.0
29	20	*/
30	21	protected $type = 'name';
31	22
		@@ -32,9 +23,8 @@
32	23	/**
33	24	* Could this field hold email values?
34	25	*
35	26	* @var bool
36		- *
37	27	* @since 3.0
38	28	*/
39	29	protected $holds_email_values = true;
40	30
		@@ -63,10 +53,11 @@
63	53	protected function get_processed_sub_fields() {
64	54	$name_layout = $this->get_name_layout();
65	55	$names = explode( '_', $name_layout );
66	56	$col_class = 'frm' . intval( 12 / count( $names ) );
67		- $result = array();
68	57
	58	+ $result = array();
	59	+
69	60	foreach ( $names as $name ) {
70	61	if ( empty( $this->sub_fields[ $name ] ) ) {
71	62	continue;
72	63	}
		@@ -91,9 +82,12 @@
91	82	* @return string
92	83	*/
93	84	protected function get_name_layout() {
94	85	$name_layout = FrmField::get_option( $this->field, 'name_layout' );
95		- return $name_layout ? $name_layout : 'first_last';
	86	+ if ( ! $name_layout ) {
	87	+ $name_layout = 'first_last';
	88	+ }
	89	+ return $name_layout;
96	90	}
97	91
98	92	/**
99	93	* Gets extra field options.
		@@ -134,9 +128,8 @@
134	128	* This also handles the shortcode output. Support [id], [id show=first], [id show=last], [id show=middle].
135	129	*
136	130	* @param mixed $value Field value before processing.
137	131	* @param array $atts Shortcode attributes.
138		- *
139	132	* @return string Most of cases, this will return string.
140	133	*/
141	134	protected function prepare_display_value( $value, $atts ) {
142	135	if ( ! is_array( $value ) ) {
		@@ -142,14 +135,14 @@
142	135	if ( ! is_array( $value ) ) {
143	136	return $value;
144	137	}
145	138
	139	+ $name_layout = $this->get_name_layout();
	140	+
146	141	if ( ! empty( $atts['show'] ) ) {
147		- return $value[ $atts['show'] ] ?? '';
	142	+ return isset( $value[ $atts['show'] ] ) ? $value[ $atts['show'] ] : '';
148	143	}
149	144
150		- $name_layout = $this->get_name_layout();
151		-
152	145	$value = wp_parse_args(
153	146	$value,
154	147	array(
155	148	'first' => '',
		@@ -176,10 +169,8 @@
176	169
177	170	/**
178	171	* @since 4.0.04
179	172	*
180		- * @param array|string $value
181		- *
182	173	* @return void
183	174	*/
184	175	public function sanitize_value( &$value ) {
185	176	FrmAppHelper::sanitize_value( 'sanitize_text_field', $value );
		@@ -188,9 +179,8 @@
188	179	/**
189	180	* Validate field.
190	181	*
191	182	* @param array $args Arguments. Includes `errors`, `value`.
192		- *
193	183	* @return array Errors array.
194	184	*/
195	185	public function validate( $args ) {
196	186	/**
		@@ -220,17 +210,15 @@
220	210	protected function process_args_for_field_output( &$args ) {
221	211	parent::process_args_for_field_output( $args );
222	212
223	213	// Show all subfields in form builder then use JS to show or hide them.
224		- if ( ! $this->should_print_hidden_sub_fields() || count( $args['sub_fields'] ) === count( $this->sub_fields ) ) {
225		- return;
226		- }
	214	+ if ( $this->should_print_hidden_sub_fields() && count( $args['sub_fields'] ) !== count( $this->sub_fields ) ) {
	215	+ $hidden_fields = array_diff_key( $this->sub_fields, $args['sub_fields'] );
	216	+ $args['sub_fields'] = $this->sub_fields;
227	217
228		- $hidden_fields = array_diff_key( $this->sub_fields, $args['sub_fields'] );
229		- $args['sub_fields'] = $this->sub_fields;
230		-
231		- foreach ( $hidden_fields as $name => $hidden_field ) {
232		- $args['sub_fields'][ $name ]['wrapper_classes'] .= ' frm_hidden';
	218	+ foreach ( $hidden_fields as $name => $hidden_field ) {
	219	+ $args['sub_fields'][ $name ]['wrapper_classes'] .= ' frm_hidden';
	220	+ }
233	221	}
234	222	}
235	223
236	224	/**
		@@ -262,15 +250,12 @@
262	250	*
263	251	* @since 6.16
264	252	*
265	253	* @param array $args
266		- *
267	254	* @return void
268	255	*/
269	256	public function show_after_default( $args ) {
270		- echo '<div class="frm-mt-xs">';
271	257	parent::show_after_default( $args );
272		- echo '</div>';
273	258
274	259	/**
275	260	* @var array $field
276	261	*/
		@@ -276,12 +261,10 @@
276	261	*/
277	262	$field = $args['field'];
278	263
279	264	$show_warning = false;
280		-
281		- foreach ( $this->sub_fields as $sub_field ) {
	265	+ foreach ( $this->sub_fields as $name => $sub_field ) {
282	266	$description = FrmField::get_option( $field, $sub_field['name'] . '_desc' );
283		-
284	267	if ( in_array( $description, array( 'First', 'Last' ), true ) ) {
285	268	$show_warning = true;
286	269	break;
287	270	}
		@@ -289,73 +272,15 @@
289	272
290	273	if ( ! $show_warning ) {
291	274	return;
292	275	}
293		- // phpcs:disable Generic.WhiteSpace.ScopeIndent
294	276	?>
295	277	<div class="frm_warning_style">
296	278	<?php
297		- FrmAppHelper::icon_by_class( 'frmfont frm_alert_icon', array( 'style' => 'width:24px' ) );
	279	+ FrmAppHelper::icon_by_class( 'frm_icon_font frm_alert_icon', array( 'style' => 'width:24px' ) );
298	280	echo ' ';
299	281	esc_html_e( 'Subfield descriptions are read by screen readers. Enhance accessibility by using complete labels, like "First Name" instead of "First".', 'formidable' );
300	282	?>
301	283	</div>
302	284	<?php
303		- // phpcs:enable Generic.WhiteSpace.ScopeIndent
304		- }
305		-
306		- /**
307		- * Tracks the first name field ID in a form.
308		- *
309		- * @since 6.26
310		- *
311		- * @param object[] $fields Array of fields in a form.
312		- *
313		- * @return void
314		- */
315		- public static function track_first_name_field( $fields ) {
316		- foreach ( $fields as $field ) {
317		- if ( 'name' === $field->type ) {
318		- self::$first_name_field_ids[ $field->form_id ] = $field->id;
319		- return;
320		- }
321		- }
322		- }
323		-
324		- /**
325		- * Gets subfield input attributes.
326		- *
327		- * @since 6.26
328		- *
329		- * @param array $sub_field Subfield data.
330		- * @param array $args Field output args. See {@see FrmFieldCombo::load_field_output()}.
331		- *
332		- * @return array
333		- */
334		- protected function get_sub_field_input_attrs( $sub_field, $args ) {
335		- $attrs = parent::get_sub_field_input_attrs( $sub_field, $args );
336		- $form_id = (int) ( is_array( $args['field'] ) ? $args['field']['form_id'] : $args['field']->form_id );
337		-
338		- if ( ! self::$first_name_field_ids || empty( self::$first_name_field_ids[ $form_id ] ) ) {
339		- return $attrs;
340		- }
341		-
342		- $parent_form_id = (int) FrmField::get_option( $args['field'], 'parent_form_id' );
343		-
344		- if ( $form_id !== $parent_form_id ) {
345		- // Do not add autocomplete attribute to a name field inside repeater.
346		- return $attrs;
347		- }
348		-
349		- $field_id = (int) ( is_array( $args['field'] ) ? $args['field']['id'] : $args['field']->id );
350		-
351		- if ( intval( self::$first_name_field_ids[ $form_id ] ) === $field_id ) {
352		- if ( 'first' === $sub_field['name'] ) {
353		- $attrs['autocomplete'] = 'given-name';
354		- } elseif ( 'last' === $sub_field['name'] ) {
355		- $attrs['autocomplete'] = 'family-name';
356		- }
357		- }
358		-
359		- return $attrs;
360	285	}
361	286	}