FrmAddonsController.php: trunk vs 6.5.2 · Formidable Forms – WordPress Form Builder for Contact Forms, Calculators, Quizzes & More

← All changes | classes/controllers/FrmAddonsController.php +796 -544 6.5.2 → trunk View file →

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