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