← All changes | classes/helpers/FrmShortcodeHelper.php +16 -71 6.35 → 5.0 View file →

		@@ -5,8 +5,9 @@
5	5
6	6	/**
7	7	* @since 2.02.12
8	8	*/
	9	+
9	10	class FrmShortcodeHelper {
10	11
11	12	/**
12	13	* Get the shortcode attributes in key/value pairs from a string
		@@ -18,65 +19,17 @@
18	19	* @return array
19	20	*/
20	21	public static function get_shortcode_attribute_array( $text ) {
21	22	$atts = array();
22		-
23	23	if ( $text !== '' ) {
24	24	$atts = shortcode_parse_atts( $text );
25	25	}
26	26
27		- return is_array( $atts ) ? $atts : array();
28		- }
29		-
30		- /**
31		- * Returns shortcodes that are shown/hidden based on the context.
32		- *
33		- * @since 6.16.3
34		- *
35		- * @return array
36		- */
37		- public static function get_contextual_shortcodes() {
38		- return array(
39		- 'address' => array(
40		- 'admin_email' => __( 'Admin email', 'formidable' ),
41		- 'default-from-email' => __( 'Default from email', 'formidable' ),
42		- 'default-email' => __( 'Default email', 'formidable' ),
43		- ),
44		- 'body' => array(
45		- 'default-message' => __( 'Default Msg', 'formidable' ),
46		- 'default-html' => __( 'Default HTML', 'formidable' ),
47		- 'default-plain' => __( 'Default Plain', 'formidable' ),
48		- ),
49		- );
50		- }
51		-
52		- /**
53		- * Get contextual shortcodes.
54		- *
55		- * @since 6.16.3
56		- *
57		- * @return array
58		- */
59		- public static function get_contextual_shortcode_values() {
60		- $contextual_shortcodes = self::get_contextual_shortcodes();
61		- return array_merge( $contextual_shortcodes['address'], $contextual_shortcodes['body'] );
62		- }
63		-
64		- /**
65		- * Get flattened format of contextual shortcodes.
66		- *
67		- * @since 6.16.3
68		- *
69		- * @return array
70		- */
71		- public static function get_contextual_codes() {
72		- $result = array();
73		-
74		- foreach ( self::get_contextual_shortcodes() as $type => $shortcodes ) {
75		- $result[ $type ] = array_keys( $shortcodes );
	27	+ if ( ! is_array( $atts ) ) {
	28	+ $atts = array();
76	29	}
77	30
78		- return $result;
	31	+ return $atts;
79	32	}
80	33
81	34	/**
82	35	* Get the name of the shortcode from the regEx
		@@ -83,9 +36,9 @@
83	36	*
84	37	* @since 3.0
85	38	*
86	39	* @param array $shortcodes
87		- * @param int $short_key The position in the shortcodes array.
	40	+ * @param int $short_key The position in the shortcodes array
88	41	* @param array $args
89	42	*
90	43	* @return string
91	44	*/
		@@ -97,15 +50,13 @@
97	50	'conditional_check' => false,
98	51	'foreach' => false,
99	52	)
100	53	);
101		-
102	54	if ( ( $args['conditional'] || $args['foreach'] ) && ! $args['conditional_check'] ) {
103	55	$args['conditional_check'] = true;
104	56	}
105	57
106	58	$prefix = '';
107		-
108	59	if ( $args['conditional_check'] ) {
109	60	if ( $args['conditional'] ) {
110	61	$prefix = 'if ';
111	62	} elseif ( $args['foreach'] ) {
		@@ -113,29 +64,23 @@
113	64	}
114	65	}
115	66
116	67	$with_tags = $args['conditional_check'] ? 3 : 2;
117		-
118		- if ( empty( $shortcodes[ $with_tags ][ $short_key ] ) ) {
119		- return $shortcodes[ $with_tags - 1 ][ $short_key ];
	68	+ if ( ! empty( $shortcodes[ $with_tags ][ $short_key ] ) ) {
	69	+ $tag = str_replace( '[' . $prefix, '', $shortcodes[0][ $short_key ] );
	70	+ $tag = str_replace( ']', '', $tag );
	71	+ $tag = str_replace( chr( 194 ) . chr( 160 ), ' ', $tag );
	72	+ $tags = preg_split( '/\s+/', $tag, 2 );
	73	+ if ( is_array( $tags ) ) {
	74	+ $tag = $tags[0];
	75	+ }
	76	+ } else {
	77	+ $tag = $shortcodes[ $with_tags - 1 ][ $short_key ];
120	78	}
121	79
122		- $tag = str_replace( '[' . $prefix, '', $shortcodes[0][ $short_key ] );
123		- $tag = str_replace( ']', '', $tag );
124		- $tag = str_replace( chr( 194 ) . chr( 160 ), ' ', $tag );
125		- $tags = preg_split( '/\s+/', $tag, 2 );
126		-
127		- return is_array( $tags ) ? $tags[0] : $tag;
	80	+ return $tag;
128	81	}
129	82
130		- /**
131		- * @param bool $no_vars
132		- * @param string $code
133		- * @param string $replace_with
134		- * @param string $html
135		- *
136		- * @return void
137		- */
138	83	public static function remove_inline_conditions( $no_vars, $code, $replace_with, &$html ) {
139	84	if ( $no_vars ) {
140	85	$html = str_replace( '[if ' . $code . ']', '', $html );
141	86	$html = str_replace( '[/if ' . $code . ']', '', $html );