← All changes | admin/class-convertkit-admin-post.php +13 -142 3.3.7 → 2.0.3 View file →

		@@ -7,10 +7,10 @@
7	7	*/
8	8
9	9	/**
10	10	* Registers a metabox on Posts, Pages and public facing Custom Post Types
11		- * that do not use the block editor, saving settings when the Post is saved
12		- * in the WordPress Administration interface.
	11	+ * and saves its settings when the Post is saved in the WordPress Administration
	12	+ * interface.
13	13	*
14	14	* @package ConvertKit
15	15	* @author ConvertKit
16	16	*/
		@@ -22,84 +22,14 @@
22	22	* @since 1.9.6
23	23	*/
24	24	public function __construct() {
25	25
26		- // Register "Add New" Kit button on Pages.
27		- add_filter( 'views_edit-page', array( $this, 'output_wp_list_table_buttons' ) );
28		-
29		- add_action( 'post_submitbox_misc_actions', array( $this, 'output_pre_publish_actions' ) );
30		- add_action( 'add_meta_boxes', array( $this, 'add_meta_boxes' ), 10, 2 );
	26	+ add_action( 'add_meta_boxes', array( $this, 'add_meta_boxes' ) );
31	27	add_action( 'save_post', array( $this, 'save_post_meta' ) );
32	28
33	29	}
34	30
35	31	/**
36		- * Registers 'Add New' buttons for the given Post Type's admin screen.
37		- *
38		- * If no options are registered, no button is displayed.
39		- *
40		- * JS will move this button to be displayed next to the "Add New" button when viewing the table of Pages or Posts,
41		- * as there is not a native WordPress action/filter for registering buttons next to the "Add New" button.
42		- *
43		- * @since 2.5.5
44		- *
45		- * @param array $views Views.
46		- * @return array Views
47		- */
48		- public function output_wp_list_table_buttons( $views ) {
49		-
50		- // Get current post type that we're viewing.
51		- $post_type = $this->get_current_post_type();
52		-
53		- // Don't output any buttons if we couldn't determine the current post type.
54		- if ( ! $post_type ) {
55		- return $views;
56		- }
57		-
58		- // Define a blank array of buttons to be filtered.
59		- $buttons = array();
60		-
61		- /**
62		- * Registers 'Add New' buttons for the given Post Type's admin screen.
63		- *
64		- * @since 2.5.5
65		- *
66		- * @param array $buttons Buttons.
67		- * @param string $post_type Post Type.
68		- */
69		- $buttons = apply_filters( 'convertkit_admin_post_register_add_new_buttons', $buttons, $post_type );
70		-
71		- // Bail if no buttons are registered for display.
72		- if ( ! count( $buttons ) ) {
73		- return $views;
74		- }
75		-
76		- // Enqueue JS and CSS.
77		- wp_enqueue_script( 'convertkit-admin-wp-list-table-buttons', CONVERTKIT_PLUGIN_URL . 'resources/backend/js/wp-list-table-buttons.js', array( 'jquery' ), CONVERTKIT_PLUGIN_VERSION, true );
78		- wp_enqueue_style( 'convertkit-admin-wp-list-table-buttons', CONVERTKIT_PLUGIN_URL . 'resources/backend/css/wp-list-table-buttons.css', array(), CONVERTKIT_PLUGIN_VERSION );
79		-
80		- // Build buttons HTML.
81		- $html = '';
82		- foreach ( $buttons as $button_name => $button ) {
83		- $html .= sprintf(
84		- '<a href="%s">%s</a>',
85		- esc_attr( $button['url'] ),
86		- esc_html( $button['label'] )
87		- );
88		- }
89		-
90		- // Register an 'Add New' dropdown button, with buttons HTML.
91		- $views['convertkit'] = sprintf(
92		- '<span class="convertkit-action page-title-action hidden">%s<span class="convertkit-actions hidden">%s</span></span>',
93		- __( 'Add New', 'convertkit' ),
94		- $html
95		- );
96		-
97		- return $views;
98		-
99		- }
100		-
101		- /**
102	32	* Enqueue JavaScript when editing a Page, Post or Custom Post Type that outputs
103	33	* ConvertKit Plugin settings.
104	34	*
105	35	* @since 1.9.6.4
		@@ -132,13 +62,10 @@
132	62
133	63	// Enqueue Post CSS.
134	64	wp_enqueue_style( 'convertkit-post', CONVERTKIT_PLUGIN_URL . 'resources/backend/css/post.css', array(), CONVERTKIT_PLUGIN_VERSION );
135	65
136		- // Enqueue Refresh Resources CSS.
137		- wp_enqueue_style( 'convertkit-admin-refresh-resources', CONVERTKIT_PLUGIN_URL . 'resources/backend/css/refresh-resources.css', array(), CONVERTKIT_PLUGIN_VERSION );
138		-
139	66	/**
140		- * Enqueue CSS for the Settings Screen at Settings > Kit
	67	+ * Enqueue CSS for the Settings Screen at Settings > ConvertKit
141	68	*
142	69	* @since 1.9.6.4
143	70	*/
144	71	do_action( 'convertkit_admin_post_enqueue_styles' );
		@@ -145,47 +72,15 @@
145	72
146	73	}
147	74
148	75	/**
149		- * Registers actions in the pre-publish actions section of the Publish metabox
150		- * in the Classic Editor.
151		- *
152		- * @since 2.4.0
153		- *
154		- * @param WP_Post $post WordPress Post.
155		- */
156		- public function output_pre_publish_actions( $post ) {
157		-
158		- // Bail if no actions registered.
159		- $pre_publish_actions = convertkit_get_pre_publish_actions();
160		- if ( ! count( $pre_publish_actions ) ) {
161		- return;
162		- }
163		-
164		- // Bail if Post is not a supported Post Type.
165		- if ( get_post_type( $post ) !== 'post' ) {
166		- return;
167		- }
168		-
169		- // Bail if Post is not a draft.
170		- if ( ! in_array( $post->post_status, array( 'draft', 'auto-draft' ), true ) ) {
171		- return;
172		- }
173		-
174		- // Load pre-publish actions view.
175		- include CONVERTKIT_PLUGIN_PATH . '/views/backend/post/pre-publish-actions.php';
176		-
177		- }
178		-
179		- /**
180	76	* Adds a meta box for the given Post Type.
181	77	*
182	78	* @since 1.9.6
183	79	*
184		- * @param string $post_type Post Type.
185		- * @param WP_Post $post Post.
	80	+ * @param string $post_type Post Type.
186	81	*/
187		- public function add_meta_boxes( $post_type, $post ) {
	82	+ public function add_meta_boxes( $post_type ) {
188	83
189	84	// Don't register the meta box if this Post Type isn't supported.
190	85	$supported_post_types = convertkit_get_supported_post_types();
191	86	if ( ! in_array( $post_type, $supported_post_types, true ) ) {
		@@ -191,15 +86,10 @@
191	86	if ( ! in_array( $post_type, $supported_post_types, true ) ) {
192	87	return;
193	88	}
194	89
195		- // Don't register the meta box if the block editor is being used, as register_post_meta() handles saving post meta.
196		- if ( function_exists( 'use_block_editor_for_post' ) && use_block_editor_for_post( $post ) ) {
197		- return;
198		- }
199		-
200	90	// Register Meta Box.
201		- add_meta_box( 'wp-convertkit-meta-box', __( 'Kit', 'convertkit' ), array( $this, 'display_meta_box' ), $post_type, 'normal' );
	91	+ add_meta_box( 'wp-convertkit-meta-box', __( 'ConvertKit', 'convertkit' ), array( $this, 'display_meta_box' ), $post_type, 'normal' );
202	92
203	93	// Enqueue JS and CSS.
204	94	add_action( 'admin_enqueue_scripts', array( $this, 'enqueue_scripts' ) );
205	95	add_action( 'admin_enqueue_scripts', array( $this, 'enqueue_styles' ) );
		@@ -221,24 +111,18 @@
221	111	}
222	112
223	113	// Show a warning if the API credentials haven't been set.
224	114	$settings = new ConvertKit_Settings();
225		- if ( ! $settings->has_access_and_refresh_token() ) {
	115	+ if ( ! $settings->has_api_key_and_secret() ) {
226	116	$post_type = get_post_type_object( $post->post_type );
227		- $api = new ConvertKit_API_V4( CONVERTKIT_OAUTH_CLIENT_ID, CONVERTKIT_OAUTH_CLIENT_REDIRECT_URI );
228	117	include CONVERTKIT_PLUGIN_PATH . '/views/backend/post/no-api-key.php';
229	118	return;
230	119	}
231	120
232		- // Initialize Restrict Content Settings class.
233		- $restrict_content_settings = new ConvertKit_Settings_Restrict_Content();
234		-
235	121	// Fetch Post Settings, Forms, Landing Pages and Tags.
236		- $convertkit_post = new ConvertKit_Post( $post->ID );
237		- $convertkit_forms = new ConvertKit_Resource_Forms();
238		-
	122	+ $convertkit_post = new ConvertKit_Post( $post->ID );
	123	+ $convertkit_forms = new ConvertKit_Resource_Forms();
239	124	$convertkit_landing_pages = new ConvertKit_Resource_Landing_Pages();
240		- $convertkit_products = new ConvertKit_Resource_Products();
241	125	$convertkit_tags = new ConvertKit_Resource_Tags();
242	126
243	127	// Get settings page link.
244	128	$settings_link = convertkit_get_settings_link();
		@@ -282,9 +166,9 @@
282	166	return;
283	167	}
284	168
285	169	// Save Post's settings.
286		- $this->save_post_settings( $post_id, wp_unslash( $_POST['wp-convertkit'] ) ); // phpcs:ignore WordPress.Security.ValidatedSanitizedInput.InputNotSanitized
	170	+ $this->save_post_settings( $post_id, $_POST['wp-convertkit'] );
287	171
288	172	}
289	173
290	174	/**
		@@ -312,13 +196,13 @@
312	196	continue;
313	197	}
314	198
315	199	// Sanitize value.
316		- $new_value = sanitize_text_field( $settings[ $key ] );
	200	+ $new_value = sanitize_text_field( wp_unslash( $settings[ $key ] ) );
317	201
318	202	// Skip if the setting value is -2, as this means it's a Bulk Edit request and this setting
319	203	// is set as 'No Change'.
320		- if ( $new_value == '-2' ) { // phpcs:ignore Universal.Operators.StrictComparisons.LooseEqual
	204	+ if ( $new_value == '-2' ) { // phpcs:ignore WordPress.PHP.StrictComparisons
321	205	continue;
322	206	}
323	207
324	208	// Update setting using posted value.
		@@ -334,21 +218,8 @@
334	218	// it is never displayed again.
335	219	if ( $meta['form'] || $meta['landing_page'] ) {
336	220	WP_ConvertKit()->get_class( 'review_request' )->request_review();
337	221	}
338		-
339		- }
340		-
341		- /**
342		- * Get the current post type based on the screen that is viewed.
343		- *
344		- * @since 2.5.5
345		- *
346		- * @return bool|string
347		- */
348		- private function get_current_post_type() {
349		-
350		- return convertkit_get_current_screen( 'post_type' );
351	222
352	223	}
353	224
354	225	}