← All changes | classes/views/shared/errors.php +10 -45 6.29 → 5.0 View file →

		@@ -5,12 +5,12 @@
5	5
6	6	if ( isset( $message ) && '' !== $message ) {
7	7	if ( FrmAppHelper::is_admin() ) {
8	8	echo '<div class="frm_updated_message">';
9		- FrmAppHelper::kses_echo( $message, 'all' );
	9	+ echo FrmAppHelper::kses( $message, 'all' ); // WPCS: XSS ok.
10	10	echo '</div>';
11	11	} else {
12		- echo FrmAppHelper::maybe_kses( $message ); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
	12	+ echo $message; // WPCS: XSS ok.
13	13	}
14	14	}
15	15
16	16	if ( ! isset( $show_messages ) ) {
		@@ -15,47 +15,31 @@
15	15
16	16	if ( ! isset( $show_messages ) ) {
17	17	$show_messages = array();
18	18	}
19		-
20	19	$show_messages = apply_filters( 'frm_message_list', $show_messages );
21		-
22		-if ( is_array( $show_messages ) && $show_messages !== array() ) {
23		- // Define a callback function to add 'data-action' attribute to allowed HTML tags
24		- $add_data_action_callback = function ( $allowed_html ) {
25		- $allowed_html['span']['data-action'] = true;
26		- return $allowed_html;
27		- };
	20	+if ( is_array( $show_messages ) && count( $show_messages ) > 0 ) {
28	21	?>
29	22	<div class="frm_warning_style" role="alert">
30	23	<ul id="frm_messages">
31	24	<?php
32		- // Add the callback function to the 'frm_striphtml_allowed_tags' filter
33		- add_filter( 'frm_striphtml_allowed_tags', $add_data_action_callback );
34		-
35	25	foreach ( $show_messages as $m ) {
36		- echo '<li>';
37		- FrmAppHelper::kses_echo( $m, array( 'a', 'br', 'span', 'p', 'svg', 'use' ) );
38		- echo '</li>';
	26	+ echo '<li>' . FrmAppHelper::kses( $m, array( 'a', 'br', 'span', 'p' ) ) . '</li>'; // WPCS: XSS ok.
39	27	}
40		- // Remove the callback function from the 'frm_striphtml_allowed_tags' filter
41		- remove_filter( 'frm_striphtml_allowed_tags', $add_data_action_callback );
42	28	?>
43	29	</ul>
44	30	</div>
45	31	<?php
46		-}//end if
	32	+}
47	33
48		-if ( ! empty( $warnings ) && is_array( $warnings ) ) {
	34	+if ( isset( $warnings ) && is_array( $warnings ) && count( $warnings ) > 0 ) {
49	35	?>
50	36	<div class="frm_warning_style inline" role="alert">
51		- <div class="frm_warning_heading"> <?php esc_html_e( 'Warning:', 'formidable' ); ?></div>
	37	+ <div class="frm_warning_heading"> <?php echo esc_html__( 'Warning:', 'formidable' ); ?></div>
52	38	<ul id="frm_warnings">
53	39	<?php
54	40	foreach ( $warnings as $warning ) {
55		- echo '<li>';
56		- FrmAppHelper::kses_echo( $warning, array( 'a', 'br' ) );
57		- echo '</li>';
	41	+ echo '<li>' . FrmAppHelper::kses( $warning, array( 'a', 'br' ) ) . '</li>'; // WPCS: XSS ok.
58	42	}
59	43	?>
60	44	</ul>
61	45	</div>
		@@ -61,36 +45,17 @@
61	45	</div>
62	46	<?php
63	47	}
64	48
65		-if ( ! empty( $errors ) && is_array( $errors ) ) {
	49	+if ( isset( $errors ) && is_array( $errors ) && count( $errors ) > 0 ) {
66	50	?>
67	51	<div class="frm_error_style inline" role="alert">
68	52	<ul id="frm_errors">
69	53	<?php
70	54	foreach ( $errors as $error ) {
71		- echo '<li>';
72		- FrmAppHelper::kses_echo( $error, array( 'a', 'br' ) );
73		- echo '</li>';
	55	+ echo '<li>' . FrmAppHelper::kses( $error, array( 'a', 'br' ) ) . '</li>'; // WPCS: XSS ok.
74	56	}
75	57	?>
76	58	</ul>
77	59	</div>
78	60	<?php
79		-}
80		-
81		-if ( ! empty( $notes ) && is_array( $notes ) ) {
82		- foreach ( $notes as $note ) {
83		- ?>
84		- <div class="frm_note_style">
85		- <?php
86		- if ( is_string( $note ) ) {
87		- echo esc_html( $note );
88		- } elseif ( is_callable( $note ) ) {
89		- // If $note is a function call it so we can handle cases where we don't want to wrap the whole note in esc_html.
90		- $note();
91		- }
92		- ?>
93		- </div>
94		- <?php
95		- }
96	61	}