← All changes | classes/controllers/FrmSimpleBlocksController.php +60 -8 6.3 → 6.17 View file →

		@@ -32,14 +32,34 @@
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 );
	40	+
36	41	$script_vars = array(
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(),
	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'] ),
	50	+ ),
	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	+ ),
42	62	);
43	63
44	64	wp_localize_script( 'formidable-form-selector', 'formidable_form_selector', $script_vars );
45	65	if ( function_exists( 'wp_set_script_translations' ) ) {
		@@ -54,8 +74,27 @@
54	74	);
55	75	}
56	76
57	77	/**
	78	+ * Gets addon info.
	79	+ *
	80	+ * @since 6.8
	81	+ *
	82	+ * @param int $addon_id Addon ID.
	83	+ * @return array|false
	84	+ */
	85	+ private static function get_addon_info( $addon_id ) {
	86	+ $api = new FrmFormApi();
	87	+ $addons = $api->get_api_info();
	88	+
	89	+ if ( ! is_array( $addons ) || ! array_key_exists( $addon_id, $addons ) ) {
	90	+ return false;
	91	+ }
	92	+
	93	+ return $addons[ $addon_id ];
	94	+ }
	95	+
	96	+ /**
58	97	* Returns a filtered list of form options with the name as label and the id as value, sorted by label
59	98	*
60	99	* @return array
61	100	*/
		@@ -78,15 +117,15 @@
78	117
79	118	/**
80	119	* Returns an array for a form with name as label and id as value
81	120	*
82		- * @param $form
	121	+ * @param object $form
83	122	*
84	123	* @return array
85	124	*/
86	125	private static function set_form_options( $form ) {
87	126	return array(
88		- 'label' => $form->name,
	127	+ 'label' => FrmFormsHelper::edit_form_link_label( $form ),
89	128	'value' => $form->id,
90	129	);
91	130	}
92	131
		@@ -142,8 +181,10 @@
142	181	if ( ! isset( $attributes['formId'] ) ) {
143	182	return '';
144	183	}
145	184
	185	+ ob_start();
	186	+
146	187	/**
147	188	* @since 5.5.2
148	189	* @param array $attributes
149	190	*/
		@@ -148,13 +189,24 @@
148	189	* @param array $attributes
149	190	*/
150	191	do_action( 'frm_before_simple_form_render', $attributes );
151	192
	193	+ $form = ob_get_clean();
	194	+
	195	+ if ( false === $form ) {
	196	+ $form = '';
	197	+ }
	198	+
152	199	$params = array_filter( $attributes );
153	200	$params['id'] = $params['formId'];
154	201	unset( $params['formId'] );
155	202
156		- $form = FrmFormsController::get_form_shortcode( $params );
	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 );
157	209	return self::maybe_remove_fade_on_load_for_block_preview( $form );
158	210	}
159	211
160	212	/**