← All changes | classes/controllers/FrmAddonsController.php +23 -188 6.5 → 5.4.5 View file →

		@@ -18,9 +18,9 @@
18	18	return;
19	19	}
20	20
21	21	$label = __( 'Add-Ons', 'formidable' );
22		- $label = '<span style="color:#1da867">' . $label . '</span>';
	22	+ $label = '<span style="color:#fe5a1d">' . $label . '</span>';
23	23
24	24	add_submenu_page( 'formidable', 'Formidable | ' . __( 'Add-Ons', 'formidable' ), $label, 'frm_view_forms', 'formidable-addons', 'FrmAddonsController::list_addons' );
25	25
26	26	if ( ! FrmAppHelper::pro_is_installed() ) {
		@@ -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,17 @@
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	+ if ( ! function_exists( 'get_plugins' ) ) {
	325	+ require_once ABSPATH . 'wp-admin/includes/plugin.php';
	326	+ }
	327	+ $wp_plugins = get_plugins();
	328	+
338	329	foreach ( $version_info as $id => $plugin ) {
339	330	$plugin = (object) $plugin;
340	331
341	332	if ( ! isset( $plugin->new_version ) || ! isset( $plugin->package ) ) {
		@@ -368,23 +359,8 @@
368	359	return $transient;
369	360	}
370	361
371	362	/**
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	363	* Check if a plugin is installed before showing an update for it
388	364	*
389	365	* @since 3.05
390	366	*
		@@ -392,9 +368,14 @@
392	368	*
393	369	* @return bool - True if installed
394	370	*/
395	371	protected static function is_installed( $plugin ) {
396		- $all_plugins = self::get_plugins();
	372	+ if ( ! function_exists( 'get_plugins' ) ) {
	373	+ require_once ABSPATH . 'wp-admin/includes/plugin.php';
	374	+ }
	375	+
	376	+ $all_plugins = get_plugins();
	377	+
397	378	return isset( $all_plugins[ $plugin ] );
398	379	}
399	380
400	381	/**
		@@ -544,11 +525,8 @@
544	525
545	526	return $plugin;
546	527	}
547	528
548		- /**
549		- * @return void
550		- */
551	529	protected static function prepare_addons( &$addons ) {
552	530	$activate_url = '';
553	531	if ( current_user_can( 'activate_plugins' ) ) {
554	532	$activate_url = add_query_arg( array( 'action' => 'activate' ), admin_url( 'plugins.php' ) );
		@@ -606,11 +584,8 @@
606	584	$addons[ $id ] = $addon;
607	585	}
608	586	}
609	587
610		- /**
611		- * @return bool
612		- */
613	588	private static function is_plugin_active( $file_name, $slug ) {
614	589	if ( 'formidable-views/formidable-views.php' === $file_name ) {
615	590	return self::get_active_views_version() === $slug;
616	591	}
		@@ -629,10 +604,8 @@
629	604	}
630	605
631	606	/**
632	607	* @since 3.04.02
633		- *
634		- * @return void
635	608	*/
636	609	protected static function prepare_addon_link( &$link ) {
637	610	$site_url = 'https://formidableforms.com/';
638	611	if ( strpos( $link, 'http' ) !== 0 ) {
		@@ -651,10 +624,8 @@
651	624	* Add the status to the addon array. Status options are:
652	625	* installed, active, not installed
653	626	*
654	627	* @since 3.04.02
655		- *
656		- * @return void
657	628	*/
658	629	protected static function set_addon_status( &$addon ) {
659	630	if ( ! empty( $addon['activate_url'] ) ) {
660	631	$addon['status'] = array(
		@@ -673,11 +644,8 @@
673	644	);
674	645	}
675	646	}
676	647
677		- /**
678		- * @return void
679		- */
680	648	public static function upgrade_to_pro() {
681	649	FrmAppHelper::include_svg();
682	650
683	651	$link_parts = array(
		@@ -887,10 +855,8 @@
887	855	/**
888	856	* Install Pro after connection with Formidable.
889	857	*
890	858	* @since 4.02.05
891		- *
892		- * @return void
893	859	*/
894	860	public static function connect_pro() {
895	861	FrmAppHelper::permission_check( 'install_plugins' );
896	862	check_ajax_referer( 'frm_ajax', 'nonce' );
		@@ -902,9 +868,9 @@
902	868
903	869	$response = array();
904	870
905	871	// It's already installed and active.
906		- $active = self::activate_plugin( 'formidable-pro/formidable-pro.php', false, false, true );
	872	+ $active = activate_plugin( 'formidable-pro/formidable-pro.php', false, false, true );
907	873	if ( is_wp_error( $active ) ) {
908	874	// The plugin was installed, but not active. Download it now.
909	875	self::ajax_install_addon();
910	876	} else {
		@@ -916,24 +882,8 @@
916	882	wp_die();
917	883	}
918	884
919	885	/**
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	886	* @since 5.0.10
937	887	*
938	888	* @return string
939	889	*/
		@@ -962,10 +912,8 @@
962	912	}
963	913
964	914	/**
965	915	* @since 3.04.02
966		- *
967		- * @return void
968	916	*/
969	917	protected static function maybe_show_cred_form() {
970	918	if ( ! function_exists( 'request_filesystem_credentials' ) ) {
971	919	include_once( ABSPATH . 'wp-admin/includes/file.php' );
		@@ -1002,23 +950,8 @@
1002	950	ob_end_clean();
1003	951	}
1004	952
1005	953	/**
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	954	* We do not need any extra credentials if we have gotten this far,
1022	955	* so let's install the plugin.
1023	956	*
1024	957	* @since 3.04.02
		@@ -1023,21 +956,12 @@
1023	956	*
1024	957	* @since 3.04.02
1025	958	*/
1026	959	protected static function install_addon() {
1027		- FrmAppHelper::permission_check( 'install_plugins' );
1028		-
1029	960	require_once ABSPATH . 'wp-admin/includes/class-wp-upgrader.php';
1030	961
1031	962	$download_url = self::get_current_plugin();
1032	963
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	964	// Create the plugin upgrader with our custom skin.
1041	965	$installer = new Plugin_Upgrader( new FrmInstallerSkin() );
1042	966	$installer->install( $download_url );
1043	967
		@@ -1055,10 +979,8 @@
1055	979	}
1056	980
1057	981	/**
1058	982	* @since 3.06.03
1059		- *
1060		- * @return void
1061	983	*/
1062	984	public static function ajax_activate_addon() {
1063	985
1064	986	self::install_addon_permissions();
		@@ -1072,17 +994,15 @@
1072	994	wp_die();
1073	995	}
1074	996
1075	997	/**
1076		- * @return array
	998	+ * @return array|string
1077	999	*/
1078	1000	private static function get_addon_activation_response() {
1079	1001	$activating_page = self::get_activating_page();
1080	1002
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	1003	$response = array(
1084		- 'message' => $message,
	1004	+ 'message' => __( 'Your plugin has been activated. Would you like to save and reload the page now?', 'formidable' ),
1085	1005	'saveAndReload' => $activating_page,
1086	1006	);
1087	1007
1088	1008	return $response;
		@@ -1108,9 +1028,8 @@
1108	1028	}
1109	1029
1110	1030	/**
1111	1031	* @since 3.04.02
1112		- *
1113	1032	* @param string $installed The plugin folder name with file name
1114	1033	*/
1115	1034	protected static function maybe_activate_addon( $installed ) {
1116	1035	if ( ! $installed ) {
		@@ -1116,9 +1035,9 @@
1116	1035	if ( ! $installed ) {
1117	1036	return;
1118	1037	}
1119	1038
1120		- $activate = self::activate_plugin( $installed );
	1039	+ $activate = activate_plugin( $installed );
1121	1040	if ( is_wp_error( $activate ) ) {
1122	1041	// Ignore the invalid header message that shows with nested plugins.
1123	1042	if ( $activate->get_error_code() !== 'no_plugin_header' ) {
1124	1043	if ( wp_doing_ajax() ) {
		@@ -1136,10 +1055,8 @@
1136	1055	/**
1137	1056	* Run security checks before installing
1138	1057	*
1139	1058	* @since 3.04.02
1140		- *
1141		- * @return void
1142	1059	*/
1143	1060	protected static function install_addon_permissions() {
1144	1061	check_ajax_referer( 'frm_ajax', 'nonce' );
1145	1062
		@@ -1150,10 +1067,8 @@
1150	1067	}
1151	1068
1152	1069	/**
1153	1070	* @since 4.08
1154		- *
1155		- * @return string
1156	1071	*/
1157	1072	public static function connect_link() {
1158	1073	$auth = get_option( 'frm_connect_token' );
1159	1074	if ( empty( $auth ) ) {
		@@ -1179,12 +1094,8 @@
1179	1094	*
1180	1095	* @return bool
1181	1096	*/
1182	1097	public static function can_install_addon_api() {
1183		- if ( ! current_user_can( 'activate_plugins' ) ) {
1184		- return false;
1185		- }
1186		-
1187	1098	// Verify params present (auth & download link).
1188	1099	$post_auth = FrmAppHelper::get_param( 'token', '', 'request', 'sanitize_text_field' );
1189	1100	$post_url = FrmAppHelper::get_param( 'file_url', '', 'request', 'sanitize_text_field' );
1190	1101
		@@ -1214,9 +1125,9 @@
1214	1125	// Delete so cannot replay.
1215	1126	delete_option( 'frm_connect_token' );
1216	1127
1217	1128	// It's already installed and active.
1218		- $active = self::activate_plugin( 'formidable-pro/formidable-pro.php', false, false, true );
	1129	+ $active = activate_plugin( 'formidable-pro/formidable-pro.php', false, false, true );
1219	1130	if ( is_wp_error( $active ) ) {
1220	1131	// Download plugin now.
1221	1132	$response = self::download_and_activate();
1222	1133	if ( is_array( $response ) && isset( $response['success'] ) ) {
		@@ -1267,9 +1178,8 @@
1267	1178	/**
1268	1179	* Render a conditional action button for an add on
1269	1180	*
1270	1181	* @since 4.09.01
1271		- *
1272	1182	* @param array $addon
1273	1183	* @param string|false $license_type
1274	1184	* @param string $plan_required
1275	1185	* @param string $upgrade_link
		@@ -1283,12 +1193,8 @@
1283	1193	}
1284	1194
1285	1195	/**
1286	1196	* @since 4.09.01
1287		- *
1288		- * @param array|false $addon
1289		- *
1290		- * @return void
1291	1197	*/
1292	1198	protected static function addon_upgrade_link( $addon, $upgrade_link ) {
1293	1199	if ( $addon ) {
1294	1200	$upgrade_link .= '&utm_content=' . $addon['slug'];
		@@ -1298,9 +1204,9 @@
1298	1204	// Solutions will go to a separate page.
1299	1205	$upgrade_link = FrmAppHelper::admin_upgrade_link( 'addons', $addon['link'] );
1300	1206	}
1301	1207	?>
1302		- <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' ); ?>">
	1208	+ <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' ); ?>">
1303	1209	<?php esc_html_e( 'Upgrade Now', 'formidable' ); ?>
1304	1210	</a>
1305	1211	<?php
1306	1212	}
		@@ -1306,19 +1212,13 @@
1306	1212	}
1307	1213
1308	1214	/**
1309	1215	* @since 3.04.02
1310		- *
1311		- * @return void
1312	1216	*/
1313	1217	public static function ajax_install_addon() {
1314	1218	self::install_addon_permissions();
1315	1219
1316		- $result = self::download_and_activate();
1317		- if ( isset( $result['success'] ) && ! $result['success'] ) {
1318		- echo json_encode( $result );
1319		- wp_die();
1320		- }
	1220	+ self::download_and_activate();
1321	1221
1322	1222	echo json_encode( self::get_addon_activation_response() );
1323	1223	wp_die();
1324	1224	}
		@@ -1323,68 +1223,10 @@
1323	1223	wp_die();
1324	1224	}
1325	1225
1326	1226	/**
1327		- * Allowed URLs used for internal source of plugins installation.
1328		- *
1329		- * @since 6.3.1
1330		- *
1331		- * @return array
1332		- */
1333		- private static function allowed_external_urls() {
1334		- $allowed_url_list = array(
1335		- 'https://downloads.wordpress.org/plugin/formidable-gravity-forms-importer.zip',
1336		- 'https://downloads.wordpress.org/plugin/formidable-import-pirate-forms.zip',
1337		- 'https://downloads.wordpress.org/plugin/wp-mail-smtp.zip',
1338		- );
1339		-
1340		- /**
1341		- * List of URLs used in plugin formidable internal installation.
1342		- *
1343		- * @since 6.3.1
1344		- *
1345		- * @param array $allowed_url_list List of URLs.
1346		- */
1347		- $allowed_url_list = apply_filters( 'frm_allowed_external_urls', $allowed_url_list );
1348		-
1349		- if ( ! is_array( $allowed_url_list ) ) {
1350		- _doing_it_wrong( __METHOD__, 'Only an array of URLs could be used within this filter.', '6.3.1' );
1351		-
1352		- return array();
1353		- }
1354		-
1355		- return $allowed_url_list;
1356		- }
1357		-
1358		- /**
1359		- * Gets required plan for an addon.
1360		- *
1361		- * @since 6.4.2
1362		- *
1363		- * @return string Empty string if no plan is required for active license.
1364		- */
1365		- public static function get_addon_required_plan( $addon_id ) {
1366		- $api = new FrmFormApi();
1367		- $addons = $api->get_api_info();
1368		-
1369		- if ( is_array( $addons ) && array_key_exists( $addon_id, $addons ) ) {
1370		- $dates = $addons[ $addon_id ];
1371		- $requires = FrmFormsHelper::get_plan_required( $dates );
1372		- }
1373		-
1374		- if ( ! isset( $requires ) || ! is_string( $requires ) ) {
1375		- $requires = '';
1376		- }
1377		-
1378		- return $requires;
1379		- }
1380		-
1381		- /**
1382	1227	* @since 4.06.02
1383		- *
1384	1228	* @deprecated 4.09.01
1385		- *
1386		- * @return void
1387	1229	*/
1388	1230	public static function ajax_multiple_addons() {
1389	1231	FrmDeprecated::ajax_multiple_addons();
1390	1232	}
		@@ -1431,14 +1273,10 @@
1431	1273	}
1432	1274
1433	1275	/**
1434	1276	* @since 3.04.03
1435		- *
1436	1277	* @deprecated 3.06
1437		- *
1438	1278	* @codeCoverageIgnore
1439		- *
1440		- * @return void
1441	1279	*/
1442	1280	public static function reset_cached_addons( $license = '' ) {
1443	1281	FrmDeprecated::reset_cached_addons( $license );
1444	1282	}
		@@ -1472,12 +1310,9 @@
1472	1310	}
1473	1311
1474	1312	/**
1475	1313	* @deprecated 3.04.03
1476		- *
1477	1314	* @codeCoverageIgnore
1478		- *
1479		- * @return void
1480	1315	*/
1481	1316	public static function get_licenses() {
1482	1317	FrmDeprecated::get_licenses();
1483	1318	}