Tests: Fix Heartbeat Warning in Siteground Speed Optimizer

admin/class-convertkit-admin-setup-wizard.php

@@ -51,9 +51,9 @@ class ConvertKit_Admin_Setup_Wizard {
 	 *
 	 * @since   1.9.8.4
 	 *
-	 * @var     int
+	 * @var     string
 	 */
-	public $step = 1;
+	public $step = 'start';
 
 	/**
 	 * The programmatic name of the setup screen.
@@ -170,7 +170,7 @@ public function maybe_load_setup_screen() {
 		}
 
 		// Define the step the user is on in the setup process.
-		$this->step = ( filter_has_var( INPUT_GET, 'step' ) ? absint( filter_input( INPUT_GET, 'step', FILTER_SANITIZE_NUMBER_INT ) ) : 1 );
+		$this->step = $this->get_current_step();
 
 		// Process any posted form data.
 		$this->process_form();
@@ -193,6 +193,66 @@ public function maybe_load_setup_screen() {
 
 	}
 
+	/**
+	 * Returns the current step in the setup process.
+	 *
+	 * @since   3.1.7
+	 *
+	 * @return  string     Current step.
+	 */
+	public function get_current_step() {
+
+		$step = ( filter_has_var( INPUT_GET, 'step' ) ? filter_input( INPUT_GET, 'step', FILTER_SANITIZE_FULL_SPECIAL_CHARS ) : 'start' );
+
+		// Fallback to 'start' if the step is a registered step.
+		if ( ! array_key_exists( $step, $this->steps ) ) {
+			$step = 'start';
+		}
+
+		return $step;
+
+	}
+
+	/**
+	 * Get the number of the current step.
+	 *
+	 * @since   3.1.7
+	 *
+	 * @return  int     Step number.
+	 */
+	public function get_current_step_number() {
+
+		return array_search( $this->step, array_keys( $this->steps ), true ) + 1;
+
+	}
+
+	/**
+	 * Get the step by number.
+	 *
+	 * @since   3.1.7
+	 *
+	 * @param   int $number     Step number (1 based index).
+	 * @return  string              Step name/key.
+	 */
+	public function get_step_key_by_number( $number ) {
+
+		return array_keys( $this->steps )[ $number - 1 ];
+
+	}
+
+	/**
+	 * Get the total number of steps.
+	 *
+	 * @since   3.1.7
+	 *
+	 * @return  int     Total steps.
+	 */
+	public function get_total_steps() {
+
+		return count( $this->steps );
+
+	}
+
 	/**
 	 * Process submitted form data for the given setup wizard name and current step.
 	 *
@@ -205,7 +265,7 @@ private function process_form() {
 		 *
 		 * @since   1.9.8.4
 		 *
-		 * @param   int     $step     Current step number.
+		 * @param   string     $step     Current step.
 		 */
 		do_action( 'convertkit_admin_setup_wizard_process_form_' . $this->page_name, $this->step );
 
@@ -231,24 +291,24 @@ private function define_step_urls() {
 		);
 
 		// Define the previous step URL if we're not on the first or last step.
-		if ( $this->step > 1 && $this->step < count( $this->steps ) ) {
+		if ( $this->get_current_step_number() > 1 && $this->get_current_step_number() < $this->get_total_steps() ) {
 			$this->previous_step_url = add_query_arg(
 				array(
 					'page'             => $this->page_name,
 					'convertkit-modal' => $this->is_modal(),
-					'step'             => ( $this->step - 1 ),
+					'step'             => $this->get_step_key_by_number( $this->get_current_step_number() - 1 ),
 				),
 				admin_url( 'options.php' )
 			);
 		}
 
 		// Define the next step URL if we're not on the last page.
-		if ( $this->step < count( $this->steps ) ) {
+		if ( $this->get_current_step_number() < $this->get_total_steps() ) {
 			$this->next_step_url = add_query_arg(
 				array(
 					'page'             => $this->page_name,
 					'convertkit-modal' => $this->is_modal(),
-					'step'             => ( $this->step + 1 ),
+					'step'             => $this->get_step_key_by_number( $this->get_current_step_number() + 1 ),
 				),
 				admin_url( 'options.php' )
 			);
@@ -268,7 +328,7 @@ private function load_screen_data() {
 		 *
 		 * @since   1.9.8.4
 		 *
-		 * @param   int     $step     Current step number.
+		 * @param   string     $step     Current step.
 		 */
 		do_action( 'convertkit_admin_setup_wizard_load_screen_data_' . $this->page_name, $this->step );
 

admin/importers/class-convertkit-admin-importer-campaignmonitor.php

@@ -0,0 +1,98 @@
+<?php
+/**
+ * ConvertKit Admin Importer CampaignMonitor class.
+ *
+ * @package ConvertKit
+ * @author ConvertKit
+ */
+
+/**
+ * Import and migrate data from CampaignMonitor to Kit.
+ *
+ * @package ConvertKit
+ * @author ConvertKit
+ */
+class ConvertKit_Admin_Importer_CampaignMonitor extends ConvertKit_Admin_Importer {
+
+	/**
+	 * Holds the programmatic name of the importer (lowercase, no spaces).
+	 *
+	 * @since   3.1.7
+	 *
+	 * @var     string
+	 */
+	public $name = 'campaignmonitor';
+
+	/**
+	 * Holds the title of the importer (for display in the importer list).
+	 *
+	 * @since   3.1.7
+	 *
+	 * @var     string
+	 */
+	public $title = 'CampaignMonitor';
+
+	/**
+	 * Holds the shortcode name for ActiveCampaign forms.
+	 *
+	 * @since   3.1.7
+	 *
+	 * @var     string
+	 */
+	public $shortcode_name = 'cm_form';
+
+	/**
+	 * Holds the ID attribute name for CampaignMonitor forms.
+	 *
+	 * @since   3.1.7
+	 *
+	 * @var     string
+	 */
+	public $shortcode_id_attribute = 'form_id';
+
+	/**
+	 * Constructor
+	 *
+	 * @since   3.1.7
+	 */
+	public function __construct() {
+
+		// Register this as an importer, if CampaignMonitor forms exist.
+		add_filter( 'convertkit_get_form_importers', array( $this, 'register' ) );
+
+	}
+
+	/**
+	 * Returns an array of CampaignMonitor form IDs and titles.
+	 *
+	 * @since   3.1.7
+	 *
+	 * @return  array
+	 */
+	public function get_forms() {
+
+		// Forms are cached in the Plugin Settings.
+		$settings = get_option( 'forms_for_campaign_monitor_forms' );
+
+		// Bail if the CampaignMonitor Plugin Settings are not set.
+		if ( ! $settings ) {
+			return array();
+		}
+
+		// Build array of forms.
+		$forms = array();
+		foreach ( $settings as $form_id => $form ) {
+			// $form is a Campaign Monitor forms\core\Form object. It'll be a __PHP_Incomplete_Class if the Campaign Monitor plugin is not active.
+			// To consistently access the protected form name property, we have to cast to an array.
+			$form = (array) $form;
+
+			// Access the protected form name property.
+			// When casting __PHP_Incomplete_Class to an array, protected properties are prefixed with \0*\0.
+			$forms[ $form_id ] = $form["\0*\0name"];
+		}
+
+		return $forms;
+
+	}
+
+}

admin/importers/class-convertkit-admin-importer.php

@@ -119,8 +119,17 @@ public function import( $mappings ) {
 
 		// Iterate through the mappings, replacing the third party form shortcodes and blocks with the Kit form shortcodes and blocks.
 		foreach ( $mappings as $third_party_form_id => $kit_form_id ) {
-			$this->replace_blocks_in_posts( (int) $third_party_form_id, (int) $kit_form_id );
-			$this->replace_shortcodes_in_posts( (int) $third_party_form_id, (int) $kit_form_id );
+			// Skip empty Kit Form IDs i.e. no mapping was provided for this third party form.
+			if ( empty( $kit_form_id ) ) {
+				continue;
+			}
+
+			if ( $this->block_name ) {
+				$this->replace_blocks_in_posts( $third_party_form_id, (int) $kit_form_id );
+			}
+			if ( $this->shortcode_name ) {
+				$this->replace_shortcodes_in_posts( $third_party_form_id, (int) $kit_form_id );
+			}
 		}
 
 	}
@@ -136,24 +145,49 @@ public function get_forms_in_posts() {
 
 		global $wpdb;
 
-		// Search post_content for the third party form block or shortcode and return array of post IDs.
-		$results = $wpdb->get_col(
-			$wpdb->prepare(
-				"
-            SELECT ID
-            FROM {$wpdb->posts}
-            WHERE post_status = %s
-            AND (
-				post_content LIKE %s
-				OR post_content LIKE %s
-			)
-            ",
-				'publish',
-				'%[' . $this->shortcode_name . '%',
-				'%<!-- wp:' . $this->block_name . '%'
+		// Build WHERE clauses and values.
+		$post_content_clauses = array();
+		$post_content_values  = array();
+
+		if ( $this->shortcode_name ) {
+			$post_content_clauses[] = 'post_content LIKE %s';
+			$post_content_values[]  = '%[' . $this->shortcode_name . '%';
+		}
+		if ( $this->block_name ) {
+			$post_content_clauses[] = 'post_content LIKE %s';
+			$post_content_values[]  = '%<!-- wp:' . $this->block_name . '%';
+		}
+
+		// Bail early if nothing to search for.
+		if ( empty( $post_content_clauses ) ) {
+			return array();
+		}
+
+		// Prepare SQL using wpdb->prepare.
+		// call_user_func_array() is used so variable length arrays can be passed to prepare().
+		$query = call_user_func_array(
+			array( $wpdb, 'prepare' ),
+			array_merge(
+				array(
+					"
+					SELECT ID
+					FROM {$wpdb->posts}
+					WHERE post_status = %s
+					AND (
+						" . implode( ' OR ', $post_content_clauses ) . '
+					)
+				',
+				),
+				array_merge(
+					array( 'publish' ),
+					$post_content_values
+				)
 			)
 		);
 
+		// Run query.
+		$results = $wpdb->get_col( $query ); // phpcs:ignore WordPress.DB.PreparedSQL.NotPrepared
+
 		return $results ? $results : array();
 
 	}
@@ -189,8 +223,8 @@ public function has_forms_in_posts() {
 	 *
 	 * @since   3.1.0
 	 *
-	 * @param   int $third_party_form_id    Third Party Form ID.
-	 * @param   int $form_id                Kit Form ID.
+	 * @param   string|int $third_party_form_id    Third Party Form ID.
+	 * @param   int        $form_id                Kit Form ID.
 	 */
 	public function replace_shortcodes_in_posts( $third_party_form_id, $form_id ) {
 
@@ -229,9 +263,9 @@ public function replace_shortcodes_in_posts( $third_party_form_id, $form_id ) {
 	 *
 	 * @since   3.1.0
 	 *
-	 * @param   string $content             Content containing third party Form Shortcodes.
-	 * @param   int    $third_party_form_id    Third Party Form ID.
-	 * @param   int    $form_id                Kit Form ID.
+	 * @param   string     $content                Content containing third party Form Shortcodes.
+	 * @param   string|int $third_party_form_id    Third Party Form ID.
+	 * @param   int        $form_id                Kit Form ID.
 
 	 * @return  string
 	 */
@@ -353,8 +387,8 @@ public function get_form_ids_from_content( $content ) {
 	 *
 	 * @since   3.1.6
 	 *
-	 * @param   int $third_party_form_id    Third Party Form ID.
-	 * @param   int $form_id                Kit Form ID.
+	 * @param   string|int $third_party_form_id    Third Party Form ID.
+	 * @param   int        $form_id                Kit Form ID.
 	 */
 	public function replace_blocks_in_posts( $third_party_form_id, $form_id ) {
 
@@ -378,9 +412,9 @@ public function replace_blocks_in_posts( $third_party_form_id, $form_id ) {
 	 *
 	 * @since   3.1.6
 	 *
-	 * @param   int $post_id                Post ID.
-	 * @param   int $third_party_form_id    Third Party Form ID.
-	 * @param   int $form_id                Kit Form ID.
+	 * @param   int        $post_id                Post ID.
+	 * @param   string|int $third_party_form_id    Third Party Form ID.
+	 * @param   int        $form_id                Kit Form ID.
 	 */
 	public function replace_blocks_in_post( $post_id, $third_party_form_id, $form_id ) {
 
@@ -419,9 +453,9 @@ public function replace_blocks_in_post( $post_id, $third_party_form_id, $form_id
 	 *
 	 * @since   3.1.6
 	 *
-	 * @param   array $blocks                 Blocks.
-	 * @param   int   $third_party_form_id    Third Party Form ID.
-	 * @param   int   $form_id                Kit Form ID.
+	 * @param   array      $blocks                 Blocks.
+	 * @param   string|int $third_party_form_id    Third Party Form ID.
+	 * @param   int        $form_id                Kit Form ID.
 	 *
 	 * @return  string
 	 */
@@ -441,9 +475,9 @@ public function replace_blocks_in_content( $blocks, $third_party_form_id, $form_
 	 *
 	 * @since   3.1.6
 	 *
-	 * @param   array $blocks                 Blocks.
-	 * @param   int   $third_party_form_id    Third Party Form ID.
-	 * @param   int   $form_id                Kit Form ID.
+	 * @param   array      $blocks                 Blocks.
+	 * @param   string|int $third_party_form_id    Third Party Form ID.
+	 * @param   int        $form_id                Kit Form ID.
 	 * @return  array
 	 */
 	private function recursively_convert_blocks( $blocks, $third_party_form_id, $form_id ) {