← All changes | classes/helpers/FrmShortcodeHelper.php +14 -74 6.28 → 6.2.2 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,15 +19,14 @@
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	27	if ( ! is_array( $atts ) ) {
28		- return array();
	28	+ $atts = array();
29	29	}
30	30
31	31	return $atts;
32	32	}
		@@ -31,66 +31,14 @@
31	31	return $atts;
32	32	}
33	33
34	34	/**
35		- * Returns shortcodes that are shown/hidden based on the context.
36		- *
37		- * @since 6.16.3
38		- *
39		- * @return array
40		- */
41		- public static function get_contextual_shortcodes() {
42		- return array(
43		- 'address' => array(
44		- 'admin_email' => __( 'Admin email', 'formidable' ),
45		- 'default-from-email' => __( 'Default from email', 'formidable' ),
46		- 'default-email' => __( 'Default email', 'formidable' ),
47		- ),
48		- 'body' => array(
49		- 'default-message' => __( 'Default Msg', 'formidable' ),
50		- 'default-html' => __( 'Default HTML', 'formidable' ),
51		- 'default-plain' => __( 'Default Plain', 'formidable' ),
52		- ),
53		- );
54		- }
55		-
56		- /**
57		- * Get contextual shortcodes.
58		- *
59		- * @since 6.16.3
60		- *
61		- * @return array
62		- */
63		- public static function get_contextual_shortcode_values() {
64		- $contextual_shortcodes = self::get_contextual_shortcodes();
65		- return array_merge( $contextual_shortcodes['address'], $contextual_shortcodes['body'] );
66		- }
67		-
68		- /**
69		- * Get flattened format of contextual shortcodes.
70		- *
71		- * @since 6.16.3
72		- *
73		- * @return array
74		- */
75		- public static function get_contextual_codes() {
76		- $contextual_shortcodes = self::get_contextual_shortcodes();
77		- $result = array();
78		-
79		- foreach ( $contextual_shortcodes as $type => $shortcodes ) {
80		- $result[ $type ] = array_keys( $shortcodes );
81		- }
82		-
83		- return $result;
84		- }
85		-
86		- /**
87	35	* Get the name of the shortcode from the regEx
88	36	*
89	37	* @since 3.0
90	38	*
91	39	* @param array $shortcodes
92		- * @param int $short_key The position in the shortcodes array.
	40	+ * @param int $short_key The position in the shortcodes array
93	41	* @param array $args
94	42	*
95	43	* @return string
96	44	*/
		@@ -102,15 +50,13 @@
102	50	'conditional_check' => false,
103	51	'foreach' => false,
104	52	)
105	53	);
106		-
107	54	if ( ( $args['conditional'] || $args['foreach'] ) && ! $args['conditional_check'] ) {
108	55	$args['conditional_check'] = true;
109	56	}
110	57
111	58	$prefix = '';
112		-
113	59	if ( $args['conditional_check'] ) {
114	60	if ( $args['conditional'] ) {
115	61	$prefix = 'if ';
116	62	} elseif ( $args['foreach'] ) {
		@@ -118,29 +64,23 @@
118	64	}
119	65	}
120	66
121	67	$with_tags = $args['conditional_check'] ? 3 : 2;
122		-
123		- if ( empty( $shortcodes[ $with_tags ][ $short_key ] ) ) {
124		- 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 ];
125	78	}
126	79
127		- $tag = str_replace( '[' . $prefix, '', $shortcodes[0][ $short_key ] );
128		- $tag = str_replace( ']', '', $tag );
129		- $tag = str_replace( chr( 194 ) . chr( 160 ), ' ', $tag );
130		- $tags = preg_split( '/\s+/', $tag, 2 );
131		-
132		- return is_array( $tags ) ? $tags[0] : $tag;
	80	+ return $tag;
133	81	}
134	82
135		- /**
136		- * @param bool $no_vars
137		- * @param string $code
138		- * @param string $replace_with
139		- * @param string $html
140		- *
141		- * @return void
142		- */
143	83	public static function remove_inline_conditions( $no_vars, $code, $replace_with, &$html ) {
144	84	if ( $no_vars ) {
145	85	$html = str_replace( '[if ' . $code . ']', '', $html );
146	86	$html = str_replace( '[/if ' . $code . ']', '', $html );