← All changes | classes/controllers/FrmSimpleBlocksController.php +19 -73 6.30 → 6.6 View file →

		@@ -21,10 +21,9 @@
21	21	true
22	22	);
23	23
24	24	$icon = apply_filters( 'frm_icon', 'svg' );
25		-
26		- if ( str_starts_with( $icon, 'data:image/svg+xml;base64,' ) ) {
	25	+ if ( 0 === strpos( $icon, 'data:image/svg+xml;base64,' ) ) {
27	26	$icon = ' ' . FrmAppHelper::get_menu_icon_class();
28	27	} else {
29	28	$icon = str_replace( 'dashicons-', '', $icon );
30	29	}
		@@ -29,62 +28,31 @@
29	28	$icon = str_replace( 'dashicons-', '', $icon );
30	29	}
31	30
32	31	$block_name = FrmAppHelper::get_menu_name();
33		-
34	32	if ( $block_name === 'Formidable' ) {
35	33	$block_name = 'Formidable Forms';
36	34	}
37	35
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 );
	36	+ $modal_addon = self::get_modal_addon_info();
42	37
43	38	$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'] ),
	39	+ 'forms' => self::get_forms_options(),
	40	+ 'icon' => $icon,
	41	+ 'name' => $block_name,
	42	+ 'link' => FrmAppHelper::admin_upgrade_link( 'block' ),
	43	+ 'url' => FrmAppHelper::plugin_url(),
	44	+ 'modalAddon' => array(
	45	+ 'link' => FrmAppHelper::admin_upgrade_link( 'block', $modal_addon['link'] ),
	46	+ 'hasAccess' => ! empty( $modal_addon['url'] ),
52	47	),
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		- ),
64	48	);
65	49
66	50	wp_localize_script( 'formidable-form-selector', 'formidable_form_selector', $script_vars );
67		-
68	51	if ( function_exists( 'wp_set_script_translations' ) ) {
69	52	wp_set_script_translations( 'formidable-form-selector', 'formidable' );
70	53	}
71		- }
72	54
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	55	wp_enqueue_style(
88	56	'formidable_block-editor-css',
89	57	FrmAppHelper::plugin_url() . '/css/frm_blocks.css',
90	58	array( 'wp-edit-blocks' ),
		@@ -92,19 +60,18 @@
92	60	);
93	61	}
94	62
95	63	/**
96		- * Gets addon info.
	64	+ * Gets the modal addon info.
97	65	*
98		- * @since 6.8
	66	+ * @since 6.3.2
99	67	*
100		- * @param int $addon_id Addon ID.
101		- *
102	68	* @return array|false
103	69	*/
104		- private static function get_addon_info( $addon_id ) {
105		- $api = new FrmFormApi();
106		- $addons = $api->get_api_info();
	70	+ private static function get_modal_addon_info() {
	71	+ $api = new FrmFormApi();
	72	+ $addons = $api->get_api_info();
	73	+ $addon_id = 185013;
107	74
108	75	if ( ! is_array( $addons ) || ! array_key_exists( $addon_id, $addons ) ) {
109	76	return false;
110	77	}
		@@ -136,9 +103,9 @@
136	103
137	104	/**
138	105	* Returns an array for a form with name as label and id as value
139	106	*
140		- * @param object $form
	107	+ * @param $form
141	108	*
142	109	* @return array
143	110	*/
144	111	private static function set_form_options( $form ) {
		@@ -193,9 +160,8 @@
193	160	/**
194	161	* Renders a form given the specified attributes.
195	162	*
196	163	* @param array $attributes
197		- *
198	164	* @return string
199	165	*/
200	166	public static function simple_form_render( $attributes ) {
201	167	if ( ! isset( $attributes['formId'] ) ) {
		@@ -201,38 +167,19 @@
201	167	if ( ! isset( $attributes['formId'] ) ) {
202	168	return '';
203	169	}
204	170
205		- ob_start();
206		-
207	171	/**
208	172	* @since 5.5.2
209		- *
210	173	* @param array $attributes
211	174	*/
212	175	do_action( 'frm_before_simple_form_render', $attributes );
213	176
214		- $form = ob_get_clean();
215		-
216		- if ( false === $form ) {
217		- $form = '';
218		- }
219		-
220	177	$params = array_filter( $attributes );
221	178	$params['id'] = $params['formId'];
222	179	unset( $params['formId'] );
223	180
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		-
	181	+ $form = FrmFormsController::get_form_shortcode( $params );
235	182	return self::maybe_remove_fade_on_load_for_block_preview( $form );
236	183	}
237	184
238	185	/**
		@@ -239,14 +186,13 @@
239	186	* Remove fade on load when /wp-json/wp/v2/block-renderer/formidable/simple-form is called.
240	187	* With the class set, the form never appears in the form block preview.
241	188	*
242	189	* @param string $form
243		- *
244	190	* @return string
245	191	*/
246	192	private static function maybe_remove_fade_on_load_for_block_preview( $form ) {
247	193	if ( is_callable( 'wp_is_json_request' ) && wp_is_json_request() ) {
248		- return str_replace( ' frm_logic_form ', ' ', $form );
	194	+ $form = str_replace( ' frm_logic_form ', ' ', $form );
249	195	}
250	196	return $form;
251	197	}
252	198	}