← All changes | classes/controllers/FrmAddonsController.php +499 -935 6.35 → 5.5 View file →

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