← All changes | classes/controllers/FrmAddonsController.php +764 -516 6.3 → 6.32 View file →

		@@ -5,15 +5,97 @@
5	5
6	6	class FrmAddonsController {
7	7
8	8	/**
9		- * @var string $plugin
	9	+ * @var string
10	10	*/
	11	+ const SCRIPT_HANDLE = 'frm-addons-page';
	12	+
	13	+ /**
	14	+ * @var array
	15	+ */
	16	+ private static $categories = array();
	17	+
	18	+ /**
	19	+ * @var string
	20	+ */
	21	+ private static $request_addon_url;
	22	+
	23	+ /**
	24	+ * @var string
	25	+ */
11	26	protected static $plugin;
12	27
13	28	/**
	29	+ * @since 6.15
	30	+ *
14	31	* @return void
15	32	*/
	33	+ public static function load_admin_hooks() {
	34	+ add_action( 'admin_menu', self::class . '::menu', 100 );
	35	+ add_filter( 'pre_set_site_transient_update_plugins', self::class . '::check_update' );
	36	+
	37	+ if ( ! FrmAppHelper::is_admin_page( 'formidable-addons' ) ) {
	38	+ return;
	39	+ }
	40	+
	41	+ self::$request_addon_url = 'https://connect.formidableforms.com/add-on-request/';
	42	+
	43	+ add_action( 'admin_enqueue_scripts', self::class . '::enqueue_assets', 15 );
	44	+ add_filter( 'frm_show_footer_links', '__return_false' );
	45	+ }
	46	+
	47	+ /**
	48	+ * Enqueues the Add-Ons page scripts and styles.
	49	+ *
	50	+ * @since 6.15
	51	+ *
	52	+ * @return void
	53	+ */
	54	+ public static function enqueue_assets() {
	55	+ $plugin_url = FrmAppHelper::plugin_url();
	56	+ $version = FrmAppHelper::plugin_version();
	57	+ $js_dependencies = array(
	58	+ 'wp-i18n',
	59	+ // This prevents a console error "wp.hooks is undefined" in WP versions older than 5.7.
	60	+ 'wp-hooks',
	61	+ 'formidable_dom',
	62	+ );
	63	+
	64	+ // Enqueue styles that needed.
	65	+ wp_enqueue_style( 'formidable-admin' );
	66	+ wp_enqueue_style( 'formidable-grids' );
	67	+
	68	+ // Register and enqueue Add-Ons page style.
	69	+ wp_register_style( self::SCRIPT_HANDLE, $plugin_url . '/css/admin/addons-page.css', array(), $version );
	70	+ wp_enqueue_style( self::SCRIPT_HANDLE );
	71	+
	72	+ // Register and enqueue Add-Ons page script.
	73	+ wp_register_script( self::SCRIPT_HANDLE, $plugin_url . '/js/addons-page.js', $js_dependencies, $version, true );
	74	+ wp_localize_script( self::SCRIPT_HANDLE, 'frmAddonsVars', self::get_js_variables() );
	75	+ wp_enqueue_script( self::SCRIPT_HANDLE );
	76	+ wp_set_script_translations( self::SCRIPT_HANDLE, 'formidable' );
	77	+
	78	+ FrmAppHelper::dequeue_extra_global_scripts();
	79	+ }
	80	+
	81	+ /**
	82	+ * Get the Add-Ons page JS variables as an array.
	83	+ *
	84	+ * @since 6.15
	85	+ *
	86	+ * @return array
	87	+ */
	88	+ private static function get_js_variables() {
	89	+ return array(
	90	+ 'proIsIncluded' => FrmAppHelper::pro_is_included(),
	91	+ 'addonRequestURL' => self::$request_addon_url,
	92	+ );
	93	+ }
	94	+
	95	+ /**
	96	+ * @return void
	97	+ */
16	98	public static function menu() {
17	99	if ( ! current_user_can( 'activate_plugins' ) ) {
18	100	return;
19	101	}
		@@ -18,25 +100,37 @@
18	100	return;
19	101	}
20	102
21	103	$label = __( 'Add-Ons', 'formidable' );
22		- $label = '<span style="color:#fe5a1d">' . $label . '</span>';
	104	+ $label = '<span style="color:#3FCA89">' . esc_html( $label ) . '</span>';
23	105
24	106	add_submenu_page( 'formidable', 'Formidable | ' . __( 'Add-Ons', 'formidable' ), $label, 'frm_view_forms', 'formidable-addons', 'FrmAddonsController::list_addons' );
25	107
	108	+ // Remove default created subpage, make the page with highest priority as default.
	109	+ remove_submenu_page( 'formidable', 'formidable' );
	110	+
26	111	if ( ! FrmAppHelper::pro_is_installed() ) {
	112	+ $cta_text = FrmSalesApi::get_best_sale_value( 'menu_cta_text' );
	113	+
	114	+ if ( ! $cta_text ) {
	115	+ $cta_text = __( 'Upgrade', 'formidable' );
	116	+ }
	117	+
27	118	add_submenu_page(
28	119	'formidable',
29	120	'Formidable | ' . __( 'Upgrade', 'formidable' ),
30		- '<span class="frm-upgrade-submenu">' . __( 'Upgrade', 'formidable' ) . '</span>',
	121	+ '<span class="frm-upgrade-submenu">' . esc_html( $cta_text ) . '</span>',
31	122	'frm_view_forms',
32	123	'formidable-pro-upgrade',
33		- 'FrmAddonsController::upgrade_to_pro'
	124	+ function () {
	125	+ // This function doesn't need to do anything.
	126	+ // The redirect is handled earlier to avoid issues with the headers being sent.
	127	+ }
34	128	);
35	129	} elseif ( 'formidable-pro-upgrade' === FrmAppHelper::get_param( 'page' ) ) {
36	130	wp_safe_redirect( admin_url( 'admin.php?page=formidable' ) );
37	131	exit;
38		- }
	132	+ }//end if
39	133	}
40	134
41	135	/**
42	136	* @return void
		@@ -42,28 +136,32 @@
42	136	* @return void
43	137	*/
44	138	public static function list_addons() {
45	139	FrmAppHelper::include_svg();
46		- $installed_addons = apply_filters( 'frm_installed_addons', array() );
47		- $license_type = '';
48	140
49		- $addons = self::get_api_addons();
50		- $errors = array();
	141	+ $view_path = FrmAppHelper::plugin_path() . '/classes/views/addons/';
	142	+ $installed_addons = apply_filters( 'frm_installed_addons', array() );
	143	+ $addons = self::get_api_addons();
	144	+ $errors = array();
	145	+ $license_type = '';
	146	+ $request_addon_url = self::$request_addon_url;
51	147
52	148	if ( isset( $addons['error'] ) ) {
53		- $api = new FrmFormApi();
54		- $errors = $api->get_error_from_response( $addons );
55		- $license_type = isset( $addons['error']['type'] ) ? $addons['error']['type'] : '';
	149	+ $api = new FrmFormApi();
	150	+ $errors = $api->get_error_from_response( $addons );
	151	+ $license_type = $addons['error']['type'] ?? '';
56	152	unset( $addons['error'] );
57	153	}
58	154
59		- $pro = array(
	155	+ $pro = array(
60	156	'pro' => array(
61		- 'title' => 'Formidable Forms Pro',
62		- 'slug' => 'formidable-pro',
63		- 'released' => '2011-02-05',
64		- 'docs' => 'knowledgebase/',
65		- 'excerpt' => 'Create calculators, surveys, smart forms, and data-driven applications. Build directories, real estate listings, job boards, and much more.',
	157	+ 'title' => 'Formidable Forms Pro',
	158	+ 'slug' => 'formidable-pro',
	159	+ 'released' => '2011-02-05',
	160	+ 'docs' => 'knowledgebase/what-is-the-difference-between-the-lite-free-and-pro-version/',
	161	+ 'docs_label' => __( 'Why Upgrade', 'formidable' ),
	162	+ 'categories' => array( 'basic', 'plus', 'business', 'elite' ),
	163	+ 'excerpt' => 'Create calculators, surveys, smart forms, and data-driven applications. Build directories, real estate listings, job boards, and much more.',
66	164	),
67	165	);
68	166	$addons = $pro + $addons;
69	167	self::prepare_addons( $addons );
		@@ -69,25 +167,120 @@
69	167	self::prepare_addons( $addons );
70	168
71	169	$pricing = FrmAppHelper::admin_upgrade_link( 'addons' );
72	170
73		- include( FrmAppHelper::plugin_path() . '/classes/views/addons/list.php' );
	171	+ self::organize_and_get_categories();
	172	+ $categories = self::$categories;
	173	+
	174	+ include $view_path . 'index.php';
74	175	}
75	176
76	177	/**
	178	+ * Organize and set categories.
	179	+ *
	180	+ * @since 6.15
	181	+ *
77	182	* @return void
78	183	*/
	184	+ protected static function organize_and_get_categories() {
	185	+ unset( self::$categories['strategy11'] );
	186	+ ksort( self::$categories );
	187	+
	188	+ $bottom_categories = array();
	189	+ $plans = FrmFormsHelper::get_license_types(
	190	+ array(
	191	+ 'include_all' => false,
	192	+ 'case_lower' => true,
	193	+ )
	194	+ );
	195	+
	196	+ // Extract the elements to move
	197	+ foreach ( $plans as $plan ) {
	198	+ if ( ! isset( self::$categories[ $plan ] ) ) {
	199	+ continue;
	200	+ }
	201	+
	202	+ $bottom_categories[ $plan ] = self::$categories[ $plan ];
	203	+ unset( self::$categories[ $plan ] );
	204	+ }
	205	+
	206	+ $special_categories = array();
	207	+
	208	+ if ( 'elite' !== self::license_type() ) {
	209	+ $special_categories['available-addons'] = array(
	210	+ 'name' => __( 'Available', 'formidable' ),
	211	+ // To be assigned via JavaScript.
	212	+ 'count' => 0,
	213	+ );
	214	+ }
	215	+
	216	+ $special_categories['active-addons'] = array(
	217	+ 'name' => __( 'Active', 'formidable' ),
	218	+ // To be assigned via JavaScript.
	219	+ 'count' => 0,
	220	+ );
	221	+
	222	+ $special_categories['all-items'] = array(
	223	+ 'name' => __( 'All Add-Ons', 'formidable' ),
	224	+ // To be assigned via JavaScript.
	225	+ 'count' => 0,
	226	+ );
	227	+
	228	+ self::$categories = array_merge(
	229	+ $special_categories,
	230	+ self::$categories,
	231	+ $bottom_categories
	232	+ );
	233	+ }
	234	+
	235	+ /**
	236	+ * Organize and set categories.
	237	+ *
	238	+ * @since 6.15
	239	+ *
	240	+ * @param array $addon The addon array that will be modified by reference.
	241	+ *
	242	+ * @return void
	243	+ */
	244	+ protected static function set_categories( &$addon ) {
	245	+ if ( ! isset( $addon['categories'] ) ) {
	246	+ return;
	247	+ }
	248	+
	249	+ $addon['category-slugs'] = array();
	250	+
	251	+ foreach ( $addon['categories'] as $category ) {
	252	+ $category = FrmFormsHelper::convert_legacy_package_names( $category );
	253	+ $category_slug = sanitize_title( $category );
	254	+
	255	+ // Add the slug to the new array.
	256	+ $addon['category-slugs'][] = $category_slug;
	257	+
	258	+ if ( ! isset( self::$categories[ $category_slug ] ) ) {
	259	+ self::$categories[ $category_slug ] = array(
	260	+ 'name' => $category,
	261	+ 'count' => 0,
	262	+ );
	263	+ }
	264	+
	265	+ ++self::$categories[ $category_slug ]['count'];
	266	+ }
	267	+ }
	268	+
	269	+ /**
	270	+ * @return void
	271	+ */
79	272	public static function license_settings() {
80	273	$plugins = apply_filters( 'frm_installed_addons', array() );
81		- if ( empty( $plugins ) ) {
	274	+
	275	+ if ( ! $plugins ) {
82	276	esc_html_e( 'There are no plugins on your site that require a license', 'formidable' );
83		-
84	277	return;
85	278	}
86	279
87	280	ksort( $plugins );
88	281
89		- include( FrmAppHelper::plugin_path() . '/classes/views/addons/settings.php' );
	282	+ include FrmAppHelper::plugin_path() . '/classes/views/addons/settings.php';
90	283	}
91	284
92	285	/**
93	286	* @return array
		@@ -95,15 +288,15 @@
95	288	protected static function get_api_addons() {
96	289	$api = new FrmFormApi();
97	290	$addons = $api->get_api_info();
98	291
99		- if ( empty( $addons ) ) {
100		- $addons = self::fallback_plugin_list();
101		- } else {
102		- foreach ( $addons as $k => $addon ) {
103		- if ( empty( $addon['excerpt'] ) && $k !== 'error' ) {
104		- unset( $addons[ $k ] );
105		- }
	292	+ if ( ! $addons ) {
	293	+ return self::fallback_plugin_list();
	294	+ }
	295	+
	296	+ foreach ( $addons as $k => $addon ) {
	297	+ if ( empty( $addon['excerpt'] ) && $k !== 'error' ) {
	298	+ unset( $addons[ $k ] );
106	299	}
107	300	}
108	301
109	302	return $addons;
		@@ -109,11 +302,23 @@
109	302	return $addons;
110	303	}
111	304
112	305	/**
	306	+ * Retrieves the count of available addons.
	307	+ *
	308	+ * @since 6.9
	309	+ *
	310	+ * @return int Count of addons.
	311	+ */
	312	+ public static function get_addons_count() {
	313	+ return count( self::get_api_addons() );
	314	+ }
	315	+
	316	+ /**
113	317	* If the API is unable to connect, show something on the addons page
114	318	*
115	319	* @since 3.04.03
	320	+ *
116	321	* @return array
117	322	*/
118	323	protected static function fallback_plugin_list() {
119	324	$list = array(
		@@ -124,19 +329,19 @@
124	329	'excerpt' => 'Enhance your basic Formidable forms with a plethora of Pro field types and features. Create advanced forms and data-driven applications in minutes.',
125	330	),
126	331	'mailchimp' => array(
127	332	'title' => 'Mailchimp Forms',
128		- 'excerpt' => 'Get on the path to more sales and leads in a matter of minutes. Add leads to a Mailchimp mailing list when they submit forms and update their information along with the entry.',
	333	+ 'excerpt' => 'Get on the path to more sales and leads in a matter of minutes. Add leads to a Mailchimp mailing list when they submit forms and update their information along with the entry.', // phpcs:ignore SlevomatCodingStandard.Files.LineLength.LineTooLong
129	334	),
130	335	'registration' => array(
131	336	'title' => 'User Registration Forms',
132	337	'link' => 'downloads/user-registration/',
133		- 'excerpt' => 'Give new users access to your site as quickly and painlessly as possible. Allow users to register, edit and be able to login to their profiles on your site from the front end in a clean, customized registration form.',
	338	+ 'excerpt' => 'Give new users access to your site as quickly and painlessly as possible. Allow users to register, edit and be able to login to their profiles on your site from the front end in a clean, customized registration form.', // phpcs:ignore SlevomatCodingStandard.Files.LineLength.LineTooLong
134	339	),
135	340	'paypal' => array(
136	341	'title' => 'PayPal Standard Forms',
137	342	'link' => 'downloads/paypal-standard/',
138		- 'excerpt' => 'Automate your business by collecting instant payments from your clients. Collect information, calculate a total, and send them on to PayPal. Require a payment before publishing content on your site.',
	343	+ 'excerpt' => 'Automate your business by collecting instant payments from your clients. Collect information, calculate a total, and send them on to PayPal. Require a payment before publishing content on your site.', // phpcs:ignore SlevomatCodingStandard.Files.LineLength.LineTooLong
139	344	),
140	345	'stripe' => array(
141	346	'title' => 'Stripe Forms',
142	347	'docs' => 'knowledgebase/stripe/',
		@@ -168,9 +373,9 @@
168	373	'excerpt' => 'Instantly add Bootstrap styling to all your Formidable forms.',
169	374	),
170	375	'zapier' => array(
171	376	'title' => 'Zapier Forms',
172		- 'excerpt' => 'Connect with hundreds of different applications through Zapier. Insert a new row in a Google docs spreadsheet, post on Twitter, or add a new Dropbox file with your form.',
	377	+ 'excerpt' => 'Connect with hundreds of different applications through Zapier. Insert a new row in a Google docs spreadsheet, post on Twitter, or add a new Dropbox file with your form.', // phpcs:ignore SlevomatCodingStandard.Files.LineLength.LineTooLong
173	378	),
174	379	'signature' => array(
175	380	'title' => 'Digital Signature Forms',
176	381	'excerpt' => 'Add a signature field to your form. The user may write their signature with a trackpad/mouse or just type it.',
		@@ -203,8 +408,9 @@
203	408	foreach ( $list as $k => $info ) {
204	409	$info['slug'] = $k;
205	410	$list[ $k ] = array_merge( $defaults, $info );
206	411	}
	412	+
207	413	return $list;
208	414	}
209	415
210	416	/**
		@@ -210,25 +416,28 @@
210	416	/**
211	417	* If Pro is missing but has been authenticated, include a download URL
212	418	*
213	419	* @since 3.04.03
	420	+ *
214	421	* @return string
215	422	*/
216	423	public static function get_pro_download_url() {
217		- $license = self::get_pro_license();
218		- $api = new FrmFormApi( $license );
	424	+ $api = new FrmFormApi( self::get_pro_license() );
219	425	$downloads = $api->get_api_info();
220	426	$pro = self::get_pro_from_addons( $downloads );
221	427
222		- return isset( $pro['url'] ) ? $pro['url'] : '';
	428	+ return $pro['url'] ?? '';
223	429	}
224	430
225	431	/**
226	432	* @since 4.08
	433	+ *
	434	+ * @return string
227	435	*/
228	436	public static function get_pro_license() {
229	437	$pro_cred_store = 'frmpro-credentials';
230	438	$pro_wpmu_store = 'frmpro-wpmu-sitewide';
	439	+
231	440	if ( is_multisite() && get_site_option( $pro_wpmu_store ) ) {
232	441	$creds = get_site_option( $pro_cred_store );
233	442	} else {
234	443	$creds = get_option( $pro_cred_store );
		@@ -238,16 +447,18 @@
238	447	return '';
239	448	}
240	449
241	450	$license = $creds['license'];
242		- if ( empty( $license ) ) {
	451	+
	452	+ if ( ! $license ) {
243	453	return '';
244	454	}
245	455
246		- if ( strpos( $license, '-' ) ) {
247		- // this is a fix for licenses saved in the past
248		- $license = strtoupper( $license );
	456	+ if ( str_contains( $license, '-' ) ) {
	457	+ // This is a fix for licenses saved in the past
	458	+ return strtoupper( $license );
249	459	}
	460	+
250	461	return $license;
251	462	}
252	463
253	464	/**
		@@ -253,20 +464,26 @@
253	464	/**
254	465	* @since 4.08
255	466	*
256	467	* @param array $addons
	468	+ *
257	469	* @return array
258	470	*/
259	471	protected static function get_pro_from_addons( $addons ) {
260		- return isset( $addons['93790'] ) ? $addons['93790'] : array();
	472	+ return $addons['93790'] ?? array();
261	473	}
262	474
263	475	/**
264	476	* @since 4.06
	477	+ * @since 6.31 Added the $force_type param.
	478	+ *
	479	+ * @param bool $force_type Whether to resolve grandfathered licenses to their real license type.
	480	+ *
	481	+ * @return string
265	482	*/
266		- public static function license_type() {
	483	+ public static function license_type( $force_type = false ) {
267	484	if ( is_callable( 'FrmProAddonsController::license_type' ) ) {
268		- return FrmProAddonsController::license_type();
	485	+ return FrmProAddonsController::license_type( $force_type );
269	486	}
270	487
271	488	return 'free';
272	489	}
		@@ -271,42 +488,85 @@
271	488	return 'free';
272	489	}
273	490
274	491	/**
	492	+ * Determine the license status for payment fee decisions.
	493	+ *
	494	+ * Mirrors the API's determine_status_from_license_details logic.
	495	+ *
	496	+ * @since 6.31
	497	+ *
	498	+ * @return string 'active', 'expired', or 'free'.
	499	+ */
	500	+ public static function get_payment_license_status() {
	501	+ $version_info = self::get_primary_license_info();
	502	+
	503	+ if ( ! $version_info ) {
	504	+ return 'free';
	505	+ }
	506	+
	507	+ $error = $version_info['error'] ?? array();
	508	+
	509	+ if ( is_array( $error ) ) {
	510	+ $code = $error['code'] ?? '';
	511	+
	512	+ if ( 'expired' === $code ) {
	513	+ return 'expired';
	514	+ }
	515	+
	516	+ if ( 'grandfathered' === $code && isset( $error['expires'] ) && gmdate( 'Y-m-d', $error['expires'] ) < '2016-04-26' ) {
	517	+ return 'free';
	518	+ }
	519	+ }
	520	+
	521	+ if ( in_array( self::license_type( true ), array( 'elite', 'business' ), true ) ) {
	522	+ return 'active';
	523	+ }
	524	+
	525	+ return 'free';
	526	+ }
	527	+
	528	+ /**
275	529	* @since 4.0.01
	530	+ *
	531	+ * @return bool
276	532	*/
277	533	public static function is_license_expired() {
278	534	$version_info = self::get_primary_license_info();
	535	+
279	536	if ( ! isset( $version_info['error'] ) ) {
280	537	return false;
281	538	}
282	539
283		- return $version_info['error'];
284		- }
	540	+ $expires = $version_info['error']['expires'] ?? 0;
285	541
286		- /**
287		- * @since 4.08
288		- *
289		- * @return boolean|int false or the number of days until expiration.
290		- */
291		- public static function is_license_expiring() {
292		- if ( is_callable( 'FrmProAddonsController::is_license_expiring' ) ) {
293		- return FrmProAddonsController::is_license_expiring();
	542	+ if ( ! $expires || $expires > time() ) {
	543	+ return false;
294	544	}
295	545
296		- return false;
	546	+ $rate_limited = ! empty( $version_info['response_code'] ) && 429 === (int) $version_info['response_code'];
	547	+
	548	+ if ( $rate_limited ) {
	549	+ // Do not return false positives for rate limited responses.
	550	+ return false;
	551	+ }
	552	+
	553	+ return $version_info['error'];
297	554	}
298	555
299	556	/**
300	557	* @since 4.08
	558	+ * @since 6.7 This is public.
301	559	*
302	560	* @return array|false
303	561	*/
304		- protected static function get_primary_license_info() {
	562	+ public static function get_primary_license_info() {
305	563	$installed_addons = apply_filters( 'frm_installed_addons', array() );
306		- if ( empty( $installed_addons ) || ! isset( $installed_addons['formidable_pro'] ) ) {
	564	+
	565	+ if ( ! $installed_addons || ! isset( $installed_addons['formidable_pro'] ) ) {
307	566	return false;
308	567	}
	568	+
309	569	$installed_addons = array(
310	570	'formidable_pro' => $installed_addons['formidable_pro'],
311	571	);
312	572
		@@ -314,8 +574,12 @@
314	574	}
315	575
316	576	/**
317	577	* @since 3.04.03
	578	+ *
	579	+ * @param mixed $transient
	580	+ *
	581	+ * @return object
318	582	*/
319	583	public static function check_update( $transient ) {
320	584	if ( ! FrmAppHelper::pro_is_installed() ) {
321	585	// Don't make any changes if only Lite is installed.
		@@ -326,9 +590,10 @@
326	590	$transient = new stdClass();
327	591	}
328	592
329	593	$installed_addons = apply_filters( 'frm_installed_addons', array() );
330		- if ( empty( $installed_addons ) ) {
	594	+
	595	+ if ( ! $installed_addons ) {
331	596	return $transient;
332	597	}
333	598
334	599	$version_info = self::fill_update_addon_info( $installed_addons );
		@@ -334,9 +599,9 @@
334	599	$version_info = self::fill_update_addon_info( $installed_addons );
335	600	$transient->last_checked = time();
336	601	$wp_plugins = self::get_plugins();
337	602
338		- foreach ( $version_info as $id => $plugin ) {
	603	+ foreach ( $version_info as $plugin ) {
339	604	$plugin = (object) $plugin;
340	605
341	606	if ( ! isset( $plugin->new_version ) || ! isset( $plugin->package ) ) {
342	607	continue;
		@@ -342,30 +607,31 @@
342	607	continue;
343	608	}
344	609
345	610	$folder = $plugin->plugin;
346		- if ( empty( $folder ) ) {
	611	+
	612	+ if ( ! $folder ) {
347	613	continue;
348	614	}
349	615
350	616	if ( ! self::is_installed( $folder ) ) {
351		- // don't show an update if the plugin isn't installed
	617	+ // Don't show an update if the plugin isn't installed
352	618	continue;
353	619	}
354	620
355		- $wp_plugin = isset( $wp_plugins[ $folder ] ) ? $wp_plugins[ $folder ] : array();
356		- $wp_version = isset( $wp_plugin['Version'] ) ? $wp_plugin['Version'] : '1.0';
	621	+ $wp_plugin = $wp_plugins[ $folder ] ?? array();
	622	+ $wp_version = $wp_plugin['Version'] ?? '1.0';
	623	+ $plugin->slug = explode( '/', $folder )[0];
357	624
358	625	if ( version_compare( $wp_version, $plugin->new_version, '<' ) ) {
359		- $slug = explode( '/', $folder );
360		- $plugin->slug = $slug[0];
361	626	$transient->response[ $folder ] = $plugin;
	627	+ } else {
	628	+ $transient->no_update[ $folder ] = $plugin;
362	629	}
363	630
364	631	$transient->checked[ $folder ] = $wp_version;
	632	+ }//end foreach
365	633
366		- }
367		-
368	634	return $transient;
369	635	}
370	636
371	637	/**
		@@ -373,8 +639,9 @@
373	639	* Because this gets called on "pre_set_site_transient_update_plugins" an old version of FrmAppHelper may be loaded on plugin update.
374	640	* This means that trying to access FrmAppHelper::get_plugins when upgrading from a Lite version before v5.5 results in a one-off error.
375	641	*
376	642	* @since 5.5.2
	643	+ *
377	644	* @return array
378	645	*/
379	646	protected static function get_plugins() {
380	647	if ( ! function_exists( 'get_plugins' ) ) {
		@@ -387,9 +654,9 @@
387	654	* Check if a plugin is installed before showing an update for it
388	655	*
389	656	* @since 3.05
390	657	*
391		- * @param string $plugin - the folder/filename.php for a plugin
	658	+ * @param string $plugin The folder/filename.php for a plugin.
392	659	*
393	660	* @return bool - True if installed
394	661	*/
395	662	protected static function is_installed( $plugin ) {
		@@ -409,45 +676,51 @@
409	676	$version_info = array();
410	677
411	678	foreach ( $installed_addons as $addon ) {
412	679	if ( $addon->store_url !== 'https://formidableforms.com' ) {
413		- // check if this is a third-party addon
	680	+ // Check if this is a third-party addon
414	681	continue;
415	682	}
416	683
417	684	$new_license = $addon->license;
418		- if ( empty( $new_license ) || in_array( $new_license, $checked_licenses ) ) {
	685	+
	686	+ if ( ! $new_license || in_array( $new_license, $checked_licenses, true ) ) {
419	687	continue;
420	688	}
421	689
422	690	$checked_licenses[] = $new_license;
	691	+ $api = new FrmFormApi( $new_license );
423	692
424		- $api = new FrmFormApi( $new_license );
425		- if ( empty( $version_info ) ) {
	693	+ if ( ! $version_info ) {
426	694	$version_info = $api->get_api_info();
427	695	continue;
428	696	}
429	697
430	698	$plugin = $api->get_addon_for_license( $addon, $version_info );
431		- if ( empty( $plugin ) ) {
	699	+
	700	+ if ( ! $plugin ) {
432	701	continue;
433	702	}
434	703
435		- $download_id = isset( $plugin['id'] ) ? $plugin['id'] : 0;
436		- if ( ! empty( $download_id ) && ! isset( $version_info[ $download_id ]['package'] ) ) {
437		- // if this addon is using its own license, get the update url
438		- $addon_info = $api->get_api_info();
	704	+ $download_id = $plugin['id'] ?? 0;
439	705
440		- $version_info[ $download_id ] = $addon_info[ $download_id ];
441		- if ( isset( $addon_info['error'] ) ) {
442		- $version_info[ $download_id ]['error'] = array(
443		- 'message' => $addon_info['error']['message'],
444		- 'code' => $addon_info['error']['code'],
445		- );
446		- }
	706	+ if ( ! $download_id || isset( $version_info[ $download_id ]['package'] ) ) {
	707	+ continue;
447	708	}
448		- }
449	709
	710	+ // If this addon is using its own license, get the update url
	711	+ $addon_info = $api->get_api_info();
	712	+
	713	+ $version_info[ $download_id ] = $addon_info[ $download_id ];
	714	+
	715	+ if ( isset( $addon_info['error'] ) ) {
	716	+ $version_info[ $download_id ]['error'] = array(
	717	+ 'message' => $addon_info['error']['message'],
	718	+ 'code' => $addon_info['error']['code'],
	719	+ );
	720	+ }
	721	+ }//end foreach
	722	+
450	723	return $version_info;
451	724	}
452	725
453	726	/**
		@@ -453,9 +726,11 @@
453	726	/**
454	727	* Get the action link for an addon that isn't active.
455	728	*
456	729	* @since 3.06.03
457		- * @param string $plugin The plugin slug
	730	+ *
	731	+ * @param string $plugin The plugin slug.
	732	+ *
458	733	* @return array
459	734	*/
460	735	public static function install_link( $plugin ) {
461	736	$link = array();
		@@ -466,20 +741,20 @@
466	741	$link = array(
467	742	'url' => $addon['plugin'],
468	743	'class' => 'frm-activate-addon',
469	744	);
470		- } elseif ( isset( $addon['url'] ) && ! empty( $addon['url'] ) ) {
	745	+ } elseif ( ! empty( $addon['url'] ) ) {
471	746	$link = array(
472	747	'url' => $addon['url'],
473	748	'class' => 'frm-install-addon',
474	749	);
475		- } elseif ( isset( $addon['categories'] ) && ! empty( $addon['categories'] ) ) {
	750	+ } elseif ( ! empty( $addon['categories'] ) ) {
476	751	$link = array(
477	752	'categories' => $addon['categories'],
478	753	);
479	754	}
480	755
481		- if ( ! empty( $link ) ) {
	756	+ if ( $link ) {
482	757	$link['status'] = $addon['status']['type'];
483	758	}
484	759	} elseif ( current_user_can( 'activate_plugins' ) && self::is_installed( 'formidable-' . $plugin . '/formidable-' . $plugin . '.php' ) ) {
485	760	$link = array(
		@@ -485,40 +760,87 @@
485	760	$link = array(
486	761	'url' => 'formidable-' . $plugin . '/formidable-' . $plugin . '.php',
487	762	'class' => 'frm-activate-addon',
488	763	);
	764	+ }//end if
	765	+
	766	+ return $link;
	767	+ }
	768	+
	769	+ /**
	770	+ * Get the JSON-encoded install data for a plugin update.
	771	+ *
	772	+ * @since 6.29
	773	+ *
	774	+ * @param string $addon_slug The addon slug (e.g. 'pro', 'dates').
	775	+ *
	776	+ * @return string JSON-encoded install data, or empty string if no URL is available.
	777	+ */
	778	+ public static function get_update_install_data( $addon_slug ) {
	779	+ $upgrading = self::install_link( $addon_slug );
	780	+
	781	+ if ( isset( $upgrading['class'] ) && 'frm-install-addon' === $upgrading['class'] ) {
	782	+ return (string) json_encode( $upgrading );
489	783	}
490	784
491		- return $link;
	785	+ if ( 'pro' === $addon_slug ) {
	786	+ $download_url = self::get_pro_download_url();
	787	+ $plugin_file = 'formidable-pro/formidable-pro.php';
	788	+ } else {
	789	+ $addon_data = self::get_addon( $addon_slug );
	790	+ $download_url = $addon_data && ! empty( $addon_data['url'] ) ? $addon_data['url'] : '';
	791	+ $plugin_file = $addon_data && ! empty( $addon_data['plugin'] ) ? $addon_data['plugin'] : 'formidable-' . $addon_slug . '/formidable-' . $addon_slug . '.php';
	792	+ }
	793	+
	794	+ if ( ! $download_url ) {
	795	+ $update_plugins = get_site_transient( 'update_plugins' );
	796	+ $plugin_update = $update_plugins->response[ $plugin_file ] ?? null;
	797	+ $download_url = $plugin_update && ! empty( $plugin_update->package ) ? $plugin_update->package : '';
	798	+ }
	799	+
	800	+ return $download_url ? (string) json_encode(
	801	+ array(
	802	+ 'url' => $download_url,
	803	+ 'class' => 'frm-install-addon',
	804	+ )
	805	+ ) : '';
492	806	}
493	807
494	808	/**
495	809	* @since 4.09
496		- * @param string $plugin The plugin slug
	810	+ *
	811	+ * @param string $plugin The plugin slug.
	812	+ *
497	813	* @return array|false
498	814	*/
499		- protected static function get_addon( $plugin ) {
	815	+ public static function get_addon( $plugin ) {
500	816	$addons = self::get_api_addons();
501	817	self::prepare_addons( $addons );
	818	+
502	819	foreach ( $addons as $addon ) {
503	820	$slug = explode( '/', $addon['plugin'] );
	821	+
504	822	if ( $slug[0] === 'formidable-' . $plugin ) {
505	823	return $addon;
506	824	}
507	825	}
	826	+
508	827	return false;
509	828	}
510	829
511	830	/**
512	831	* @since 4.09
	832	+ *
513	833	* @return string
514	834	*/
515	835	protected static function get_license_type() {
516	836	$license_type = '';
517	837	$addons = self::get_api_addons();
	838	+
518	839	if ( isset( $addons['error'] ) && isset( $addons['error']['type'] ) ) {
519		- $license_type = $addons['error']['type'];
	840	+ return $addons['error']['type'];
520	841	}
	842	+
521	843	return $license_type;
522	844	}
523	845
524	846	/**
		@@ -523,10 +845,10 @@
523	845
524	846	/**
525	847	* @since 3.04.03
526	848	*
527		- * @param array $addons
528		- * @param object $license The FrmAddon object
	849	+ * @param array $addons
	850	+ * @param object $license The FrmAddon object.
529	851	*
530	852	* @return array
531	853	*/
532	854	public static function get_addon_for_license( $addons, $license ) {
		@@ -531,11 +853,12 @@
531	853	*/
532	854	public static function get_addon_for_license( $addons, $license ) {
533	855	$download_id = $license->download_id;
534	856	$plugin = array();
535		- if ( empty( $download_id ) && ! empty( $addons ) ) {
	857	+
	858	+ if ( ! $download_id && $addons ) {
536	859	foreach ( $addons as $addon ) {
537		- if ( strtolower( $license->plugin_name ) == strtolower( $addon['title'] ) ) {
	860	+ if ( 0 === strcasecmp( $license->plugin_name, $addon['title'] ) ) {
538	861	return $addon;
539	862	}
540	863	}
541	864	} elseif ( isset( $addons[ $download_id ] ) ) {
		@@ -545,29 +868,33 @@
545	868	return $plugin;
546	869	}
547	870
548	871	/**
	872	+ * @param array $addons
	873	+ *
549	874	* @return void
550	875	*/
551	876	protected static function prepare_addons( &$addons ) {
	877	+ // Reset categories to prevent count accumulation across multiple calls.
	878	+ self::$categories = array();
	879	+
552	880	$activate_url = '';
	881	+
553	882	if ( current_user_can( 'activate_plugins' ) ) {
554	883	$activate_url = add_query_arg( array( 'action' => 'activate' ), admin_url( 'plugins.php' ) );
555	884	}
556	885
557	886	$loop_addons = $addons;
	887	+
558	888	foreach ( $loop_addons as $id => $addon ) {
559	889	if ( is_numeric( $id ) ) {
560	890	$slug = str_replace( array( '-wordpress-plugin', '-wordpress' ), '', $addon['slug'] );
561	891	$file_name = $addon['plugin'];
562	892	} else {
563		- $slug = $id;
564		- if ( isset( $addon['file'] ) ) {
565		- $base_file = $addon['file'];
566		- } else {
567		- $base_file = 'formidable-' . $slug;
568		- }
	893	+ $slug = $id;
	894	+ $base_file = $addon['file'] ?? 'formidable-' . $slug;
569	895	$file_name = $base_file . '/' . $base_file . '.php';
	896	+
570	897	if ( ! isset( $addon['plugin'] ) ) {
571	898	$addon['plugin'] = $file_name;
572	899	}
573	900	}
		@@ -572,10 +899,17 @@
572	899	}
573	900	}
574	901
575	902	$addon['installed'] = self::is_installed( $file_name );
	903	+
	904	+ if ( 'highrise' === $slug && ! $addon['installed'] ) {
	905	+ unset( $addons[ $id ] );
	906	+ continue;
	907	+ }
	908	+
576	909	if ( $addon['installed'] && 'formidable-views/formidable-views.php' === $file_name ) {
577	910	$active_views_version = self::get_active_views_version();
	911	+
578	912	if ( false !== $active_views_version && $slug !== $active_views_version ) {
579	913	$addon['installed'] = false;
580	914	}
581	915	}
		@@ -581,9 +915,9 @@
581	915	}
582	916
583	917	$addon['activate_url'] = '';
584	918
585		- if ( $addon['installed'] && ! empty( $activate_url ) && ! self::is_plugin_active( $file_name, $slug ) ) {
	919	+ if ( $addon['installed'] && $activate_url && ! self::is_plugin_active( $file_name, $slug ) ) {
586	920	$addon['activate_url'] = add_query_arg(
587	921	array(
588	922	'_wpnonce' => wp_create_nonce( 'activate-plugin_' . $file_name ),
589	923	'plugin' => $file_name,
		@@ -599,16 +933,21 @@
599	933
600	934	if ( ! isset( $addon['link'] ) ) {
601	935	$addon['link'] = 'downloads/' . $slug . '/';
602	936	}
	937	+
603	938	self::prepare_addon_link( $addon['link'] );
	939	+ self::set_addon_status( $addon );
	940	+ self::set_categories( $addon );
604	941
605		- self::set_addon_status( $addon );
606	942	$addons[ $id ] = $addon;
607		- }
	943	+ }//end foreach
608	944	}
609	945
610	946	/**
	947	+ * @param string $file_name
	948	+ * @param string $slug
	949	+ *
611	950	* @return bool
612	951	*/
613	952	private static function is_plugin_active( $file_name, $slug ) {
614	953	if ( 'formidable-views/formidable-views.php' === $file_name ) {
		@@ -617,14 +956,15 @@
617	956	return is_plugin_active( $file_name );
618	957	}
619	958
620	959	/**
621		- * @return string|false either 'visual-views' or 'views', false if one is not found.
	960	+ * @return false|string either 'visual-views' or 'views', false if one is not found.
622	961	*/
623	962	private static function get_active_views_version() {
624	963	if ( ! is_callable( 'FrmViewsAppHelper::plugin_version' ) ) {
625	964	return false;
626	965	}
	966	+
627	967	$plugin_version = FrmViewsAppHelper::plugin_version();
628	968	return version_compare( $plugin_version, '5.0', '>=' ) ? 'visual-views' : 'views';
629	969	}
630	970
		@@ -630,22 +970,25 @@
630	970
631	971	/**
632	972	* @since 3.04.02
633	973	*
	974	+ * @param string $link
	975	+ *
634	976	* @return void
635	977	*/
636	978	protected static function prepare_addon_link( &$link ) {
637	979	$site_url = 'https://formidableforms.com/';
638		- if ( strpos( $link, 'http' ) !== 0 ) {
	980	+
	981	+ if ( ! str_starts_with( $link, 'http' ) ) {
639	982	$link = $site_url . $link;
640	983	}
641		- $link = FrmAppHelper::make_affiliate_url( $link );
642		- $query_args = array(
643		- 'utm_source' => 'WordPress',
644		- 'utm_medium' => 'addons',
645		- 'utm_campaign' => 'liteplugin',
	984	+
	985	+ $link = FrmAppHelper::make_affiliate_url( $link );
	986	+
	987	+ $utm = array(
	988	+ 'campaign' => 'addons',
646	989	);
647		- $link = add_query_arg( $query_args, $link );
	990	+ $link = FrmAppHelper::maybe_add_missing_utm( $link, $utm );
648	991	}
649	992
650	993	/**
651	994	* Add the status to the addon array. Status options are:
		@@ -652,8 +995,10 @@
652	995	* installed, active, not installed
653	996	*
654	997	* @since 3.04.02
655	998	*
	999	+ * @param array $addon
	1000	+ *
656	1001	* @return void
657	1002	*/
658	1003	protected static function set_addon_status( &$addon ) {
659	1004	if ( ! empty( $addon['activate_url'] ) ) {
		@@ -674,263 +1019,63 @@
674	1019	}
675	1020	}
676	1021
677	1022	/**
678		- * @return void
	1023	+ * @since 5.5.2
	1024	+ *
	1025	+ * @param string $plugin
	1026	+ * @param string $redirect
	1027	+ * @param bool $network_wide
	1028	+ * @param bool $silent
	1029	+ *
	1030	+ * @return WP_Error|null Null on success, WP_Error on invalid file.
679	1031	*/
680		- public static function upgrade_to_pro() {
681		- FrmAppHelper::include_svg();
682		-
683		- $link_parts = array(
684		- 'medium' => 'upgrade',
685		- 'content' => 'button',
686		- );
687		-
688		- $features = array(
689		- 'Display Entries' => array(
690		- array(
691		- 'label' => 'Display form data with virtually limitless views',
692		- 'link' => array(
693		- 'content' => 'views',
694		- 'param' => 'views-display-form-data',
695		- ),
696		- 'lite' => false,
697		- ),
698		- array(
699		- 'label' => 'Generate graphs and stats based on your submitted data',
700		- 'link' => array(
701		- 'content' => 'graphs',
702		- 'param' => 'statistics-graphs-wordpress-forms',
703		- ),
704		- 'lite' => false,
705		- ),
706		- ),
707		- 'Entry Management' => array(
708		- array(
709		- 'label' => 'Import entries from a CSV',
710		- 'link' => array(
711		- 'content' => 'import-entries',
712		- 'param' => 'importing-exporting-wordpress-forms',
713		- ),
714		- 'lite' => false,
715		- ),
716		- array(
717		- 'label' => 'Logged-in users can save drafts and return later',
718		- 'link' => array(
719		- 'content' => 'save-drafts',
720		- 'param' => 'save-drafts-wordpress-form',
721		- ),
722		- 'lite' => false,
723		- ),
724		- array(
725		- 'label' => 'Flexibly and powerfully view, edit, and delete entries from anywhere on your site',
726		- 'link' => array(
727		- 'content' => 'front-edit',
728		- 'param' => 'wordpress-front-end-editing',
729		- ),
730		- 'lite' => false,
731		- ),
732		- array(
733		- 'label' => 'View form submissions from the back-end',
734		- 'lite' => true,
735		- ),
736		- array(
737		- 'label' => 'Export your entries to a CSV',
738		- 'lite' => true,
739		- ),
740		- ),
741		- 'Form Building' => array(
742		- array(
743		- 'label' => 'Save a calculated value into a field',
744		- 'link' => array(
745		- 'content' => 'calculations',
746		- 'param' => 'field-calculations-wordpress-form',
747		- ),
748		- 'lite' => false,
749		- ),
750		- array(
751		- 'label' => 'Allow multiple file uploads',
752		- 'link' => array(
753		- 'content' => 'file-uploads',
754		- 'param' => 'wordpress-multi-file-upload-fields',
755		- ),
756		- 'lite' => false,
757		- ),
758		- array(
759		- 'label' => 'Repeat sections of fields',
760		- 'link' => array(
761		- 'content' => 'repeaters',
762		- 'param' => 'repeatable-sections-forms',
763		- ),
764		- 'lite' => false,
765		- ),
766		- array(
767		- 'label' => 'Hide and show fields conditionally based on other fields or the user\'s role',
768		- 'link' => array(
769		- 'content' => 'conditional-logic',
770		- 'param' => 'conditional-logic-wordpress-forms',
771		- ),
772		- 'lite' => false,
773		- ),
774		- array(
775		- 'label' => 'Confirmation fields',
776		- 'link' => array(
777		- 'content' => 'confirmation-fields',
778		- 'param' => 'confirmation-fields-wordpress-forms',
779		- ),
780		- 'lite' => false,
781		- ),
782		- array(
783		- 'label' => 'Multi-paged forms',
784		- 'link' => array(
785		- 'content' => 'page-breaks',
786		- 'param' => 'wordpress-multi-page-forms',
787		- ),
788		- 'lite' => false,
789		- ),
790		- array(
791		- 'label' => 'Include section headings, page breaks, rich text, dates, times, scales, star ratings, sliders, toggles, dynamic fields populated from other forms, passwords, and tags in advanced forms.',
792		- 'lite' => false,
793		- ),
794		- array(
795		- 'label' => 'Include text, email, url, paragraph text, radio, checkbox, dropdown fields, hidden fields, user ID fields, and HTML blocks in your form.',
796		- 'lite' => true,
797		- ),
798		- array(
799		- 'label' => 'Drag & Drop Form building',
800		- 'link' => array(
801		- 'content' => 'drag-drop',
802		- 'param' => 'drag-drop-forms',
803		- ),
804		- 'lite' => true,
805		- ),
806		- array(
807		- 'label' => 'Create forms from Templates',
808		- 'link' => array(
809		- 'content' => 'form-templates',
810		- 'param' => 'wordpress-form-templates',
811		- ),
812		- 'lite' => true,
813		- ),
814		- array(
815		- 'label' => 'Import and export forms with XML',
816		- 'link' => array(
817		- 'content' => 'import',
818		- 'param' => 'importing-exporting-wordpress-forms',
819		- ),
820		- 'lite' => true,
821		- ),
822		- array(
823		- 'label' => 'Use input placeholder text in your fields that clear when typing starts.',
824		- 'lite' => true,
825		- ),
826		- ),
827		- 'Form Actions' => array(
828		- array(
829		- 'label' => 'Conditionally send your email notifications based on values in your form',
830		- 'link' => array(
831		- 'content' => 'conditional-emails',
832		- ),
833		- 'lite' => false,
834		- ),
835		- array(
836		- 'label' => 'Create and edit WordPress posts or custom posts from the front-end',
837		- 'link' => array(
838		- 'content' => 'create-posts',
839		- 'param' => 'create-posts-pages-wordpress-forms',
840		- ),
841		- 'lite' => false,
842		- ),
843		- array(
844		- 'label' => 'Send multiple emails and autoresponders',
845		- 'link' => array(
846		- 'content' => 'multiple-emails',
847		- 'param' => 'virtually-unlimited-emails',
848		- ),
849		- 'lite' => true,
850		- ),
851		- ),
852		- 'Form Appearance' => array(
853		- array(
854		- 'label' => 'Create Multiple styles for different forms',
855		- 'link' => array(
856		- 'content' => 'multiple-styles',
857		- 'param' => 'wordpress-visual-form-styler',
858		- ),
859		- 'lite' => false,
860		- ),
861		- array(
862		- 'label' => 'Customizable layout with CSS classes',
863		- 'link' => array(
864		- 'content' => 'form-layout',
865		- 'param' => 'wordpress-mobile-friendly-forms',
866		- ),
867		- 'lite' => true,
868		- ),
869		- array(
870		- 'label' => 'Customize the HTML for your forms',
871		- 'link' => array(
872		- 'content' => 'custom-html',
873		- 'param' => 'customizable-html-wordpress-form',
874		- ),
875		- 'lite' => true,
876		- ),
877		- array(
878		- 'label' => 'Style your form with the Visual Form Styler',
879		- 'lite' => true,
880		- ),
881		- ),
882		- );
883		-
884		- include( FrmAppHelper::plugin_path() . '/classes/views/addons/upgrade_to_pro.php' );
	1032	+ protected static function activate_plugin( $plugin, $redirect = '', $network_wide = false, $silent = false ) {
	1033	+ if ( ! function_exists( 'activate_plugin' ) ) {
	1034	+ require_once ABSPATH . 'wp-admin/includes/plugin.php';
	1035	+ }
	1036	+ return activate_plugin( $plugin, $redirect, $network_wide, $silent );
885	1037	}
886	1038
887	1039	/**
888		- * Install Pro after connection with Formidable.
	1040	+ * Deactivate a specified plugin.
889	1041	*
890		- * @since 4.02.05
	1042	+ * @since 6.8
891	1043	*
	1044	+ * @param string $plugin
	1045	+ * @param bool $silent
	1046	+ *
892	1047	* @return void
893	1048	*/
894		- public static function connect_pro() {
895		- FrmAppHelper::permission_check( 'install_plugins' );
896		- check_ajax_referer( 'frm_ajax', 'nonce' );
897		-
898		- $url = self::get_current_plugin();
899		- if ( FrmAppHelper::pro_is_installed() || empty( $url ) ) {
900		- wp_die();
	1049	+ protected static function deactivate_plugin( $plugin, $silent = false ) {
	1050	+ if ( ! function_exists( 'deactivate_plugins' ) ) {
	1051	+ require_once ABSPATH . 'wp-admin/includes/plugin.php';
901	1052	}
902		-
903		- $response = array();
904		-
905		- // It's already installed and active.
906		- $active = self::activate_plugin( 'formidable-pro/formidable-pro.php', false, false, true );
907		- if ( is_wp_error( $active ) ) {
908		- // The plugin was installed, but not active. Download it now.
909		- self::ajax_install_addon();
910		- } else {
911		- $response['active'] = true;
912		- $response['success'] = true;
913		- }
914		-
915		- echo json_encode( $response );
916		- wp_die();
	1053	+ deactivate_plugins( $plugin, $silent );
917	1054	}
918	1055
919	1056	/**
920		- * @since 5.5.2
	1057	+ * Uninstall a specified plugin.
921	1058	*
	1059	+ * @since 6.8
	1060	+ *
922	1061	* @param string $plugin
923		- * @param string $redirect
924		- * @param bool $network_wide
925		- * @param bool $silent
926		- * @return null|WP_Error Null on success, WP_Error on invalid file.
	1062	+ *
	1063	+ * @return true|WP_Error True on success, WP_Error on invalid file.
927	1064	*/
928		- protected static function activate_plugin( $plugin, $redirect = '', $network_wide = false, $silent = false ) {
929		- if ( ! function_exists( 'activate_plugin' ) ) {
	1065	+ protected static function uninstall_plugin( $plugin ) {
	1066	+ if ( ! current_user_can( 'delete_plugins' ) ) {
	1067	+ return new WP_Error( 'uninstall_failed', __( 'Current user cannot delete plugins.', 'formidable' ) );
	1068	+ }
	1069	+
	1070	+ if ( ! function_exists( 'delete_plugins' ) ) {
930	1071	require_once ABSPATH . 'wp-admin/includes/plugin.php';
931	1072	}
932		- return activate_plugin( $plugin, $redirect, $network_wide, $silent );
	1073	+
	1074	+ self::deactivate_plugin( $plugin, true );
	1075	+ $result = delete_plugins( array( $plugin ) );
	1076	+
	1077	+ return is_wp_error( $result ) ? $result : true;
933	1078	}
934	1079
935	1080	/**
936	1081	* @since 5.0.10
		@@ -937,9 +1082,9 @@
937	1082	*
938	1083	* @return string
939	1084	*/
940	1085	protected static function get_current_plugin() {
941		- if ( ! isset( self::$plugin ) ) {
	1086	+ if ( ! self::$plugin ) {
942	1087	self::$plugin = FrmAppHelper::get_param( 'plugin', '', 'post', 'esc_url_raw' );
943	1088	}
944	1089	return self::$plugin;
945	1090	}
		@@ -945,8 +1090,10 @@
945	1090	}
946	1091
947	1092	/**
948	1093	* @since 4.08
	1094	+ *
	1095	+ * @return mixed[]|null
949	1096	*/
950	1097	protected static function download_and_activate() {
951	1098	if ( is_admin() ) {
952	1099	FrmAppHelper::set_current_screen_and_hook_suffix();
		@@ -954,12 +1101,14 @@
954	1101
955	1102	self::maybe_show_cred_form();
956	1103
957	1104	$installed = self::install_addon();
	1105	+
958	1106	if ( is_array( $installed ) && isset( $installed['message'] ) ) {
959	1107	return $installed;
960	1108	}
961		- self::maybe_activate_addon( $installed );
	1109	+ self::handle_addon_action( $installed, 'activate' );
	1110	+ return null;
962	1111	}
963	1112
964	1113	/**
965	1114	* @since 3.04.02
		@@ -967,12 +1116,12 @@
967	1116	* @return void
968	1117	*/
969	1118	protected static function maybe_show_cred_form() {
970	1119	if ( ! function_exists( 'request_filesystem_credentials' ) ) {
971		- include_once( ABSPATH . 'wp-admin/includes/file.php' );
	1120	+ include_once ABSPATH . 'wp-admin/includes/file.php';
972	1121	}
973	1122
974		- // Start output bufferring to catch the filesystem form if credentials are needed.
	1123	+ // Start output buffering to catch the filesystem form if credentials are needed.
975	1124	ob_start();
976	1125
977	1126	$show_form = false;
978	1127	$method = '';
		@@ -989,9 +1138,8 @@
989	1138
990	1139	if ( $show_form ) {
991	1140	$form = ob_get_clean();
992	1141	$message = __( 'Sorry, your site requires FTP authentication. Please download plugins from FormidableForms.com and install them manually.', 'formidable' );
993		- $data = $form;
994	1142	$response = array(
995	1143	'success' => false,
996	1144	'message' => $message,
997	1145	'form' => $form,
		@@ -1011,12 +1159,9 @@
1011	1159	*
1012	1160	* @return bool
1013	1161	*/
1014	1162	public static function url_is_allowed( $download_url ) {
1015		- return (
1016		- FrmAppHelper::validate_url_is_in_s3_bucket( $download_url, 'zip' ) ||
1017		- ( strpos( $download_url, 'https://downloads.wordpress.org/plugin' ) === 0 && substr_compare( $download_url, '.zip', -4 ) === 0 )
1018		- );
	1163	+ return FrmAppHelper::validate_url_is_in_s3_bucket( $download_url, 'zip' ) || in_array( $download_url, self::allowed_external_urls(), true );
1019	1164	}
1020	1165
1021	1166	/**
1022	1167	* We do not need any extra credentials if we have gotten this far,
		@@ -1022,8 +1167,10 @@
1022	1167	* We do not need any extra credentials if we have gotten this far,
1023	1168	* so let's install the plugin.
1024	1169	*
1025	1170	* @since 3.04.02
	1171	+ *
	1172	+ * @return array|string
1026	1173	*/
1027	1174	protected static function install_addon() {
1028	1175	require_once ABSPATH . 'wp-admin/includes/class-wp-upgrader.php';
1029	1176
		@@ -1037,14 +1184,15 @@
1037	1184	}
1038	1185
1039	1186	// Create the plugin upgrader with our custom skin.
1040	1187	$installer = new Plugin_Upgrader( new FrmInstallerSkin() );
1041		- $installer->install( $download_url );
	1188	+ $installer->install( $download_url, array( 'overwrite_package' => true ) );
1042	1189
1043	1190	// Flush the cache and return the newly installed plugin basename.
1044	1191	wp_cache_flush();
1045	1192
1046	1193	$plugin = $installer->plugin_info();
	1194	+
1047	1195	if ( ! $plugin ) {
1048	1196	return array(
1049	1197	'message' => 'Plugin was not installed. ' . $installer->result,
1050	1198	'success' => false,
		@@ -1049,89 +1197,167 @@
1049	1197	'message' => 'Plugin was not installed. ' . $installer->result,
1050	1198	'success' => false,
1051	1199	);
1052	1200	}
	1201	+
1053	1202	return $plugin;
1054	1203	}
1055	1204
1056	1205	/**
1057		- * @since 3.06.03
	1206	+ * Handle the AJAX request to activate an add-on.
1058	1207	*
	1208	+ * @since 6.8
	1209	+ *
1059	1210	* @return void
1060	1211	*/
1061	1212	public static function ajax_activate_addon() {
	1213	+ self::process_addon_action(
	1214	+ function ( $plugin ) {
	1215	+ return self::handle_addon_action( $plugin, 'activate' );
	1216	+ },
	1217	+ array( 'FrmAddonsController', 'get_addon_activation_response' )
	1218	+ );
	1219	+ }
1062	1220
1063		- self::install_addon_permissions();
	1221	+ /**
	1222	+ * @since 3.04.02
	1223	+ *
	1224	+ * @param string $installed The plugin folder name with file name.
	1225	+ */
	1226	+ protected static function maybe_activate_addon( $installed ) {
	1227	+ self::ajax_activate_addon();
	1228	+ }
1064	1229
1065		- FrmAppHelper::set_current_screen_and_hook_suffix();
1066		-
1067		- $plugin = FrmAppHelper::get_param( 'plugin', '', 'post', 'sanitize_text_field' );
1068		- self::maybe_activate_addon( $plugin );
1069		-
1070		- echo json_encode( self::get_addon_activation_response() );
1071		- wp_die();
	1230	+ /**
	1231	+ * Handle the AJAX request to deactivate an add-on.
	1232	+ *
	1233	+ * @since 6.8
	1234	+ *
	1235	+ * @return void
	1236	+ */
	1237	+ public static function ajax_deactivate_addon() {
	1238	+ self::process_addon_action(
	1239	+ function ( $plugin ) {
	1240	+ return self::handle_addon_action( $plugin, 'deactivate' );
	1241	+ }
	1242	+ );
1072	1243	}
1073	1244
1074	1245	/**
1075		- * @return array
	1246	+ * Handle the AJAX request to uninstall an add-on.
	1247	+ *
	1248	+ * @since 6.8
	1249	+ *
	1250	+ * @return void
1076	1251	*/
1077		- private static function get_addon_activation_response() {
1078		- $activating_page = self::get_activating_page();
1079		-
1080		- $response = array(
1081		- 'message' => __( 'Your plugin has been activated. Would you like to save and reload the page now?', 'formidable' ),
1082		- 'saveAndReload' => $activating_page,
	1252	+ public static function ajax_uninstall_addon() {
	1253	+ self::process_addon_action(
	1254	+ function ( $plugin ) {
	1255	+ return self::handle_addon_action( $plugin, 'uninstall' );
	1256	+ }
1083	1257	);
1084		-
1085		- return $response;
1086	1258	}
1087	1259
1088	1260	/**
1089		- * Return a string that reflects the page from which the addon is being activated on,
1090		- * if it is from settings or form builder, otherwise return empty string.
	1261	+ * Process a specific action (activate, deactivate, uninstall) on an add-on.
1091	1262	*
1092		- * @return string
	1263	+ * @since 6.8
	1264	+ *
	1265	+ * @param callable $action_callback The specific add-on action to be executed.
	1266	+ * @param callable|null $response_callback Optional. The response handling callback. Default null.
	1267	+ *
	1268	+ * @return void
1093	1269	*/
1094		- private static function get_activating_page() {
1095		- $referer = FrmAppHelper::get_server_value( 'HTTP_REFERER' );
1096		- if ( false !== strpos( $referer, 'frm_action=settings' ) ) {
1097		- return 'settings';
1098		- }
	1270	+ private static function process_addon_action( $action_callback, $response_callback = null ) {
	1271	+ self::install_addon_permissions();
	1272	+ FrmAppHelper::set_current_screen_and_hook_suffix();
1099	1273
1100		- if ( false !== strpos( $referer, 'frm_action=edit' ) ) {
1101		- return 'form_builder';
	1274	+ $plugin = FrmAppHelper::get_param( 'plugin', '', 'post', 'sanitize_text_field' );
	1275	+ call_user_func( $action_callback, $plugin );
	1276	+
	1277	+ if ( is_callable( $response_callback ) ) {
	1278	+ wp_send_json_success( call_user_func( $response_callback ) );
	1279	+ return;
1102	1280	}
1103	1281
1104		- return '';
	1282	+ wp_send_json_success();
1105	1283	}
1106	1284
1107	1285	/**
1108		- * @since 3.04.02
	1286	+ * Attempt to perform a specific action (activate, deactivate, uninstall) on an add-on.
1109	1287	*
1110		- * @param string $installed The plugin folder name with file name
	1288	+ * @since 6.8
	1289	+ *
	1290	+ * @param string $installed The plugin folder name with file name.
	1291	+ * @param string $action The action type ('activate', 'deactivate', 'uninstall').
	1292	+ *
	1293	+ * @return mixed[]|null
1111	1294	*/
1112		- protected static function maybe_activate_addon( $installed ) {
1113		- if ( ! $installed ) {
1114		- return;
	1295	+ protected static function handle_addon_action( $installed, $action ) {
	1296	+ if ( ! $installed || ! $action ) {
	1297	+ return null;
1115	1298	}
1116	1299
1117		- $activate = self::activate_plugin( $installed );
1118		- if ( is_wp_error( $activate ) ) {
	1300	+ $result = null;
	1301	+ switch ( $action ) {
	1302	+ case 'activate':
	1303	+ $result = self::activate_plugin( $installed );
	1304	+ break;
	1305	+ case 'deactivate':
	1306	+ self::deactivate_plugin( $installed );
	1307	+ break;
	1308	+ case 'uninstall':
	1309	+ $result = self::uninstall_plugin( $installed );
	1310	+ break;
	1311	+ }
	1312	+
	1313	+ if ( is_wp_error( $result ) ) {
1119	1314	// Ignore the invalid header message that shows with nested plugins.
1120		- if ( $activate->get_error_code() !== 'no_plugin_header' ) {
	1315	+ if ( $result->get_error_code() !== 'no_plugin_header' ) {
1121	1316	if ( wp_doing_ajax() ) {
1122		- echo json_encode( array( 'error' => $activate->get_error_message() ) );
1123		- wp_die();
	1317	+ wp_send_json_error( array( 'error' => $result->get_error_message() ) );
1124	1318	}
	1319	+
1125	1320	return array(
1126		- 'message' => $activate->get_error_message(),
	1321	+ 'message' => $result->get_error_message(),
1127	1322	'success' => false,
1128	1323	);
1129	1324	}
1130	1325	}
	1326	+
	1327	+ return $result;
1131	1328	}
1132	1329
1133	1330	/**
	1331	+ * @return array
	1332	+ */
	1333	+ private static function get_addon_activation_response() {
	1334	+ $activating_page = self::get_activating_page();
	1335	+ $message = $activating_page ? __( 'Your plugin has been activated. Would you like to save and reload the page now?', 'formidable' ) : __( 'Your plugin has been activated.', 'formidable' ); // phpcs:ignore SlevomatCodingStandard.Files.LineLength.LineTooLong
	1336	+
	1337	+ return array(
	1338	+ 'message' => $message,
	1339	+ 'saveAndReload' => $activating_page,
	1340	+ );
	1341	+ }
	1342	+
	1343	+ /**
	1344	+ * Return a string that reflects the page from which the addon is being activated on,
	1345	+ * if it is from settings or form builder, otherwise return empty string.
	1346	+ *
	1347	+ * @return string
	1348	+ */
	1349	+ private static function get_activating_page() {
	1350	+ $referer = FrmAppHelper::get_server_value( 'HTTP_REFERER' );
	1351	+
	1352	+ if ( str_contains( $referer, 'frm_action=settings' ) ) {
	1353	+ return 'settings';
	1354	+ }
	1355	+
	1356	+ return str_contains( $referer, 'frm_action=edit' ) ? 'form_builder' : '';
	1357	+ }
	1358	+
	1359	+ /**
1134	1360	* Run security checks before installing
1135	1361	*
1136	1362	* @since 3.04.02
1137	1363	*
		@@ -1139,12 +1365,14 @@
1139	1365	*/
1140	1366	protected static function install_addon_permissions() {
1141	1367	check_ajax_referer( 'frm_ajax', 'nonce' );
1142	1368
1143		- if ( ! current_user_can( 'activate_plugins' ) || ! self::get_current_plugin() ) {
1144		- echo json_encode( true );
1145		- wp_die();
	1369	+ if ( current_user_can( 'activate_plugins' ) && self::get_current_plugin() ) {
	1370	+ return;
1146	1371	}
	1372	+
	1373	+ echo json_encode( true );
	1374	+ wp_die();
1147	1375	}
1148	1376
1149	1377	/**
1150	1378	* @since 4.08
		@@ -1152,17 +1380,22 @@
1152	1380	* @return string
1153	1381	*/
1154	1382	public static function connect_link() {
1155	1383	$auth = get_option( 'frm_connect_token' );
1156		- if ( empty( $auth ) ) {
	1384	+
	1385	+ if ( ! $auth ) {
1157	1386	$auth = hash( 'sha512', wp_rand() );
1158		- update_option( 'frm_connect_token', $auth );
	1387	+ update_option( 'frm_connect_token', $auth, false );
1159	1388	}
1160		- $link = FrmAppHelper::admin_upgrade_link( 'connect', 'api-connect' );
	1389	+
	1390	+ $page = FrmAppHelper::simple_get( 'page', 'sanitize_title', 'formidable-settings' );
	1391	+ $link = 'https://formidableforms.com/api-connect/';
1161	1392	$args = array(
1162	1393	'v' => 2,
1163	1394	'siteurl' => FrmAppHelper::site_url(),
1164	1395	'url' => get_rest_url(),
	1396	+ 'inst' => (int) FrmAppHelper::pro_is_included(),
	1397	+ 'return' => $page,
1165	1398	'token' => $auth,
1166	1399	'l' => self::get_pro_license(),
1167	1400	);
1168	1401
		@@ -1180,19 +1413,19 @@
1180	1413	// Verify params present (auth & download link).
1181	1414	$post_auth = FrmAppHelper::get_param( 'token', '', 'request', 'sanitize_text_field' );
1182	1415	$post_url = FrmAppHelper::get_param( 'file_url', '', 'request', 'sanitize_text_field' );
1183	1416
1184		- if ( empty( $post_auth ) || empty( $post_url ) ) {
	1417	+ // The download link is not required if already installed.
	1418	+ $is_installed = FrmAppHelper::pro_is_included();
	1419	+ $file_missing = ! $is_installed && ! $post_url;
	1420	+
	1421	+ if ( ! $post_auth || $file_missing ) {
1185	1422	return false;
1186	1423	}
1187	1424
1188	1425	// Verify auth.
1189	1426	$auth = get_option( 'frm_connect_token' );
1190		- if ( empty( $auth ) || ! hash_equals( $auth, $post_auth ) ) {
1191		- return false;
1192		- }
1193		-
1194		- return true;
	1427	+ return $auth && hash_equals( $auth, $post_auth );
1195	1428	}
1196	1429
1197	1430	/**
1198	1431	* Install and/or activate the add-on file.
		@@ -1197,31 +1430,34 @@
1197	1430	/**
1198	1431	* Install and/or activate the add-on file.
1199	1432	*
1200	1433	* @since 4.08
	1434	+ *
	1435	+ * @return array
1201	1436	*/
1202	1437	public static function install_addon_api() {
1203	1438	self::$plugin = FrmAppHelper::get_param( 'file_url', '', 'request', 'esc_url_raw' );
1204	1439
1205		- $error = esc_html__( 'Could not install an upgrade. Please download from formidableforms.com and install manually.', 'formidable' );
1206		-
1207	1440	// Delete so cannot replay.
1208	1441	delete_option( 'frm_connect_token' );
1209	1442
1210	1443	// It's already installed and active.
1211	1444	$active = self::activate_plugin( 'formidable-pro/formidable-pro.php', false, false, true );
	1445	+
1212	1446	if ( is_wp_error( $active ) ) {
1213		- // Download plugin now.
1214		- $response = self::download_and_activate();
1215		- if ( is_array( $response ) && isset( $response['success'] ) ) {
	1447	+ $response = self::maybe_download_and_activate();
	1448	+
	1449	+ if ( is_array( $response ) ) {
	1450	+ // The download failed.
1216	1451	return $response;
1217	1452	}
1218	1453	}
1219	1454
1220	1455	// If empty license, save it now.
1221		- if ( empty( self::get_pro_license() ) && function_exists( 'load_formidable_pro' ) ) {
	1456	+ if ( ! self::get_pro_license() && function_exists( 'load_formidable_pro' ) ) {
1222	1457	load_formidable_pro();
1223	1458	$license = stripslashes( FrmAppHelper::get_param( 'key', '', 'request', 'sanitize_text_field' ) );
	1459	+
1224	1460	if ( ! $license ) {
1225	1461	return array(
1226	1462	'success' => false,
1227	1463	'error' => 'That site does not have a valid license key.',
		@@ -1228,8 +1464,9 @@
1228	1464	);
1229	1465	}
1230	1466
1231	1467	$response = FrmAddon::activate_license_for_plugin( $license, 'formidable_pro' );
	1468	+
1232	1469	if ( ! $response['success'] ) {
1233	1470	// Could not activate license.
1234	1471	return $response;
1235	1472	}
		@@ -1240,22 +1477,60 @@
1240	1477	);
1241	1478	}
1242	1479
1243	1480	/**
	1481	+ * @since 6.8.3
	1482	+ *
	1483	+ * @return array|true
	1484	+ */
	1485	+ private static function maybe_download_and_activate() {
	1486	+ if ( ! self::$plugin ) {
	1487	+ return array(
	1488	+ 'success' => false,
	1489	+ 'message' => __( 'The plugin download was not found.', 'formidable' ),
	1490	+ );
	1491	+ }
	1492	+
	1493	+ // Download plugin now.
	1494	+ $response = self::download_and_activate();
	1495	+
	1496	+ if ( is_array( $response ) && isset( $response['success'] ) ) {
	1497	+ // The download failed.
	1498	+ return $response;
	1499	+ }
	1500	+
	1501	+ return true;
	1502	+ }
	1503	+
	1504	+ /**
1244	1505	* Render a conditional action button for a specified plugin
1245	1506	*
1246		- * @param string $plugin
	1507	+ * @since 4.09
	1508	+ *
	1509	+ * @param string $plugin
1247	1510	* @param array|string $upgrade_link_args
1248		- * @since 4.09
	1511	+ *
	1512	+ * @return void
1249	1513	*/
1250	1514	public static function conditional_action_button( $plugin, $upgrade_link_args ) {
1251	1515	if ( is_callable( 'FrmProAddonsController::conditional_action_button' ) ) {
1252		- return FrmProAddonsController::conditional_action_button( $plugin, $upgrade_link_args );
	1516	+ FrmProAddonsController::conditional_action_button( $plugin, $upgrade_link_args );
	1517	+ return;
1253	1518	}
1254	1519
1255	1520	$addon = self::get_addon( $plugin );
1256	1521	$upgrade_link = FrmAppHelper::admin_upgrade_link( $upgrade_link_args );
1257		- self::addon_upgrade_link( $addon, $upgrade_link );
	1522	+
	1523	+ if ( ! is_array( $upgrade_link_args ) ) {
	1524	+ // A string $upgrade_link_args is used for the utm-medium value when calling
	1525	+ // FrmAppHelper::admin_upgrade_link above.
	1526	+ // For self::addon_upgrade_link, we'll pass just an empty array with the link key (set below).
	1527	+ $upgrade_link_args = array();
	1528	+ }
	1529	+
	1530	+ $upgrade_link_args['link'] = $upgrade_link;
	1531	+
	1532	+ self::addon_upgrade_link( $addon, $upgrade_link_args );
1258	1533	}
1259	1534
1260	1535	/**
1261	1536	* Render a conditional action button for an add on
		@@ -1261,16 +1536,23 @@
1261	1536	* Render a conditional action button for an add on
1262	1537	*
1263	1538	* @since 4.09.01
1264	1539	*
1265		- * @param array $addon
1266		- * @param string|false $license_type
1267		- * @param string $plan_required
1268		- * @param string $upgrade_link
	1540	+ * @param array $atts {
	1541	+ * Button attributes.
	1542	+ *
	1543	+ * @type array $addon
	1544	+ * @type false|string $license_type
	1545	+ * @type string $plan_required
	1546	+ * @type string $upgrade_link
	1547	+ * }
	1548	+ *
	1549	+ * @return void
1269	1550	*/
1270	1551	public static function show_conditional_action_button( $atts ) {
1271	1552	if ( is_callable( 'FrmProAddonsController::show_conditional_action_button' ) ) {
1272		- return FrmProAddonsController::show_conditional_action_button( $atts );
	1553	+ FrmProAddonsController::show_conditional_action_button( $atts );
	1554	+ return;
1273	1555	}
1274	1556
1275	1557	self::addon_upgrade_link( $atts['addon'], $atts['upgrade_link'] );
1276	1558	}
		@@ -1277,13 +1559,18 @@
1277	1559
1278	1560	/**
1279	1561	* @since 4.09.01
1280	1562	*
1281		- * @param array|false $addon
	1563	+ * @param array|false $addon
	1564	+ * @param array|string $upgrade_link
1282	1565	*
1283	1566	* @return void
1284	1567	*/
1285		- protected static function addon_upgrade_link( $addon, $upgrade_link ) {
	1568	+ public static function addon_upgrade_link( $addon, $upgrade_link ) {
	1569	+ $atts = is_array( $upgrade_link ) ? $upgrade_link : array();
	1570	+ $upgrade_link = is_array( $upgrade_link ) ? $upgrade_link['link'] : $upgrade_link;
	1571	+ $text = ! empty( $atts['text'] ) ? $atts['text'] : __( 'Upgrade Now', 'formidable' );
	1572	+
1286	1573	if ( $addon ) {
1287	1574	$upgrade_link .= '&utm_content=' . $addon['slug'];
1288	1575	}
1289	1576
		@@ -1290,13 +1577,21 @@
1290	1577	if ( $addon && isset( $addon['categories'] ) && in_array( 'Solution', $addon['categories'], true ) ) {
1291	1578	// Solutions will go to a separate page.
1292	1579	$upgrade_link = FrmAppHelper::admin_upgrade_link( 'addons', $addon['link'] );
1293	1580	}
	1581	+
	1582	+ $class = ! empty( $atts['class'] ) ? $atts['class'] : '';
	1583	+
	1584	+ if ( ! str_contains( $class, 'frm-button' ) ) {
	1585	+ $class .= ' frm-button-secondary frm-button-sm';
	1586	+ }
	1587	+ // phpcs:disable Generic.WhiteSpace.ScopeIndent
1294	1588	?>
1295		- <a class="install-now button frm-button-secondary frm-button-sm" href="<?php echo esc_url( $upgrade_link ); ?>" target="_blank" rel="noopener" aria-label="<?php esc_attr_e( 'Upgrade Now', 'formidable' ); ?>">
1296		- <?php esc_html_e( 'Upgrade Now', 'formidable' ); ?>
	1589	+ <a class="install-now button <?php echo esc_attr( $class ); ?>" href="<?php echo esc_url( $upgrade_link ); ?>" target="_blank" rel="noopener" aria-label="<?php esc_attr_e( 'Upgrade Now', 'formidable' ); ?>"><?php // phpcs:ignore SlevomatCodingStandard.Files.LineLength.LineTooLong ?>
	1590	+ <?php echo esc_html( $text ); ?>
1297	1591	</a>
1298	1592	<?php
	1593	+ // phpcs:enable Generic.WhiteSpace.ScopeIndent
1299	1594	}
1300	1595
1301	1596	/**
1302	1597	* @since 3.04.02
		@@ -1306,8 +1601,9 @@
1306	1601	public static function ajax_install_addon() {
1307	1602	self::install_addon_permissions();
1308	1603
1309	1604	$result = self::download_and_activate();
	1605	+
1310	1606	if ( isset( $result['success'] ) && ! $result['success'] ) {
1311	1607	echo json_encode( $result );
1312	1608	wp_die();
1313	1609	}
		@@ -1316,107 +1612,59 @@
1316	1612	wp_die();
1317	1613	}
1318	1614
1319	1615	/**
1320		- * @since 4.06.02
	1616	+ * Allowed URLs used for internal source of plugins installation.
1321	1617	*
1322		- * @deprecated 4.09.01
	1618	+ * @since 6.3.1
1323	1619	*
1324		- * @return void
1325		- */
1326		- public static function ajax_multiple_addons() {
1327		- FrmDeprecated::ajax_multiple_addons();
1328		- }
1329		-
1330		- /**
1331		- * @since 3.04.03
1332		- * @deprecated 3.06
1333		- * @codeCoverageIgnore
1334	1620	* @return array
1335	1621	*/
1336		- public static function error_for_license( $license ) {
1337		- return FrmDeprecated::error_for_license( $license );
1338		- }
	1622	+ private static function allowed_external_urls() {
	1623	+ $allowed_url_list = array(
	1624	+ 'https://downloads.wordpress.org/plugin/formidable-gravity-forms-importer.zip',
	1625	+ 'https://downloads.wordpress.org/plugin/formidable-import-pirate-forms.zip',
	1626	+ 'https://downloads.wordpress.org/plugin/wp-mail-smtp.zip',
	1627	+ );
1339	1628
1340		- /**
1341		- * @since 3.04.03
1342		- * @deprecated 3.06
1343		- * @codeCoverageIgnore
1344		- */
1345		- public static function get_pro_updater() {
1346		- return FrmDeprecated::get_pro_updater();
1347		- }
	1629	+ /**
	1630	+ * List of URLs used in plugin formidable internal installation.
	1631	+ *
	1632	+ * @since 6.3.1
	1633	+ *
	1634	+ * @param array $allowed_url_list List of URLs.
	1635	+ */
	1636	+ $allowed_url_list = apply_filters( 'frm_allowed_external_urls', $allowed_url_list );
1348	1637
1349		- /**
1350		- * @since 3.04.03
1351		- * @deprecated 3.06
1352		- * @codeCoverageIgnore
1353		- *
1354		- * @return array
1355		- */
1356		- public static function get_addon_info( $license = '' ) {
1357		- return FrmDeprecated::get_addon_info( $license );
1358		- }
	1638	+ if ( ! is_array( $allowed_url_list ) ) {
	1639	+ _doing_it_wrong( __METHOD__, 'Only an array of URLs could be used within this filter.', '6.3.1' );
	1640	+ return array();
	1641	+ }
1359	1642
1360		- /**
1361		- * @since 3.04.03
1362		- * @deprecated 3.06
1363		- * @codeCoverageIgnore
1364		- *
1365		- * @return string
1366		- */
1367		- public static function get_cache_key( $license ) {
1368		- return FrmDeprecated::get_cache_key( $license );
	1643	+ return $allowed_url_list;
1369	1644	}
1370	1645
1371	1646	/**
1372		- * @since 3.04.03
	1647	+ * Gets required plan for an addon.
1373	1648	*
1374		- * @deprecated 3.06
	1649	+ * @since 6.4.2
1375	1650	*
1376		- * @codeCoverageIgnore
	1651	+ * @param int|string $addon_id
1377	1652	*
1378		- * @return void
	1653	+ * @return string Empty string if no plan is required for active license.
1379	1654	*/
1380		- public static function reset_cached_addons( $license = '' ) {
1381		- FrmDeprecated::reset_cached_addons( $license );
1382		- }
	1655	+ public static function get_addon_required_plan( $addon_id ) {
	1656	+ $api = new FrmFormApi();
	1657	+ $addons = $api->get_api_info();
1383	1658
1384		- /**
1385		- * @since 2.03.08
1386		- * @deprecated 3.04.03
1387		- * @codeCoverageIgnore
1388		- *
1389		- * @param boolean $return
1390		- * @param string $package
1391		- *
1392		- * @return boolean
1393		- */
1394		- public static function add_shorten_edd_filename_filter( $return, $package ) {
1395		- return FrmDeprecated::add_shorten_edd_filename_filter( $return, $package );
1396		- }
	1659	+ if ( is_array( $addons ) && array_key_exists( $addon_id, $addons ) ) {
	1660	+ $dates = $addons[ $addon_id ];
	1661	+ $requires = FrmFormsHelper::get_plan_required( $dates );
	1662	+ }
1397	1663
1398		- /**
1399		- * @since 2.03.08
1400		- * @deprecated 3.04.03
1401		- * @codeCoverageIgnore
1402		- *
1403		- * @param string $filename
1404		- * @param string $ext
1405		- *
1406		- * @return string
1407		- */
1408		- public static function shorten_edd_filename( $filename, $ext ) {
1409		- return FrmDeprecated::shorten_edd_filename( $filename, $ext );
1410		- }
	1664	+ if ( ! isset( $requires ) || ! is_string( $requires ) ) {
	1665	+ return '';
	1666	+ }
1411	1667
1412		- /**
1413		- * @deprecated 3.04.03
1414		- *
1415		- * @codeCoverageIgnore
1416		- *
1417		- * @return void
1418		- */
1419		- public static function get_licenses() {
1420		- FrmDeprecated::get_licenses();
	1668	+ return $requires;
1421	1669	}
1422	1670	}