← All changes | classes/controllers/FrmAddonsController.php +506 -954 6.35 → 5.0.14 View file →

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