← All changes | classes/views/shared/toggle.php +13 -22 6.34 → 6.2 View file →

		@@ -13,17 +13,17 @@
13	13	die( 'You are not allowed to call this page directly.' );
14	14	}
15	15	?>
16	16	<?php
17		-$div_class = $args['div_class'] ?? false;
18		-$show_labels = $args['show_labels'] ?? false;
19		-$off_label = $args['off_label'] ?? '';
20		-$on_label = $args['on_label'] ?? 1;
21		-$value = $args['value'] ?? $on_label;
22		-$checked = isset( $args['checked'] ) && ( true === $args['checked'] || str_contains( $args['checked'], 'checked="checked"' ) );
23		-$disabled = ! empty( $args['disabled'] );
24		-$aria_checked = $checked ? 'true' : 'false';
25		-$input_html = $args['input_html'] ?? array();
	17	+$div_class = isset( $args['div_class'] ) ? $args['div_class'] : false;
	18	+$show_labels = isset( $args['show_labels'] ) ? $args['show_labels'] : false;
	19	+$off_label = isset( $args['off_label'] ) ? $args['off_label'] : '';
	20	+$on_label = isset( $args['on_label'] ) ? $args['on_label'] : 1;
	21	+$value = isset( $args['value'] ) ? $args['value'] : $on_label;
	22	+$checked = isset( $args['checked'] ) && ( true === $args['checked'] || false !== strpos( $args['checked'], 'checked="checked"' ) );
	23	+$aria_checked = $checked ? 'true' : 'false';
	24	+$input_html = isset( $args['input_html'] ) ? $args['input_html'] : array();
	25	+
26	26	$use_container = false;
27	27
28	28	$div_params = array(
29	29	// This is important when the default style is !important as Pro styling may cause conflicts.
		@@ -29,15 +29,14 @@
29	29	// This is important when the default style is !important as Pro styling may cause conflicts.
30	30	// It uses --toggle-on-color so just set the variable.
31	31	'style' => '--toggle-on-color:var(--primary-color);',
32	32	);
33		-
34	33	if ( $div_class ) {
35	34	$use_container = true;
36	35	$div_params['class'] = $div_class;
37	36	}
38	37
39		-if ( ! str_contains( $name, '[' ) ) {
	38	+if ( strpos( $name, '[' ) === false ) {
40	39	$name .= '[]';
41	40	}
42	41
43	42	if ( $use_container ) {
		@@ -48,9 +47,9 @@
48	47	}
49	48	?>
50	49	<label class="frm_toggle_block" <?php FrmAppHelper::array_to_html_params( $div_params, true ); ?>>
51	50	<?php if ( $show_labels && $off_label ) { ?>
52		- <span class="frm_off_label frm_toggle_opt frm-leading-none"><?php echo esc_html( $off_label ); ?></span>
	51	+ <span class="frm_off_label frm_toggle_opt"><?php echo esc_html( $off_label ); ?></span>
53	52	<?php } ?>
54	53
55	54	<input type="checkbox" name="<?php echo esc_attr( $name ); ?>" id="<?php echo esc_attr( $id ); ?>" value="<?php echo esc_attr( $value ); ?>"
56	55	<?php checked( $checked, true ); ?>
		@@ -56,11 +55,8 @@
56	55	<?php checked( $checked, true ); ?>
57	56	<?php if ( $show_labels && $off_label ) { ?>
58	57	data-off="<?php echo esc_attr( $off_label ); ?>"
59	58	<?php } ?>
60		- <?php if ( $disabled ) { ?>
61		- disabled
62		- <?php } ?>
63	59	<?php
64	60	if ( is_array( $input_html ) ) {
65	61	FrmAppHelper::array_to_html_params( $input_html, true );
66	62	} else {
		@@ -68,19 +64,14 @@
68	64	}
69	65	?>
70	66	/>
71	67
72		- <span class="frm_toggle" tabindex="0" role="switch"
73		- <?php echo ! empty( $args['aria-label-attr'] ) ? 'aria-label="' . esc_attr( $args['aria-label-attr'] ) . '"' : ''; ?>
74		- aria-labelledby="<?php echo esc_attr( $id ); ?>_label"
75		- aria-checked="<?php echo esc_attr( $aria_checked ); ?>"
76		- >
	68	+ <span class="frm_toggle" tabindex="0" role="switch" aria-labelledby="<?php echo esc_attr( $id ); ?>_label" aria-checked="<?php echo esc_attr( $aria_checked ); ?>">
77	69	<span class="frm_toggle_slider"></span>
78	70	</span>
79	71
80		- <?php // phpcs:ignore Universal.Operators.StrictComparisons ?>
81	72	<?php if ( $show_labels && $on_label != 1 ) { ?>
82		- <span class="frm_on_label frm_toggle_opt frm-leading-none"><?php FrmAppHelper::kses_echo( $on_label, 'all' ); ?></span>
	73	+ <span class="frm_on_label frm_toggle_opt"><?php echo FrmAppHelper::kses( $on_label, 'all' ); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped ?></span>
83	74	<?php } ?>
84	75	</label>
85	76	<?php if ( $use_container ) { ?>
86	77	</div>