← All changes | wp-convertkit.php +39 -23 2.3.3 → 2.7.4 View file →

		@@ -1,42 +1,47 @@
1	1	<?php
2	2	/**
3		- * ConvertKit WordPress Plugin.
	3	+ * Kit (formerly ConvertKit) WordPress Plugin.
4	4	*
5	5	* @package ConvertKit
6	6	* @author ConvertKit
7	7	*
8	8	* @wordpress-plugin
9		- * Plugin Name: ConvertKit
10		- * Plugin URI: https://convertkit.com/
11		- * Description: Display ConvertKit email subscription forms, landing pages, products, broadcasts and more.
12		- * Version: 2.3.3
13		- * Author: ConvertKit
14		- * Author URI: https://convertkit.com/
	9	+ * Plugin Name: Kit (formerly ConvertKit)
	10	+ * Plugin URI: https://kit.com/
	11	+ * Description: Display Kit (formerly ConvertKit) email subscription forms, landing pages, products, broadcasts and more.
	12	+ * Version: 2.7.4
	13	+ * Author: Kit
	14	+ * Author URI: https://kit.com/
15	15	* Text Domain: convertkit
16	16	*/
17	17
18		-// Bail if ConvertKit is alread loaded.
	18	+// Bail if Kit is alread loaded.
19	19	if ( class_exists( 'WP_ConvertKit' ) ) {
20	20	return;
21	21	}
22	22
23		-// Define ConverKit Plugin paths and version number.
	23	+// Define Kit Plugin paths and version number.
24	24	define( 'CONVERTKIT_PLUGIN_NAME', 'ConvertKit' ); // Used for user-agent in API class.
25	25	define( 'CONVERTKIT_PLUGIN_FILE', plugin_basename( __FILE__ ) );
26	26	define( 'CONVERTKIT_PLUGIN_URL', plugin_dir_url( __FILE__ ) );
27	27	define( 'CONVERTKIT_PLUGIN_PATH', __DIR__ );
28		-define( 'CONVERTKIT_PLUGIN_VERSION', '2.3.3' );
	28	+define( 'CONVERTKIT_PLUGIN_VERSION', '2.7.4' );
	29	+define( 'CONVERTKIT_OAUTH_CLIENT_ID', 'HXZlOCj-K5r0ufuWCtyoyo3f688VmMAYSsKg1eGvw0Y' );
	30	+define( 'CONVERTKIT_OAUTH_CLIENT_REDIRECT_URI', 'https://app.kit.com/wordpress/redirect' );
29	31
30		-// Load shared classes, if they have not been included by another ConvertKit Plugin.
31		-if ( ! class_exists( 'ConvertKit_API' ) ) {
32		- require_once CONVERTKIT_PLUGIN_PATH . '/vendor/convertkit/convertkit-wordpress-libraries/src/class-convertkit-api.php';
	32	+// Load shared classes, if they have not been included by another Kit Plugin.
	33	+if ( ! trait_exists( 'ConvertKit_API_Traits' ) ) {
	34	+ require_once CONVERTKIT_PLUGIN_PATH . '/vendor/convertkit/convertkit-wordpress-libraries/src/class-convertkit-api-traits.php';
33	35	}
	36	+if ( ! class_exists( 'ConvertKit_API_V4' ) ) {
	37	+ require_once CONVERTKIT_PLUGIN_PATH . '/vendor/convertkit/convertkit-wordpress-libraries/src/class-convertkit-api-v4.php';
	38	+}
34	39	if ( ! class_exists( 'ConvertKit_Log' ) ) {
35	40	require_once CONVERTKIT_PLUGIN_PATH . '/vendor/convertkit/convertkit-wordpress-libraries/src/class-convertkit-log.php';
36	41	}
37		-if ( ! class_exists( 'ConvertKit_Resource' ) ) {
38		- require_once CONVERTKIT_PLUGIN_PATH . '/vendor/convertkit/convertkit-wordpress-libraries/src/class-convertkit-resource.php';
	42	+if ( ! class_exists( 'ConvertKit_Resource_V4' ) ) {
	43	+ require_once CONVERTKIT_PLUGIN_PATH . '/vendor/convertkit/convertkit-wordpress-libraries/src/class-convertkit-resource-v4.php';
39	44	}
40	45	if ( ! class_exists( 'ConvertKit_Review_Request' ) ) {
41	46	require_once CONVERTKIT_PLUGIN_PATH . '/vendor/convertkit/convertkit-wordpress-libraries/src/class-convertkit-review-request.php';
42	47	}
		@@ -47,12 +52,14 @@
47	52	require_once CONVERTKIT_PLUGIN_PATH . '/includes/class-wp-convertkit.php';
48	53	require_once CONVERTKIT_PLUGIN_PATH . '/includes/class-convertkit-ajax.php';
49	54	require_once CONVERTKIT_PLUGIN_PATH . '/includes/class-convertkit-broadcasts-exporter.php';
50	55	require_once CONVERTKIT_PLUGIN_PATH . '/includes/class-convertkit-broadcasts-importer.php';
	56	+require_once CONVERTKIT_PLUGIN_PATH . '/includes/class-convertkit-cache-plugins.php';
51	57	require_once CONVERTKIT_PLUGIN_PATH . '/includes/class-convertkit-cron.php';
52	58	require_once CONVERTKIT_PLUGIN_PATH . '/includes/class-convertkit-gutenberg.php';
53	59	require_once CONVERTKIT_PLUGIN_PATH . '/includes/class-convertkit-media-library.php';
54	60	require_once CONVERTKIT_PLUGIN_PATH . '/includes/class-convertkit-output.php';
	61	+require_once CONVERTKIT_PLUGIN_PATH . '/includes/class-convertkit-output-broadcasts.php';
55	62	require_once CONVERTKIT_PLUGIN_PATH . '/includes/class-convertkit-output-restrict-content.php';
56	63	require_once CONVERTKIT_PLUGIN_PATH . '/includes/class-convertkit-post.php';
57	64	require_once CONVERTKIT_PLUGIN_PATH . '/includes/class-convertkit-preview-output.php';
58	65	require_once CONVERTKIT_PLUGIN_PATH . '/includes/class-convertkit-resource-creator-network-recommendations.php';
		@@ -59,8 +66,9 @@
59	66	require_once CONVERTKIT_PLUGIN_PATH . '/includes/class-convertkit-resource-forms.php';
60	67	require_once CONVERTKIT_PLUGIN_PATH . '/includes/class-convertkit-resource-landing-pages.php';
61	68	require_once CONVERTKIT_PLUGIN_PATH . '/includes/class-convertkit-resource-posts.php';
62	69	require_once CONVERTKIT_PLUGIN_PATH . '/includes/class-convertkit-resource-products.php';
	70	+require_once CONVERTKIT_PLUGIN_PATH . '/includes/class-convertkit-resource-sequences.php';
63	71	require_once CONVERTKIT_PLUGIN_PATH . '/includes/class-convertkit-resource-tags.php';
64	72	require_once CONVERTKIT_PLUGIN_PATH . '/includes/class-convertkit-settings.php';
65	73	require_once CONVERTKIT_PLUGIN_PATH . '/includes/class-convertkit-settings-broadcasts.php';
66	74	require_once CONVERTKIT_PLUGIN_PATH . '/includes/class-convertkit-settings-restrict-content.php';
		@@ -86,8 +94,11 @@
86	94	// Contact Form 7 Integration.
87	95	require_once CONVERTKIT_PLUGIN_PATH . '/includes/integrations/contactform7/class-convertkit-contactform7.php';
88	96	require_once CONVERTKIT_PLUGIN_PATH . '/includes/integrations/contactform7/class-convertkit-contactform7-settings.php';
89	97
	98	+// Divi Integration.
	99	+require_once CONVERTKIT_PLUGIN_PATH . '/includes/integrations/divi/class-convertkit-divi.php';
	100	+
90	101	// Elementor Integration.
91	102	require_once CONVERTKIT_PLUGIN_PATH . '/includes/integrations/elementor/class-convertkit-elementor.php';
92	103
93	104	// Forminator Integration.
		@@ -114,29 +125,34 @@
114	125	require_once CONVERTKIT_PLUGIN_PATH . '/admin/class-convertkit-admin-tinymce.php';
115	126	require_once CONVERTKIT_PLUGIN_PATH . '/admin/class-convertkit-admin-user.php';
116	127	require_once CONVERTKIT_PLUGIN_PATH . '/admin/class-convertkit-admin-setup-wizard.php';
117	128	require_once CONVERTKIT_PLUGIN_PATH . '/admin/class-multi-value-field-table.php';
118		- require_once CONVERTKIT_PLUGIN_PATH . '/admin/section/class-convertkit-settings-base.php';
119		- require_once CONVERTKIT_PLUGIN_PATH . '/admin/section/class-convertkit-settings-general.php';
120		- require_once CONVERTKIT_PLUGIN_PATH . '/admin/section/class-convertkit-settings-tools.php';
	129	+ require_once CONVERTKIT_PLUGIN_PATH . '/admin/section/class-convertkit-admin-section-base.php';
	130	+ require_once CONVERTKIT_PLUGIN_PATH . '/admin/section/class-convertkit-admin-section-general.php';
	131	+ require_once CONVERTKIT_PLUGIN_PATH . '/admin/section/class-convertkit-admin-section-oauth.php';
	132	+ require_once CONVERTKIT_PLUGIN_PATH . '/admin/section/class-convertkit-admin-section-tools.php';
121	133	require_once CONVERTKIT_PLUGIN_PATH . '/admin/setup-wizard/class-convertkit-admin-setup-wizard-plugin.php';
122	134
123	135	// Contact Form 7 Integration.
124		- require_once CONVERTKIT_PLUGIN_PATH . '/includes/integrations/contactform7/class-convertkit-contactform7-admin-settings.php';
	136	+ require_once CONVERTKIT_PLUGIN_PATH . '/includes/integrations/contactform7/class-convertkit-contactform7-admin-section.php';
125	137
126	138	// Forminator Integration.
127		- require_once CONVERTKIT_PLUGIN_PATH . '/includes/integrations/forminator/class-convertkit-forminator-admin-settings.php';
	139	+ require_once CONVERTKIT_PLUGIN_PATH . '/includes/integrations/forminator/class-convertkit-forminator-admin-section.php';
128	140
129	141	// WishList Member Integration.
130		- require_once CONVERTKIT_PLUGIN_PATH . '/includes/integrations/wishlist/class-convertkit-wishlist-admin-settings.php';
	142	+ require_once CONVERTKIT_PLUGIN_PATH . '/includes/integrations/wishlist/class-convertkit-wishlist-admin-section.php';
131	143
132	144	// Restrict Content Integration.
133	145	require_once CONVERTKIT_PLUGIN_PATH . '/admin/class-convertkit-admin-restrict-content.php';
134		- require_once CONVERTKIT_PLUGIN_PATH . '/admin/class-convertkit-admin-settings-restrict-content.php';
	146	+ require_once CONVERTKIT_PLUGIN_PATH . '/admin/section/class-convertkit-admin-section-restrict-content.php';
135	147	require_once CONVERTKIT_PLUGIN_PATH . '/admin/setup-wizard/class-convertkit-admin-setup-wizard-restrict-content.php';
136	148
	149	+ // Landing Page Integration.
	150	+ require_once CONVERTKIT_PLUGIN_PATH . '/admin/class-convertkit-admin-landing-page.php';
	151	+ require_once CONVERTKIT_PLUGIN_PATH . '/admin/setup-wizard/class-convertkit-admin-setup-wizard-landing-page.php';
	152	+
137	153	// Broadcasts Integration.
138		- require_once CONVERTKIT_PLUGIN_PATH . '/admin/section/class-convertkit-admin-settings-broadcasts.php';
	154	+ require_once CONVERTKIT_PLUGIN_PATH . '/admin/section/class-convertkit-admin-section-broadcasts.php';
139	155	}
140	156
141	157	// Register Plugin activation and deactivation functions.
142	158	register_activation_hook( __FILE__, 'convertkit_plugin_activate' );