← All changes | classes/controllers/FrmSimpleBlocksController.php +11 -99 6.35 → 5.4 View file →

		@@ -6,10 +6,8 @@
6	6	class FrmSimpleBlocksController {
7	7
8	8	/**
9	9	* Enqueue Formidable Simple Blocks' js and CSS for editor in admin.
10		- *
11		- * @return void
12	10	*/
13	11	public static function block_editor_assets() {
14	12	$version = FrmAppHelper::plugin_version();
15	13
		@@ -21,10 +19,9 @@
21	19	true
22	20	);
23	21
24	22	$icon = apply_filters( 'frm_icon', 'svg' );
25		-
26		- if ( str_starts_with( $icon, 'data:image/svg+xml;base64,' ) ) {
	23	+ if ( 0 === strpos( $icon, 'data:image/svg+xml;base64,' ) ) {
27	24	$icon = ' ' . FrmAppHelper::get_menu_icon_class();
28	25	} else {
29	26	$icon = str_replace( 'dashicons-', '', $icon );
30	27	}
		@@ -29,62 +26,25 @@
29	26	$icon = str_replace( 'dashicons-', '', $icon );
30	27	}
31	28
32	29	$block_name = FrmAppHelper::get_menu_name();
33		-
34	30	if ( $block_name === 'Formidable' ) {
35	31	$block_name = 'Formidable Forms';
36	32	}
37	33
38		- $modal_addon = self::get_addon_info( 185013 );
39		- $charts_addon = self::get_addon_info( 28248560 );
40		- $views_addon = FrmAddonsController::get_addon( 'views' );
41		- $views_addon_info = self::get_addon_info( 28027505 );
42		-
43	34	$script_vars = array(
44		- 'forms' => self::get_forms_options(),
45		- 'icon' => $icon,
46		- 'name' => $block_name,
47		- 'link' => FrmAppHelper::admin_upgrade_link( 'block' ),
48		- 'url' => FrmAppHelper::plugin_url(),
49		- 'modalAddon' => array(
50		- 'link' => is_array( $modal_addon ) && isset( $modal_addon['link'] ) ? FrmAppHelper::admin_upgrade_link( 'block', $modal_addon['link'] ) : '',
51		- 'hasAccess' => is_array( $modal_addon ) && ! empty( $modal_addon['url'] ),
52		- ),
53		- 'viewsAddon' => array(
54		- 'link' => is_array( $views_addon_info ) && isset( $views_addon_info['link'] ) ? FrmAppHelper::admin_upgrade_link( 'block', $views_addon_info['link'] ) : '',
55		- 'hasAccess' => is_array( $views_addon_info ) && ! empty( $views_addon_info['url'] ),
56		- 'url' => ! empty( $views_addon_info['url'] ) ? $views_addon_info['url'] : '',
57		- 'installed' => is_array( $views_addon ) && 'installed' === $views_addon['status']['type'],
58		- ),
59		- 'chartsAddon' => array(
60		- 'link' => is_array( $charts_addon ) && isset( $charts_addon['link'] ) ? FrmAppHelper::admin_upgrade_link( 'block', $charts_addon['link'] ) : '',
61		- 'hasAccess' => is_array( $charts_addon ) && ! empty( $charts_addon['url'] ),
62		- 'installed' => class_exists( 'FrmChartsAppController' ),
63		- ),
	35	+ 'forms' => self::get_forms_options(),
	36	+ 'icon' => $icon,
	37	+ 'name' => $block_name,
	38	+ 'link' => FrmAppHelper::admin_upgrade_link( 'block' ),
	39	+ 'url' => FrmAppHelper::plugin_url(),
64	40	);
65	41
66	42	wp_localize_script( 'formidable-form-selector', 'formidable_form_selector', $script_vars );
67		-
68	43	if ( function_exists( 'wp_set_script_translations' ) ) {
69	44	wp_set_script_translations( 'formidable-form-selector', 'formidable' );
70	45	}
71		- }
72	46
73		- /**
74		- * Enqueue Formidable Simple Blocks' JS and CSS for the content.
75		- *
76		- * @since 6.26
77		- *
78		- * @return void
79		- */
80		- public static function block_assets() {
81		- if ( ! is_admin() ) {
82		- return;
83		- }
84		-
85		- $version = FrmAppHelper::plugin_version();
86		-
87	47	wp_enqueue_style(
88	48	'formidable_block-editor-css',
89	49	FrmAppHelper::plugin_url() . '/css/frm_blocks.css',
90	50	array( 'wp-edit-blocks' ),
		@@ -92,28 +52,8 @@
92	52	);
93	53	}
94	54
95	55	/**
96		- * Gets addon info.
97		- *
98		- * @since 6.8
99		- *
100		- * @param int $addon_id Addon ID.
101		- *
102		- * @return array|false
103		- */
104		- private static function get_addon_info( $addon_id ) {
105		- $api = new FrmFormApi();
106		- $addons = $api->get_api_info();
107		-
108		- if ( ! is_array( $addons ) || ! array_key_exists( $addon_id, $addons ) ) {
109		- return false;
110		- }
111		-
112		- return $addons[ $addon_id ];
113		- }
114		-
115		- /**
116	56	* Returns a filtered list of form options with the name as label and the id as value, sorted by label
117	57	*
118	58	* @return array
119	59	*/
		@@ -136,15 +76,15 @@
136	76
137	77	/**
138	78	* Returns an array for a form with name as label and id as value
139	79	*
140		- * @param object $form
	80	+ * @param $form
141	81	*
142	82	* @return array
143	83	*/
144	84	private static function set_form_options( $form ) {
145	85	return array(
146		- 'label' => FrmFormsHelper::edit_form_link_label( $form ),
	86	+ 'label' => $form->name,
147	87	'value' => $form->id,
148	88	);
149	89	}
150	90
		@@ -149,10 +89,8 @@
149	89	}
150	90
151	91	/**
152	92	* Registers simple form block
153		- *
154		- * @return void
155	93	*/
156	94	public static function register_simple_form_block() {
157	95	if ( ! is_callable( 'register_block_type' ) ) {
158	96	return;
		@@ -192,9 +130,9 @@
192	130
193	131	/**
194	132	* Renders a form given the specified attributes.
195	133	*
196		- * @param array $attributes
	134	+ * @param $attributes
197	135	*
198	136	* @return string
199	137	*/
200	138	public static function simple_form_render( $attributes ) {
		@@ -201,38 +139,13 @@
201	139	if ( ! isset( $attributes['formId'] ) ) {
202	140	return '';
203	141	}
204	142
205		- ob_start();
206		-
207		- /**
208		- * @since 5.5.2
209		- *
210		- * @param array $attributes
211		- */
212		- do_action( 'frm_before_simple_form_render', $attributes );
213		-
214		- $form = ob_get_clean();
215		-
216		- if ( false === $form ) {
217		- $form = '';
218		- }
219		-
220	143	$params = array_filter( $attributes );
221	144	$params['id'] = $params['formId'];
222	145	unset( $params['formId'] );
223	146
224		- // Still pass false for title and description options if nothing is set,
225		- // So a default doesn't overwrite the block option.
226		- $params['title'] = ! empty( $params['title'] );
227		- $params['description'] = ! empty( $params['description'] );
228		-
229		- $form .= FrmFormsController::get_form_shortcode( $params );
230		-
231		- if ( ! empty( $attributes['className'] ) ) {
232		- $form = preg_replace( '/\bfrm_forms\b/', 'frm_forms ' . esc_attr( $attributes['className'] ), $form, 1 );
233		- }
234		-
	147	+ $form = FrmFormsController::get_form_shortcode( $params );
235	148	return self::maybe_remove_fade_on_load_for_block_preview( $form );
236	149	}
237	150
238	151	/**
		@@ -239,14 +152,13 @@
239	152	* Remove fade on load when /wp-json/wp/v2/block-renderer/formidable/simple-form is called.
240	153	* With the class set, the form never appears in the form block preview.
241	154	*
242	155	* @param string $form
243		- *
244	156	* @return string
245	157	*/
246	158	private static function maybe_remove_fade_on_load_for_block_preview( $form ) {
247	159	if ( is_callable( 'wp_is_json_request' ) && wp_is_json_request() ) {
248		- return str_replace( ' frm_logic_form ', ' ', $form );
	160	+ $form = str_replace( ' frm_logic_form ', ' ', $form );
249	161	}
250	162	return $form;
251	163	}
252	164	}