← All changes | classes/controllers/FrmSimpleBlocksController.php +10 -89 6.30 → 6.2 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,25 @@
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 );
42		-
43	36	$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		- ),
	37	+ 'forms' => self::get_forms_options(),
	38	+ 'icon' => $icon,
	39	+ 'name' => $block_name,
	40	+ 'link' => FrmAppHelper::admin_upgrade_link( 'block' ),
	41	+ 'url' => FrmAppHelper::plugin_url(),
64	42	);
65	43
66	44	wp_localize_script( 'formidable-form-selector', 'formidable_form_selector', $script_vars );
67		-
68	45	if ( function_exists( 'wp_set_script_translations' ) ) {
69	46	wp_set_script_translations( 'formidable-form-selector', 'formidable' );
70	47	}
71		- }
72	48
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	49	wp_enqueue_style(
88	50	'formidable_block-editor-css',
89	51	FrmAppHelper::plugin_url() . '/css/frm_blocks.css',
90	52	array( 'wp-edit-blocks' ),
		@@ -92,28 +54,8 @@
92	54	);
93	55	}
94	56
95	57	/**
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	58	* Returns a filtered list of form options with the name as label and the id as value, sorted by label
117	59	*
118	60	* @return array
119	61	*/
		@@ -136,15 +78,15 @@
136	78
137	79	/**
138	80	* Returns an array for a form with name as label and id as value
139	81	*
140		- * @param object $form
	82	+ * @param $form
141	83	*
142	84	* @return array
143	85	*/
144	86	private static function set_form_options( $form ) {
145	87	return array(
146		- 'label' => FrmFormsHelper::edit_form_link_label( $form ),
	88	+ 'label' => $form->name,
147	89	'value' => $form->id,
148	90	);
149	91	}
150	92
		@@ -193,9 +135,8 @@
193	135	/**
194	136	* Renders a form given the specified attributes.
195	137	*
196	138	* @param array $attributes
197		- *
198	139	* @return string
199	140	*/
200	141	public static function simple_form_render( $attributes ) {
201	142	if ( ! isset( $attributes['formId'] ) ) {
		@@ -201,38 +142,19 @@
201	142	if ( ! isset( $attributes['formId'] ) ) {
202	143	return '';
203	144	}
204	145
205		- ob_start();
206		-
207	146	/**
208	147	* @since 5.5.2
209		- *
210	148	* @param array $attributes
211	149	*/
212	150	do_action( 'frm_before_simple_form_render', $attributes );
213	151
214		- $form = ob_get_clean();
215		-
216		- if ( false === $form ) {
217		- $form = '';
218		- }
219		-
220	152	$params = array_filter( $attributes );
221	153	$params['id'] = $params['formId'];
222	154	unset( $params['formId'] );
223	155
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		-
	156	+ $form = FrmFormsController::get_form_shortcode( $params );
235	157	return self::maybe_remove_fade_on_load_for_block_preview( $form );
236	158	}
237	159
238	160	/**
		@@ -239,14 +161,13 @@
239	161	* Remove fade on load when /wp-json/wp/v2/block-renderer/formidable/simple-form is called.
240	162	* With the class set, the form never appears in the form block preview.
241	163	*
242	164	* @param string $form
243		- *
244	165	* @return string
245	166	*/
246	167	private static function maybe_remove_fade_on_load_for_block_preview( $form ) {
247	168	if ( is_callable( 'wp_is_json_request' ) && wp_is_json_request() ) {
248		- return str_replace( ' frm_logic_form ', ' ', $form );
	169	+ $form = str_replace( ' frm_logic_form ', ' ', $form );
249	170	}
250	171	return $form;
251	172	}
252	173	}