← All changes | classes/controllers/FrmAddonsController.php +5 -87 6.3 → 5.5.4 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'] ) ) {
		@@ -544,11 +530,8 @@
544	530
545	531	return $plugin;
546	532	}
547	533
548		- /**
549		- * @return void
550		- */
551	534	protected static function prepare_addons( &$addons ) {
552	535	$activate_url = '';
553	536	if ( current_user_can( 'activate_plugins' ) ) {
554	537	$activate_url = add_query_arg( array( 'action' => 'activate' ), admin_url( 'plugins.php' ) );
		@@ -606,11 +589,8 @@
606	589	$addons[ $id ] = $addon;
607	590	}
608	591	}
609	592
610		- /**
611		- * @return bool
612		- */
613	593	private static function is_plugin_active( $file_name, $slug ) {
614	594	if ( 'formidable-views/formidable-views.php' === $file_name ) {
615	595	return self::get_active_views_version() === $slug;
616	596	}
		@@ -629,10 +609,8 @@
629	609	}
630	610
631	611	/**
632	612	* @since 3.04.02
633		- *
634		- * @return void
635	613	*/
636	614	protected static function prepare_addon_link( &$link ) {
637	615	$site_url = 'https://formidableforms.com/';
638	616	if ( strpos( $link, 'http' ) !== 0 ) {
		@@ -651,10 +629,8 @@
651	629	* Add the status to the addon array. Status options are:
652	630	* installed, active, not installed
653	631	*
654	632	* @since 3.04.02
655		- *
656		- * @return void
657	633	*/
658	634	protected static function set_addon_status( &$addon ) {
659	635	if ( ! empty( $addon['activate_url'] ) ) {
660	636	$addon['status'] = array(
		@@ -673,11 +649,8 @@
673	649	);
674	650	}
675	651	}
676	652
677		- /**
678		- * @return void
679		- */
680	653	public static function upgrade_to_pro() {
681	654	FrmAppHelper::include_svg();
682	655
683	656	$link_parts = array(
		@@ -887,10 +860,8 @@
887	860	/**
888	861	* Install Pro after connection with Formidable.
889	862	*
890	863	* @since 4.02.05
891		- *
892		- * @return void
893	864	*/
894	865	public static function connect_pro() {
895	866	FrmAppHelper::permission_check( 'install_plugins' );
896	867	check_ajax_referer( 'frm_ajax', 'nonce' );
		@@ -962,10 +933,8 @@
962	933	}
963	934
964	935	/**
965	936	* @since 3.04.02
966		- *
967		- * @return void
968	937	*/
969	938	protected static function maybe_show_cred_form() {
970	939	if ( ! function_exists( 'request_filesystem_credentials' ) ) {
971	940	include_once( ABSPATH . 'wp-admin/includes/file.php' );
		@@ -1002,24 +971,8 @@
1002	971	ob_end_clean();
1003	972	}
1004	973
1005	974	/**
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' ) ||
1017		- ( strpos( $download_url, 'https://downloads.wordpress.org/plugin' ) === 0 && substr_compare( $download_url, '.zip', -4 ) === 0 )
1018		- );
1019		- }
1020		-
1021		- /**
1022	975	* We do not need any extra credentials if we have gotten this far,
1023	976	* so let's install the plugin.
1024	977	*
1025	978	* @since 3.04.02
		@@ -1028,15 +981,8 @@
1028	981	require_once ABSPATH . 'wp-admin/includes/class-wp-upgrader.php';
1029	982
1030	983	$download_url = self::get_current_plugin();
1031	984
1032		- if ( ! self::url_is_allowed( $download_url ) ) {
1033		- return array(
1034		- 'message' => 'Plugin URL is not valid',
1035		- 'success' => false,
1036		- );
1037		- }
1038		-
1039	985	// Create the plugin upgrader with our custom skin.
1040	986	$installer = new Plugin_Upgrader( new FrmInstallerSkin() );
1041	987	$installer->install( $download_url );
1042	988
		@@ -1054,10 +1000,8 @@
1054	1000	}
1055	1001
1056	1002	/**
1057	1003	* @since 3.06.03
1058		- *
1059		- * @return void
1060	1004	*/
1061	1005	public static function ajax_activate_addon() {
1062	1006
1063	1007	self::install_addon_permissions();
		@@ -1071,9 +1015,9 @@
1071	1015	wp_die();
1072	1016	}
1073	1017
1074	1018	/**
1075		- * @return array
	1019	+ * @return array|string
1076	1020	*/
1077	1021	private static function get_addon_activation_response() {
1078	1022	$activating_page = self::get_activating_page();
1079	1023
		@@ -1105,9 +1049,8 @@
1105	1049	}
1106	1050
1107	1051	/**
1108	1052	* @since 3.04.02
1109		- *
1110	1053	* @param string $installed The plugin folder name with file name
1111	1054	*/
1112	1055	protected static function maybe_activate_addon( $installed ) {
1113	1056	if ( ! $installed ) {
		@@ -1133,10 +1076,8 @@
1133	1076	/**
1134	1077	* Run security checks before installing
1135	1078	*
1136	1079	* @since 3.04.02
1137		- *
1138		- * @return void
1139	1080	*/
1140	1081	protected static function install_addon_permissions() {
1141	1082	check_ajax_referer( 'frm_ajax', 'nonce' );
1142	1083
		@@ -1147,10 +1088,8 @@
1147	1088	}
1148	1089
1149	1090	/**
1150	1091	* @since 4.08
1151		- *
1152		- * @return string
1153	1092	*/
1154	1093	public static function connect_link() {
1155	1094	$auth = get_option( 'frm_connect_token' );
1156	1095	if ( empty( $auth ) ) {
		@@ -1260,9 +1199,8 @@
1260	1199	/**
1261	1200	* Render a conditional action button for an add on
1262	1201	*
1263	1202	* @since 4.09.01
1264		- *
1265	1203	* @param array $addon
1266	1204	* @param string|false $license_type
1267	1205	* @param string $plan_required
1268	1206	* @param string $upgrade_link
		@@ -1276,12 +1214,8 @@
1276	1214	}
1277	1215
1278	1216	/**
1279	1217	* @since 4.09.01
1280		- *
1281		- * @param array|false $addon
1282		- *
1283		- * @return void
1284	1218	*/
1285	1219	protected static function addon_upgrade_link( $addon, $upgrade_link ) {
1286	1220	if ( $addon ) {
1287	1221	$upgrade_link .= '&utm_content=' . $addon['slug'];
		@@ -1291,9 +1225,9 @@
1291	1225	// Solutions will go to a separate page.
1292	1226	$upgrade_link = FrmAppHelper::admin_upgrade_link( 'addons', $addon['link'] );
1293	1227	}
1294	1228	?>
1295		- <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' ); ?>">
	1229	+ <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' ); ?>">
1296	1230	<?php esc_html_e( 'Upgrade Now', 'formidable' ); ?>
1297	1231	</a>
1298	1232	<?php
1299	1233	}
		@@ -1299,19 +1233,13 @@
1299	1233	}
1300	1234
1301	1235	/**
1302	1236	* @since 3.04.02
1303		- *
1304		- * @return void
1305	1237	*/
1306	1238	public static function ajax_install_addon() {
1307	1239	self::install_addon_permissions();
1308	1240
1309		- $result = self::download_and_activate();
1310		- if ( isset( $result['success'] ) && ! $result['success'] ) {
1311		- echo json_encode( $result );
1312		- wp_die();
1313		- }
	1241	+ self::download_and_activate();
1314	1242
1315	1243	echo json_encode( self::get_addon_activation_response() );
1316	1244	wp_die();
1317	1245	}
		@@ -1317,12 +1245,9 @@
1317	1245	}
1318	1246
1319	1247	/**
1320	1248	* @since 4.06.02
1321		- *
1322	1249	* @deprecated 4.09.01
1323		- *
1324		- * @return void
1325	1250	*/
1326	1251	public static function ajax_multiple_addons() {
1327	1252	FrmDeprecated::ajax_multiple_addons();
1328	1253	}
		@@ -1369,14 +1294,10 @@
1369	1294	}
1370	1295
1371	1296	/**
1372	1297	* @since 3.04.03
1373		- *
1374	1298	* @deprecated 3.06
1375		- *
1376	1299	* @codeCoverageIgnore
1377		- *
1378		- * @return void
1379	1300	*/
1380	1301	public static function reset_cached_addons( $license = '' ) {
1381	1302	FrmDeprecated::reset_cached_addons( $license );
1382	1303	}
		@@ -1410,12 +1331,9 @@
1410	1331	}
1411	1332
1412	1333	/**
1413	1334	* @deprecated 3.04.03
1414		- *
1415	1335	* @codeCoverageIgnore
1416		- *
1417		- * @return void
1418	1336	*/
1419	1337	public static function get_licenses() {
1420	1338	FrmDeprecated::get_licenses();
1421	1339	}