← All changes | classes/controllers/FrmAddonsController.php +13 -161 6.4 → 5.5.1 View file →

		@@ -37,11 +37,8 @@
37	37	exit;
38	38	}
39	39	}
40	40
41		- /**
42		- * @return void
43		- */
44	41	public static function list_addons() {
45	42	FrmAppHelper::include_svg();
46	43	$installed_addons = apply_filters( 'frm_installed_addons', array() );
47	44	$license_type = '';
		@@ -72,11 +69,8 @@
72	69
73	70	include( FrmAppHelper::plugin_path() . '/classes/views/addons/list.php' );
74	71	}
75	72
76		- /**
77		- * @return void
78		- */
79	73	public static function license_settings() {
80	74	$plugins = apply_filters( 'frm_installed_addons', array() );
81	75	if ( empty( $plugins ) ) {
82	76	esc_html_e( 'There are no plugins on your site that require a license', 'formidable' );
		@@ -88,11 +82,8 @@
88	82
89	83	include( FrmAppHelper::plugin_path() . '/classes/views/addons/settings.php' );
90	84	}
91	85
92		- /**
93		- * @return array
94		- */
95	86	protected static function get_api_addons() {
96	87	$api = new FrmFormApi();
97	88	$addons = $api->get_api_info();
98	89
		@@ -123,10 +114,10 @@
123	114	'docs' => '',
124	115	'excerpt' => 'Enhance your basic Formidable forms with a plethora of Pro field types and features. Create advanced forms and data-driven applications in minutes.',
125	116	),
126	117	'mailchimp' => array(
127		- '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.',
	118	+ 'title' => 'MailChimp Forms',
	119	+ 'excerpt' => 'Get on the path to more sales and leads in a matter of minutes. Add leads to a MailChimp mailing list when they submit forms and update their information along with the entry.',
129	120	),
130	121	'registration' => array(
131	122	'title' => 'User Registration Forms',
132	123	'link' => 'downloads/user-registration/',
		@@ -251,11 +242,8 @@
251	242	}
252	243
253	244	/**
254	245	* @since 4.08
255		- *
256		- * @param array $addons
257		- * @return array
258	246	*/
259	247	protected static function get_pro_from_addons( $addons ) {
260	248	return isset( $addons['93790'] ) ? $addons['93790'] : array();
261	249	}
		@@ -297,10 +285,8 @@
297	285	}
298	286
299	287	/**
300	288	* @since 4.08
301		- *
302		- * @return array|false
303	289	*/
304	290	protected static function get_primary_license_info() {
305	291	$installed_addons = apply_filters( 'frm_installed_addons', array() );
306	292	if ( empty( $installed_addons ) || ! isset( $installed_addons['formidable_pro'] ) ) {
		@@ -330,12 +316,14 @@
330	316	if ( empty( $installed_addons ) ) {
331	317	return $transient;
332	318	}
333	319
334		- $version_info = self::fill_update_addon_info( $installed_addons );
	320	+ $version_info = self::fill_update_addon_info( $installed_addons );
	321	+
335	322	$transient->last_checked = time();
336		- $wp_plugins = self::get_plugins();
337	323
	324	+ $wp_plugins = FrmAppHelper::get_plugins();
	325	+
338	326	foreach ( $version_info as $id => $plugin ) {
339	327	$plugin = (object) $plugin;
340	328
341	329	if ( ! isset( $plugin->new_version ) || ! isset( $plugin->package ) ) {
		@@ -368,23 +356,8 @@
368	356	return $transient;
369	357	}
370	358
371	359	/**
372		- * Copy of FrmAppHelper::get_plugins.
373		- * Because this gets called on "pre_set_site_transient_update_plugins" an old version of FrmAppHelper may be loaded on plugin update.
374		- * 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		- *
376		- * @since 5.5.2
377		- * @return array
378		- */
379		- protected static function get_plugins() {
380		- if ( ! function_exists( 'get_plugins' ) ) {
381		- require_once ABSPATH . 'wp-admin/includes/plugin.php';
382		- }
383		- return get_plugins();
384		- }
385		-
386		- /**
387	360	* Check if a plugin is installed before showing an update for it
388	361	*
389	362	* @since 3.05
390	363	*
		@@ -392,9 +365,9 @@
392	365	*
393	366	* @return bool - True if installed
394	367	*/
395	368	protected static function is_installed( $plugin ) {
396		- $all_plugins = self::get_plugins();
	369	+ $all_plugins = FrmAppHelper::get_plugins();
397	370	return isset( $all_plugins[ $plugin ] );
398	371	}
399	372
400	373	/**
		@@ -544,11 +517,8 @@
544	517
545	518	return $plugin;
546	519	}
547	520
548		- /**
549		- * @return void
550		- */
551	521	protected static function prepare_addons( &$addons ) {
552	522	$activate_url = '';
553	523	if ( current_user_can( 'activate_plugins' ) ) {
554	524	$activate_url = add_query_arg( array( 'action' => 'activate' ), admin_url( 'plugins.php' ) );
		@@ -606,11 +576,8 @@
606	576	$addons[ $id ] = $addon;
607	577	}
608	578	}
609	579
610		- /**
611		- * @return bool
612		- */
613	580	private static function is_plugin_active( $file_name, $slug ) {
614	581	if ( 'formidable-views/formidable-views.php' === $file_name ) {
615	582	return self::get_active_views_version() === $slug;
616	583	}
		@@ -629,10 +596,8 @@
629	596	}
630	597
631	598	/**
632	599	* @since 3.04.02
633		- *
634		- * @return void
635	600	*/
636	601	protected static function prepare_addon_link( &$link ) {
637	602	$site_url = 'https://formidableforms.com/';
638	603	if ( strpos( $link, 'http' ) !== 0 ) {
		@@ -651,10 +616,8 @@
651	616	* Add the status to the addon array. Status options are:
652	617	* installed, active, not installed
653	618	*
654	619	* @since 3.04.02
655		- *
656		- * @return void
657	620	*/
658	621	protected static function set_addon_status( &$addon ) {
659	622	if ( ! empty( $addon['activate_url'] ) ) {
660	623	$addon['status'] = array(
		@@ -673,11 +636,8 @@
673	636	);
674	637	}
675	638	}
676	639
677		- /**
678		- * @return void
679		- */
680	640	public static function upgrade_to_pro() {
681	641	FrmAppHelper::include_svg();
682	642
683	643	$link_parts = array(
		@@ -887,10 +847,8 @@
887	847	/**
888	848	* Install Pro after connection with Formidable.
889	849	*
890	850	* @since 4.02.05
891		- *
892		- * @return void
893	851	*/
894	852	public static function connect_pro() {
895	853	FrmAppHelper::permission_check( 'install_plugins' );
896	854	check_ajax_referer( 'frm_ajax', 'nonce' );
		@@ -902,9 +860,9 @@
902	860
903	861	$response = array();
904	862
905	863	// It's already installed and active.
906		- $active = self::activate_plugin( 'formidable-pro/formidable-pro.php', false, false, true );
	864	+ $active = activate_plugin( 'formidable-pro/formidable-pro.php', false, false, true );
907	865	if ( is_wp_error( $active ) ) {
908	866	// The plugin was installed, but not active. Download it now.
909	867	self::ajax_install_addon();
910	868	} else {
		@@ -916,24 +874,8 @@
916	874	wp_die();
917	875	}
918	876
919	877	/**
920		- * @since 5.5.2
921		- *
922		- * @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.
927		- */
928		- protected static function activate_plugin( $plugin, $redirect = '', $network_wide = false, $silent = false ) {
929		- if ( ! function_exists( 'activate_plugin' ) ) {
930		- require_once ABSPATH . 'wp-admin/includes/plugin.php';
931		- }
932		- return activate_plugin( $plugin, $redirect, $network_wide, $silent );
933		- }
934		-
935		- /**
936	878	* @since 5.0.10
937	879	*
938	880	* @return string
939	881	*/
		@@ -962,10 +904,8 @@
962	904	}
963	905
964	906	/**
965	907	* @since 3.04.02
966		- *
967		- * @return void
968	908	*/
969	909	protected static function maybe_show_cred_form() {
970	910	if ( ! function_exists( 'request_filesystem_credentials' ) ) {
971	911	include_once( ABSPATH . 'wp-admin/includes/file.php' );
		@@ -1002,23 +942,8 @@
1002	942	ob_end_clean();
1003	943	}
1004	944
1005	945	/**
1006		- * Checks if an addon download url is allowed.
1007		- *
1008		- * @since 6.2
1009		- *
1010		- * @param string $download_url
1011		- *
1012		- * @return bool
1013		- */
1014		- 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		- );
1018		- }
1019		-
1020		- /**
1021	946	* We do not need any extra credentials if we have gotten this far,
1022	947	* so let's install the plugin.
1023	948	*
1024	949	* @since 3.04.02
		@@ -1023,21 +948,12 @@
1023	948	*
1024	949	* @since 3.04.02
1025	950	*/
1026	951	protected static function install_addon() {
1027		- FrmAppHelper::permission_check( 'install_plugins' );
1028		-
1029	952	require_once ABSPATH . 'wp-admin/includes/class-wp-upgrader.php';
1030	953
1031	954	$download_url = self::get_current_plugin();
1032	955
1033		- if ( ! self::url_is_allowed( $download_url ) ) {
1034		- return array(
1035		- 'message' => 'Plugin URL is not valid',
1036		- 'success' => false,
1037		- );
1038		- }
1039		-
1040	956	// Create the plugin upgrader with our custom skin.
1041	957	$installer = new Plugin_Upgrader( new FrmInstallerSkin() );
1042	958	$installer->install( $download_url );
1043	959
		@@ -1055,10 +971,8 @@
1055	971	}
1056	972
1057	973	/**
1058	974	* @since 3.06.03
1059		- *
1060		- * @return void
1061	975	*/
1062	976	public static function ajax_activate_addon() {
1063	977
1064	978	self::install_addon_permissions();
		@@ -1072,9 +986,9 @@
1072	986	wp_die();
1073	987	}
1074	988
1075	989	/**
1076		- * @return array
	990	+ * @return array|string
1077	991	*/
1078	992	private static function get_addon_activation_response() {
1079	993	$activating_page = self::get_activating_page();
1080	994
		@@ -1106,9 +1020,8 @@
1106	1020	}
1107	1021
1108	1022	/**
1109	1023	* @since 3.04.02
1110		- *
1111	1024	* @param string $installed The plugin folder name with file name
1112	1025	*/
1113	1026	protected static function maybe_activate_addon( $installed ) {
1114	1027	if ( ! $installed ) {
		@@ -1114,9 +1027,9 @@
1114	1027	if ( ! $installed ) {
1115	1028	return;
1116	1029	}
1117	1030
1118		- $activate = self::activate_plugin( $installed );
	1031	+ $activate = activate_plugin( $installed );
1119	1032	if ( is_wp_error( $activate ) ) {
1120	1033	// Ignore the invalid header message that shows with nested plugins.
1121	1034	if ( $activate->get_error_code() !== 'no_plugin_header' ) {
1122	1035	if ( wp_doing_ajax() ) {
		@@ -1134,10 +1047,8 @@
1134	1047	/**
1135	1048	* Run security checks before installing
1136	1049	*
1137	1050	* @since 3.04.02
1138		- *
1139		- * @return void
1140	1051	*/
1141	1052	protected static function install_addon_permissions() {
1142	1053	check_ajax_referer( 'frm_ajax', 'nonce' );
1143	1054
		@@ -1148,10 +1059,8 @@
1148	1059	}
1149	1060
1150	1061	/**
1151	1062	* @since 4.08
1152		- *
1153		- * @return string
1154	1063	*/
1155	1064	public static function connect_link() {
1156	1065	$auth = get_option( 'frm_connect_token' );
1157	1066	if ( empty( $auth ) ) {
		@@ -1177,12 +1086,8 @@
1177	1086	*
1178	1087	* @return bool
1179	1088	*/
1180	1089	public static function can_install_addon_api() {
1181		- if ( ! current_user_can( 'activate_plugins' ) ) {
1182		- return false;
1183		- }
1184		-
1185	1090	// Verify params present (auth & download link).
1186	1091	$post_auth = FrmAppHelper::get_param( 'token', '', 'request', 'sanitize_text_field' );
1187	1092	$post_url = FrmAppHelper::get_param( 'file_url', '', 'request', 'sanitize_text_field' );
1188	1093
		@@ -1212,9 +1117,9 @@
1212	1117	// Delete so cannot replay.
1213	1118	delete_option( 'frm_connect_token' );
1214	1119
1215	1120	// It's already installed and active.
1216		- $active = self::activate_plugin( 'formidable-pro/formidable-pro.php', false, false, true );
	1121	+ $active = activate_plugin( 'formidable-pro/formidable-pro.php', false, false, true );
1217	1122	if ( is_wp_error( $active ) ) {
1218	1123	// Download plugin now.
1219	1124	$response = self::download_and_activate();
1220	1125	if ( is_array( $response ) && isset( $response['success'] ) ) {
		@@ -1265,9 +1170,8 @@
1265	1170	/**
1266	1171	* Render a conditional action button for an add on
1267	1172	*
1268	1173	* @since 4.09.01
1269		- *
1270	1174	* @param array $addon
1271	1175	* @param string|false $license_type
1272	1176	* @param string $plan_required
1273	1177	* @param string $upgrade_link
		@@ -1281,12 +1185,8 @@
1281	1185	}
1282	1186
1283	1187	/**
1284	1188	* @since 4.09.01
1285		- *
1286		- * @param array|false $addon
1287		- *
1288		- * @return void
1289	1189	*/
1290	1190	protected static function addon_upgrade_link( $addon, $upgrade_link ) {
1291	1191	if ( $addon ) {
1292	1192	$upgrade_link .= '&utm_content=' . $addon['slug'];
		@@ -1296,9 +1196,9 @@
1296	1196	// Solutions will go to a separate page.
1297	1197	$upgrade_link = FrmAppHelper::admin_upgrade_link( 'addons', $addon['link'] );
1298	1198	}
1299	1199	?>
1300		- <a class="install-now button frm-button-secondary frm-button-sm" href="<?php echo esc_url( $upgrade_link ); ?>" target="_blank" rel="noopener" aria-label="<?php esc_attr_e( 'Upgrade Now', 'formidable' ); ?>">
	1200	+ <a class="install-now button button-secondary frm-button-secondary" href="<?php echo esc_url( $upgrade_link ); ?>" target="_blank" rel="noopener" aria-label="<?php esc_attr_e( 'Upgrade Now', 'formidable' ); ?>">
1301	1201	<?php esc_html_e( 'Upgrade Now', 'formidable' ); ?>
1302	1202	</a>
1303	1203	<?php
1304	1204	}
		@@ -1304,19 +1204,13 @@
1304	1204	}
1305	1205
1306	1206	/**
1307	1207	* @since 3.04.02
1308		- *
1309		- * @return void
1310	1208	*/
1311	1209	public static function ajax_install_addon() {
1312	1210	self::install_addon_permissions();
1313	1211
1314		- $result = self::download_and_activate();
1315		- if ( isset( $result['success'] ) && ! $result['success'] ) {
1316		- echo json_encode( $result );
1317		- wp_die();
1318		- }
	1212	+ self::download_and_activate();
1319	1213
1320	1214	echo json_encode( self::get_addon_activation_response() );
1321	1215	wp_die();
1322	1216	}
		@@ -1321,45 +1215,10 @@
1321	1215	wp_die();
1322	1216	}
1323	1217
1324	1218	/**
1325		- * Allowed URLs used for internal source of plugins installation.
1326		- *
1327		- * @since 6.3.1
1328		- *
1329		- * @return array
1330		- */
1331		- private static function allowed_external_urls() {
1332		- $allowed_url_list = array(
1333		- 'https://downloads.wordpress.org/plugin/formidable-gravity-forms-importer.zip',
1334		- 'https://downloads.wordpress.org/plugin/formidable-import-pirate-forms.zip',
1335		- 'https://downloads.wordpress.org/plugin/wp-mail-smtp.zip',
1336		- );
1337		-
1338		- /**
1339		- * List of URLs used in plugin formidable internal installation.
1340		- *
1341		- * @since 6.3.1
1342		- *
1343		- * @param array $allowed_url_list List of URLs.
1344		- */
1345		- $allowed_url_list = apply_filters( 'frm_allowed_external_urls', $allowed_url_list );
1346		-
1347		- if ( ! is_array( $allowed_url_list ) ) {
1348		- _doing_it_wrong( __METHOD__, 'Only an array of URLs could be used within this filter.', '6.3.1' );
1349		-
1350		- return array();
1351		- }
1352		-
1353		- return $allowed_url_list;
1354		- }
1355		-
1356		- /**
1357	1219	* @since 4.06.02
1358		- *
1359	1220	* @deprecated 4.09.01
1360		- *
1361		- * @return void
1362	1221	*/
1363	1222	public static function ajax_multiple_addons() {
1364	1223	FrmDeprecated::ajax_multiple_addons();
1365	1224	}
		@@ -1406,14 +1265,10 @@
1406	1265	}
1407	1266
1408	1267	/**
1409	1268	* @since 3.04.03
1410		- *
1411	1269	* @deprecated 3.06
1412		- *
1413	1270	* @codeCoverageIgnore
1414		- *
1415		- * @return void
1416	1271	*/
1417	1272	public static function reset_cached_addons( $license = '' ) {
1418	1273	FrmDeprecated::reset_cached_addons( $license );
1419	1274	}
		@@ -1447,12 +1302,9 @@
1447	1302	}
1448	1303
1449	1304	/**
1450	1305	* @deprecated 3.04.03
1451		- *
1452	1306	* @codeCoverageIgnore
1453		- *
1454		- * @return void
1455	1307	*/
1456	1308	public static function get_licenses() {
1457	1309	FrmDeprecated::get_licenses();
1458	1310	}