← All changes | classes/controllers/FrmSimpleBlocksController.php +17 -47 6.25 → 6.7 View file →

		@@ -32,34 +32,20 @@
32	32	if ( $block_name === 'Formidable' ) {
33	33	$block_name = 'Formidable Forms';
34	34	}
35	35
36		- $modal_addon = self::get_addon_info( 185013 );
37		- $charts_addon = self::get_addon_info( 28248560 );
38		- $views_addon = FrmAddonsController::get_addon( 'views' );
39		- $views_addon_info = self::get_addon_info( 28027505 );
	36	+ $modal_addon = self::get_modal_addon_info();
40	37
41	38	$script_vars = array(
42		- 'forms' => self::get_forms_options(),
43		- 'icon' => $icon,
44		- 'name' => $block_name,
45		- 'link' => FrmAppHelper::admin_upgrade_link( 'block' ),
46		- 'url' => FrmAppHelper::plugin_url(),
47		- 'modalAddon' => array(
48		- 'link' => is_array( $modal_addon ) && isset( $modal_addon['link'] ) ? FrmAppHelper::admin_upgrade_link( 'block', $modal_addon['link'] ) : '',
49		- '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'] ),
50	47	),
51		- 'viewsAddon' => array(
52		- 'link' => is_array( $views_addon_info ) && isset( $views_addon_info['link'] ) ? FrmAppHelper::admin_upgrade_link( 'block', $views_addon_info['link'] ) : '',
53		- 'hasAccess' => is_array( $views_addon_info ) && ! empty( $views_addon_info['url'] ),
54		- 'url' => ! empty( $views_addon_info['url'] ) ? $views_addon_info['url'] : '',
55		- 'installed' => is_array( $views_addon ) && 'installed' === $views_addon['status']['type'],
56		- ),
57		- 'chartsAddon' => array(
58		- 'link' => is_array( $charts_addon ) && isset( $charts_addon['link'] ) ? FrmAppHelper::admin_upgrade_link( 'block', $charts_addon['link'] ) : '',
59		- 'hasAccess' => is_array( $charts_addon ) && ! empty( $charts_addon['url'] ),
60		- 'installed' => class_exists( 'FrmChartsAppController' ),
61		- ),
62	48	);
63	49
64	50	wp_localize_script( 'formidable-form-selector', 'formidable_form_selector', $script_vars );
65	51	if ( function_exists( 'wp_set_script_translations' ) ) {
		@@ -74,18 +60,18 @@
74	60	);
75	61	}
76	62
77	63	/**
78		- * Gets addon info.
	64	+ * Gets the modal addon info.
79	65	*
80		- * @since 6.8
	66	+ * @since 6.3.2
81	67	*
82		- * @param int $addon_id Addon ID.
83	68	* @return array|false
84	69	*/
85		- private static function get_addon_info( $addon_id ) {
86		- $api = new FrmFormApi();
87		- $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;
88	74
89	75	if ( ! is_array( $addons ) || ! array_key_exists( $addon_id, $addons ) ) {
90	76	return false;
91	77	}
		@@ -117,9 +103,9 @@
117	103
118	104	/**
119	105	* Returns an array for a form with name as label and id as value
120	106	*
121		- * @param object $form
	107	+ * @param $form
122	108	*
123	109	* @return array
124	110	*/
125	111	private static function set_form_options( $form ) {
		@@ -181,10 +167,8 @@
181	167	if ( ! isset( $attributes['formId'] ) ) {
182	168	return '';
183	169	}
184	170
185		- ob_start();
186		-
187	171	/**
188	172	* @since 5.5.2
189	173	* @param array $attributes
190	174	*/
		@@ -189,27 +173,13 @@
189	173	* @param array $attributes
190	174	*/
191	175	do_action( 'frm_before_simple_form_render', $attributes );
192	176
193		- $form = ob_get_clean();
194		-
195		- if ( false === $form ) {
196		- $form = '';
197		- }
198		-
199	177	$params = array_filter( $attributes );
200	178	$params['id'] = $params['formId'];
201	179	unset( $params['formId'] );
202	180
203		- // Still pass false for title and description options if nothing is set,
204		- // so a default doesn't overwrite the block option.
205		- $params['title'] = ! empty( $params['title'] );
206		- $params['description'] = ! empty( $params['description'] );
207		-
208		- $form .= FrmFormsController::get_form_shortcode( $params );
209		- if ( ! empty( $attributes['className'] ) ) {
210		- $form = preg_replace( '/\bfrm_forms\b/', 'frm_forms ' . esc_attr( $attributes['className'] ), $form, 1 );
211		- }
	181	+ $form = FrmFormsController::get_form_shortcode( $params );
212	182	return self::maybe_remove_fade_on_load_for_block_preview( $form );
213	183	}
214	184
215	185	/**