Inspection of "Merge pull request #873 from yikesinc/staging" - yikesinc/yikes-inc-easy-mailchimp-extender - Measure and Improve Code Quality continuously with Scrutinizer

Completed

Push — master ( 3d2fa9...bff9f7 )

unknown

created 2021-02-18 18:33 UTC

Status

Indentation +67 added lines, -67 removed lines patch added patch discarded remove patch

@@ -581,7 +581,7 @@  discard block
 block discarded – undo
 			yikes_easy_mailchimp_stop_bugging_me()
 			Remove the Review us notification when user clicks 'Dismiss'
 			@since v3.1.1
-		*/
+		 */
 		public function yikes_easy_mailchimp_stop_bugging_me() {
 			if ( isset( $_GET['yikes_easy_mc_icons_nobug'] ) && (int) filter_var( $_GET['yikes_easy_mc_icons_nobug'], FILTER_SANITIZE_NUMBER_INT ) === 1 ) {
 				add_option( 'yikes_easy_mailchimp_review_stop_bugging_me', true );
@@ -843,9 +843,9 @@  discard block
 block discarded – undo
 	}
 
 	/**
-	*	Register our admin pages
-	*	used to display data back to the user
-	**/
+	 *	Register our admin pages
+	 *	used to display data back to the user
+	 **/
 	public function register_admin_pages() {
 
 		/* Top Level Menu 'Easy Mailchimp' */
@@ -964,28 +964,28 @@  discard block
 block discarded – undo
 	}
 
 	/**
-	* Generate Us Easy Mailchimp Manage Forms Page
-	*
-	* @since    1.0.0
-	*/
+	 * Generate Us Easy Mailchimp Manage Forms Page
+	 *
+	 * @since    1.0.0
+	 */
 	function generateManageFormsPage() {
 		require_once YIKES_MC_PATH . 'admin/partials/menu/manage-forms.php'; // include our manage forms page
 	}
 
 	/**
-	* Generate Us Easy Mailchimp Manage Lists Page
-	*
-	* @since    1.0.0
-	*/
+	 * Generate Us Easy Mailchimp Manage Lists Page
+	 *
+	 * @since    1.0.0
+	 */
 	function generateManageListsPage() {
 		require_once YIKES_MC_PATH . 'admin/partials/menu/manage-lists.php'; // include our lists page
 	}
 
 	/**
-	* Generate Us Easy Mailchimp Support Page
-	*
-	* @since    1.0.0
-	*/
+	 * Generate Us Easy Mailchimp Support Page
+	 *
+	 * @since    1.0.0
+	 */
 	function generateSupportPage() {
 
 		wp_enqueue_script( 'yikes-inc-easy-mailchimp-extender-support-scripts', plugin_dir_url( __FILE__ ) . 'js/support.js', array( 'jquery' ), $this->version, false );
@@ -993,37 +993,37 @@  discard block
 block discarded – undo
 	}
 
 	/**
-	* Generate Us Easy Mailchimp Edit Form Page
-	*
-	* @since    1.0.0
-	*/
+	 * Generate Us Easy Mailchimp Edit Form Page
+	 *
+	 * @since    1.0.0
+	 */
 	function generateEditFormPage() {
 		require_once YIKES_MC_PATH . 'admin/partials/edit-form.php'; // include our options page
 	}
 
 	/**
-	* Generate Us Easy Mailchimp View List Page
-	*
-	* @since    1.0.0
-	*/
+	 * Generate Us Easy Mailchimp View List Page
+	 *
+	 * @since    1.0.0
+	 */
 	function generateViewListPage() {
 		require_once YIKES_MC_PATH . 'admin/partials/view-list.php'; // include our options page
 	}
 
 	/**
-	* Generate Us Easy Mailchimp View User Page
-	*
-	* @since    1.0.0
-	*/
+	 * Generate Us Easy Mailchimp View User Page
+	 *
+	 * @since    1.0.0
+	 */
 	function generateViewUserPage() {
 		require_once YIKES_MC_PATH . 'admin/partials/view-user.php'; // include our options page
 	}
 
 	/**
-	*	Register our plugin settings, and display them on our settings page
-	*
-	* @since v.5.4
-	**/
+	 *	Register our plugin settings, and display them on our settings page
+	 *
+	 * @since v.5.4
+	 **/
 	function yikes_easy_mc_settings_init() {
 
 		/* Register General Settings Section */
@@ -1167,9 +1167,9 @@  discard block
 block discarded – undo
 	}
 
 	/**
-	*	Options Sanitization & Validation
-	*	@since complete re-write
-	**/
+	 *	Options Sanitization & Validation
+	 *	@since complete re-write
+	 **/
 	function yikes_mc_validate_api_key( $input ) {
 		if ( $input === '' ) {
 			update_option( 'yikes-mc-api-validation', 'invalid_api_key' );
@@ -1201,20 +1201,20 @@  discard block
 block discarded – undo
 	}
 
 	/**
-	* Generate Us Easy Forms for Mailchimp Options Page
-	*
-	* @since    1.0.0
-	*/
+	 * Generate Us Easy Forms for Mailchimp Options Page
+	 *
+	 * @since    1.0.0
+	 */
 	function generatePageOptions() {
 		require_once YIKES_MC_PATH . 'admin/partials/menu/options.php'; // include our options page
 	}
 
 	/**
-	*	Check if users API key is valid, if not
-	*	this function will apply a disabled attribute
-	*	to form fields. (input, dropdowns, buttons etc.)
-	* 	@since v5.5 re-write
-	**/
+	 *	Check if users API key is valid, if not
+	 *	this function will apply a disabled attribute
+	 *	to form fields. (input, dropdowns, buttons etc.)
+	 * 	@since v5.5 re-write
+	 **/
 	public function is_user_mc_api_valid_form( $echo = true ) {
 		if ( $echo == true ) {
 			if ( get_option( 'yikes-mc-api-validation', 'invalid_api_key' ) == 'invalid_api_key' ) {
@@ -1240,12 +1240,12 @@  discard block
 block discarded – undo
 		*	- http://stackoverflow.com/questions/6661530/php-multi-dimensional-array-search
 		*/
 		function findMCListID($id, $array) {
-		   foreach ($array as $key => $val) {
-			   if ($val['id'] === $id) {
-				   return $key;
-			   }
-		   }
-		   return null;
+			foreach ($array as $key => $val) {
+				if ($val['id'] === $id) {
+					return $key;
+				}
+			}
+			return null;
 		} // end
 
 		/*
@@ -1420,13 +1420,13 @@  discard block
 block discarded – undo
 				<?php
 
 					/**
-					*	yikes-mailchimp-excluded-redirect-post-types
-					*
-					*	Filter the post types that will not show on the redirect list dropdown.
-					*
-					* 	@param array | $excluded_post_types | The array of default excluded post types
-					*	@return array| $excluded_post_types | The array of user-defined excluded post types
-					*/
+					 *	yikes-mailchimp-excluded-redirect-post-types
+					 *
+					 *	Filter the post types that will not show on the redirect list dropdown.
+					 *
+					 * 	@param array | $excluded_post_types | The array of default excluded post types
+					 *	@return array| $excluded_post_types | The array of user-defined excluded post types
+					 */
 					$excluded_post_types = array( 'attachment', 'revision', 'nav_menu_item', 'shop_order', 'shop_order_refund', 'custom_css', 'customize_changeset', 'forum', 'topic', 'reply' );
 					$excluded_post_types = apply_filters( 'yikes-mailchimp-excluded-redirect-post-types', $excluded_post_types );
 
@@ -1556,9 +1556,9 @@  discard block
 block discarded – undo
 			}
 
 			/**
-			*	Custom action hook for our extensions to hook into
-			*	@parameter	get_current_screen()	current screen information
-			*/
+			 *	Custom action hook for our extensions to hook into
+			 *	@parameter	get_current_screen()	current screen information
+			 */
 			do_action( 'yikes-mailchimp-admin-sidebar', get_current_screen() );
 
 		}
@@ -2508,13 +2508,13 @@  discard block
 block discarded – undo
 			$result = $this->form_interface->create_form( $form_data );
 
 			/**
-			* `yikes-mailchimp-after-duplicating-form`
-			*
-			* @param $post_id_to_clone | int   | ID of the original form
-			* @param $result           | mixed | ID of the new form OR false if the operation failed
-			* @param $form_data        | array | Array of the form data
-			*
-			*/
+			 * `yikes-mailchimp-after-duplicating-form`
+			 *
+			 * @param $post_id_to_clone | int   | ID of the original form
+			 * @param $result           | mixed | ID of the new form OR false if the operation failed
+			 * @param $form_data        | array | Array of the form data
+			 *
+			 */
 			do_action( 'yikes-mailchimp-after-duplicating-form', $post_id_to_clone, $result, $form_data );
 
 			if ( false === $result ) {

Please login to merge, or discard this patch.

Spacing +346 added lines, -346 removed lines patch added patch discarded remove patch

@@ -92,7 +92,7 @@  discard block
 block discarded – undo
 		/***********************/
 		/** Create A Form **/
 		/**********************/
-		if ( isset( $_REQUEST['action'] ) && $_REQUEST['action'] == 'yikes-easy-mc-create-form' ) {
+		if ( isset( $_REQUEST[ 'action' ] ) && $_REQUEST[ 'action' ] == 'yikes-easy-mc-create-form' ) {
 
 			add_action( 'init', array( $this, 'yikes_easy_mailchimp_create_form' ) );
 
@@ -101,7 +101,7 @@  discard block
 block discarded – undo
 		/***********************/
 		/** Delete A Form **/
 		/**********************/
-		if ( isset( $_REQUEST['action'] ) && $_REQUEST['action'] == 'yikes-easy-mc-delete-form' ) {
+		if ( isset( $_REQUEST[ 'action' ] ) && $_REQUEST[ 'action' ] == 'yikes-easy-mc-delete-form' ) {
 
 			add_action( 'init', array( $this, 'yikes_easy_mailchimp_delete_form' ) );
 
@@ -110,7 +110,7 @@  discard block
 block discarded – undo
 		/**********************************/
 		/** Duplicate/Clone A Form    **/
 		/********************************/
-		if ( isset( $_REQUEST['action'] ) && $_REQUEST['action'] == 'yikes-easy-mc-duplicate-form' ) {
+		if ( isset( $_REQUEST[ 'action' ] ) && $_REQUEST[ 'action' ] == 'yikes-easy-mc-duplicate-form' ) {
 
 			add_action( 'init', array( $this, 'yikes_easy_mailchimp_duplicate_form' ) );
 
@@ -119,7 +119,7 @@  discard block
 block discarded – undo
 		/*************************************/
 		/**  Reset Form Impression Stats **/
 		/***********************************/
-		if ( isset( $_REQUEST['action'] ) && $_REQUEST['action'] == 'yikes-easy-mc-reset-stats' ) {
+		if ( isset( $_REQUEST[ 'action' ] ) && $_REQUEST[ 'action' ] == 'yikes-easy-mc-reset-stats' ) {
 
 			add_action( 'init', array( $this, 'yikes_easy_mailchimp_reset_impression_stats' ) );
 
@@ -128,7 +128,7 @@  discard block
 block discarded – undo
 		/**********************************/
 		/**         Update A Form        **/
 		/********************************/
-		if ( isset( $_REQUEST['action'] ) && $_REQUEST['action'] == 'yikes-easy-mc-update-form' ) {
+		if ( isset( $_REQUEST[ 'action' ] ) && $_REQUEST[ 'action' ] == 'yikes-easy-mc-update-form' ) {
 
 			add_action( 'init', array( $this, 'yikes_easy_mailchimp_update_form' ) );
 
@@ -137,7 +137,7 @@  discard block
 block discarded – undo
 		/**************************************************/
 		/**     Clear Store Mailchimp Transient Data   **/
 		/*************************************************/
-		if ( isset( $_REQUEST['action'] ) && $_REQUEST['action'] == 'yikes-easy-mc-clear-transient-data' ) {
+		if ( isset( $_REQUEST[ 'action' ] ) && $_REQUEST[ 'action' ] == 'yikes-easy-mc-clear-transient-data' ) {
 
 			add_action( 'init', array( $this, 'yikes_easy_mailchimp_clear_transient_data' ) );
 
@@ -146,7 +146,7 @@  discard block
 block discarded – undo
 		/*******************************************/
 		/** Remove a user from a mailing list     **/
 		/*****************************************/
-		if ( isset( $_REQUEST['action'] ) && $_REQUEST['action'] == 'yikes-easy-mc-unsubscribe-user' ) {
+		if ( isset( $_REQUEST[ 'action' ] ) && $_REQUEST[ 'action' ] == 'yikes-easy-mc-unsubscribe-user' ) {
 
 			add_action( 'init', array( $this, 'yikes_easy_mailchimp_unsubscribe_user' ) );
 
@@ -155,7 +155,7 @@  discard block
 block discarded – undo
 		/*******************************************/
 		/**    Create misisng error log file  **/
 		/*****************************************/
-		if ( isset( $_REQUEST['action'] ) && $_REQUEST['action'] == 'yikes-easy-mc-create-error-log' ) {
+		if ( isset( $_REQUEST[ 'action' ] ) && $_REQUEST[ 'action' ] == 'yikes-easy-mc-create-error-log' ) {
 
 			add_action( 'init', array( $this, 'yikes_easy_mailchimp_create_missing_error_log' ) );
 
@@ -187,7 +187,7 @@  discard block
 block discarded – undo
 		/**************************************************/
 		/**        Clear Mailchimp Error Log Data        **/
 		/*************************************************/
-		if ( isset( $_REQUEST['action'] ) && $_REQUEST['action'] == 'yikes-easy-mc-clear-error-log' ) {
+		if ( isset( $_REQUEST[ 'action' ] ) && $_REQUEST[ 'action' ] == 'yikes-easy-mc-clear-error-log' ) {
 
 			add_action( 'init', array( $this, 'yikes_easy_mailchimp_clear_error_log' ) );
 
@@ -196,7 +196,7 @@  discard block
 block discarded – undo
 		/*********************************************/
 		/**        Export Mailchimp Opt-in Forms   **/
 		/*******************************************/
-		if ( isset( $_REQUEST['action'] ) && $_REQUEST['action'] == 'yikes-easy-mc-export-forms' ) {
+		if ( isset( $_REQUEST[ 'action' ] ) && $_REQUEST[ 'action' ] == 'yikes-easy-mc-export-forms' ) {
 
 			add_action( 'init', array( $this, 'yikes_easy_mailchimp_export_forms' ) );
 
@@ -205,7 +205,7 @@  discard block
 block discarded – undo
 		/*********************************************/
 		/**                Export Plugin Settings           **/
 		/*******************************************/
-		if ( isset( $_REQUEST['action'] ) && $_REQUEST['action'] == 'yikes-easy-mc-export-settings' ) {
+		if ( isset( $_REQUEST[ 'action' ] ) && $_REQUEST[ 'action' ] == 'yikes-easy-mc-export-settings' ) {
 
 			add_action( 'init', array( $this, 'yikes_easy_mailchimp_export_plugin_settings' ) );
 
@@ -214,7 +214,7 @@  discard block
 block discarded – undo
 		/*******************************************/
 		/**        Import Class Inclusion       **/
 		/*****************************************/
-		if ( isset( $_REQUEST['action'] ) && $_REQUEST['action'] == 'yikes-easy-mc-import-forms' ) {
+		if ( isset( $_REQUEST[ 'action' ] ) && $_REQUEST[ 'action' ] == 'yikes-easy-mc-import-forms' ) {
 
 			add_action( 'init', array( $this, 'yikes_easy_mailchimp_import_forms' ) );
 
@@ -223,7 +223,7 @@  discard block
 block discarded – undo
 		/*******************************************/
 		/**    Premium Support Request     **/
 		/*****************************************/
-		if ( isset( $_POST['submit-premium-support-request'] ) ) {
+		if ( isset( $_POST[ 'submit-premium-support-request' ] ) ) {
 
 			add_action( 'init', array( $this, 'yikes_easy_mailchimp_premium_support_request' ) );
 
@@ -256,8 +256,8 @@  discard block
 block discarded – undo
 		 * @ return array  $links  New array of plugin actions
 		 */
 		public function easy_forms_plugin_action_links( $links ) {
-			$links[] = '<a href="'. esc_url( get_admin_url(null, 'admin.php?page=yikes-inc-easy-mailchimp-settings') ) .'">' . __( 'Settings', 'yikes-inc-easy-mailchimp-extender' ) . '</a>';
-			$links[] = '<a href="' . esc_url( 'http://www.yikesplugins.com?utm_source=plugins-page&utm_medium=plugin-row&utm_campaign=admin' ) . '" target="_blank">' . __( 'More plugins by YIKES, Inc.', 'yikes-inc-easy-mailchimp-extender' ) . '</a>';
+			$links[ ] = '<a href="' . esc_url( get_admin_url( null, 'admin.php?page=yikes-inc-easy-mailchimp-settings' ) ) . '">' . __( 'Settings', 'yikes-inc-easy-mailchimp-extender' ) . '</a>';
+			$links[ ] = '<a href="' . esc_url( 'http://www.yikesplugins.com?utm_source=plugins-page&utm_medium=plugin-row&utm_campaign=admin' ) . '" target="_blank">' . __( 'More plugins by YIKES, Inc.', 'yikes-inc-easy-mailchimp-extender' ) . '</a>';
 			return $links;
 		}
 
@@ -358,17 +358,17 @@  discard block
 block discarded – undo
 		*/
 		public function yikes_easy_mailchimp_export_forms() {
 			// grab our nonce.
-			$nonce = $_REQUEST['nonce'];
+			$nonce = $_REQUEST[ 'nonce' ];
 			// grab the forms.
-			$forms = isset( $_REQUEST['yikes_export_forms'] ) ? $_REQUEST['yikes_export_forms'] : array();
+			$forms = isset( $_REQUEST[ 'yikes_export_forms' ] ) ? $_REQUEST[ 'yikes_export_forms' ] : array();
 			// validate nonce.
 			if ( ! wp_verify_nonce( $nonce, 'export-forms' ) ) {
-				wp_die( __( "We've run into an error. The security check didn't pass. Please try again." , 'yikes-inc-easy-mailchimp-extender' ) , __( "Failed nonce validation" , 'yikes-inc-easy-mailchimp-extender' ) , array( 'response' => 500 , 'back_link' => true ) );
+				wp_die( __( "We've run into an error. The security check didn't pass. Please try again.", 'yikes-inc-easy-mailchimp-extender' ), __( "Failed nonce validation", 'yikes-inc-easy-mailchimp-extender' ), array( 'response' => 500, 'back_link' => true ) );
 			}
 
 			// run the export function.
 			// parameters: ( $table_name, $form_ids, $file_name ).
-			Yikes_Inc_Easy_Mailchimp_Export_Class::yikes_mailchimp_form_export('Yikes-Inc-Easy-Mailchimp-Forms-Export', $forms );
+			Yikes_Inc_Easy_Mailchimp_Export_Class::yikes_mailchimp_form_export( 'Yikes-Inc-Easy-Mailchimp-Forms-Export', $forms );
 			// re-direct the user back to the page.
 			wp_redirect( esc_url_raw( admin_url( 'admin.php?page=yikes-inc-easy-mailchimp-settings&section=import-export-forms' ) ) );
 			die();
@@ -382,10 +382,10 @@  discard block
 block discarded – undo
 		*/
 		public function yikes_easy_mailchimp_export_plugin_settings() {
 			// grab our nonce
-			$nonce = $_REQUEST['nonce'];
+			$nonce = $_REQUEST[ 'nonce' ];
 			// validate nonce.
 			if ( ! wp_verify_nonce( $nonce, 'export-settings' ) ) {
-				wp_die( __( "We've run into an error. The security check didn't pass. Please try again." , 'yikes-inc-easy-mailchimp-extender' ) , __( "Failed nonce validation" , 'yikes-inc-easy-mailchimp-extender' ) , array( 'response' => 500 , 'back_link' => true ) );
+				wp_die( __( "We've run into an error. The security check didn't pass. Please try again.", 'yikes-inc-easy-mailchimp-extender' ), __( "Failed nonce validation", 'yikes-inc-easy-mailchimp-extender' ), array( 'response' => 500, 'back_link' => true ) );
 			}
 
 			// run the export function.
@@ -402,10 +402,10 @@  discard block
 block discarded – undo
 		*/
 		public function yikes_easy_mailchimp_import_forms() {
 			// grab our nonce.
-			$nonce = $_REQUEST['nonce'];
+			$nonce = $_REQUEST[ 'nonce' ];
 			// validate nonce.
 			if ( ! wp_verify_nonce( $nonce, 'import-forms' ) ) {
-				wp_die( __( "We've run into an error. The security check didn't pass. Please try again." , 'yikes-inc-easy-mailchimp-extender' ) , __( "Failed nonce validation" , 'yikes-inc-easy-mailchimp-extender' ) , array( 'response' => 500 , 'back_link' => true ) );
+				wp_die( __( "We've run into an error. The security check didn't pass. Please try again.", 'yikes-inc-easy-mailchimp-extender' ), __( "Failed nonce validation", 'yikes-inc-easy-mailchimp-extender' ), array( 'response' => 500, 'back_link' => true ) );
 			}
 			// include the export class.
 			if ( ! class_exists( 'Yikes_Inc_Easy_Mailchimp_Import_Class' ) ) {
@@ -426,18 +426,18 @@  discard block
 block discarded – undo
 		*/
 		public function yikes_easy_mailchimp_premium_support_request() {
 
-			if ( isset( $_POST['action'] ) && $_POST['action'] != 'yikes-support-request' ) {
+			if ( isset( $_POST[ 'action' ] ) && $_POST[ 'action' ] != 'yikes-support-request' ) {
 				return __( 'We encountered an error. Please contact the YIKES Inc. support team.', 'yikes-inc-easy-mailchimp-extender' );
 			}
 
-			$email       = isset( $_POST['user-email'] ) ? $_POST['user-email'] : '';
-			$topic       = isset( $_POST['support-topic'] ) ? $_POST['support-topic'] : '';
-			$issue       = isset( $_POST['support-content'] ) ? $_POST['support-content'] : '';
-			$priority    = isset( $_POST['support-priority'] ) ? $_POST['support-priority'] : 1;
-			$license     = isset( $_POST['license_key'] ) ? $_POST['license_key'] : '';
-			$plugin_name = isset( $_POST['plugin-name'] ) ? $_POST['plugin-name'] : '';
-			$plugin_slug = isset( $_POST['plugin-slug'] ) ? $_POST['plugin-slug'] : '';
-			$name        = isset( $_POST['user-name'] ) ? $_POST['user-name'] : 'Mailchimp Support';
+			$email       = isset( $_POST[ 'user-email' ] ) ? $_POST[ 'user-email' ] : '';
+			$topic       = isset( $_POST[ 'support-topic' ] ) ? $_POST[ 'support-topic' ] : '';
+			$issue       = isset( $_POST[ 'support-content' ] ) ? $_POST[ 'support-content' ] : '';
+			$priority    = isset( $_POST[ 'support-priority' ] ) ? $_POST[ 'support-priority' ] : 1;
+			$license     = isset( $_POST[ 'license_key' ] ) ? $_POST[ 'license_key' ] : '';
+			$plugin_name = isset( $_POST[ 'plugin-name' ] ) ? $_POST[ 'plugin-name' ] : '';
+			$plugin_slug = isset( $_POST[ 'plugin-slug' ] ) ? $_POST[ 'plugin-slug' ] : '';
+			$name        = isset( $_POST[ 'user-name' ] ) ? $_POST[ 'user-name' ] : 'Mailchimp Support';
 
 			$edd_item_id = $this->get_premium_license( $plugin_slug );
 
@@ -472,7 +472,7 @@  discard block
 block discarded – undo
 
 		public function get_premium_license( $plugin_slug ) {
 
-			switch( $plugin_slug ) {
+			switch ( $plugin_slug ) {
 
 				case 'form-customizer':
 					return defined( 'YIKES_CUSTOMIZER_EDD_ITEM_ID' ) ? YIKES_CUSTOMIZER_EDD_ITEM_ID : '';
@@ -516,7 +516,7 @@  discard block
 block discarded – undo
 			// add a new option to store the plugin activation date/time.
 			// @since v6.0.0.
 			// this is used to notify the user that they should review after 2 weeks.
-			if ( !get_option( 'yikes_easy_mailchimp_activation_date' ) ) {
+			if ( ! get_option( 'yikes_easy_mailchimp_activation_date' ) ) {
 				add_option( 'yikes_easy_mailchimp_activation_date', strtotime( "now" ) );
 			}
 
@@ -526,7 +526,7 @@  discard block
 block discarded – undo
 				$install_date = get_option( 'yikes_easy_mailchimp_activation_date' );
 				$past_date = strtotime( '-14 days' );
 				if ( $past_date >= $install_date && current_user_can( 'install_plugins' ) ) {
-					add_action( 'admin_notices', array( $this , 'yikes_easy_mailchimp_display_review_us_notice' ) );
+					add_action( 'admin_notices', array( $this, 'yikes_easy_mailchimp_display_review_us_notice' ) );
 				}
 			}
 
@@ -539,13 +539,13 @@  discard block
 block discarded – undo
 		*/
 		public function yikes_easy_mailchimp_display_review_us_notice() {
 			/* Lets only display our admin notice on YT4WP pages to not annoy the hell out of people :) */
-			if ( in_array( get_current_screen()->base , array( 'dashboard', 'post', 'edit' ) ) || strpos( get_current_screen()->base ,'yikes-inc-easy-mailchimp') !== false ) {
+			if ( in_array( get_current_screen()->base, array( 'dashboard', 'post', 'edit' ) ) || strpos( get_current_screen()->base, 'yikes-inc-easy-mailchimp' ) !== false ) {
 
 				// The URL of the page the user is currently on
-				$current_uri  	  = isset( $_SERVER['REQUEST_URI'] ) && ! empty( $_SERVER['REQUEST_URI'] ) ? $_SERVER['REQUEST_URI'] : false;
-				$current_host	  = isset( $_SERVER['HTTP_HOST'] ) && ! empty( $_SERVER['HTTP_HOST'] ) ? $_SERVER['HTTP_HOST'] : false;
+				$current_uri = isset( $_SERVER[ 'REQUEST_URI' ] ) && ! empty( $_SERVER[ 'REQUEST_URI' ] ) ? $_SERVER[ 'REQUEST_URI' ] : false;
+				$current_host = isset( $_SERVER[ 'HTTP_HOST' ] ) && ! empty( $_SERVER[ 'HTTP_HOST' ] ) ? $_SERVER[ 'HTTP_HOST' ] : false;
 				$current_protocol = is_ssl() === true ? 'https://' : 'http://';
-				$current_url	  = ( $current_uri !== false && $current_host !== false ) ? $current_protocol . $current_host . $current_uri : admin_url();
+				$current_url = ( $current_uri !== false && $current_host !== false ) ? $current_protocol . $current_host . $current_uri : admin_url();
 
 				$plugin_name = '<strong>Easy Forms for Mailchimp</strong>';
 				// Review URL - Change to the URL of your plugin on WordPress.org.
@@ -556,17 +556,17 @@  discard block
 block discarded – undo
 				// Make sure all of our variables have values.
 				$reviewurl  = ( ! empty( $reviewurl ) ) ? $reviewurl : '';
 				$addons_url = ( ! empty( $addons_url ) ) ? $addons_url : '';
-				$nobugurl	= ( ! empty( $nobugurl ) ) ? $nobugurl : '';
+				$nobugurl = ( ! empty( $nobugurl ) ) ? $nobugurl : '';
 
 				$review_message = '<div id="yikes-mailchimp-logo"></div>';
 				$review_message .= sprintf(
 					__( 'It looks like you\'ve been using %1$s for 2 weeks now. We hope you\'re enjoying the features included with the free version. If so, please consider leaving us a review. Reviews only help to catch other users attention as well as provide us with feedback to grow and improve upon. If you\'re really enjoying the plugin, consider buying an add-on or developer license for some really awesome features and premium support.', 'yikes-inc-easy-mailchimp-extender' )
 					. '<span class="button-container"> <a href="%2$s" target="_blank" class="button-secondary"><span class="dashicons dashicons-star-filled"></span>'
-						. __( "Leave A Review" , 'yikes-inc-easy-mailchimp-extender' )
+						. __( "Leave A Review", 'yikes-inc-easy-mailchimp-extender' )
 					. '</a> <a href="%3$s" class="button-secondary"><span class="dashicons dashicons-upload"></span>'
-						. __( "View Addons" , 'yikes-inc-easy-mailchimp-extender' )
+						. __( "View Addons", 'yikes-inc-easy-mailchimp-extender' )
 					. '</a> <a href="%4$s" class="button-secondary"><span class="dashicons dashicons-no-alt"></span>'
-						. __( "Dismiss" , 'yikes-inc-easy-mailchimp-extender' )
+						. __( "Dismiss", 'yikes-inc-easy-mailchimp-extender' )
 					. "</a> </span>",
 				$plugin_name, $reviewurl, $addons_url, $nobugurl );
 				?>
@@ -583,7 +583,7 @@  discard block
 block discarded – undo
 			@since v3.1.1
 		*/
 		public function yikes_easy_mailchimp_stop_bugging_me() {
-			if ( isset( $_GET['yikes_easy_mc_icons_nobug'] ) && (int) filter_var( $_GET['yikes_easy_mc_icons_nobug'], FILTER_SANITIZE_NUMBER_INT ) === 1 ) {
+			if ( isset( $_GET[ 'yikes_easy_mc_icons_nobug' ] ) && (int) filter_var( $_GET[ 'yikes_easy_mc_icons_nobug' ], FILTER_SANITIZE_NUMBER_INT ) === 1 ) {
 				add_option( 'yikes_easy_mailchimp_review_stop_bugging_me', true );
 			}
 		}
@@ -621,7 +621,7 @@  discard block
 block discarded – undo
 	// inlcude the js for tinymce.
 	public function yks_mc_add_tinymce_plugin( $plugin_array ) {
 
-		$plugin_array['yks_mc_tinymce_button'] = plugins_url( '/js/min/yikes-inc-easy-mailchimp-tinymce-button.min.js', __FILE__ );
+		$plugin_array[ 'yks_mc_tinymce_button' ] = plugins_url( '/js/min/yikes-inc-easy-mailchimp-tinymce-button.min.js', __FILE__ );
 
 		return $plugin_array;
 	}
@@ -642,13 +642,13 @@  discard block
 block discarded – undo
 		if ( ! empty( $list_data ) ) {
 			// build an array to pass to our javascript.
 			foreach ( $list_data as $id => $form ) {
-				$lists[] = array(
-					'text'  => urlencode( $form['form_name'] ),
+				$lists[ ] = array(
+					'text'  => urlencode( $form[ 'form_name' ] ),
 					'value' => $id,
 				);
 			}
 		} else {
-			$lists[0] = array(
+			$lists[ 0 ] = array(
 				'text'  => __( 'Please Import Some Mailchimp Lists', 'yikes-inc-easy-mailchimp-extender' ),
 				'value' => '-',
 			);
@@ -729,8 +729,8 @@  discard block
 block discarded – undo
 
 		wp_enqueue_style( 'wp-color-picker' );
 		wp_enqueue_script( 'wp-color-picker' );
-		wp_enqueue_script( 'jquery.timepicker.js',YIKES_MC_URL . 'admin/js/jquery.timepicker.min.js', array( 'jquery' ) , $this->version, false );
-		wp_enqueue_script( 'edit-form-js', YIKES_MC_URL . 'admin/js/min/yikes-inc-easy-mailchimp-extender-edit-form.min.js', array( 'jquery.timepicker.js', 'jquery-ui-datepicker' ) , $this->version, false );
+		wp_enqueue_script( 'jquery.timepicker.js', YIKES_MC_URL . 'admin/js/jquery.timepicker.min.js', array( 'jquery' ), $this->version, false );
+		wp_enqueue_script( 'edit-form-js', YIKES_MC_URL . 'admin/js/min/yikes-inc-easy-mailchimp-extender-edit-form.min.js', array( 'jquery.timepicker.js', 'jquery-ui-datepicker' ), $this->version, false );
 
 		$localized_data = array(
 			'add_tag_nonce'                     => wp_create_nonce( 'add-tag' ),
@@ -826,7 +826,7 @@  discard block
 block discarded – undo
 	 * Convert the php date format string to a js date format
 	 */
 	public function yikes_jQuery_datepicker_date_format( $site_option ) {
-		switch( $site_option ) {
+		switch ( $site_option ) {
 			//Predefined WP date formats
 			default:
 			case 'F j, Y':
@@ -1028,7 +1028,7 @@  discard block
 block discarded – undo
 
 		/* Register General Settings Section */
 
-		register_setting( 'yikes_inc_easy_mc_general_settings_page', 'yikes-mc-api-key', array( $this , 'yikes_mc_validate_api_key' ) );
+		register_setting( 'yikes_inc_easy_mc_general_settings_page', 'yikes-mc-api-key', array( $this, 'yikes_mc_validate_api_key' ) );
 
 		register_setting( 'yikes_inc_easy_mc_general_settings_page', 'yikes-mailchimp-use-nonce' );
 
@@ -1073,7 +1073,7 @@  discard block
 block discarded – undo
 		add_settings_field(
 			'optin-checkbox-init',
 			__( 'Select Checkboxes to Generate', 'yikes-inc-easy-mailchimp-extender' ),
-			'',  // callback + validation inside of admin/partials/menu/options.php
+			'', // callback + validation inside of admin/partials/menu/options.php
 			'yikes_inc_easy_mc_checkbox_settings'
 		);
 		/* End Checkbox Settings */
@@ -1100,42 +1100,42 @@  discard block
 block discarded – undo
 			add_settings_field(
 				'yikes-mc-recaptcha-site-key',
 				__( 'Enter reCAPTCHA V2 Site Key', 'yikes-inc-easy-mailchimp-extender' ),
-				'',  // callback + validation inside of admin/partials/menu/options.php
+				'', // callback + validation inside of admin/partials/menu/options.php
 				'yikes_easy_mc_settings_recpatcha_section'
 			);
 
 			add_settings_field(
 				'yikes-mc-recaptcha-secret-key',
 				__( 'Enter reCAPTCHA V2 Secret Key', 'yikes-inc-easy-mailchimp-extender' ),
-				'',  // callback + validation inside of admin/partials/menu/options.php
+				'', // callback + validation inside of admin/partials/menu/options.php
 				'yikes_easy_mc_settings_recpatcha_section'
 			);
 
 			add_settings_field(
 				'yikes-mc-recaptcha-status',
 				__( 'Enable ReCaptcha', 'yikes-inc-easy-mailchimp-extender' ),
-				'',  // callback + validation inside of admin/partials/menu/options.php
+				'', // callback + validation inside of admin/partials/menu/options.php
 				'yikes_easy_mc_settings_recpatcha_section'
 			);
 
 			add_settings_field(
 				'yikes-mc-recaptcha-version-three',
 				__( 'Enable Version 3', 'yikes-inc-easy-mailchimp-extender' ),
-				'',  // callback + validation inside of admin/partials/menu/options.php
+				'', // callback + validation inside of admin/partials/menu/options.php
 				'yikes_easy_mc_settings_recpatcha_section'
 			);
 
 			add_settings_field(
 				'yikes-mc-recaptcha-site-key-three',
 				__( 'Enter reCAPTCHA V3 Site Key', 'yikes-inc-easy-mailchimp-extender' ),
-				'',  // callback + validation inside of admin/partials/menu/options.php
+				'', // callback + validation inside of admin/partials/menu/options.php
 				'yikes_easy_mc_settings_recpatcha_section'
 			);
 
 			add_settings_field(
 				'yikes-mc-recaptcha-secret-key-three',
 				__( 'Enter reCAPTCHA V3 Secret Key', 'yikes-inc-easy-mailchimp-extender' ),
-				'',  // callback + validation inside of admin/partials/menu/options.php
+				'', // callback + validation inside of admin/partials/menu/options.php
 				'yikes_easy_mc_settings_recpatcha_section'
 			);
 
@@ -1155,7 +1155,7 @@  discard block
 block discarded – undo
 			add_settings_field(
 				'yikes-mailchimp-debug-status',
 				__( 'Enable Debugging', 'yikes-inc-easy-mailchimp-extender' ),
-				'',  // callback + validation inside of admin/partials/menu/options.php
+				'', // callback + validation inside of admin/partials/menu/options.php
 				'yikes_easy_mc_settings_debug_section'
 			);
 
@@ -1175,7 +1175,7 @@  discard block
 block discarded – undo
 			update_option( 'yikes-mc-api-validation', 'invalid_api_key' );
 			return '';
 		}
-		$api_key = strip_tags ( trim( $input ) );
+		$api_key = strip_tags( trim( $input ) );
 		$dash_position = strpos( trim( $input ), '-' );
 		if ( $dash_position !== false ) {
 			$manager = new Yikes_Inc_Easy_Mailchimp_API_Manager( $api_key );
@@ -1190,9 +1190,9 @@  discard block
 block discarded – undo
 			update_option( 'yikes-mc-api-validation', 'valid_api_key' );
 				// Clear the API key transient data
 			$this->delete_yikes_mailchimp_transients();
-		}  else {
+		} else {
 			$error_logging = new Yikes_Inc_Easy_Mailchimp_Error_Logging();
-			$error_logging->yikes_easy_mailchimp_write_to_error_log( $response->get_error_message() , __( "Connecting to Mailchimp" , 'yikes-inc-easy-mailchimp-extender' ) , __( "Settings Page/General Settings" , 'yikes-inc-easy-mailchimp-extender' ) );
+			$error_logging->yikes_easy_mailchimp_write_to_error_log( $response->get_error_message(), __( "Connecting to Mailchimp", 'yikes-inc-easy-mailchimp-extender' ), __( "Settings Page/General Settings", 'yikes-inc-easy-mailchimp-extender' ) );
 			update_option( 'yikes-mc-api-invalid-key-response', $response->get_error_message() );
 			update_option( 'yikes-mc-api-validation', 'invalid_api_key' );
 		}
@@ -1239,9 +1239,9 @@  discard block
 block discarded – undo
 		*	and return the index ( used to find the list name assigned to a form )
 		*	- http://stackoverflow.com/questions/6661530/php-multi-dimensional-array-search
 		*/
-		function findMCListID($id, $array) {
-		   foreach ($array as $key => $val) {
-			   if ($val['id'] === $id) {
+		function findMCListID( $id, $array ) {
+		   foreach ( $array as $key => $val ) {
+			   if ( $val[ 'id' ] === $id ) {
 				   return $key;
 			   }
 		   }
@@ -1254,8 +1254,8 @@  discard block
 block discarded – undo
 		*	@since v5.6 - complete re-write
 		*/
 		public function generate_options_pages_sidebar_menu() {
-			if ( isset( $_REQUEST['section'] ) ) {
-				$selected = $_REQUEST['section'];
+			if ( isset( $_REQUEST[ 'section' ] ) ) {
+				$selected = $_REQUEST[ 'section' ];
 			}
 			$installed_addons = get_option( 'yikes-easy-mc-active-addons', array() );
 
@@ -1272,25 +1272,25 @@  discard block
 block discarded – undo
 				<h3><span><?php _e( 'Additional Settings', 'yikes-inc-easy-mailchimp-extender' ); ?></span></h3>
 				<div class="inside">
 					<ul id="settings-nav">
-						<li><?php if ( isset( $_REQUEST['section'] ) && $_REQUEST['section'] == 'general-settings' || !isset( $_REQUEST['section'] ) ) { ?><div class="option-menu-selected-arrow"></div><?php } ?><a href="<?php echo esc_url_raw( add_query_arg( array( 'section' => 'general-settings' ) , admin_url( 'admin.php?page=yikes-inc-easy-mailchimp-settings&section=general-settings' ) ) ); ?>"><?php _e( 'General Settings', 'yikes-inc-easy-mailchimp-extender' ); ?></a></li>
-						<li><?php if ( isset( $_REQUEST['section'] ) && $_REQUEST['section'] == 'integration-settings' ) { ?><div class="option-menu-selected-arrow"></div><?php } ?><a href="<?php echo esc_url_raw( add_query_arg( array( 'section' => 'integration-settings' ) , admin_url( 'admin.php?page=yikes-inc-easy-mailchimp-settings&section=integration-settings' ) ) ); ?>"><?php _e( 'Integration Settings', 'yikes-inc-easy-mailchimp-extender' ); ?></a></li>
-						<li><?php if ( isset( $_REQUEST['section'] ) && $_REQUEST['section'] == 'recaptcha-settings' ) { ?><div class="option-menu-selected-arrow"></div><?php } ?><a href="<?php echo esc_url_raw( add_query_arg( array( 'section' => 'recaptcha-settings' ) , admin_url( 'admin.php?page=yikes-inc-easy-mailchimp-settings&section=recaptcha-settings' ) ) ); ?>"><?php _e( 'ReCaptcha Settings', 'yikes-inc-easy-mailchimp-extender' ); ?></a></li>
-						<li><?php if ( isset( $_REQUEST['section'] ) && $_REQUEST['section'] == 'api-cache-settings' ) { ?><div class="option-menu-selected-arrow"></div><?php } ?><a href="<?php echo esc_url_raw( add_query_arg( array( 'section' => 'api-cache-settings' ) , admin_url( 'admin.php?page=yikes-inc-easy-mailchimp-settings&section=api-cache-settings' ) ) ); ?>"><?php _e( 'API Cache Settings', 'yikes-inc-easy-mailchimp-extender' ); ?></a></li>
-						<li><?php if ( isset( $_REQUEST['section'] ) && $_REQUEST['section'] ==  'debug-settings' ) { ?><div class="option-menu-selected-arrow"></div><?php } ?><a href="<?php echo esc_url_raw( add_query_arg( array( 'section' => 'debug-settings' ) , admin_url( 'admin.php?page=yikes-inc-easy-mailchimp-settings&section=debug-settings' ) ) ); ?>"><?php _e( 'Debug Settings', 'yikes-inc-easy-mailchimp-extender' ); ?></a></li>
-						<li><?php if ( isset( $_REQUEST['section'] ) && $_REQUEST['section'] ==  'import-export-forms' ) { ?><div class="option-menu-selected-arrow"></div><?php } ?><a href="<?php echo esc_url_raw( add_query_arg( array( 'section' => 'import-export-forms' ) , admin_url( 'admin.php?page=yikes-inc-easy-mailchimp-settings&section=import-export-forms' ) ) ); ?>"><?php _e( 'Import/Export', 'yikes-inc-easy-mailchimp-extender' ); ?></a></li>
+						<li><?php if ( isset( $_REQUEST[ 'section' ] ) && $_REQUEST[ 'section' ] == 'general-settings' || ! isset( $_REQUEST[ 'section' ] ) ) { ?><div class="option-menu-selected-arrow"></div><?php } ?><a href="<?php echo esc_url_raw( add_query_arg( array( 'section' => 'general-settings' ), admin_url( 'admin.php?page=yikes-inc-easy-mailchimp-settings&section=general-settings' ) ) ); ?>"><?php _e( 'General Settings', 'yikes-inc-easy-mailchimp-extender' ); ?></a></li>
+						<li><?php if ( isset( $_REQUEST[ 'section' ] ) && $_REQUEST[ 'section' ] == 'integration-settings' ) { ?><div class="option-menu-selected-arrow"></div><?php } ?><a href="<?php echo esc_url_raw( add_query_arg( array( 'section' => 'integration-settings' ), admin_url( 'admin.php?page=yikes-inc-easy-mailchimp-settings&section=integration-settings' ) ) ); ?>"><?php _e( 'Integration Settings', 'yikes-inc-easy-mailchimp-extender' ); ?></a></li>
+						<li><?php if ( isset( $_REQUEST[ 'section' ] ) && $_REQUEST[ 'section' ] == 'recaptcha-settings' ) { ?><div class="option-menu-selected-arrow"></div><?php } ?><a href="<?php echo esc_url_raw( add_query_arg( array( 'section' => 'recaptcha-settings' ), admin_url( 'admin.php?page=yikes-inc-easy-mailchimp-settings&section=recaptcha-settings' ) ) ); ?>"><?php _e( 'ReCaptcha Settings', 'yikes-inc-easy-mailchimp-extender' ); ?></a></li>
+						<li><?php if ( isset( $_REQUEST[ 'section' ] ) && $_REQUEST[ 'section' ] == 'api-cache-settings' ) { ?><div class="option-menu-selected-arrow"></div><?php } ?><a href="<?php echo esc_url_raw( add_query_arg( array( 'section' => 'api-cache-settings' ), admin_url( 'admin.php?page=yikes-inc-easy-mailchimp-settings&section=api-cache-settings' ) ) ); ?>"><?php _e( 'API Cache Settings', 'yikes-inc-easy-mailchimp-extender' ); ?></a></li>
+						<li><?php if ( isset( $_REQUEST[ 'section' ] ) && $_REQUEST[ 'section' ] == 'debug-settings' ) { ?><div class="option-menu-selected-arrow"></div><?php } ?><a href="<?php echo esc_url_raw( add_query_arg( array( 'section' => 'debug-settings' ), admin_url( 'admin.php?page=yikes-inc-easy-mailchimp-settings&section=debug-settings' ) ) ); ?>"><?php _e( 'Debug Settings', 'yikes-inc-easy-mailchimp-extender' ); ?></a></li>
+						<li><?php if ( isset( $_REQUEST[ 'section' ] ) && $_REQUEST[ 'section' ] == 'import-export-forms' ) { ?><div class="option-menu-selected-arrow"></div><?php } ?><a href="<?php echo esc_url_raw( add_query_arg( array( 'section' => 'import-export-forms' ), admin_url( 'admin.php?page=yikes-inc-easy-mailchimp-settings&section=import-export-forms' ) ) ); ?>"><?php _e( 'Import/Export', 'yikes-inc-easy-mailchimp-extender' ); ?></a></li>
 					</ul>
 					<?php
 						// create our add-on settings pages
-						if ( !empty( $installed_addons ) ) {
+						if ( ! empty( $installed_addons ) ) {
 							?>
 							<hr class="add-on-settings-divider" />
 							<strong><?php _e( 'Addon Settings', 'yikes-inc-easy-mailchimp-extender' ); ?></strong>
 							<ul id="addon-settings-nav">
 							<?php
-							foreach( $installed_addons as $addon_name ) {
+							foreach ( $installed_addons as $addon_name ) {
 								?>
 									<li>
-										<?php if ( isset( $_REQUEST['section'] ) && $_REQUEST['section'] ==  $addon_name ) { ?><div class="option-menu-selected-arrow"></div><?php } ?><a href="<?php echo esc_url_raw( add_query_arg( array( 'section' => $addon_name, 'addon' => 'true' ) , admin_url( 'admin.php?page=yikes-inc-easy-mailchimp-settings&section='.$addon_name ) ) ); ?>"><?php echo ucwords( str_replace( '-', ' ', $addon_name ) ); ?></a></li>
+										<?php if ( isset( $_REQUEST[ 'section' ] ) && $_REQUEST[ 'section' ] == $addon_name ) { ?><div class="option-menu-selected-arrow"></div><?php } ?><a href="<?php echo esc_url_raw( add_query_arg( array( 'section' => $addon_name, 'addon' => 'true' ), admin_url( 'admin.php?page=yikes-inc-easy-mailchimp-settings&section=' . $addon_name ) ) ); ?>"><?php echo ucwords( str_replace( '-', ' ', $addon_name ) ); ?></a></li>
 								<?php
 							}
 							?>
@@ -1339,19 +1339,19 @@  discard block
 block discarded – undo
 						<select name="associated-list" id="associated-list" class=" input-field" <?php $this->is_user_mc_api_valid_form( true ); disabled( true, empty( $lists ) ); ?>>
 							<?php
 							if ( ! empty( $lists ) ) {
-								foreach( $lists as $mailing_list ) {
+								foreach ( $lists as $mailing_list ) {
 									?>
-									<option value="<?php echo $mailing_list['id']; ?>"><?php echo stripslashes( $mailing_list['name'] ) . ' (' . $mailing_list['stats']['member_count'] . ') '; ?></option>
+									<option value="<?php echo $mailing_list[ 'id' ]; ?>"><?php echo stripslashes( $mailing_list[ 'name' ] ) . ' (' . $mailing_list[ 'stats' ][ 'member_count' ] . ') '; ?></option>
 									<?php
 								}
 							} else {
 								if ( get_option( 'yikes-mc-api-validation', 'invalid_api_key' ) == 'invalid_api_key' ) {
 									?>
-									<option><?php echo __( "Please enter a valid API key." , 'yikes-inc-easy-mailchimp-extender' ); ?></option>
+									<option><?php echo __( "Please enter a valid API key.", 'yikes-inc-easy-mailchimp-extender' ); ?></option>
 									<?php
 								} else {
 									?>
-									<option><?php echo __( "No lists were found on the account." , 'yikes-inc-easy-mailchimp-extender' ); ?></option>
+									<option><?php echo __( "No lists were found on the account.", 'yikes-inc-easy-mailchimp-extender' ); ?></option>
 									<?php
 
 								}
@@ -1360,8 +1360,8 @@  discard block
 block discarded – undo
 						</select>
 
 						<?php
-						if ( isset( $_GET['transient-cleared'] ) ) {
-							if ( 'true' === $_GET['transient-cleared'] ) {
+						if ( isset( $_GET[ 'transient-cleared' ] ) ) {
+							if ( 'true' === $_GET[ 'transient-cleared' ] ) {
 								?>
 								<div class="yikes-list-refreshed-notice">
 									<p><?php esc_attr_e( 'Mailchimp list data has been succesfully refreshed.', 'yikes-inc-easy-mailchimp-extender' ); ?></p>
@@ -1374,7 +1374,7 @@  discard block
 block discarded – undo
 							if ( get_option( 'yikes-mc-api-validation', 'invalid_api_key' ) != 'invalid_api_key' ) {
 								?>
 									<p class="description">
-										<?php printf( __( 'Head over to <a href="http://www.Mailchimp.com" title="%s">Mailchimp</a> to create a new list.', 'yikes-inc-easy-mailchimp-extender' ) , __( 'Create a list', 'yikes-inc-easy-mailchimp-extender' ) ); ?>
+										<?php printf( __( 'Head over to <a href="http://www.Mailchimp.com" title="%s">Mailchimp</a> to create a new list.', 'yikes-inc-easy-mailchimp-extender' ), __( 'Create a list', 'yikes-inc-easy-mailchimp-extender' ) ); ?>
 									</p>
 								<?php
 							}
@@ -1383,9 +1383,9 @@  discard block
 block discarded – undo
 					</label>
 					<?php
 						if ( $this->is_user_mc_api_valid_form( false ) ) {
-							echo submit_button( __( 'Create', 'yikes-inc-easy-mailchimp-extender' ) , 'primary', '', false , array( 'style' => 'margin:.75em 0 .5em 0;' ) );
+							echo submit_button( __( 'Create', 'yikes-inc-easy-mailchimp-extender' ), 'primary', '', false, array( 'style' => 'margin:.75em 0 .5em 0;' ) );
 						} else {
-							echo '<p class="description">' . __( "Please enter a valid Mailchimp API key to get started." , 'yikes-inc-easy-mailchimp-extender' ) . '</p>';
+							echo '<p class="description">' . __( "Please enter a valid Mailchimp API key to get started.", 'yikes-inc-easy-mailchimp-extender' ) . '</p>';
 							?>
 								<a href="<?php echo esc_url_raw( admin_url( 'admin.php?page=yikes-inc-easy-mailchimp-settings&settings-updated=true' ) ); ?>"><?php _e( 'general settings', 'yikes-inc-easy-mailchimp-extender' ); ?></a>
 							<?php
@@ -1415,7 +1415,7 @@  discard block
 block discarded – undo
 				$post_types = get_post_types();
 				?>
 				<label id="redirect-user-to-selection-label" for="redirect-user-to-selection" class="<?php if ( $redirect == '0' ) { echo 'yikes-easy-mc-hidden'; } ?>">
-					<?php _e( "Select A Page or Post" , 'yikes-inc-easy-mailchimp-extender' ); ?>
+					<?php _e( "Select A Page or Post", 'yikes-inc-easy-mailchimp-extender' ); ?>
 					<select id="redirect-user-to-selection" name="redirect-user-to-selection" onchange="shouldWeDisplayCustomURL( this );return;">
 				<?php
 
@@ -1431,7 +1431,7 @@  discard block
 block discarded – undo
 					$excluded_post_types = apply_filters( 'yikes-mailchimp-excluded-redirect-post-types', $excluded_post_types );
 
 						// loop over registered post types, and query!
-						foreach( $post_types as $registered_post_type ) {
+						foreach ( $post_types as $registered_post_type ) {
 
 							// exclude a few built in custom post types and any defined by the filter
 							if ( ! in_array( $registered_post_type, $excluded_post_types ) ) {
@@ -1453,8 +1453,8 @@  discard block
 block discarded – undo
 									?>
 										<optgroup label="<?php echo ucwords( str_replace( '_', ' ', $registered_post_type ) ); ?>">
 									<?php
-											foreach( $post_ids as $post_id ) {
-												?><option <?php selected( $redirect_page , $post_id ); ?> value="<?php echo $post_id; ?>"><?php echo get_the_title( $post_id ) ?></option><?php
+											foreach ( $post_ids as $post_id ) {
+												?><option <?php selected( $redirect_page, $post_id ); ?> value="<?php echo $post_id; ?>"><?php echo get_the_title( $post_id ) ?></option><?php
 											}
 									?>
 										</optgroup>
@@ -1470,7 +1470,7 @@  discard block
 block discarded – undo
 					</select>
 
 					<label name="custom-redirect-url" class="custom_redirect_url_label" <?php if ( ! isset( $redirect_page ) || $redirect_page != 'custom_url' ) { echo 'style="display:none;"'; } ?>>
-						<?php _e( "Enter Custom URL" , 'yikes-inc-easy-mailchimp-extender' ); ?>
+						<?php _e( "Enter Custom URL", 'yikes-inc-easy-mailchimp-extender' ); ?>
 						<input type="text" class="widefat custom-redirect-url" name="custom-redirect-url" value="<?php echo $custom_redirect_url; ?>" />
 					</label>
 
@@ -1529,7 +1529,7 @@  discard block
 block discarded – undo
 							</p>
 						</div>
 
-						<p class="description sidebar-footer-text"><?php printf( __( "This plugin made with %s by %s" , 'yikes-inc-easy-mailchimp-extender' ), '<span class="dashicons dashicons-heart yikes-love"></span>', '<a href="http://www.yikesinc.com" target="_blank" title="YIKES Inc.">YIKES Inc.</a>' ); ?> </p>
+						<p class="description sidebar-footer-text"><?php printf( __( "This plugin made with %s by %s", 'yikes-inc-easy-mailchimp-extender' ), '<span class="dashicons dashicons-heart yikes-love"></span>', '<a href="http://www.yikesinc.com" target="_blank" title="YIKES Inc.">YIKES Inc.</a>' ); ?> </p>
 
 						<section id="about-yikes-inc" class="inside">
 							<a href="https://www.yikesinc.com" target="_blank" title="YIKES Inc.">
@@ -1547,7 +1547,7 @@  discard block
 block discarded – undo
 						<!-- review us container -->
 						<h3><?php _e( 'Easy Forms for Mailchimp Add-Ons', 'yikes-inc-easy-mailchimp-extender' ); ?></h3>
 						<div id="review-yikes-easy-mc" class="inside">
-							<p><?php _e( "Check out available add-ons for some seriously enhanced features." , 'yikes-inc-easy-mailchimp-extender' ); ?></p>
+							<p><?php _e( "Check out available add-ons for some seriously enhanced features.", 'yikes-inc-easy-mailchimp-extender' ); ?></p>
 							<p><a class="button-secondary" href="<?php echo esc_url_raw( admin_url( 'admin.php?page=yikes-inc-easy-mailchimp-addons' ) ); ?>" title="<?php _e( 'View Add-Ons', 'yikes-inc-easy-mailchimp-extender' ); ?>"><?php _e( 'View Add-Ons', 'yikes-inc-easy-mailchimp-extender' ); ?></a></p>
 						</div>
 
@@ -1574,11 +1574,11 @@  discard block
 block discarded – undo
 
 			// if no list id, die!
 			if ( ! $list_id ) {
-				wp_die( __( "We've encountered an error. No list ID was sent." , 'yikes-inc-easy-mailchimp-extender' ) );
+				wp_die( __( "We've encountered an error. No list ID was sent.", 'yikes-inc-easy-mailchimp-extender' ) );
 			}
 
 			if ( ! $merge_variables ) {
-				wp_die( __( "We've encountered an error. Reload the page and try again. If the error persists, please reach out to support." , 'yikes-inc-easy-mailchimp-extender' ) );
+				wp_die( __( "We've encountered an error. Reload the page and try again. If the error persists, please reach out to support.", 'yikes-inc-easy-mailchimp-extender' ) );
 			}
 
 			if ( ! empty( $form_fields ) ) {
@@ -1589,17 +1589,17 @@  discard block
 block discarded – undo
 				$available_interest_groups	= array();
 
 				// Default variables as arrays - these are used for holding the Mailchimp merge field ID
-				$merge_field_ids			= array();
-				$mailchimp_merge_field_ids	= array();
+				$merge_field_ids = array();
+				$mailchimp_merge_field_ids = array();
 
 				// loop over merge variables
-				if ( ! empty( $merge_variables['merge_fields'] ) ) {
-					$available_merge_variables = wp_list_pluck( $merge_variables['merge_fields'], 'tag' );
-					$mailchimp_merge_field_ids = wp_list_pluck( $merge_variables['merge_fields'], 'merge_id' );
+				if ( ! empty( $merge_variables[ 'merge_fields' ] ) ) {
+					$available_merge_variables = wp_list_pluck( $merge_variables[ 'merge_fields' ], 'tag' );
+					$mailchimp_merge_field_ids = wp_list_pluck( $merge_variables[ 'merge_fields' ], 'merge_id' );
 
 					// Array will look like $merge_tag => $merge_id
-					foreach( $available_merge_variables as $index => $merge_tag ) {
-						$merge_field_ids[$merge_tag] = $mailchimp_merge_field_ids[$index];
+					foreach ( $available_merge_variables as $index => $merge_tag ) {
+						$merge_field_ids[ $merge_tag ] = $mailchimp_merge_field_ids[ $index ];
 					}
 				}
 
@@ -1613,51 +1613,51 @@  discard block
 block discarded – undo
 				$merged_fields   = array_merge( $available_merge_variables, $available_interest_groups );
 				$excluded_fields = array_diff( $assigned_fields, $merged_fields );
 
-				$form_fields = array_filter($form_fields, function($field){
-					return isset($field['type']);
+				$form_fields = array_filter( $form_fields, function( $field ) {
+					return isset( $field[ 'type' ] );
 				});
 
 				$i = 1;
-				foreach( $form_fields as $field ) {
+				foreach ( $form_fields as $field ) {
 
-					if ( isset( $field['merge'] ) ) {
+					if ( isset( $field[ 'merge' ] ) ) {
 						// @todo: don't use in_array()
-						$excluded_field = in_array( $field['merge'], $excluded_fields, true );
+						$excluded_field = in_array( $field[ 'merge' ], $excluded_fields, true );
 						?>
-						<section class="draggable" id="<?php echo $field['merge']; ?>">
+						<section class="draggable" id="<?php echo $field[ 'merge' ]; ?>">
 							<!-- top -->
 							<a class="expansion-section-title settings-sidebar">
 								<span class="dashicons dashicons-plus yikes-mc-expansion-toggle"></span>
-								<span class="yikes-mc-expansion-section-field-label"> <?php echo stripslashes( $field['label'] ); ?> </span>
+								<span class="yikes-mc-expansion-section-field-label"> <?php echo stripslashes( $field[ 'label' ] ); ?> </span>
 								<?php if ( $excluded_field ) { ?>
 									<img src="<?php echo YIKES_MC_URL . 'includes/images/warning.svg'; ?>" class="field-doesnt-exist-notice" title="<?php _e( 'Field no longer exists.', 'yikes-inc-easy-mailchimp-extender' ); ?>" alt="<?php _e( 'Field no longer exists.', 'yikes-inc-easy-mailchimp-extender' ); ?>">
 								<?php } ?>
-								<input maxlength="50" type="text" class="yikes-mc-edit-field-label-input" value="<?php echo stripslashes( $field['label'] ); ?>" />
+								<input maxlength="50" type="text" class="yikes-mc-edit-field-label-input" value="<?php echo stripslashes( $field[ 'label' ] ); ?>" />
 								<span class="dashicons dashicons-yes yikes-mc-save-field-label-edits-icon" title="<?php _e( 'Click to save changes.', 'yikes-inc-easy-mailchimp-extender' ); ?>"></span>
 								<span class="dashicons dashicons-edit yikes-mc-edit-field-label-icon" title="<?php _e( 'Click to edit the label', 'yikes-inc-easy-mailchimp-extender' ); ?>"></span>
 								<span class="yikes-mc-edit-field-label-message"></span>
-								<span class="field-type-text"><small><?php echo __( 'type', 'yikes-inc-easy-mailchimp-extender' ) . ' : ' . $field['type']; ?></small></span>
+								<span class="field-type-text"><small><?php echo __( 'type', 'yikes-inc-easy-mailchimp-extender' ) . ' : ' . $field[ 'type' ]; ?></small></span>
 							</a>
 							<!-- expansion section -->
 							<div class="yikes-mc-settings-expansion-section">
 
 								<?php if ( $excluded_field ) { ?>
-									<p class="yikes-mc-warning-message"><?php _e( "This field no longer exists in this list. Delete this field from the form to prevent issues on your website." , 'yikes-inc-easy-mailchimp-extender' ); ?></p>
+									<p class="yikes-mc-warning-message"><?php _e( "This field no longer exists in this list. Delete this field from the form to prevent issues on your website.", 'yikes-inc-easy-mailchimp-extender' ); ?></p>
 								<?php } ?>
 
 								<!-- store field data -->
-								<input type="hidden" class="yikes-mc-merge-field-label" name="field[<?php echo $field['merge']; ?>][label]" value="<?php echo htmlspecialchars( $field['label'] ); ?>" />
-								<input type="hidden" class="yikes-mc-merge-field-type" name="field[<?php echo $field['merge']; ?>][type]" value="<?php echo $field['type']; ?>" />
-								<input type="hidden" class="yikes-mc-merge-field-tag" name="field[<?php echo $field['merge']; ?>][merge]" value="<?php echo $field['merge']; ?>" />
-								<input type="hidden" class="field-<?php echo $field['merge']; ?>-position position-input" name="field[<?php echo $field['merge']; ?>][position]" value="<?php echo $i++; ?>" />
-								<?php if ( isset( $merge_field_ids[ $field['merge'] ] ) && is_int( $merge_field_ids[ $field['merge'] ] ) ) { ?>
-									<input type="hidden" class="yikes-mc-merge-field-id" name="field[<?php echo $field['merge']; ?>][id]" value="<?php echo $merge_field_ids[ $field['merge'] ] ?>" />
+								<input type="hidden" class="yikes-mc-merge-field-label" name="field[<?php echo $field[ 'merge' ]; ?>][label]" value="<?php echo htmlspecialchars( $field[ 'label' ] ); ?>" />
+								<input type="hidden" class="yikes-mc-merge-field-type" name="field[<?php echo $field[ 'merge' ]; ?>][type]" value="<?php echo $field[ 'type' ]; ?>" />
+								<input type="hidden" class="yikes-mc-merge-field-tag" name="field[<?php echo $field[ 'merge' ]; ?>][merge]" value="<?php echo $field[ 'merge' ]; ?>" />
+								<input type="hidden" class="field-<?php echo $field[ 'merge' ]; ?>-position position-input" name="field[<?php echo $field[ 'merge' ]; ?>][position]" value="<?php echo $i++; ?>" />
+								<?php if ( isset( $merge_field_ids[ $field[ 'merge' ] ] ) && is_int( $merge_field_ids[ $field[ 'merge' ] ] ) ) { ?>
+									<input type="hidden" class="yikes-mc-merge-field-id" name="field[<?php echo $field[ 'merge' ]; ?>][id]" value="<?php echo $merge_field_ids[ $field[ 'merge' ] ] ?>" />
 								<?php } ?>
 
-								<?php if ( $field['type'] == 'radio' || $field['type'] == 'dropdown' || $field['type'] == 'select' ) {
-									$choices = json_decode( $field['choices'], true );
+								<?php if ( $field[ 'type' ] == 'radio' || $field[ 'type' ] == 'dropdown' || $field[ 'type' ] == 'select' ) {
+									$choices = json_decode( $field[ 'choices' ], true );
 								?>
-									<input type="hidden" name="field[<?php echo $field['merge']; ?>][choices]" value='<?php echo esc_attr( json_encode( $choices ) ); ?>' />
+									<input type="hidden" name="field[<?php echo $field[ 'merge' ]; ?>][choices]" value='<?php echo esc_attr( json_encode( $choices ) ); ?>' />
 								<?php } ?>
 
 								<!-- Single or Double Opt-in -->
@@ -1673,12 +1673,12 @@  discard block
 block discarded – undo
 												</label>
 											</td>
 											<td>
-												<input class="widefat merge-tag-text" type="text" readonly value="<?php echo $field['merge']; ?>">
+												<input class="widefat merge-tag-text" type="text" readonly value="<?php echo $field[ 'merge' ]; ?>">
 											</td>
 										</tr>
 
 										<!-- Placeholder Value -->
-										<?php switch( $field['type'] ) {
+										<?php switch ( $field[ 'type' ] ) {
 
 											case 'text':
 											case 'email':
@@ -1692,13 +1692,13 @@  discard block
 block discarded – undo
 										<!-- Placeholder -->
 										<tr valign="top">
 											<td scope="row">
-												<label for="placeholder_<?php echo esc_attr( $field['merge'] ); ?>">
+												<label for="placeholder_<?php echo esc_attr( $field[ 'merge' ] ); ?>">
 													<?php _e( 'Placeholder', 'yikes-inc-easy-mailchimp-extender' ); ?>
 												</label>
 											</td>
 											<td>
-												<input type="text" id="placeholder_<?php echo esc_attr( $field['merge'] ); ?>" class="widefat" name="field[<?php echo $field['merge']; ?>][placeholder]" value="<?php echo isset( $field['placeholder'] ) ? $field['placeholder'] : '' ; ?>" />
-												<p class="description"><small><?php _e( "Assign a placeholder value to this field.", 'yikes-inc-easy-mailchimp-extender' );?></small></p>
+												<input type="text" id="placeholder_<?php echo esc_attr( $field[ 'merge' ] ); ?>" class="widefat" name="field[<?php echo $field[ 'merge' ]; ?>][placeholder]" value="<?php echo isset( $field[ 'placeholder' ] ) ? $field[ 'placeholder' ] : ''; ?>" />
+												<p class="description"><small><?php _e( "Assign a placeholder value to this field.", 'yikes-inc-easy-mailchimp-extender' ); ?></small></p>
 											</td>
 										</tr>
 										<?php
@@ -1709,13 +1709,13 @@  discard block
 block discarded – undo
 											?>
 												<tr valign="top">
 													<td scope="row">
-														<label for="placeholder_<?php echo esc_attr( $field['merge'] ); ?>">
+														<label for="placeholder_<?php echo esc_attr( $field[ 'merge' ] ); ?>">
 															<?php _e( 'Placeholder', 'yikes-inc-easy-mailchimp-extender' ); ?>
 														</label>
 													</td>
 													<td>
-														<input type="checkbox" id="placeholder_<?php echo esc_attr( $field['merge'] ); ?>" class="widefat" name="field[<?php echo $field['merge']; ?>][placeholder]" value="1" <?php echo isset( $field['placeholder'] ) && ! empty( $field['placeholder'] ) ? 'checked="checked"' : '' ; ?> />
-														<span class="description"><small><?php _e( "Use placeholders for this field (these will be automatically filled in with field names).", 'yikes-inc-easy-mailchimp-extender' );?></small></span>
+														<input type="checkbox" id="placeholder_<?php echo esc_attr( $field[ 'merge' ] ); ?>" class="widefat" name="field[<?php echo $field[ 'merge' ]; ?>][placeholder]" value="1" <?php echo isset( $field[ 'placeholder' ] ) && ! empty( $field[ 'placeholder' ] ) ? 'checked="checked"' : ''; ?> />
+														<span class="description"><small><?php _e( "Use placeholders for this field (these will be automatically filled in with field names).", 'yikes-inc-easy-mailchimp-extender' ); ?></small></span>
 													</td>
 												</tr>
 											<?php
@@ -1725,7 +1725,7 @@  discard block
 block discarded – undo
 										?>
 
 										<!-- Default Value -->
-										<?php switch( $field['type'] ) {
+										<?php switch ( $field[ 'type' ] ) {
 											default:
 											case 'text':
 											case 'number':
@@ -1733,15 +1733,15 @@  discard block
 block discarded – undo
 										?>
 											<tr valign="top">
 												<td scope="row">
-													<label for="default_value_<?php echo esc_attr( $field['merge'] ); ?>">
+													<label for="default_value_<?php echo esc_attr( $field[ 'merge' ] ); ?>">
 														<?php _e( 'Default Value', 'yikes-inc-easy-mailchimp-extender' ); ?>
 													</label>
 												</td>
 												<td>
-													<input id="default_value_<?php echo esc_attr( $field['merge'] ); ?>" <?php if ( $field['type'] != 'number' ) { ?> type="text" <?php } else { ?> type="number" <?php } ?> class="widefat" name="field[<?php echo $field['merge']; ?>][default]" <?php if ( $field['type'] != 'url' ) { ?> value="<?php echo isset( $field['default'] ) ? stripslashes( wp_strip_all_tags( $field['default'] ) ) : ''; ?>" <?php } else { ?> value="<?php echo isset( $field['default'] ) ? stripslashes( wp_strip_all_tags( esc_url_raw( $field['default'] ) ) ) : ''; ?>" <?php } ?> />
-													<p class="description"><small><?php _e( "Assign a default value to populate this field with on initial page load.", 'yikes-inc-easy-mailchimp-extender' );?></small></p>
+													<input id="default_value_<?php echo esc_attr( $field[ 'merge' ] ); ?>" <?php if ( $field[ 'type' ] != 'number' ) { ?> type="text" <?php } else { ?> type="number" <?php } ?> class="widefat" name="field[<?php echo $field[ 'merge' ]; ?>][default]" <?php if ( $field[ 'type' ] != 'url' ) { ?> value="<?php echo isset( $field[ 'default' ] ) ? stripslashes( wp_strip_all_tags( $field[ 'default' ] ) ) : ''; ?>" <?php } else { ?> value="<?php echo isset( $field[ 'default' ] ) ? stripslashes( wp_strip_all_tags( esc_url_raw( $field[ 'default' ] ) ) ) : ''; ?>" <?php } ?> />
+													<p class="description"><small><?php _e( "Assign a default value to populate this field with on initial page load.", 'yikes-inc-easy-mailchimp-extender' ); ?></small></p>
 													<?php
-													switch( $field['type'] ) {
+													switch ( $field[ 'type' ] ) {
 														case 'text':
 															?>
 																<p><small class="pre-defined-tag-link"><a href="#TB_inline?width=600&height=550&inlineId=pre-defined-tag-container" onclick="storeGlobalClicked( jQuery( this ) );" class="thickbox"><?php _e( 'View Pre-Defined Tags', 'yikes-inc-easy-mailchimp-extender' ); ?></a></small></p>
@@ -1763,28 +1763,28 @@  discard block
 block discarded – undo
 													</td>
 													<td>
 														<?php
-															$field['default_choice'] = ! isset( $field['default_choice'] ) ? 'no-default' : $field['default_choice'];
+															$field[ 'default_choice' ] = ! isset( $field[ 'default_choice' ] ) ? 'no-default' : $field[ 'default_choice' ];
 															$x = 0;
 														?>
-														<label for="<?php echo $field['merge'] . '-no-default'; ?>">
-															<input id="<?php echo $field['merge'] . '-no-default'; ?>"
+														<label for="<?php echo $field[ 'merge' ] . '-no-default'; ?>">
+															<input id="<?php echo $field[ 'merge' ] . '-no-default'; ?>"
 															       type="radio"
-															       name="field[<?php echo $field['merge']; ?>][default_choice]"
-															       value="no-default" <?php checked( $field['default_choice'], 'no-default' ); ?>
+															       name="field[<?php echo $field[ 'merge' ]; ?>][default_choice]"
+															       value="no-default" <?php checked( $field[ 'default_choice' ], 'no-default' ); ?>
 															>
 															No Default&nbsp;
 														</label>
 														<?php
 														foreach ( $choices as $choice => $value ) { ?>
-															<label for="<?php echo $field['merge'].'-'.$x; ?>">
-																<input id="<?php echo $field['merge'].'-'.$x; ?>"
+															<label for="<?php echo $field[ 'merge' ] . '-' . $x; ?>">
+																<input id="<?php echo $field[ 'merge' ] . '-' . $x; ?>"
 																       type="radio"
-																       name="field[<?php echo $field['merge']; ?>][default_choice]"
-																       value="<?php echo $x; ?>" <?php checked( $field['default_choice'], $x ); ?>>
+																       name="field[<?php echo $field[ 'merge' ]; ?>][default_choice]"
+																       value="<?php echo $x; ?>" <?php checked( $field[ 'default_choice' ], $x ); ?>>
 																<?php echo $value; ?>&nbsp;
 															</label>
 														<?php $x++; } ?>
-														<p class="description"><small><?php _e( "Select the option that should be selected by default.", 'yikes-inc-easy-mailchimp-extender' );?></small></p>
+														<p class="description"><small><?php _e( "Select the option that should be selected by default.", 'yikes-inc-easy-mailchimp-extender' ); ?></small></p>
 													</td>
 												</tr>
 
@@ -1796,13 +1796,13 @@  discard block
 block discarded – undo
 												<!-- Placeholder -->
 												<tr valign="top">
 													<td scope="row">
-														<label for="placeholder_<?php echo esc_attr( $field['merge'] ); ?>">
+														<label for="placeholder_<?php echo esc_attr( $field[ 'merge' ] ); ?>">
 															<?php _e( 'Placeholder', 'yikes-inc-easy-mailchimp-extender' ); ?>
 														</label>
 													</td>
 													<td>
-														<input type="text" id="placeholder_<?php echo esc_attr( $field['merge'] ); ?>" class="widefat" name="field[<?php echo $field['merge']; ?>][placeholder]" value="<?php echo isset( $field['placeholder'] ) ? $field['placeholder'] : '' ; ?>" />
-														<p class="description"><small><?php _e( "Assign a placeholder value to this field.", 'yikes-inc-easy-mailchimp-extender' );?></small></p>
+														<input type="text" id="placeholder_<?php echo esc_attr( $field[ 'merge' ] ); ?>" class="widefat" name="field[<?php echo $field[ 'merge' ]; ?>][placeholder]" value="<?php echo isset( $field[ 'placeholder' ] ) ? $field[ 'placeholder' ] : ''; ?>" />
+														<p class="description"><small><?php _e( "Assign a placeholder value to this field.", 'yikes-inc-easy-mailchimp-extender' ); ?></small></p>
 													</td>
 												</tr>
 												<tr valign="top">
@@ -1812,13 +1812,13 @@  discard block
 block discarded – undo
 														</label>
 													</td>
 													<td>
-														<select type="default" name="field[<?php echo $field['merge']; ?>][default_choice]">
-															<option value="no-default" <?php selected( $field['default_choice'] , 'no-default' ); ?>>No Default</option>
-															<?php foreach( json_decode( $field['choices'], true ) as $choice => $value ) { ?>
-																<option value="<?php echo $choice; ?>" <?php selected( $field['default_choice'] , $choice ); ?>><?php echo $value; ?></option>
+														<select type="default" name="field[<?php echo $field[ 'merge' ]; ?>][default_choice]">
+															<option value="no-default" <?php selected( $field[ 'default_choice' ], 'no-default' ); ?>>No Default</option>
+															<?php foreach ( json_decode( $field[ 'choices' ], true ) as $choice => $value ) { ?>
+																<option value="<?php echo $choice; ?>" <?php selected( $field[ 'default_choice' ], $choice ); ?>><?php echo $value; ?></option>
 															<?php } ?>
 														</select>
-														<p class="description"><small><?php _e( "Which option should be selected by default?", 'yikes-inc-easy-mailchimp-extender' );?></small></p>
+														<p class="description"><small><?php _e( "Which option should be selected by default?", 'yikes-inc-easy-mailchimp-extender' ); ?></small></p>
 													</td>
 												</tr>
 
@@ -1835,82 +1835,82 @@  discard block
 block discarded – undo
 										<!-- Field Description -->
 										<tr valign="top">
 											<td scope="row">
-												<label for="description_<?php echo esc_attr( $field['merge'] ); ?>">
+												<label for="description_<?php echo esc_attr( $field[ 'merge' ] ); ?>">
 													<?php _e( 'Description', 'yikes-inc-easy-mailchimp-extender' ); ?>
 												</label>
 											</td>
 											<td>
-												<textarea class="widefat field-description-input" id="description_<?php echo esc_attr( $field['merge'] ); ?>" name="field[<?php echo $field['merge']; ?>][description]"><?php echo isset( $field['description'] ) ? stripslashes( esc_html( $field['description'] ) ) : '' ; ?></textarea>
-												<p class="description"><small><?php _e( "Enter the description for the form field. This will be displayed to the user and will provide some direction on how the field should be filled out or selected.", 'yikes-inc-easy-mailchimp-extender' );?></small></p>
+												<textarea class="widefat field-description-input" id="description_<?php echo esc_attr( $field[ 'merge' ] ); ?>" name="field[<?php echo $field[ 'merge' ]; ?>][description]"><?php echo isset( $field[ 'description' ] ) ? stripslashes( esc_html( $field[ 'description' ] ) ) : ''; ?></textarea>
+												<p class="description"><small><?php _e( "Enter the description for the form field. This will be displayed to the user and will provide some direction on how the field should be filled out or selected.", 'yikes-inc-easy-mailchimp-extender' ); ?></small></p>
 											</td>
 										</tr>
 										<!-- Description Above Field -->
 										<tr valign="top" class="yikes-checkbox-container">
 											<td scope="row">
-												<label for="description_above_<?php echo esc_attr( $field['merge'] ); ?>">
+												<label for="description_above_<?php echo esc_attr( $field[ 'merge' ] ); ?>">
 													<?php _e( 'Description Above Field', 'yikes-inc-easy-mailchimp-extender' ); ?>
 												</label>
 											</td>
 											<td>
-												<input type="checkbox" id="description_above_<?php echo esc_attr( $field['merge'] ); ?>" class="widefat field-description-input" name="field[<?php echo $field['merge']; ?>][description_above]" value="1" <?php echo isset( $field['description_above'] ) && $field['description_above'] === '1' ? 'checked="checked"' : ''; ?> />
-												<p class="description"><small><?php _e( "By default the description will appear undearneath the field. Check this box if you'd like the description to appear above the field.", 'yikes-inc-easy-mailchimp-extender' );?></small></p>
+												<input type="checkbox" id="description_above_<?php echo esc_attr( $field[ 'merge' ] ); ?>" class="widefat field-description-input" name="field[<?php echo $field[ 'merge' ]; ?>][description_above]" value="1" <?php echo isset( $field[ 'description_above' ] ) && $field[ 'description_above' ] === '1' ? 'checked="checked"' : ''; ?> />
+												<p class="description"><small><?php _e( "By default the description will appear undearneath the field. Check this box if you'd like the description to appear above the field.", 'yikes-inc-easy-mailchimp-extender' ); ?></small></p>
 											</td>
 										</tr>
 										<!-- Additional Classes -->
 										<tr valign="top">
 											<td scope="row">
-												<label for="classes_<?php echo esc_attr( $field['merge'] ); ?>">
+												<label for="classes_<?php echo esc_attr( $field[ 'merge' ] ); ?>">
 													<?php _e( 'Additional Classes', 'yikes-inc-easy-mailchimp-extender' ); ?>
 												</label>
 											</td>
 											<td>
-												<input type="text" id="classes_<?php echo esc_attr( $field['merge'] ); ?>" class="widefat" name="field[<?php echo $field['merge']; ?>][additional-classes]" value="<?php echo isset( $field['additional-classes'] ) ? stripslashes( wp_strip_all_tags( $field['additional-classes'] ) ) : '' ; ?>" />
-												<p class="description"><small><?php printf( __( "Assign additional classes to this field. %s.", 'yikes-inc-easy-mailchimp-extender' ), '<a target="_blank" href="' . esc_url( 'https://yikesplugins.com/support/knowledge-base/bundled-css-classes/' ) . '">' . __( 'View bundled classes', 'yikes-inc-easy-mailchimp-extender' ) . '</a>' );?></small></p>
+												<input type="text" id="classes_<?php echo esc_attr( $field[ 'merge' ] ); ?>" class="widefat" name="field[<?php echo $field[ 'merge' ]; ?>][additional-classes]" value="<?php echo isset( $field[ 'additional-classes' ] ) ? stripslashes( wp_strip_all_tags( $field[ 'additional-classes' ] ) ) : ''; ?>" />
+												<p class="description"><small><?php printf( __( "Assign additional classes to this field. %s.", 'yikes-inc-easy-mailchimp-extender' ), '<a target="_blank" href="' . esc_url( 'https://yikesplugins.com/support/knowledge-base/bundled-css-classes/' ) . '">' . __( 'View bundled classes', 'yikes-inc-easy-mailchimp-extender' ) . '</a>' ); ?></small></p>
 											</td>
 										</tr>
 										<!-- Required Toggle -->
 										<tr valign="top" class="yikes-checkbox-container yikes-checkbox-container-first">
 											<td scope="row">
-												<label for="field-required-<?php echo esc_attr( $field['merge'] ); ?>">
+												<label for="field-required-<?php echo esc_attr( $field[ 'merge' ] ); ?>">
 													<?php _e( 'Field Required?', 'yikes-inc-easy-mailchimp-extender' ); ?>
 												</label>
 											</td>
 											<td>
-												<?php $checked = isset( $field['require'] ) ? $field['require'] : '0'; ?>
-												<input id="field-required-<?php echo esc_attr( $field['merge'] ); ?>" type="checkbox" class="widefat" value="1" name="field[<?php echo $field['merge']; ?>][require]" <?php checked( $checked , 1 ); ?> <?php if ( $field['merge'] == 'EMAIL' ) {  ?> disabled="disabled" checked="checked" title="<?php echo __( 'Email is a required field.', 'yikes-inc-easy-mailchimp-extender' ); } ?>">
-												<p class="description"><small><?php _e( "Require this field to be filled in before the form can be submitted.", 'yikes-inc-easy-mailchimp-extender' );?></small></p>
+												<?php $checked = isset( $field[ 'require' ] ) ? $field[ 'require' ] : '0'; ?>
+												<input id="field-required-<?php echo esc_attr( $field[ 'merge' ] ); ?>" type="checkbox" class="widefat" value="1" name="field[<?php echo $field[ 'merge' ]; ?>][require]" <?php checked( $checked, 1 ); ?> <?php if ( $field[ 'merge' ] == 'EMAIL' ) {  ?> disabled="disabled" checked="checked" title="<?php echo __( 'Email is a required field.', 'yikes-inc-easy-mailchimp-extender' ); } ?>">
+												<p class="description"><small><?php _e( "Require this field to be filled in before the form can be submitted.", 'yikes-inc-easy-mailchimp-extender' ); ?></small></p>
 											</td>
 										</tr>
 										<!-- Visible Toggle -->
 										<tr valign="top" class="yikes-checkbox-container">
 											<td scope="row">
-												<label for="hide-field-<?php echo esc_attr( $field['merge'] ); ?>">
+												<label for="hide-field-<?php echo esc_attr( $field[ 'merge' ] ); ?>">
 													<?php _e( 'Hide Field', 'yikes-inc-easy-mailchimp-extender' ); ?>
 												</label>
 											</td>
 											<td>
-												<?php $hide = isset( $field['hide'] ) ? $field['hide'] : '0'; ?>
-												<input id="hide-field-<?php echo esc_attr( $field['merge'] ); ?>" type="checkbox" class="widefat" value="1" name="field[<?php echo $field['merge']; ?>][hide]" <?php checked( $hide , 1 ); ?> <?php if ( $field['merge'] == 'EMAIL' ) {  ?> disabled="disabled" title="<?php echo __( 'Cannot toggle email field visibility.', 'yikes-inc-easy-mailchimp-extender' ); } ?>">
-												<p class="description"><small><?php _e( "Hide this field from being displayed on the front end.", 'yikes-inc-easy-mailchimp-extender' );?></small></p>
+												<?php $hide = isset( $field[ 'hide' ] ) ? $field[ 'hide' ] : '0'; ?>
+												<input id="hide-field-<?php echo esc_attr( $field[ 'merge' ] ); ?>" type="checkbox" class="widefat" value="1" name="field[<?php echo $field[ 'merge' ]; ?>][hide]" <?php checked( $hide, 1 ); ?> <?php if ( $field[ 'merge' ] == 'EMAIL' ) {  ?> disabled="disabled" title="<?php echo __( 'Cannot toggle email field visibility.', 'yikes-inc-easy-mailchimp-extender' ); } ?>">
+												<p class="description"><small><?php _e( "Hide this field from being displayed on the front end.", 'yikes-inc-easy-mailchimp-extender' ); ?></small></p>
 											</td>
 										</tr>
 										<!-- Toggle Field Label Visibility -->
 										<tr valign="top" class="yikes-checkbox-container">
 											<td scope="row">
-												<label for="hide-label-<?php echo esc_attr( $field['merge'] ); ?>">
+												<label for="hide-label-<?php echo esc_attr( $field[ 'merge' ] ); ?>">
 													<?php _e( 'Hide Label', 'yikes-inc-easy-mailchimp-extender' ); ?>
 												</label>
 											</td>
 											<td>
-												<?php $hide_label = isset( $field['hide-label'] ) ? $field['hide-label'] : '0'; ?>
-												<input id="hide-label-<?php echo esc_attr( $field['merge'] ); ?>" type="checkbox" name="field[<?php echo $field['merge']; ?>][hide-label]" value="1" <?php checked( $hide_label , 1 ); ?>/>
-												<p class="description"><small><?php _e( "Toggle field label visibility.", 'yikes-inc-easy-mailchimp-extender' );?></small></p>
+												<?php $hide_label = isset( $field[ 'hide-label' ] ) ? $field[ 'hide-label' ] : '0'; ?>
+												<input id="hide-label-<?php echo esc_attr( $field[ 'merge' ] ); ?>" type="checkbox" name="field[<?php echo $field[ 'merge' ]; ?>][hide-label]" value="1" <?php checked( $hide_label, 1 ); ?>/>
+												<p class="description"><small><?php _e( "Toggle field label visibility.", 'yikes-inc-easy-mailchimp-extender' ); ?></small></p>
 											</td>
 										</tr>
 										<!-- Display Phone/Date Formats back to the user -->
 										<!-- Phone Format Initial Load -->
 										<?php
-											switch( $field['type'] ) {
+											switch ( $field[ 'type' ] ) {
 												/* Store the phone format, for properly regex pattern */
 												case 'phone':
 												case 'birthday':
@@ -1920,23 +1920,23 @@  discard block
 block discarded – undo
 															<td scope="row">
 																<label for="placeholder">
 																	<?php
-																		switch( $field['type'] ) {
+																		switch ( $field[ 'type' ] ) {
 																			default:
 																			case 'birthday':
 																				$type = __( 'Date Format', 'yikes-inc-easy-mailchimp-extender' );
-																				$format = ( isset( $field['date_format'] ) ) ? $field['date_format'] : 'MM/DD';
+																				$format = ( isset( $field[ 'date_format' ] ) ) ? $field[ 'date_format' ] : 'MM/DD';
 																				$format_name = 'date_format';
 																				break;
 
 																			case 'date':
 																				$type = __( 'Date Format', 'yikes-inc-easy-mailchimp-extender' );
-																				$format = ( isset( $field['date_format'] ) ) ? $field['date_format'] : 'MM/DD/YYYY';
+																				$format = ( isset( $field[ 'date_format' ] ) ) ? $field[ 'date_format' ] : 'MM/DD/YYYY';
 																				$format_name = 'date_format';
 																				break;
 
 																			case 'phone':
 																				$type = __( 'Phone Format', 'yikes-inc-easy-mailchimp-extender' );
-																				$format = isset( $field['phone_format'] ) && ! empty( $field['phone_format'] ) ? $field['phone_format'] : __( 'International', 'yikes-inc-easy-mailchimp-extender' );
+																				$format = isset( $field[ 'phone_format' ] ) && ! empty( $field[ 'phone_format' ] ) ? $field[ 'phone_format' ] : __( 'International', 'yikes-inc-easy-mailchimp-extender' );
 																				$format_name = 'phone_format';
 																				break;
 																		}
@@ -1946,7 +1946,7 @@  discard block
 block discarded – undo
 															</td>
 															<td>
 																<strong><?php echo $format; ?></strong>
-																<input type="hidden" name="field[<?php echo $field['merge']; ?>][<?php echo $format_name; ?>]" value="<?php echo $format; ?>" />
+																<input type="hidden" name="field[<?php echo $field[ 'merge' ]; ?>][<?php echo $format_name; ?>]" value="<?php echo $format; ?>" />
 																<p class="description"><small>
 																	<?php printf( __( 'To change the %s please head over to <a href="%s" title="Mailchimp" target="_blank">Mailchimp</a>. If you alter the format, you should re-import this field.', 'yikes-inc-easy-mailchimp-extender' ), strtolower( $type ), esc_url( 'http://www.mailchimp.com' ) ); ?>
 																</small></p>
@@ -1967,8 +1967,8 @@  discard block
 block discarded – undo
 											</td>
 											<td>
 												<span class="toggle-container">
-													<a href="#" class="close-form-expansion"><?php _e( "Close" , 'yikes-inc-easy-mailchimp-extender' ); ?></a> |
-													<a href="#" class="remove-field" alt="<?php echo $field['merge']; ?>"><?php _e( "Remove Field" , 'yikes-inc-easy-mailchimp-extender' ); ?></a>
+													<a href="#" class="close-form-expansion"><?php _e( "Close", 'yikes-inc-easy-mailchimp-extender' ); ?></a> |
+													<a href="#" class="remove-field" alt="<?php echo $field[ 'merge' ]; ?>"><?php _e( "Remove Field", 'yikes-inc-easy-mailchimp-extender' ); ?></a>
 												</span>
 											</td>
 										</tr>
@@ -1986,35 +1986,35 @@  discard block
 block discarded – undo
 						/**** Interest Group ****/
 
 						?>
-						<section class="draggable" id="<?php echo $field['group_id']; ?>">
+						<section class="draggable" id="<?php echo $field[ 'group_id' ]; ?>">
 							<!-- top -->
 							<a href="#" class="expansion-section-title settings-sidebar">
-								<span class="dashicons dashicons-plus yikes-mc-expansion-toggle"></span><?php echo stripslashes( $field['label'] ); ?>
-								<?php if ( in_array( $field['group_id'] , $excluded_fields ) ) { ?>
+								<span class="dashicons dashicons-plus yikes-mc-expansion-toggle"></span><?php echo stripslashes( $field[ 'label' ] ); ?>
+								<?php if ( in_array( $field[ 'group_id' ], $excluded_fields ) ) { ?>
 									<img src="<?php echo YIKES_MC_URL . 'includes/images/warning.svg'; ?>" class="field-no-longer-exists-warning" title="<?php _e( 'Field no longer exists.', 'yikes-inc-easy-mailchimp-extender' ); ?>" alt="<?php _e( 'Field no longer exists.', 'yikes-inc-easy-mailchimp-extender' ); ?>">
 								<?php } ?>
-								<span class="field-type-text"><small><?php echo __( 'type', 'yikes-inc-easy-mailchimp-extender' ) . ' : ' . $field['type']; ?></small></span>
+								<span class="field-type-text"><small><?php echo __( 'type', 'yikes-inc-easy-mailchimp-extender' ) . ' : ' . $field[ 'type' ]; ?></small></span>
 							</a>
 							<!-- expansion section -->
 							<div class="yikes-mc-settings-expansion-section">
 
 								<!-- check if this field exists in the available interest group array -->
-								<?php if ( in_array( $field['group_id'] , $excluded_fields ) ) { ?>
-									<p class="yikes-mc-warning-message"><?php _e( "This field no longer exists in this list. Delete this field from the form to prevent issues on the front end." , 'yikes-inc-easy-mailchimp-extender' ); ?></p>
+								<?php if ( in_array( $field[ 'group_id' ], $excluded_fields ) ) { ?>
+									<p class="yikes-mc-warning-message"><?php _e( "This field no longer exists in this list. Delete this field from the form to prevent issues on the front end.", 'yikes-inc-easy-mailchimp-extender' ); ?></p>
 								<?php } ?>
 
 								<!-- store the label -->
-								<input type="hidden" name="field[<?php echo $field['group_id']; ?>][label]" value="<?php echo htmlspecialchars( $field['label'] ); ?>" />
-								<input type="hidden" name="field[<?php echo $field['group_id']; ?>][type]" value="<?php echo $field['type']; ?>" />
-								<input type="hidden" name="field[<?php echo $field['group_id']; ?>][group_id]" value="<?php echo $field['group_id']; ?>" />
-								<input type="hidden" name="field[<?php echo $field['group_id']; ?>][groups]" value='<?php echo esc_attr( json_encode( json_decode( $field['groups'], true ) ) ); ?>' />
+								<input type="hidden" name="field[<?php echo $field[ 'group_id' ]; ?>][label]" value="<?php echo htmlspecialchars( $field[ 'label' ] ); ?>" />
+								<input type="hidden" name="field[<?php echo $field[ 'group_id' ]; ?>][type]" value="<?php echo $field[ 'type' ]; ?>" />
+								<input type="hidden" name="field[<?php echo $field[ 'group_id' ]; ?>][group_id]" value="<?php echo $field[ 'group_id' ]; ?>" />
+								<input type="hidden" name="field[<?php echo $field[ 'group_id' ]; ?>][groups]" value='<?php echo esc_attr( json_encode( json_decode( $field[ 'groups' ], true ) ) ); ?>' />
 
 								<!-- Single or Double Opt-in -->
 								<p class="type-container"><!-- necessary to prevent skipping on slideToggle(); -->
 
 									<table class="form-table form-field-container">
 										<!-- Default Value -->
-										<?php switch( $field['type'] ) {
+										<?php switch ( $field[ 'type' ] ) {
 											default:
 											case 'radio':
 											case 'checkboxes':
@@ -2027,15 +2027,15 @@  discard block
 block discarded – undo
 													</td>
 													<td>
 														<?php
-														$field['default_choice'] = isset( $field['default_choice'] ) ? $field['default_choice'] : '';
+														$field[ 'default_choice' ] = isset( $field[ 'default_choice' ] ) ? $field[ 'default_choice' ] : '';
 
 														$default_shown = false;
 
-														foreach ( json_decode( $field['groups'], true ) as $id => $group ) {
-															$field_id   = "{$field['group_id']}-{$id}";
-															$field_type = 'hidden' == $field['type'] ? 'checkbox' : $field['type'];
+														foreach ( json_decode( $field[ 'groups' ], true ) as $id => $group ) {
+															$field_id   = "{$field[ 'group_id' ]}-{$id}";
+															$field_type = 'hidden' == $field[ 'type' ] ? 'checkbox' : $field[ 'type' ];
 															$field_type = 'checkboxes' == $field_type ? 'checkbox' : $field_type;
-															$field_name = "field[{$field['group_id']}][default_choice]";
+															$field_name = "field[{$field[ 'group_id' ]}][default_choice]";
 															$field_name = 'checkbox' == $field_type ? $field_name . '[]' : $field_name;
 
 															// Determine if the current group is checked.
@@ -2043,13 +2043,13 @@  discard block
 block discarded – undo
 															switch ( $field_type ) {
 																case 'radio':
 																default:
-																	$default = is_array( $field['default_choice'] ) ? current( $field['default_choice'] ) : $field['default_choice'];
-																	$checked = is_array( $field['default_choice'] ) ? checked( current( $field['default_choice'] ), $id, false ) : checked( $field['default_choice'], $id, false );
+																	$default = is_array( $field[ 'default_choice' ] ) ? current( $field[ 'default_choice' ] ) : $field[ 'default_choice' ];
+																	$checked = is_array( $field[ 'default_choice' ] ) ? checked( current( $field[ 'default_choice' ] ), $id, false ) : checked( $field[ 'default_choice' ], $id, false );
 																break;
 
 																case 'checkbox':
 																case 'hidden':
-																	if ( is_array( $field['default_choice'] ) && in_array( $id, $field['default_choice'] ) ) {
+																	if ( is_array( $field[ 'default_choice' ] ) && in_array( $id, $field[ 'default_choice' ] ) ) {
 																		$checked = checked( true, true, false );
 																	}
 																break;
@@ -2064,7 +2064,7 @@  discard block
 block discarded – undo
 																	    type="<?php echo $field_type; ?>"
 																	    name="<?php echo $field_name; ?>"
 																	    value="no-default"
-																	    <?php is_array( $field['default_choice'] ) ? checked( current( $field['default_choice'] ), 'no-default' ) : checked( $field['default_choice'], 'no-default' ); ?>>
+																	    <?php is_array( $field[ 'default_choice' ] ) ? checked( current( $field[ 'default_choice' ] ), 'no-default' ) : checked( $field[ 'default_choice' ], 'no-default' ); ?>>
 																	No Default&nbsp;
 																</label>
 																<?php
@@ -2080,7 +2080,7 @@  discard block
 block discarded – undo
 															</label>
 															<?php
 														} ?>
-														<p class="description"><small><?php _e( "Select the option that should be selected by default.", 'yikes-inc-easy-mailchimp-extender' );?></small></p>
+														<p class="description"><small><?php _e( "Select the option that should be selected by default.", 'yikes-inc-easy-mailchimp-extender' ); ?></small></p>
 													</td>
 												</tr>
 
@@ -2092,13 +2092,13 @@  discard block
 block discarded – undo
 												<!-- Placeholder -->
 												<tr valign="top">
 													<td scope="row">
-														<label for="placeholder_<?php echo esc_attr( $field['merge'] ); ?>">
+														<label for="placeholder_<?php echo esc_attr( $field[ 'merge' ] ); ?>">
 															<?php _e( 'Placeholder', 'yikes-inc-easy-mailchimp-extender' ); ?>
 														</label>
 													</td>
 													<td>
-														<input type="text" id="placeholder_<?php echo esc_attr( $field['merge'] ); ?>" class="widefat" name="field[<?php echo $field['merge']; ?>][placeholder]" value="<?php echo isset( $field['placeholder'] ) ? $field['placeholder'] : '' ; ?>" />
-														<p class="description"><small><?php _e( "Assign a placeholder value to this field.", 'yikes-inc-easy-mailchimp-extender' );?></small></p>
+														<input type="text" id="placeholder_<?php echo esc_attr( $field[ 'merge' ] ); ?>" class="widefat" name="field[<?php echo $field[ 'merge' ]; ?>][placeholder]" value="<?php echo isset( $field[ 'placeholder' ] ) ? $field[ 'placeholder' ] : ''; ?>" />
+														<p class="description"><small><?php _e( "Assign a placeholder value to this field.", 'yikes-inc-easy-mailchimp-extender' ); ?></small></p>
 													</td>
 												</tr>
 												<tr valign="top">
@@ -2108,13 +2108,13 @@  discard block
 block discarded – undo
 														</label>
 													</td>
 													<td>
-														<select type="default" name="field[<?php echo $field['group_id']; ?>][default_choice]">
+														<select type="default" name="field[<?php echo $field[ 'group_id' ]; ?>][default_choice]">
 															<option value="no-default">No Default</option>
-															<?php foreach( json_decode( stripslashes_deep( $field['groups'] ) , true ) as $id => $group ) { ?>
-																<option value="<?php echo $id; ?>" <?php selected( $field['default_choice'] , $id ); ?>><?php echo stripslashes( $group ); ?></option>
+															<?php foreach ( json_decode( stripslashes_deep( $field[ 'groups' ] ), true ) as $id => $group ) { ?>
+																<option value="<?php echo $id; ?>" <?php selected( $field[ 'default_choice' ], $id ); ?>><?php echo stripslashes( $group ); ?></option>
 															<?php } ?>
 														</select>
-														<p class="description"><small><?php _e( "Which option should be selected by default?", 'yikes-inc-easy-mailchimp-extender' );?></small></p>
+														<p class="description"><small><?php _e( "Which option should be selected by default?", 'yikes-inc-easy-mailchimp-extender' ); ?></small></p>
 													</td>
 												</tr>
 
@@ -2127,78 +2127,78 @@  discard block
 block discarded – undo
 										<!-- Field Description -->
 										<tr valign="top">
 											<td scope="row">
-												<label for="description_<?php echo esc_attr( $field['group_id'] ); ?>">
+												<label for="description_<?php echo esc_attr( $field[ 'group_id' ] ); ?>">
 													<?php _e( 'Description', 'yikes-inc-easy-mailchimp-extender' ); ?>
 												</label>
 											</td>
 											<td>
-												<textarea id="description_<?php echo esc_attr( $field['group_id'] ); ?>" class="widefat field-description-input" name="field[<?php echo $field['group_id']; ?>][description]"><?php echo isset( $field['description'] ) ? stripslashes( esc_html( $field['description'] ) ) : '' ; ?></textarea>
-												<p class="description"><small><?php _e( "Enter the description for the form field. This will be displayed to the user and provide some direction on how the field should be filled out or selected.", 'yikes-inc-easy-mailchimp-extender' );?></small></p>
+												<textarea id="description_<?php echo esc_attr( $field[ 'group_id' ] ); ?>" class="widefat field-description-input" name="field[<?php echo $field[ 'group_id' ]; ?>][description]"><?php echo isset( $field[ 'description' ] ) ? stripslashes( esc_html( $field[ 'description' ] ) ) : ''; ?></textarea>
+												<p class="description"><small><?php _e( "Enter the description for the form field. This will be displayed to the user and provide some direction on how the field should be filled out or selected.", 'yikes-inc-easy-mailchimp-extender' ); ?></small></p>
 											</td>
 										</tr>
 
 										<!-- Description Above Field -->
 										<tr valign="top" class="yikes-checkbox-container">
 											<td scope="row">
-												<label for="description_above_<?php echo $field['group_id']; ?>">
+												<label for="description_above_<?php echo $field[ 'group_id' ]; ?>">
 													<?php _e( 'Description Above Field', 'yikes-inc-easy-mailchimp-extender' ); ?>
 												</label>
 											</td>
 											<td>
-												<input type="checkbox" id="description_above_<?php echo $field['group_id']; ?>" class="widefat field-description-input" name="field[<?php echo $field['group_id']; ?>][description_above]" value="1" <?php echo isset( $field['description_above'] ) && $field['description_above'] === '1' ? 'checked="checked"' : ''; ?> />
-												<p class="description"><small><?php _e( "By default the description will appear undearneath the field. Check this box if you'd like the description to appear above the field.", 'yikes-inc-easy-mailchimp-extender' );?></small></p>
+												<input type="checkbox" id="description_above_<?php echo $field[ 'group_id' ]; ?>" class="widefat field-description-input" name="field[<?php echo $field[ 'group_id' ]; ?>][description_above]" value="1" <?php echo isset( $field[ 'description_above' ] ) && $field[ 'description_above' ] === '1' ? 'checked="checked"' : ''; ?> />
+												<p class="description"><small><?php _e( "By default the description will appear undearneath the field. Check this box if you'd like the description to appear above the field.", 'yikes-inc-easy-mailchimp-extender' ); ?></small></p>
 											</td>
 										</tr>
 
 										<!-- Additional Classes -->
 										<tr valign="top">
 											<td scope="row">
-												<label for="classes_<?php echo esc_attr( $field['group_id'] ); ?>">
+												<label for="classes_<?php echo esc_attr( $field[ 'group_id' ] ); ?>">
 													<?php _e( 'Additional Classes', 'yikes-inc-easy-mailchimp-extender' ); ?>
 												</label>
 											</td>
 											<td>
-												<input type="text" id="classes_<?php echo esc_attr( $field['group_id'] ); ?>" class="widefat" name="field[<?php echo $field['group_id']; ?>][additional-classes]" value="<?php echo isset( $field['additional-classes'] ) ? stripslashes( wp_strip_all_tags( $field['additional-classes'] ) ) : '' ; ?>" />
-												<p class="description"><small><?php printf( __( "Assign additional classes to this field. %s.", 'yikes-inc-easy-mailchimp-extender' ), '<a target="_blank" href="' . esc_url( 'https://yikesplugins.com/support/knowledge-base/bundled-css-classes/' ) . '">' . __( 'View bundled classes', 'yikes-inc-easy-mailchimp-extender' ) . '</a>' );?></small></p>
+												<input type="text" id="classes_<?php echo esc_attr( $field[ 'group_id' ] ); ?>" class="widefat" name="field[<?php echo $field[ 'group_id' ]; ?>][additional-classes]" value="<?php echo isset( $field[ 'additional-classes' ] ) ? stripslashes( wp_strip_all_tags( $field[ 'additional-classes' ] ) ) : ''; ?>" />
+												<p class="description"><small><?php printf( __( "Assign additional classes to this field. %s.", 'yikes-inc-easy-mailchimp-extender' ), '<a target="_blank" href="' . esc_url( 'https://yikesplugins.com/support/knowledge-base/bundled-css-classes/' ) . '">' . __( 'View bundled classes', 'yikes-inc-easy-mailchimp-extender' ) . '</a>' ); ?></small></p>
 											</td>
 										</tr>
 										<!-- Required Toggle -->
 										<tr valign="top" class="yikes-checkbox-container">
 											<td scope="row">
-												<label for="field-required-<?php echo esc_attr( $field['group_id'] ); ?>">
+												<label for="field-required-<?php echo esc_attr( $field[ 'group_id' ] ); ?>">
 													<?php _e( 'Field Required?', 'yikes-inc-easy-mailchimp-extender' ); ?>
 												</label>
 											</td>
 											<td>
-												<?php $checked = isset( $field['require'] ) ? $field['require'] : '0'; ?>
-												<input type="checkbox" id="field-required-<?php echo esc_attr( $field['group_id'] ); ?>" class="widefat" value="1" name="field[<?php echo $field['group_id']; ?>][require]" <?php checked( $checked , 1 ); ?>>
-												<p class="description"><small><?php _e( "Require this field to be filled in before the form can be submitted.", 'yikes-inc-easy-mailchimp-extender' );?></small></p>
+												<?php $checked = isset( $field[ 'require' ] ) ? $field[ 'require' ] : '0'; ?>
+												<input type="checkbox" id="field-required-<?php echo esc_attr( $field[ 'group_id' ] ); ?>" class="widefat" value="1" name="field[<?php echo $field[ 'group_id' ]; ?>][require]" <?php checked( $checked, 1 ); ?>>
+												<p class="description"><small><?php _e( "Require this field to be filled in before the form can be submitted.", 'yikes-inc-easy-mailchimp-extender' ); ?></small></p>
 											</td>
 										</tr>
 										<!-- Visible Toggle -->
 										<tr valign="top" class="yikes-checkbox-container">
 											<td scope="row">
-												<label for="hide-field-<?php echo esc_attr( $field['group_id'] ); ?>">
+												<label for="hide-field-<?php echo esc_attr( $field[ 'group_id' ] ); ?>">
 													<?php _e( 'Hide Field', 'yikes-inc-easy-mailchimp-extender' ); ?>
 												</label>
 											</td>
 											<td>
-												<?php $hide = isset( $field['hide'] ) ? $field['hide'] : '0'; ?>
-												<input type="checkbox" id="hide-field-<?php echo esc_attr( $field['group_id'] ); ?>" class="widefat" value="1" name="field[<?php echo $field['group_id']; ?>][hide]" <?php checked( $hide , 1 ); ?>>
-												<p class="description"><small><?php _e( "Hide this field from being displayed on the front end.", 'yikes-inc-easy-mailchimp-extender' );?></small></p>
+												<?php $hide = isset( $field[ 'hide' ] ) ? $field[ 'hide' ] : '0'; ?>
+												<input type="checkbox" id="hide-field-<?php echo esc_attr( $field[ 'group_id' ] ); ?>" class="widefat" value="1" name="field[<?php echo $field[ 'group_id' ]; ?>][hide]" <?php checked( $hide, 1 ); ?>>
+												<p class="description"><small><?php _e( "Hide this field from being displayed on the front end.", 'yikes-inc-easy-mailchimp-extender' ); ?></small></p>
 											</td>
 										</tr>
 										<!-- Toggle Field Label Visibility -->
 										<tr valign="top" class="yikes-checkbox-container">
 											<td scope="row">
-												<label for="hide-label-<?php echo esc_attr( $field['group_id'] ); ?>">
+												<label for="hide-label-<?php echo esc_attr( $field[ 'group_id' ] ); ?>">
 													<?php _e( 'Hide Label', 'yikes-inc-easy-mailchimp-extender' ); ?>
 												</label>
 											</td>
 											<td>
-												<?php $hide = isset( $field['hide-label'] ) ? $field['hide-label'] : '0'; ?>
-												<input type="checkbox" id="hide-label-<?php echo esc_attr( $field['group_id'] ); ?>" name="field[<?php echo $field['group_id']; ?>][hide-label]" value="1" <?php checked( $hide , 1 ); ?>/>
-												<p class="description"><small><?php _e( "Toggle field label visibility.", 'yikes-inc-easy-mailchimp-extender' );?></small></p>
+												<?php $hide = isset( $field[ 'hide-label' ] ) ? $field[ 'hide-label' ] : '0'; ?>
+												<input type="checkbox" id="hide-label-<?php echo esc_attr( $field[ 'group_id' ] ); ?>" name="field[<?php echo $field[ 'group_id' ]; ?>][hide-label]" value="1" <?php checked( $hide, 1 ); ?>/>
+												<p class="description"><small><?php _e( "Toggle field label visibility.", 'yikes-inc-easy-mailchimp-extender' ); ?></small></p>
 											</td>
 										</tr>
 										<!-- Toggle Buttons -->
@@ -2208,8 +2208,8 @@  discard block
 block discarded – undo
 											</td>
 											<td>
 												<span class="toggle-container">
-													<a href="#" class="close-form-expansion"><?php _e( "Close" , 'yikes-inc-easy-mailchimp-extender' ); ?></a> |
-													<a href="#" class="remove-field" alt="<?php echo $field['group_id']; ?>"><?php _e( "Remove Field" , 'yikes-inc-easy-mailchimp-extender' ); ?></a>
+													<a href="#" class="close-form-expansion"><?php _e( "Close", 'yikes-inc-easy-mailchimp-extender' ); ?></a> |
+													<a href="#" class="remove-field" alt="<?php echo $field[ 'group_id' ]; ?>"><?php _e( "Remove Field", 'yikes-inc-easy-mailchimp-extender' ); ?></a>
 												</span>
 											</td>
 										</tr>
@@ -2230,7 +2230,7 @@  discard block
 block discarded – undo
 				add_thickbox();
 				// enqueue jquery qtip for our tooltip
 				wp_enqueue_script( 'jquery-qtip-tooltip', YIKES_MC_URL . 'admin/js/min/jquery.qtip.min.js', array( 'jquery' ) );
-				wp_enqueue_style( 'jquery-qtip-style',  YIKES_MC_URL . 'admin/css/jquery.qtip.min.css' );
+				wp_enqueue_style( 'jquery-qtip-style', YIKES_MC_URL . 'admin/css/jquery.qtip.min.css' );
 					$available_tags = array(
 						array(
 							'tag' => '{page_title}',
@@ -2285,14 +2285,14 @@  discard block
 block discarded – undo
 						<h3><?php _e( 'Pre Defined Tags', 'yikes-inc-easy-mailchimp-extender' ); ?></h3>
 						<p class="description"><?php _e( 'You can use any of the following tags to populate a Mailchimp text field with dynamic content. This can be used to determine which page the user signed up on, if the user was logged in and more.', 'yikes-inc-easy-mailchimp-extender' ); ?></p>
 						<ul>
-							<?php foreach( apply_filters( 'yikes-mailchimp-custom-default-value-tags', $available_tags ) as $tag ) { ?>
+							<?php foreach ( apply_filters( 'yikes-mailchimp-custom-default-value-tags', $available_tags ) as $tag ) { ?>
 								<li class="tooltop-tag">
 									<!-- link/tag -->
-									<a href="#" onclick="populateDefaultValue( '<?php echo $tag['tag']; ?>' );return false;" data-attr-tag="<?php echo $tag['tag']; ?>" title="<?php echo $tag['title']; ?>"><?php echo $tag['title']; ?></a>
+									<a href="#" onclick="populateDefaultValue( '<?php echo $tag[ 'tag' ]; ?>' );return false;" data-attr-tag="<?php echo $tag[ 'tag' ]; ?>" title="<?php echo $tag[ 'title' ]; ?>"><?php echo $tag[ 'title' ]; ?></a>
 									<!-- help icon -->
 									<span class="dashicons dashicons-editor-help"></span>
 									<!-- tooltip -->
-									<div class="tooltiptext qtip-bootstrap yikes-easy-mc-hidden"><?php echo $tag['description']; ?></div>
+									<div class="tooltiptext qtip-bootstrap yikes-easy-mc-hidden"><?php echo $tag[ 'description' ]; ?></div>
 								</li>
 							<?php } ?>
 						</ul>
@@ -2311,32 +2311,32 @@  discard block
 block discarded – undo
 		public function build_available_merge_vars( $form_fields, $available_merge_variables ) {
 			$fields_assigned_to_form = array();
 			foreach ( $form_fields as $field ) {
-				if ( isset( $field['merge'] ) ) {
-					$fields_assigned_to_form[ $field['merge'] ] = true;
+				if ( isset( $field[ 'merge' ] ) ) {
+					$fields_assigned_to_form[ $field[ 'merge' ] ] = true;
 				}
 			}
 
-			if ( ! empty( $available_merge_variables['merge_fields'] ) ) {
+			if ( ! empty( $available_merge_variables[ 'merge_fields' ] ) ) {
 				?>
 				<ul id="available-fields"><?php
-				foreach ( $available_merge_variables['merge_fields'] as $merge_var ) {
-					$not_available = isset( $fields_assigned_to_form[ $merge_var['tag'] ] );
+				foreach ( $available_merge_variables[ 'merge_fields' ] as $merge_var ) {
+					$not_available = isset( $fields_assigned_to_form[ $merge_var[ 'tag' ] ] );
 					?>
 					<li class="available-field <?php echo $not_available ? 'not-available' : ''; ?>"
-						alt="<?php echo esc_attr( $merge_var['tag'] ); ?>"
-						data-attr-field-type="<?php echo esc_attr( $merge_var['type'] ); ?>"
-						data-attr-field-name="<?php echo esc_attr( $merge_var['name'] ); ?>"
-						data-attr-form-id="<?php echo esc_attr( $available_merge_variables['list_id'] ); ?>"
+						alt="<?php echo esc_attr( $merge_var[ 'tag' ] ); ?>"
+						data-attr-field-type="<?php echo esc_attr( $merge_var[ 'type' ] ); ?>"
+						data-attr-field-name="<?php echo esc_attr( $merge_var[ 'name' ] ); ?>"
+						data-attr-form-id="<?php echo esc_attr( $available_merge_variables[ 'list_id' ] ); ?>"
 						title="<?php echo $not_available ? esc_attr__( 'Already assigned to your form', 'yikes-inc-easy-mailchimp-extender' ) : ''; ?>"
 						<?php echo $not_available ? 'disabled="disabled"' : ''; ?>
 					>
 						<?php
-							echo esc_html( stripslashes( $merge_var['name'] ) );
-							if ( $merge_var['required'] ) {
+							echo esc_html( stripslashes( $merge_var[ 'name' ] ) );
+							if ( $merge_var[ 'required' ] ) {
 								echo ' <span class="field-required" title="' . __( 'required field', 'yikes-inc-easy-mailchimp-extender' ) . '">*</span>';
 							}
 						?>
-						<small class="field-type-text"><?php echo esc_html( $merge_var['type'] ); ?></small>
+						<small class="field-type-text"><?php echo esc_html( $merge_var[ 'type' ] ); ?></small>
 					</li>
 					<?php
 				}
@@ -2361,8 +2361,8 @@  discard block
 block discarded – undo
 			$fields_assigned_to_form = array();
 			if ( ! empty( $form_fields ) ) {
 				foreach ( $form_fields as $field ) {
-					if ( isset( $field['group_id'] ) ) {
-						$fields_assigned_to_form[ $field['group_id'] ] = true;
+					if ( isset( $field[ 'group_id' ] ) ) {
+						$fields_assigned_to_form[ $field[ 'group_id' ] ] = true;
 					}
 				}
 			}
@@ -2372,19 +2372,19 @@  discard block
 block discarded – undo
 				<ul id="available-interest-groups">
 				<?php
 					foreach ( $available_interest_groups as $interest_group ) {
-						$not_available = isset( $fields_assigned_to_form[ $interest_group['id'] ] );
+						$not_available = isset( $fields_assigned_to_form[ $interest_group[ 'id' ] ] );
 						?>
 						<li class="available-field <?php echo $not_available ? 'not-available' : ''; ?>"
-							alt="<?php echo esc_attr( $interest_group['id'] ); ?>"
-							data-group-id="<?php echo esc_attr( $interest_group['id'] ); ?>"
-							data-attr-field-name="<?php echo esc_attr( htmlspecialchars( $interest_group['title'] ) ); ?>"
-							data-attr-field-type="<?php echo esc_attr( $interest_group['type'] ); ?>"
+							alt="<?php echo esc_attr( $interest_group[ 'id' ] ); ?>"
+							data-group-id="<?php echo esc_attr( $interest_group[ 'id' ] ); ?>"
+							data-attr-field-name="<?php echo esc_attr( htmlspecialchars( $interest_group[ 'title' ] ) ); ?>"
+							data-attr-field-type="<?php echo esc_attr( $interest_group[ 'type' ] ); ?>"
 							data-attr-form-id="<?php echo esc_attr( $list_id ); ?>"
 							title="<?php echo $not_available ? __( 'Already assigned to your form', 'yikes-inc-easy-mailchimp-extender' ) : ''; ?>"
 							<?php echo $not_available ? 'disabled="disabled"' : ''; ?>
 						>
-							<?php echo esc_html( stripslashes( $interest_group['title'] ) ); ?>
-							<small class="field-type-text"><?php echo esc_html( $interest_group['type'] ); ?></small>
+							<?php echo esc_html( stripslashes( $interest_group[ 'title' ] ) ); ?>
+							<small class="field-type-text"><?php echo esc_html( $interest_group[ 'type' ] ); ?></small>
 						</li>
 						<?php
 					}
@@ -2410,13 +2410,13 @@  discard block
 block discarded – undo
 				$not_available = isset( $form_tags[ $tag_id ] );
 				?>
 				<li class="available-field <?php echo $not_available ? 'not-available' : ''; ?>"
-					id="tag-<?php echo esc_attr( $tag['id'] ); ?>"
-					data-tag-id="<?php echo esc_attr( $tag['id'] ); ?>"
-					data-tag-name="<?php echo esc_attr( $tag['name'] ); ?>"
-					title="<?php echo $not_available ? __( 'Already assigned to your form', 'yikes-inc-easy-mailchimp-extender' ) : esc_attr( $tag['name'] ); ?>"
+					id="tag-<?php echo esc_attr( $tag[ 'id' ] ); ?>"
+					data-tag-id="<?php echo esc_attr( $tag[ 'id' ] ); ?>"
+					data-tag-name="<?php echo esc_attr( $tag[ 'name' ] ); ?>"
+					title="<?php echo $not_available ? __( 'Already assigned to your form', 'yikes-inc-easy-mailchimp-extender' ) : esc_attr( $tag[ 'name' ] ); ?>"
 					<?php echo $not_available ? 'disabled="disabled"' : ''; ?>
 				>
-					<?php echo esc_html( $tag['name'] ); ?>
+					<?php echo esc_html( $tag[ 'name' ] ); ?>
 				</li>
 				<?php
 			}
@@ -2437,15 +2437,15 @@  discard block
 block discarded – undo
 		*	- must clean up db tables , ensure what data is going in and what is needed...
 		*/
 		public function yikes_easy_mailchimp_create_form() {
-			$nonce = $_REQUEST['nonce'];
+			$nonce = $_REQUEST[ 'nonce' ];
 			if ( ! wp_verify_nonce( $nonce, 'create_mailchimp_form' ) ) {
-				wp_die( __( "We've run into an error. The security check didn't pass. Please try again." , 'yikes-inc-easy-mailchimp-extender' ) );
+				wp_die( __( "We've run into an error. The security check didn't pass. Please try again.", 'yikes-inc-easy-mailchimp-extender' ) );
 			}
 
 			$result = $this->form_interface->create_form( array(
-				'list_id'          => sanitize_key( $_POST['associated-list'] ),
-				'form_name'        => stripslashes( $_POST['form-name'] ),
-				'form_description' => stripslashes( $_POST['form-description'] ),
+				'list_id'          => sanitize_key( $_POST[ 'associated-list' ] ),
+				'form_name'        => stripslashes( $_POST[ 'form-name' ] ),
+				'form_description' => stripslashes( $_POST[ 'form-description' ] ),
 			) );
 
 			// if an error occurs during the form creation process
@@ -2453,11 +2453,11 @@  discard block
 block discarded – undo
 				// write it to the error log
 				// if the form was not created successfully
 				$error_logging = new Yikes_Inc_Easy_Mailchimp_Error_Logging();
-				$error_logging->maybe_write_to_log( __( 'Error creating a new form', 'yikes-inc-easy-mailchimp-extender') , __( "Creating a new form" , 'yikes-inc-easy-mailchimp-extender' ) , __( "Forms" , 'yikes-inc-easy-mailchimp-extender' ) );
+				$error_logging->maybe_write_to_log( __( 'Error creating a new form', 'yikes-inc-easy-mailchimp-extender' ), __( "Creating a new form", 'yikes-inc-easy-mailchimp-extender' ), __( "Forms", 'yikes-inc-easy-mailchimp-extender' ) );
 				wp_redirect( esc_url_raw( admin_url( 'admin.php?page=yikes-mailchimp-edit-form&sql_error=' . urlencode( __( 'Error creating a new form', 'yikes-inc-easy-mailchimp-extender' ) ) ) ) );
 			} else {
 				// redirect the user to the new form edit page
-				wp_redirect( esc_url_raw( admin_url( 'admin.php?page=yikes-mailchimp-edit-form&id=' . $result) ) );
+				wp_redirect( esc_url_raw( admin_url( 'admin.php?page=yikes-mailchimp-edit-form&id=' . $result ) ) );
 			}
 			exit();
 		}
@@ -2470,11 +2470,11 @@  discard block
 block discarded – undo
 		*/
 		public function yikes_easy_mailchimp_delete_form() {
 			// grab & store our variables ( associated list & form name )
-			$nonce = $_REQUEST['nonce'];
-			$post_id_to_delete = $_REQUEST['mailchimp-form'];
+			$nonce = $_REQUEST[ 'nonce' ];
+			$post_id_to_delete = $_REQUEST[ 'mailchimp-form' ];
 			// verify our nonce
-			if ( ! wp_verify_nonce( $nonce, 'delete-mailchimp-form-'.$post_id_to_delete ) ) {
-				wp_die( __( "We've run into an error. The security check didn't pass. Please try again." , 'yikes-inc-easy-mailchimp-extender' ) , __( "Failed nonce validation" , 'yikes-inc-easy-mailchimp-extender' ) , array( 'response' => 500 , 'back_link' => true ) );
+			if ( ! wp_verify_nonce( $nonce, 'delete-mailchimp-form-' . $post_id_to_delete ) ) {
+				wp_die( __( "We've run into an error. The security check didn't pass. Please try again.", 'yikes-inc-easy-mailchimp-extender' ), __( "Failed nonce validation", 'yikes-inc-easy-mailchimp-extender' ), array( 'response' => 500, 'back_link' => true ) );
 			}
 
 			$this->form_interface->delete_form( $post_id_to_delete );
@@ -2490,19 +2490,19 @@  discard block
 block discarded – undo
 		*/
 		public function yikes_easy_mailchimp_duplicate_form() {
 			// grab & store our variables ( associated list & form name )
-			$nonce = $_REQUEST['nonce'];
-			$post_id_to_clone = $_REQUEST['mailchimp-form'];
+			$nonce = $_REQUEST[ 'nonce' ];
+			$post_id_to_clone = $_REQUEST[ 'mailchimp-form' ];
 			// verify our nonce
-			if ( ! wp_verify_nonce( $nonce, 'duplicate-mailchimp-form-'.$post_id_to_clone ) ) {
-				wp_die( __( "We've run into an error. The security check didn't pass. Please try again." , 'yikes-inc-easy-mailchimp-extender' ) , __( "Failed nonce validation" , 'yikes-inc-easy-mailchimp-extender' ) , array( 'response' => 500 , 'back_link' => true ) );
+			if ( ! wp_verify_nonce( $nonce, 'duplicate-mailchimp-form-' . $post_id_to_clone ) ) {
+				wp_die( __( "We've run into an error. The security check didn't pass. Please try again.", 'yikes-inc-easy-mailchimp-extender' ), __( "Failed nonce validation", 'yikes-inc-easy-mailchimp-extender' ), array( 'response' => 500, 'back_link' => true ) );
 			}
 
 			// Get the current form data.
 			$form_data = $this->form_interface->get_form( $post_id_to_clone );
 
 			// Update some of the data before duplication
-			$form_data['form_name'] .= ' - Copy';
-			$form_data['impressions'] = $form_data['submissions'] = 0;
+			$form_data[ 'form_name' ] .= ' - Copy';
+			$form_data[ 'impressions' ] = $form_data[ 'submissions' ] = 0;
 
 			// Create the new form, and handle the result.
 			$result = $this->form_interface->create_form( $form_data );
@@ -2533,11 +2533,11 @@  discard block
 block discarded – undo
 		*/
 		public function yikes_easy_mailchimp_reset_impression_stats() {
 			// grab & store our variables ( associated list & form name )
-			$nonce = $_REQUEST['nonce'];
-			$form_id_to_reset = $_REQUEST['mailchimp-form'];
+			$nonce = $_REQUEST[ 'nonce' ];
+			$form_id_to_reset = $_REQUEST[ 'mailchimp-form' ];
 			// verify our nonce
-			if ( ! wp_verify_nonce( $nonce, 'reset-stats-mailchimp-form-'.$form_id_to_reset ) ) {
-				wp_die( __( "We've run into an error. The security check didn't pass. Please try again." , 'yikes-inc-easy-mailchimp-extender' ) , __( "Failed nonce validation" , 'yikes-inc-easy-mailchimp-extender' ) , array( 'response' => 500 , 'back_link' => true ) );
+			if ( ! wp_verify_nonce( $nonce, 'reset-stats-mailchimp-form-' . $form_id_to_reset ) ) {
+				wp_die( __( "We've run into an error. The security check didn't pass. Please try again.", 'yikes-inc-easy-mailchimp-extender' ), __( "Failed nonce validation", 'yikes-inc-easy-mailchimp-extender' ), array( 'response' => 500, 'back_link' => true ) );
 			}
 
 			$result = $this->form_interface->update_form(
@@ -2565,8 +2565,8 @@  discard block
 block discarded – undo
 		*/
 		public function yikes_easy_mailchimp_update_form() {
 
-			$nonce   = $_REQUEST['nonce'];
-			$form_id = $_REQUEST['id'];
+			$nonce   = $_REQUEST[ 'nonce' ];
+			$form_id = $_REQUEST[ 'id' ];
 
 			// verify our nonce
 			if ( ! wp_verify_nonce( $nonce, 'update-mailchimp-form-' . $form_id ) ) {
@@ -2580,70 +2580,70 @@  discard block
 block discarded – undo
 			}
 
 			// Store our values!
-			$list_id                 = $_POST['associated-list'];
-			$form_name               = stripslashes( $_POST['form-name'] );
-			$form_description        = sanitize_text_field( stripslashes( $_POST['form-description'] ) );
-			$redirect_user_on_submit = $_POST['redirect-user-on-submission'];
-			$redirect_page           = $_POST['redirect-user-to-selection'];
+			$list_id                 = $_POST[ 'associated-list' ];
+			$form_name               = stripslashes( $_POST[ 'form-name' ] );
+			$form_description        = sanitize_text_field( stripslashes( $_POST[ 'form-description' ] ) );
+			$redirect_user_on_submit = $_POST[ 'redirect-user-on-submission' ];
+			$redirect_page           = $_POST[ 'redirect-user-to-selection' ];
 
 			// stripslashes_deep on save, to prevent foreign languages from added excessive backslashes
-			$assigned_fields = isset( $_POST['field'] ) ? stripslashes_deep( $_POST['field'] ): array();
+			$assigned_fields = isset( $_POST[ 'field' ] ) ? stripslashes_deep( $_POST[ 'field' ] ) : array();
 
 			// setup our submission settings serialized array
 			$submission_settings = array(
-				'ajax'                   => $_POST['form-ajax-submission'],
-				'redirect_on_submission' => $_POST['redirect-user-on-submission'],
-				'redirect_page'          => $_POST['redirect-user-to-selection'],
-				'custom_redirect_url'    => esc_url( $_POST['custom-redirect-url'] ),
-				'redirect_new_window'	 => $_POST['redirect_new_window'],
-				'hide_form_post_signup'  => $_POST['hide-form-post-signup'],
-				'replace_interests'      => $_POST['replace-interest-groups'],
+				'ajax'                   => $_POST[ 'form-ajax-submission' ],
+				'redirect_on_submission' => $_POST[ 'redirect-user-on-submission' ],
+				'redirect_page'          => $_POST[ 'redirect-user-to-selection' ],
+				'custom_redirect_url'    => esc_url( $_POST[ 'custom-redirect-url' ] ),
+				'redirect_new_window'	 => $_POST[ 'redirect_new_window' ],
+				'hide_form_post_signup'  => $_POST[ 'hide-form-post-signup' ],
+				'replace_interests'      => $_POST[ 'replace-interest-groups' ],
 			);
 
 			// setup our opt-in settings serialized array
 			$optin_settings = array(
-				'optin'                => $_POST['single-double-optin'],
-				'update_existing_user' => $_POST['update-existing-user'],
-				'send_update_email'    => $_POST['update-existing-email'],
+				'optin'                => $_POST[ 'single-double-optin' ],
+				'update_existing_user' => $_POST[ 'update-existing-user' ],
+				'send_update_email'    => $_POST[ 'update-existing-email' ],
 			);
 
 			// Setup our error settings serialized array
 			$error_settings = array(
-				'success'				=> trim( $_POST['yikes-easy-mc-success-message'] ) ? trim( stripslashes( $_POST['yikes-easy-mc-success-message'] ) ) : '',
-				'success-single-optin'	=> trim( $_POST['yikes-easy-mc-success-single-optin-message'] ) ? trim( stripslashes( $_POST['yikes-easy-mc-success-single-optin-message'] ) ) : '',
-				'success-resubscribed'	=> trim( $_POST['yikes-easy-mc-user-resubscribed-success-message'] ) ? trim( stripslashes( $_POST['yikes-easy-mc-user-resubscribed-success-message'] ) ) : '',
-				'general-error'			=> trim( $_POST['yikes-easy-mc-general-error-message'] ) ? trim( stripslashes( $_POST['yikes-easy-mc-general-error-message'] ) ) : '',
-				'already-subscribed'	=> trim( $_POST['yikes-easy-mc-user-subscribed-message'] ) ? trim( stripslashes( $_POST['yikes-easy-mc-user-subscribed-message'] ) ) : '',
-				'update-link'			=> trim( $_POST['yikes-easy-mc-user-update-link'] ) ? trim( stripslashes( $_POST['yikes-easy-mc-user-update-link'] ) ) : '',
-				'email-subject'			=> trim( $_POST['yikes-easy-mc-user-email-subject'] ) ? trim( stripslashes( $_POST['yikes-easy-mc-user-email-subject'] ) ) : '',
-				'email-body'			=> trim( $_POST['yikes-easy-mc-user-email-body'] ) ? trim( stripslashes( $_POST['yikes-easy-mc-user-email-body'] ) ) : '',
-				'update-email-success'  => trim( $_POST['yikes-easy-mc-update-email-successful'] ) ? trim( stripslashes( $_POST['yikes-easy-mc-update-email-successful'] ) ) : '',
-				'update-email-failure'  => trim( $_POST['yikes-easy-mc-update-email-failure'] ) ? trim( stripslashes( $_POST['yikes-easy-mc-update-email-failure'] ) ) : '',
+				'success'				=> trim( $_POST[ 'yikes-easy-mc-success-message' ] ) ? trim( stripslashes( $_POST[ 'yikes-easy-mc-success-message' ] ) ) : '',
+				'success-single-optin'	=> trim( $_POST[ 'yikes-easy-mc-success-single-optin-message' ] ) ? trim( stripslashes( $_POST[ 'yikes-easy-mc-success-single-optin-message' ] ) ) : '',
+				'success-resubscribed'	=> trim( $_POST[ 'yikes-easy-mc-user-resubscribed-success-message' ] ) ? trim( stripslashes( $_POST[ 'yikes-easy-mc-user-resubscribed-success-message' ] ) ) : '',
+				'general-error'			=> trim( $_POST[ 'yikes-easy-mc-general-error-message' ] ) ? trim( stripslashes( $_POST[ 'yikes-easy-mc-general-error-message' ] ) ) : '',
+				'already-subscribed'	=> trim( $_POST[ 'yikes-easy-mc-user-subscribed-message' ] ) ? trim( stripslashes( $_POST[ 'yikes-easy-mc-user-subscribed-message' ] ) ) : '',
+				'update-link'			=> trim( $_POST[ 'yikes-easy-mc-user-update-link' ] ) ? trim( stripslashes( $_POST[ 'yikes-easy-mc-user-update-link' ] ) ) : '',
+				'email-subject'			=> trim( $_POST[ 'yikes-easy-mc-user-email-subject' ] ) ? trim( stripslashes( $_POST[ 'yikes-easy-mc-user-email-subject' ] ) ) : '',
+				'email-body'			=> trim( $_POST[ 'yikes-easy-mc-user-email-body' ] ) ? trim( stripslashes( $_POST[ 'yikes-easy-mc-user-email-body' ] ) ) : '',
+				'update-email-success'  => trim( $_POST[ 'yikes-easy-mc-update-email-successful' ] ) ? trim( stripslashes( $_POST[ 'yikes-easy-mc-update-email-successful' ] ) ) : '',
+				'update-email-failure'  => trim( $_POST[ 'yikes-easy-mc-update-email-failure' ] ) ? trim( stripslashes( $_POST[ 'yikes-easy-mc-update-email-failure' ] ) ) : '',
 			);
 
 			// Setup the new form settings array
 			// @since 6.0.3.8
 			// To Do: Combine date & time so it's a single unix timestamp
 			$form_settings = array(
-				'yikes-easy-mc-form-class-names'                 => trim( $_POST['yikes-easy-mc-form-class-names'] ),
-				'yikes-easy-mc-inline-form'                      => $_POST['yikes-easy-mc-inline-form'][0],
-				'yikes-easy-mc-submit-button-type'               => $_POST['yikes-easy-mc-submit-button-type'][0],
-				'yikes-easy-mc-submit-button-text'               => trim( $_POST['yikes-easy-mc-submit-button-text'] ),
-				'yikes-easy-mc-submit-button-image'              => esc_url( trim( $_POST['yikes-easy-mc-submit-button-image'] ) ),
-				'yikes-easy-mc-submit-button-classes'            => trim( $_POST['yikes-easy-mc-submit-button-classes'] ),
-				'yikes-easy-mc-form-schedule'                    => ( isset( $_POST['yikes-easy-mc-form-schedule'] ) ) ? '1' : '0',
-				'yikes-easy-mc-form-restriction-start'           => strtotime( $_POST['yikes-easy-mc-form-restriction-start-date'] . ' ' . $_POST['yikes-easy-mc-form-restriction-start-time'] ),
-				'yikes-easy-mc-form-restriction-end'             => strtotime( $_POST['yikes-easy-mc-form-restriction-end-date'] . ' ' . $_POST['yikes-easy-mc-form-restriction-end-time'] ),
-				'yikes-easy-mc-form-restriction-pending-message' => trim( $_POST['yikes-easy-mc-form-restriction-pending-message'] ),
-				'yikes-easy-mc-form-restriction-expired-message' => trim( $_POST['yikes-easy-mc-form-restriction-expired-message'] ),
-				'yikes-easy-mc-form-login-required'              => ( isset( $_POST['yikes-easy-mc-form-login-required'] ) ) ? '1' : '0',
-				'yikes-easy-mc-form-restriction-login-message'   => trim( $_POST['yikes-easy-mc-form-restriction-login-message'] ),
+				'yikes-easy-mc-form-class-names'                 => trim( $_POST[ 'yikes-easy-mc-form-class-names' ] ),
+				'yikes-easy-mc-inline-form'                      => $_POST[ 'yikes-easy-mc-inline-form' ][ 0 ],
+				'yikes-easy-mc-submit-button-type'               => $_POST[ 'yikes-easy-mc-submit-button-type' ][ 0 ],
+				'yikes-easy-mc-submit-button-text'               => trim( $_POST[ 'yikes-easy-mc-submit-button-text' ] ),
+				'yikes-easy-mc-submit-button-image'              => esc_url( trim( $_POST[ 'yikes-easy-mc-submit-button-image' ] ) ),
+				'yikes-easy-mc-submit-button-classes'            => trim( $_POST[ 'yikes-easy-mc-submit-button-classes' ] ),
+				'yikes-easy-mc-form-schedule'                    => ( isset( $_POST[ 'yikes-easy-mc-form-schedule' ] ) ) ? '1' : '0',
+				'yikes-easy-mc-form-restriction-start'           => strtotime( $_POST[ 'yikes-easy-mc-form-restriction-start-date' ] . ' ' . $_POST[ 'yikes-easy-mc-form-restriction-start-time' ] ),
+				'yikes-easy-mc-form-restriction-end'             => strtotime( $_POST[ 'yikes-easy-mc-form-restriction-end-date' ] . ' ' . $_POST[ 'yikes-easy-mc-form-restriction-end-time' ] ),
+				'yikes-easy-mc-form-restriction-pending-message' => trim( $_POST[ 'yikes-easy-mc-form-restriction-pending-message' ] ),
+				'yikes-easy-mc-form-restriction-expired-message' => trim( $_POST[ 'yikes-easy-mc-form-restriction-expired-message' ] ),
+				'yikes-easy-mc-form-login-required'              => ( isset( $_POST[ 'yikes-easy-mc-form-login-required' ] ) ) ? '1' : '0',
+				'yikes-easy-mc-form-restriction-login-message'   => trim( $_POST[ 'yikes-easy-mc-form-restriction-login-message' ] ),
 			);
 
 			// additional custom fields (extensions / user defined fields)
 			$custom_fields = array();
-			if ( isset( $_POST['custom-field'] ) ) {
-				foreach ( $_POST['custom-field'] as $custom_field => $custom_value ) {
+			if ( isset( $_POST[ 'custom-field' ] ) ) {
+				foreach ( $_POST[ 'custom-field' ] as $custom_field => $custom_value ) {
 					if ( is_array( $custom_value ) ) {
 						$custom_fields[ $custom_field ] = array_filter( stripslashes_deep( $custom_value ) ); // array_filters to remove empty items (don't save them!)
 					} else {
@@ -2675,7 +2675,7 @@  discard block
 block discarded – undo
 			$this->form_interface->update_form( $form_id, $form_updates );
 
 			/* Custom action hook which allows users to update specific options when a form is updated - used in add ons */
-			do_action( 'yikes-mailchimp-save-form', $form_id,  $custom_fields );
+			do_action( 'yikes-mailchimp-save-form', $form_id, $custom_fields );
 
 			// redirect the user to the manage forms page, display confirmation
 			wp_redirect( esc_url_raw( admin_url( 'admin.php?page=yikes-mailchimp-edit-form&id=' . $form_id . '&updated-form=true' ) ) );
@@ -2686,11 +2686,11 @@  discard block
 block discarded – undo
 			$email_body  = '<p>' . __( 'Greetings,', 'yikes-inc-easy-mailchimp-extender' ) . '</p>';
 
 			$email_body .= '<p>';
-			$email_body .= 	__( 'A request has been made to update your Mailchimp account profile information.', 'yikes-inc-easy-mailchimp-extender' );
-			$email_body .=	__( ' To do so please use the following link: ', 'yikes-inc-easy-mailchimp-extender' );
-			$email_body .=	'[link]';
-			$email_body .=		__( 'Update Mailchimp Profile Info', 'yikes-inc-easy-mailchimp-extender' );
-			$email_body .= 	'[/link]';
+			$email_body .= __( 'A request has been made to update your Mailchimp account profile information.', 'yikes-inc-easy-mailchimp-extender' );
+			$email_body .= __( ' To do so please use the following link: ', 'yikes-inc-easy-mailchimp-extender' );
+			$email_body .= '[link]';
+			$email_body .= __( 'Update Mailchimp Profile Info', 'yikes-inc-easy-mailchimp-extender' );
+			$email_body .= '[/link]';
 			$email_body .= '</p>';
 
 			$email_body .= '<p>' . __( 'If you did not request this update, please disregard this email.', 'yikes-inc-easy-mailchimp-extender' ) . '</p>';
@@ -2706,13 +2706,13 @@  discard block
 block discarded – undo
 
 		/* Unsubscribe a given user from our list */
 		public function yikes_easy_mailchimp_unsubscribe_user() {
-			$nonce    = $_REQUEST['nonce'];
-			$list_id  = $_REQUEST['mailchimp-list'];
-			$email_id = $_REQUEST['email_id'];
+			$nonce    = $_REQUEST[ 'nonce' ];
+			$list_id  = $_REQUEST[ 'mailchimp-list' ];
+			$email_id = $_REQUEST[ 'email_id' ];
 
 			// verify our nonce
 			if ( ! wp_verify_nonce( $nonce, 'unsubscribe-user-' . $email_id ) ) {
-				wp_die( __( "We've run into an error. The security check didn't pass. Please try again." , 'yikes-inc-easy-mailchimp-extender' ) , __( "Failed nonce validation" , 'yikes-inc-easy-mailchimp-extender' ) , array( 'response' => 500 , 'back_link' => true ) );
+				wp_die( __( "We've run into an error. The security check didn't pass. Please try again.", 'yikes-inc-easy-mailchimp-extender' ), __( "Failed nonce validation", 'yikes-inc-easy-mailchimp-extender' ), array( 'response' => 500, 'back_link' => true ) );
 			}
 
 			$response = yikes_get_mc_api_manager()->get_list_handler()->member_unsubscribe( $list_id, $email_id );
@@ -2731,21 +2731,21 @@  discard block
 block discarded – undo
 
 		public function yikes_easy_mailchimp_create_missing_error_log() {
 			// grab our nonnce
-			$nonce = $_REQUEST['nonce'];
+			$nonce = $_REQUEST[ 'nonce' ];
 			// validate nonce
-			if ( !wp_verify_nonce( $nonce, 'create_error_log' ) ) {
-				wp_die( __( "We've run into an error. The security check didn't pass. Please try again." , 'yikes-inc-easy-mailchimp-extender' ) , __( "Failed nonce validation" , 'yikes-inc-easy-mailchimp-extender' ) , array( 'response' => 500 , 'back_link' => true ) );
+			if ( ! wp_verify_nonce( $nonce, 'create_error_log' ) ) {
+				wp_die( __( "We've run into an error. The security check didn't pass. Please try again.", 'yikes-inc-easy-mailchimp-extender' ), __( "Failed nonce validation", 'yikes-inc-easy-mailchimp-extender' ), array( 'response' => 500, 'back_link' => true ) );
 			}
 			// setup the path to the error log
 			$error_log = fopen( plugin_dir_path( __FILE__ ) . '../includes/error_log/yikes-easy-mailchimp-error-log.php', 'w' );
 			try {
 				// create the file
-				fwrite( $error_log , '' );
+				fwrite( $error_log, '' );
 				// close out
 				fclose( $error_log );
 				wp_redirect( esc_url_raw( admin_url( 'admin.php?page=yikes-inc-easy-mailchimp-settings&section=debug-settings&error_log_created=true' ) ) );
 			} catch ( Exception $e ) {
-				wp_redirect( esc_url_raw( admin_url( 'admin.php?page=yikes-inc-easy-mailchimp-settings&section=debug-settings&error_log_created=false&error_message='.urlencode( $e->getMessage() ) ) ) );
+				wp_redirect( esc_url_raw( admin_url( 'admin.php?page=yikes-inc-easy-mailchimp-settings&section=debug-settings&error_log_created=false&error_message=' . urlencode( $e->getMessage() ) ) ) );
 			}
 		}
 
@@ -2756,9 +2756,9 @@  discard block
 block discarded – undo
 		public function yikes_easy_mailchimp_clear_transient_data() {
 
 			// verify our nonce
-			$nonce = $_REQUEST['nonce'];
+			$nonce = $_REQUEST[ 'nonce' ];
 			if ( ! wp_verify_nonce( $nonce, 'clear-mc-transient-data' ) ) {
-				wp_die( __( "We've run into an error. The security check didn't pass. Please try again." , 'yikes-inc-easy-mailchimp-extender' ) , __( "Failed nonce validation" , 'yikes-inc-easy-mailchimp-extender' ) , array( 'response' => 500 , 'back_link' => true ) );
+				wp_die( __( "We've run into an error. The security check didn't pass. Please try again.", 'yikes-inc-easy-mailchimp-extender' ), __( "Failed nonce validation", 'yikes-inc-easy-mailchimp-extender' ), array( 'response' => 500, 'back_link' => true ) );
 			}
 
 			$this->delete_yikes_mailchimp_transients();
@@ -2767,10 +2767,10 @@  discard block
 block discarded – undo
 			$referer = wp_get_referer();
 			if ( $referer && ( strpos( $referer, 'yikes-inc-easy-mailchimp-settings' ) > 0 ) ) {
 				wp_redirect( esc_url_raw( admin_url( 'admin.php?page=yikes-inc-easy-mailchimp-settings&section=api-cache-settings&transient-cleared=true' ) ) );
-			} elseif ( isset( $_REQUEST['page'] ) && $_REQUEST['page'] === 'yikes-mailchimp-edit-form' && isset( $_REQUEST['id'] ) && ! empty( $_REQUEST['id'] ) ) {
+			} elseif ( isset( $_REQUEST[ 'page' ] ) && $_REQUEST[ 'page' ] === 'yikes-mailchimp-edit-form' && isset( $_REQUEST[ 'id' ] ) && ! empty( $_REQUEST[ 'id' ] ) ) {
 
 				// else check if we were editing a form.
-				$id = filter_var( $_REQUEST['id'], FILTER_SANITIZE_NUMBER_INT );
+				$id = filter_var( $_REQUEST[ 'id' ], FILTER_SANITIZE_NUMBER_INT );
 				wp_redirect( esc_url_raw( admin_url( 'admin.php?page=yikes-mailchimp-edit-form&id=' . $id ) ) );
 			} else {
 				// else redirect to the manage forms page.
@@ -2814,7 +2814,7 @@  discard block
 block discarded – undo
 		 */
 		public function yikes_mailchimp_load_helper_class() {
 			// check to see if it's already loaded up.
-			if ( !class_exists( 'Yikes_Inc_Easy_Mailchimp_Forms_Helper' ) ) {
+			if ( ! class_exists( 'Yikes_Inc_Easy_Mailchimp_Forms_Helper' ) ) {
 				// Include our main helper class file
 				include_once( YIKES_MC_PATH . 'admin/partials/helpers/init.php' );
 			}

Please login to merge, or discard this patch.

Braces +217 added lines, -217 removed lines patch added patch discarded remove patch

@@ -9,7 +9,7 @@  discard block
 block discarded – undo
  * @subpackage Yikes_Inc_Easy_Mailchimp_Forms/admin
  * @author     YIKES, Inc. <[email protected]>
  */
-class Yikes_Inc_Easy_Mailchimp_Forms_Admin {
+class Yikes_Inc_Easy_Mailchimp_Forms_Admin {
 
 	/**
 	 * The ID of this plugin.
@@ -49,7 +49,7 @@  discard block
 block discarded – undo
 		$yikes_inc_easy_mailchimp_extender,
 		$version,
 		Yikes_Inc_Easy_Mailchimp_Extender_Form_Interface $form_interface
-	) {
+	) {
 		$this->yikes_inc_easy_mailchimp_extender = $yikes_inc_easy_mailchimp_extender;
 		$this->version                           = $version;
 		$this->form_interface                    = $form_interface;
@@ -60,7 +60,7 @@  discard block
 block discarded – undo
 	 *
 	 * @author Jeremy Pry
 	 */
-	public function hooks() {
+	public function hooks() {
 
 		// Register admin pages.
 		add_action( 'admin_menu', array( $this, 'register_admin_pages' ), 11 );
@@ -92,7 +92,7 @@  discard block
 block discarded – undo
 		/***********************/
 		/** Create A Form **/
 		/**********************/
-		if ( isset( $_REQUEST['action'] ) && $_REQUEST['action'] == 'yikes-easy-mc-create-form' ) {
+		if ( isset( $_REQUEST['action'] ) && $_REQUEST['action'] == 'yikes-easy-mc-create-form' ) {
 
 			add_action( 'init', array( $this, 'yikes_easy_mailchimp_create_form' ) );
 
@@ -101,7 +101,7 @@  discard block
 block discarded – undo
 		/***********************/
 		/** Delete A Form **/
 		/**********************/
-		if ( isset( $_REQUEST['action'] ) && $_REQUEST['action'] == 'yikes-easy-mc-delete-form' ) {
+		if ( isset( $_REQUEST['action'] ) && $_REQUEST['action'] == 'yikes-easy-mc-delete-form' ) {
 
 			add_action( 'init', array( $this, 'yikes_easy_mailchimp_delete_form' ) );
 
@@ -110,7 +110,7 @@  discard block
 block discarded – undo
 		/**********************************/
 		/** Duplicate/Clone A Form    **/
 		/********************************/
-		if ( isset( $_REQUEST['action'] ) && $_REQUEST['action'] == 'yikes-easy-mc-duplicate-form' ) {
+		if ( isset( $_REQUEST['action'] ) && $_REQUEST['action'] == 'yikes-easy-mc-duplicate-form' ) {
 
 			add_action( 'init', array( $this, 'yikes_easy_mailchimp_duplicate_form' ) );
 
@@ -119,7 +119,7 @@  discard block
 block discarded – undo
 		/*************************************/
 		/**  Reset Form Impression Stats **/
 		/***********************************/
-		if ( isset( $_REQUEST['action'] ) && $_REQUEST['action'] == 'yikes-easy-mc-reset-stats' ) {
+		if ( isset( $_REQUEST['action'] ) && $_REQUEST['action'] == 'yikes-easy-mc-reset-stats' ) {
 
 			add_action( 'init', array( $this, 'yikes_easy_mailchimp_reset_impression_stats' ) );
 
@@ -128,7 +128,7 @@  discard block
 block discarded – undo
 		/**********************************/
 		/**         Update A Form        **/
 		/********************************/
-		if ( isset( $_REQUEST['action'] ) && $_REQUEST['action'] == 'yikes-easy-mc-update-form' ) {
+		if ( isset( $_REQUEST['action'] ) && $_REQUEST['action'] == 'yikes-easy-mc-update-form' ) {
 
 			add_action( 'init', array( $this, 'yikes_easy_mailchimp_update_form' ) );
 
@@ -137,7 +137,7 @@  discard block
 block discarded – undo
 		/**************************************************/
 		/**     Clear Store Mailchimp Transient Data   **/
 		/*************************************************/
-		if ( isset( $_REQUEST['action'] ) && $_REQUEST['action'] == 'yikes-easy-mc-clear-transient-data' ) {
+		if ( isset( $_REQUEST['action'] ) && $_REQUEST['action'] == 'yikes-easy-mc-clear-transient-data' ) {
 
 			add_action( 'init', array( $this, 'yikes_easy_mailchimp_clear_transient_data' ) );
 
@@ -146,7 +146,7 @@  discard block
 block discarded – undo
 		/*******************************************/
 		/** Remove a user from a mailing list     **/
 		/*****************************************/
-		if ( isset( $_REQUEST['action'] ) && $_REQUEST['action'] == 'yikes-easy-mc-unsubscribe-user' ) {
+		if ( isset( $_REQUEST['action'] ) && $_REQUEST['action'] == 'yikes-easy-mc-unsubscribe-user' ) {
 
 			add_action( 'init', array( $this, 'yikes_easy_mailchimp_unsubscribe_user' ) );
 
@@ -155,7 +155,7 @@  discard block
 block discarded – undo
 		/*******************************************/
 		/**    Create misisng error log file  **/
 		/*****************************************/
-		if ( isset( $_REQUEST['action'] ) && $_REQUEST['action'] == 'yikes-easy-mc-create-error-log' ) {
+		if ( isset( $_REQUEST['action'] ) && $_REQUEST['action'] == 'yikes-easy-mc-create-error-log' ) {
 
 			add_action( 'init', array( $this, 'yikes_easy_mailchimp_create_missing_error_log' ) );
 
@@ -167,14 +167,14 @@  discard block
 block discarded – undo
 		add_action( 'admin_head', array( $this, 'add_tinyMCE_buttons' ) );
 
 		// pass our lists data to tinyMCE button for use.
-		foreach ( array( 'post.php', 'post-new.php' ) as $hook ) {
+		foreach ( array( 'post.php', 'post-new.php' ) as $hook ) {
 
 			add_action( 'admin_enqueue_scripts', array( $this, 'tinymce_yikes_easy_mc' ) );
 
 		}
 
 		// display an admin notice for users on PHP < 5.3.
-		if ( phpversion() < '5.3' ) {
+		if ( phpversion() < '5.3' ) {
 			add_action( "admin_notices", array( $this, 'display_php_warning' ), 999 );
 		}
 
@@ -187,7 +187,7 @@  discard block
 block discarded – undo
 		/**************************************************/
 		/**        Clear Mailchimp Error Log Data        **/
 		/*************************************************/
-		if ( isset( $_REQUEST['action'] ) && $_REQUEST['action'] == 'yikes-easy-mc-clear-error-log' ) {
+		if ( isset( $_REQUEST['action'] ) && $_REQUEST['action'] == 'yikes-easy-mc-clear-error-log' ) {
 
 			add_action( 'init', array( $this, 'yikes_easy_mailchimp_clear_error_log' ) );
 
@@ -196,7 +196,7 @@  discard block
 block discarded – undo
 		/*********************************************/
 		/**        Export Mailchimp Opt-in Forms   **/
 		/*******************************************/
-		if ( isset( $_REQUEST['action'] ) && $_REQUEST['action'] == 'yikes-easy-mc-export-forms' ) {
+		if ( isset( $_REQUEST['action'] ) && $_REQUEST['action'] == 'yikes-easy-mc-export-forms' ) {
 
 			add_action( 'init', array( $this, 'yikes_easy_mailchimp_export_forms' ) );
 
@@ -205,7 +205,7 @@  discard block
 block discarded – undo
 		/*********************************************/
 		/**                Export Plugin Settings           **/
 		/*******************************************/
-		if ( isset( $_REQUEST['action'] ) && $_REQUEST['action'] == 'yikes-easy-mc-export-settings' ) {
+		if ( isset( $_REQUEST['action'] ) && $_REQUEST['action'] == 'yikes-easy-mc-export-settings' ) {
 
 			add_action( 'init', array( $this, 'yikes_easy_mailchimp_export_plugin_settings' ) );
 
@@ -214,7 +214,7 @@  discard block
 block discarded – undo
 		/*******************************************/
 		/**        Import Class Inclusion       **/
 		/*****************************************/
-		if ( isset( $_REQUEST['action'] ) && $_REQUEST['action'] == 'yikes-easy-mc-import-forms' ) {
+		if ( isset( $_REQUEST['action'] ) && $_REQUEST['action'] == 'yikes-easy-mc-import-forms' ) {
 
 			add_action( 'init', array( $this, 'yikes_easy_mailchimp_import_forms' ) );
 
@@ -223,7 +223,7 @@  discard block
 block discarded – undo
 		/*******************************************/
 		/**    Premium Support Request     **/
 		/*****************************************/
-		if ( isset( $_POST['submit-premium-support-request'] ) ) {
+		if ( isset( $_POST['submit-premium-support-request'] ) ) {
 
 			add_action( 'init', array( $this, 'yikes_easy_mailchimp_premium_support_request' ) );
 
@@ -255,7 +255,7 @@  discard block
 block discarded – undo
 		 * @ param  array  $links  Pre-existing plugin action links
 		 * @ return array  $links  New array of plugin actions
 		 */
-		public function easy_forms_plugin_action_links( $links ) {
+		public function easy_forms_plugin_action_links( $links ) {
 			$links[] = '<a href="'. esc_url( get_admin_url(null, 'admin.php?page=yikes-inc-easy-mailchimp-settings') ) .'">' . __( 'Settings', 'yikes-inc-easy-mailchimp-extender' ) . '</a>';
 			$links[] = '<a href="' . esc_url( 'http://www.yikesplugins.com?utm_source=plugins-page&utm_medium=plugin-row&utm_campaign=admin' ) . '" target="_blank">' . __( 'More plugins by YIKES, Inc.', 'yikes-inc-easy-mailchimp-extender' ) . '</a>';
 			return $links;
@@ -271,13 +271,13 @@  discard block
 block discarded – undo
 		 *
 		 * @return string
 		 */
-		public function yikes_easy_forms_admin_disclaimer( $footer_text ) {
+		public function yikes_easy_forms_admin_disclaimer( $footer_text ) {
 			$page = get_current_screen();
 			$base = $page->base;
-			if ( strpos( $base, 'yikes-inc-easy-mailchimp' ) !== false || strpos( $base, 'yikes-mailchimp' ) !== false ) {
+			if ( strpos( $base, 'yikes-inc-easy-mailchimp' ) !== false || strpos( $base, 'yikes-mailchimp' ) !== false ) {
 				$disclaimer_text = sprintf( '<em>' . __( 'Disclaimer: <strong>Easy Forms for Mailchimp</strong> is in no way endorsed, affiliated or backed by Mailchimp, or its parent company Rocket Science Group.', 'yikes-inc-easy-mailchimp-extender' ), '<a href="https://wordpress.org/support/view/plugin-reviews/give?filter=5#postform" target="_blank" class="give-rating-link" data-rated="' . __( 'Thanks :)', 'yikes-inc-easy-mailchimp-extender' ) . '">', '</a></em>' );
 				return $disclaimer_text;
-			} else {
+			} else {
 				return $footer_text;
 			}
 		}
@@ -289,32 +289,32 @@  discard block
 block discarded – undo
 		*	@since 6.0.0
 		*	@return	parsed tag content
 		*/
-		public function parse_mailchimp_default_tag( $default_tag ) {
-			if ( ! $default_tag || $default_tag == '' ) {
+		public function parse_mailchimp_default_tag( $default_tag ) {
+			if ( ! $default_tag || $default_tag == '' ) {
 				return $default_tag;
 			}
 			global $post;
 			// page title.
-			if ( $default_tag == '{page_title}' ) {
+			if ( $default_tag == '{page_title}' ) {
 				$default_tag = get_the_title( $post->ID );
 			}
 			// page id.
-			if ( $default_tag == '{page_id}' ) {
+			if ( $default_tag == '{page_id}' ) {
 				$default_tag = $post->ID;
 			}
 			// page url.
-			if ( $default_tag == '{page_url}' ) {
+			if ( $default_tag == '{page_url}' ) {
 				$default_tag = get_permalink( $post->ID );
 			}
 			// blog name.
-			if ( $default_tag == '{blog_name}' ) {
+			if ( $default_tag == '{blog_name}' ) {
 				$default_tag = get_bloginfo( 'name' );
 			}
 			// is user logged in.
-			if ( $default_tag == '{user_logged_in}' ) {
-				if ( is_user_logged_in() ) {
+			if ( $default_tag == '{user_logged_in}' ) {
+				if ( is_user_logged_in() ) {
 					$default_tag = 'Registered User';
-				} else {
+				} else {
 					$default_tag = 'Guest User';
 				}
 			}
@@ -328,21 +328,21 @@  discard block
 block discarded – undo
 		*	When a user clicks 'Clear Log' on the debug settings page, this funciton
 		*	is used to clear the data out of our php file.
 		*/
-		public function yikes_easy_mailchimp_clear_error_log() {
+		public function yikes_easy_mailchimp_clear_error_log() {
 
 			// Get our error log class.
 			$error_logging = new Yikes_Inc_Easy_Mailchimp_Error_Logging();
 
 			// file put contents $returned error + other data.
-			if ( file_exists( $error_logging->error_log_file_path ) ) {
+			if ( file_exists( $error_logging->error_log_file_path ) ) {
 
 				$clear_log = file_put_contents( $error_logging->error_log_file_path, '' );
 
-				if ( $clear_log === false ) {
+				if ( $clear_log === false ) {
 
 					// redirect the user to the manage forms page, display error message.
 					wp_redirect( esc_url_raw( admin_url( 'admin.php?page=yikes-inc-easy-mailchimp-settings&section=debug-settings&error-log-cleared=false' ) ) );
-				} else {
+				} else {
 
 					// redirect the user to the manage forms page, display confirmation.
 					wp_redirect( esc_url_raw( admin_url( 'admin.php?page=yikes-inc-easy-mailchimp-settings&section=debug-settings&error-log-cleared=true' ) ) );
@@ -356,13 +356,13 @@  discard block
 block discarded – undo
 		*	@since 		6.0.0
 		*	@return 	CSV export file
 		*/
-		public function yikes_easy_mailchimp_export_forms() {
+		public function yikes_easy_mailchimp_export_forms() {
 			// grab our nonce.
 			$nonce = $_REQUEST['nonce'];
 			// grab the forms.
 			$forms = isset( $_REQUEST['yikes_export_forms'] ) ? $_REQUEST['yikes_export_forms'] : array();
 			// validate nonce.
-			if ( ! wp_verify_nonce( $nonce, 'export-forms' ) ) {
+			if ( ! wp_verify_nonce( $nonce, 'export-forms' ) ) {
 				wp_die( __( "We've run into an error. The security check didn't pass. Please try again." , 'yikes-inc-easy-mailchimp-extender' ) , __( "Failed nonce validation" , 'yikes-inc-easy-mailchimp-extender' ) , array( 'response' => 500 , 'back_link' => true ) );
 			}
 
@@ -380,11 +380,11 @@  discard block
 block discarded – undo
 		*	@since 		6.0.0
 		*	@return 	CSV export file
 		*/
-		public function yikes_easy_mailchimp_export_plugin_settings() {
+		public function yikes_easy_mailchimp_export_plugin_settings() {
 			// grab our nonce
 			$nonce = $_REQUEST['nonce'];
 			// validate nonce.
-			if ( ! wp_verify_nonce( $nonce, 'export-settings' ) ) {
+			if ( ! wp_verify_nonce( $nonce, 'export-settings' ) ) {
 				wp_die( __( "We've run into an error. The security check didn't pass. Please try again." , 'yikes-inc-easy-mailchimp-extender' ) , __( "Failed nonce validation" , 'yikes-inc-easy-mailchimp-extender' ) , array( 'response' => 500 , 'back_link' => true ) );
 			}
 
@@ -400,15 +400,15 @@  discard block
 block discarded – undo
 		*	Custom import function to import all or specific forms
 		*	@since 6.0.0
 		*/
-		public function yikes_easy_mailchimp_import_forms() {
+		public function yikes_easy_mailchimp_import_forms() {
 			// grab our nonce.
 			$nonce = $_REQUEST['nonce'];
 			// validate nonce.
-			if ( ! wp_verify_nonce( $nonce, 'import-forms' ) ) {
+			if ( ! wp_verify_nonce( $nonce, 'import-forms' ) ) {
 				wp_die( __( "We've run into an error. The security check didn't pass. Please try again." , 'yikes-inc-easy-mailchimp-extender' ) , __( "Failed nonce validation" , 'yikes-inc-easy-mailchimp-extender' ) , array( 'response' => 500 , 'back_link' => true ) );
 			}
 			// include the export class.
-			if ( ! class_exists( 'Yikes_Inc_Easy_Mailchimp_Import_Class' ) ) {
+			if ( ! class_exists( 'Yikes_Inc_Easy_Mailchimp_Import_Class' ) ) {
 				include_once( YIKES_MC_PATH . 'includes/import-export/yikes-easy-mailchimp-import.class.php' );
 			}
 			// run the import function.
@@ -424,9 +424,9 @@  discard block
 block discarded – undo
 		*	Premium Support Request
 		*	@since 6.0.0
 		*/
-		public function yikes_easy_mailchimp_premium_support_request() {
+		public function yikes_easy_mailchimp_premium_support_request() {
 
-			if ( isset( $_POST['action'] ) && $_POST['action'] != 'yikes-support-request' ) {
+			if ( isset( $_POST['action'] ) && $_POST['action'] != 'yikes-support-request' ) {
 				return __( 'We encountered an error. Please contact the YIKES Inc. support team.', 'yikes-inc-easy-mailchimp-extender' );
 			}
 
@@ -462,7 +462,7 @@  discard block
 block discarded – undo
 			) );
 
 			// Catch the error.
-			if ( is_wp_error( $response ) ) {
+			if ( is_wp_error( $response ) ) {
 				wp_send_json_error( $response->getMessage() );
 			}
 
@@ -470,9 +470,9 @@  discard block
 block discarded – undo
 			$response_body = json_decode( wp_remote_retrieve_body( $response ) );
 		}
 
-		public function get_premium_license( $plugin_slug ) {
+		public function get_premium_license( $plugin_slug ) {
 
-			switch( $plugin_slug ) {
+			switch( $plugin_slug ) {
 
 				case 'form-customizer':
 					return defined( 'YIKES_CUSTOMIZER_EDD_ITEM_ID' ) ? YIKES_CUSTOMIZER_EDD_ITEM_ID : '';
@@ -495,8 +495,8 @@  discard block
 block discarded – undo
 		 *
 		 * @since 6.0.0
 		 */
-		public function load_error_logging_class() {
-			if ( get_option( 'yikes-mailchimp-debug-status', '' ) == '1' ) {
+		public function load_error_logging_class() {
+			if ( get_option( 'yikes-mailchimp-debug-status', '' ) == '1' ) {
 				// if error logging is enabled we should include our error logging class
 				/* Generate oure error logging table */
 				require_once YIKES_MC_PATH . '/includes/error_log/class-yikes-inc-easy-mailchimp-error-logging.php';
@@ -511,21 +511,21 @@  discard block
 block discarded – undo
 		 *
 		 * @since v6.0.0
 		 */
-		public function yikes_easy_mailchimp_check_installation_date() {
+		public function yikes_easy_mailchimp_check_installation_date() {
 
 			// add a new option to store the plugin activation date/time.
 			// @since v6.0.0.
 			// this is used to notify the user that they should review after 2 weeks.
-			if ( !get_option( 'yikes_easy_mailchimp_activation_date' ) ) {
+			if ( !get_option( 'yikes_easy_mailchimp_activation_date' ) ) {
 				add_option( 'yikes_easy_mailchimp_activation_date', strtotime( "now" ) );
 			}
 
 			$stop_bugging_me = get_option( 'yikes_easy_mailchimp_review_stop_bugging_me' );
 
-			if ( ! $stop_bugging_me ) {
+			if ( ! $stop_bugging_me ) {
 				$install_date = get_option( 'yikes_easy_mailchimp_activation_date' );
 				$past_date = strtotime( '-14 days' );
-				if ( $past_date >= $install_date && current_user_can( 'install_plugins' ) ) {
+				if ( $past_date >= $install_date && current_user_can( 'install_plugins' ) ) {
 					add_action( 'admin_notices', array( $this , 'yikes_easy_mailchimp_display_review_us_notice' ) );
 				}
 			}
@@ -537,9 +537,9 @@  discard block
 block discarded – undo
 			asking for a review, and for user feedback
 			@since v6.0.0
 		*/
-		public function yikes_easy_mailchimp_display_review_us_notice() {
+		public function yikes_easy_mailchimp_display_review_us_notice() {
 			/* Lets only display our admin notice on YT4WP pages to not annoy the hell out of people :) */
-			if ( in_array( get_current_screen()->base , array( 'dashboard', 'post', 'edit' ) ) || strpos( get_current_screen()->base ,'yikes-inc-easy-mailchimp') !== false ) {
+			if ( in_array( get_current_screen()->base , array( 'dashboard', 'post', 'edit' ) ) || strpos( get_current_screen()->base ,'yikes-inc-easy-mailchimp') !== false ) {
 
 				// The URL of the page the user is currently on
 				$current_uri  	  = isset( $_SERVER['REQUEST_URI'] ) && ! empty( $_SERVER['REQUEST_URI'] ) ? $_SERVER['REQUEST_URI'] : false;
@@ -582,8 +582,8 @@  discard block
 block discarded – undo
 			Remove the Review us notification when user clicks 'Dismiss'
 			@since v3.1.1
 		*/
-		public function yikes_easy_mailchimp_stop_bugging_me() {
-			if ( isset( $_GET['yikes_easy_mc_icons_nobug'] ) && (int) filter_var( $_GET['yikes_easy_mc_icons_nobug'], FILTER_SANITIZE_NUMBER_INT ) === 1 ) {
+		public function yikes_easy_mailchimp_stop_bugging_me() {
+			if ( isset( $_GET['yikes_easy_mc_icons_nobug'] ) && (int) filter_var( $_GET['yikes_easy_mc_icons_nobug'], FILTER_SANITIZE_NUMBER_INT ) === 1 ) {
 				add_option( 'yikes_easy_mailchimp_review_stop_bugging_me', true );
 			}
 		}
@@ -591,7 +591,7 @@  discard block
 block discarded – undo
 	/* End Two Week Notification */
 
 		/* Display a warning users who are using PHP < 5.3 */
-		public function display_php_warning() {
+		public function display_php_warning() {
 			$message = __( 'Easy Forms for Mailchimp requires a minimum of PHP 5.3. The plugin will not function properly until you update. Please reach out to your host provider for assistance.', 'yikes-inc-easy-mailchimp-extender' );
 			echo "<div class='error'> <p><span class='dashicons dashicons-no-alt' style='color:rgb(231, 98, 98)'></span> $message</p></div>";
 		}
@@ -601,10 +601,10 @@  discard block
 block discarded – undo
 	 * TinyMCE Functions
 	 */
 	// load our button and pass in the JS form data variable.
-	public function add_tinyMCE_buttons() {
+	public function add_tinyMCE_buttons() {
 		global $typenow;
 		// only on Post Type: post and page.
-		if ( ! in_array( $typenow, array( 'post', 'page' ) ) ) {
+		if ( ! in_array( $typenow, array( 'post', 'page' ) ) ) {
 			return;
 		}
 		add_filter( 'mce_buttons', array( $this, 'yks_mc_add_tinymce_button' ) );
@@ -612,14 +612,14 @@  discard block
 block discarded – undo
 	}
 
 	// Add the button key for address via JS.
-	public function yks_mc_add_tinymce_button( $buttons ) {
+	public function yks_mc_add_tinymce_button( $buttons ) {
 		array_push( $buttons, 'yks_mc_tinymce_button_key' );
 		// Print all buttons.
 		return $buttons;
 	}
 
 	// inlcude the js for tinymce.
-	public function yks_mc_add_tinymce_plugin( $plugin_array ) {
+	public function yks_mc_add_tinymce_plugin( $plugin_array ) {
 
 		$plugin_array['yks_mc_tinymce_button'] = plugins_url( '/js/min/yikes-inc-easy-mailchimp-tinymce-button.min.js', __FILE__ );
 
@@ -631,23 +631,23 @@  discard block
 block discarded – undo
 		 * Pass our imported list data, to the JS file
 		 * to build the drop down list in the modal
 		 */
-	public function tinymce_yikes_easy_mc() {
+	public function tinymce_yikes_easy_mc() {
 		// check capabilities.
-		if ( ! current_user_can( apply_filters( 'yikes-mailchimp-user-role-access', 'manage_options' ) ) ) {
+		if ( ! current_user_can( apply_filters( 'yikes-mailchimp-user-role-access', 'manage_options' ) ) ) {
 			return;
 		}
 
 		$list_data = $this->form_interface->get_all_forms();
 		$lists     = array();
-		if ( ! empty( $list_data ) ) {
+		if ( ! empty( $list_data ) ) {
 			// build an array to pass to our javascript.
-			foreach ( $list_data as $id => $form ) {
+			foreach ( $list_data as $id => $form ) {
 				$lists[] = array(
 					'text'  => urlencode( $form['form_name'] ),
 					'value' => $id,
 				);
 			}
-		} else {
+		} else {
 			$lists[0] = array(
 				'text'  => __( 'Please Import Some Mailchimp Lists', 'yikes-inc-easy-mailchimp-extender' ),
 				'value' => '-',
@@ -672,7 +672,7 @@  discard block
 block discarded – undo
 	/**
 	 *  Fix the Mailchimp icon spacing in the admin menu.
 	 */
-	public function fix_menu_icon_spacing() {
+	public function fix_menu_icon_spacing() {
 		?>
 			<style>
 			a[href="admin.php?page=yikes-inc-easy-mailchimp"] .wp-menu-image img {
@@ -687,7 +687,7 @@  discard block
 block discarded – undo
 	 *
 	 * @since    6.0.0
 	 */
-	public function enqueue_styles() {
+	public function enqueue_styles() {
 		/**
 		 *	Enqueue our global dashboard styles.
 		 */
@@ -696,7 +696,7 @@  discard block
 block discarded – undo
 		/*
 		*	Enqueue Add-ons styles.
 		*/
-		if ( get_current_screen()->base == 'easy-forms_page_yikes-inc-easy-mailchimp-addons' ) {
+		if ( get_current_screen()->base == 'easy-forms_page_yikes-inc-easy-mailchimp-addons' ) {
 			wp_enqueue_style( 'yikes-inc-easy-mailchimp-extender-addons-styles', plugin_dir_url( __FILE__ ) . 'css/yikes-inc-easy-mailchimp-extender-addons.min.css', array(), $this->version, 'all' );
 		}
 	}
@@ -705,7 +705,7 @@  discard block
 block discarded – undo
 	 *
 	 * @since    6.0.0
 	 */
-	public function enqueue_scripts() {
+	public function enqueue_scripts() {
 		wp_enqueue_script( 'yikes-inc-easy-mailchimp-extender-admin-js', plugin_dir_url( __FILE__ ) . 'js/min/yikes-inc-easy-mailchimp-extender-admin.min.js', array( 'jquery', 'jquery-ui-sortable' ), $this->version, false );
 
 		$localized_data = array(
@@ -720,7 +720,7 @@  discard block
 block discarded – undo
 
 		// Enqueue required scripts for the form editor
 		$screen = get_current_screen();
-		if ( ! isset( $screen->base ) || 'admin_page_yikes-mailchimp-edit-form' !== $screen->base ) {
+		if ( ! isset( $screen->base ) || 'admin_page_yikes-mailchimp-edit-form' !== $screen->base ) {
 			return;
 		}
 
@@ -768,12 +768,12 @@  discard block
 block discarded – undo
 	/**
 	 * Convert the php date format string to a js date format
 	 */
-	public function yikes_jQuery_datepicker_date_format_php_to_js( $sFormat, $type ) {
-		switch ( $type ) {
+	public function yikes_jQuery_datepicker_date_format_php_to_js( $sFormat, $type ) {
+		switch ( $type ) {
 			default:
 			case 'date':
 				// Standard Date Fields
-				switch ( $sFormat ) {
+				switch ( $sFormat ) {
 					//Predefined WP date formats
 					case 'F j, Y':
 					case 'j F Y':
@@ -796,7 +796,7 @@  discard block
 block discarded – undo
 				break;
 			// Birthday Fields
 			case 'birthday':
-				switch ( $sFormat ) {
+				switch ( $sFormat ) {
 					//Predefined WP date formats
 					case 'F j, Y':
 					case 'j F Y':
@@ -825,8 +825,8 @@  discard block
 block discarded – undo
 	/**
 	 * Convert the php date format string to a js date format
 	 */
-	public function yikes_jQuery_datepicker_date_format( $site_option ) {
-		switch( $site_option ) {
+	public function yikes_jQuery_datepicker_date_format( $site_option ) {
+		switch( $site_option ) {
 			//Predefined WP date formats
 			default:
 			case 'F j, Y':
@@ -846,7 +846,7 @@  discard block
 block discarded – undo
 	*	Register our admin pages
 	*	used to display data back to the user
 	**/
-	public function register_admin_pages() {
+	public function register_admin_pages() {
 
 		/* Top Level Menu 'Easy Mailchimp' */
 		add_menu_page(
@@ -959,7 +959,7 @@  discard block
 block discarded – undo
 	*	when they click 'Go Pro' in the admin menu
 	*	to do: populate with sales URL
 	*/
-	public function generateAddOnsPage() {
+	public function generateAddOnsPage() {
 		require_once YIKES_MC_PATH . 'admin/partials/menu/add-ons.php'; // include our add-ons page
 	}
 
@@ -968,7 +968,7 @@  discard block
 block discarded – undo
 	*
 	* @since    1.0.0
 	*/
-	function generateManageFormsPage() {
+	function generateManageFormsPage() {
 		require_once YIKES_MC_PATH . 'admin/partials/menu/manage-forms.php'; // include our manage forms page
 	}
 
@@ -977,7 +977,7 @@  discard block
 block discarded – undo
 	*
 	* @since    1.0.0
 	*/
-	function generateManageListsPage() {
+	function generateManageListsPage() {
 		require_once YIKES_MC_PATH . 'admin/partials/menu/manage-lists.php'; // include our lists page
 	}
 
@@ -986,7 +986,7 @@  discard block
 block discarded – undo
 	*
 	* @since    1.0.0
 	*/
-	function generateSupportPage() {
+	function generateSupportPage() {
 
 		wp_enqueue_script( 'yikes-inc-easy-mailchimp-extender-support-scripts', plugin_dir_url( __FILE__ ) . 'js/support.js', array( 'jquery' ), $this->version, false );
 		require_once YIKES_MC_PATH . 'admin/partials/menu/support.php';
@@ -997,7 +997,7 @@  discard block
 block discarded – undo
 	*
 	* @since    1.0.0
 	*/
-	function generateEditFormPage() {
+	function generateEditFormPage() {
 		require_once YIKES_MC_PATH . 'admin/partials/edit-form.php'; // include our options page
 	}
 
@@ -1006,7 +1006,7 @@  discard block
 block discarded – undo
 	*
 	* @since    1.0.0
 	*/
-	function generateViewListPage() {
+	function generateViewListPage() {
 		require_once YIKES_MC_PATH . 'admin/partials/view-list.php'; // include our options page
 	}
 
@@ -1015,7 +1015,7 @@  discard block
 block discarded – undo
 	*
 	* @since    1.0.0
 	*/
-	function generateViewUserPage() {
+	function generateViewUserPage() {
 		require_once YIKES_MC_PATH . 'admin/partials/view-user.php'; // include our options page
 	}
 
@@ -1024,7 +1024,7 @@  discard block
 block discarded – undo
 	*
 	* @since v.5.4
 	**/
-	function yikes_easy_mc_settings_init() {
+	function yikes_easy_mc_settings_init() {
 
 		/* Register General Settings Section */
 
@@ -1170,27 +1170,27 @@  discard block
 block discarded – undo
 	*	Options Sanitization & Validation
 	*	@since complete re-write
 	**/
-	function yikes_mc_validate_api_key( $input ) {
-		if ( $input === '' ) {
+	function yikes_mc_validate_api_key( $input ) {
+		if ( $input === '' ) {
 			update_option( 'yikes-mc-api-validation', 'invalid_api_key' );
 			return '';
 		}
 		$api_key = strip_tags ( trim( $input ) );
 		$dash_position = strpos( trim( $input ), '-' );
-		if ( $dash_position !== false ) {
+		if ( $dash_position !== false ) {
 			$manager = new Yikes_Inc_Easy_Mailchimp_API_Manager( $api_key );
-		} else {
+		} else {
 			update_option( 'yikes-mc-api-invalid-key-response', __( 'Your API key appears to be invalid.', 'yikes-inc-easy-mailchimp-extender' ) );
 			update_option( 'yikes-mc-api-validation', 'invalid_api_key' );
 			return $api_key;
 		}
 
 		$response = $manager->get_account_handler()->get_account( false );
-		if ( ! is_wp_error( $response ) ) {
+		if ( ! is_wp_error( $response ) ) {
 			update_option( 'yikes-mc-api-validation', 'valid_api_key' );
 				// Clear the API key transient data
 			$this->delete_yikes_mailchimp_transients();
-		}  else {
+		} else {
 			$error_logging = new Yikes_Inc_Easy_Mailchimp_Error_Logging();
 			$error_logging->yikes_easy_mailchimp_write_to_error_log( $response->get_error_message() , __( "Connecting to Mailchimp" , 'yikes-inc-easy-mailchimp-extender' ) , __( "Settings Page/General Settings" , 'yikes-inc-easy-mailchimp-extender' ) );
 			update_option( 'yikes-mc-api-invalid-key-response', $response->get_error_message() );
@@ -1205,7 +1205,7 @@  discard block
 block discarded – undo
 	*
 	* @since    1.0.0
 	*/
-	function generatePageOptions() {
+	function generatePageOptions() {
 		require_once YIKES_MC_PATH . 'admin/partials/menu/options.php'; // include our options page
 	}
 
@@ -1215,15 +1215,15 @@  discard block
 block discarded – undo
 	*	to form fields. (input, dropdowns, buttons etc.)
 	* 	@since v5.5 re-write
 	**/
-	public function is_user_mc_api_valid_form( $echo = true ) {
-		if ( $echo == true ) {
-			if ( get_option( 'yikes-mc-api-validation', 'invalid_api_key' ) == 'invalid_api_key' ) {
+	public function is_user_mc_api_valid_form( $echo = true ) {
+		if ( $echo == true ) {
+			if ( get_option( 'yikes-mc-api-validation', 'invalid_api_key' ) == 'invalid_api_key' ) {
 				echo 'disabled="disabled"';
 			}
-		} else {
-			if ( get_option( 'yikes-mc-api-validation', 'invalid_api_key' ) == 'invalid_api_key' ) {
+		} else {
+			if ( get_option( 'yikes-mc-api-validation', 'invalid_api_key' ) == 'invalid_api_key' ) {
 				return false;
-			} else {
+			} else {
 				return true;
 			}
 		}
@@ -1239,9 +1239,9 @@  discard block
 block discarded – undo
 		*	and return the index ( used to find the list name assigned to a form )
 		*	- http://stackoverflow.com/questions/6661530/php-multi-dimensional-array-search
 		*/
-		function findMCListID($id, $array) {
-		   foreach ($array as $key => $val) {
-			   if ($val['id'] === $id) {
+		function findMCListID($id, $array) {
+		   foreach ($array as $key => $val) {
+			   if ($val['id'] === $id) {
 				   return $key;
 			   }
 		   }
@@ -1253,8 +1253,8 @@  discard block
 block discarded – undo
 		*	Render our sidebar menu on all of the setings pages (general, form, checkbox, recaptcha, popup, debug etc. )
 		*	@since v5.6 - complete re-write
 		*/
-		public function generate_options_pages_sidebar_menu() {
-			if ( isset( $_REQUEST['section'] ) ) {
+		public function generate_options_pages_sidebar_menu() {
+			if ( isset( $_REQUEST['section'] ) ) {
 				$selected = $_REQUEST['section'];
 			}
 			$installed_addons = get_option( 'yikes-easy-mc-active-addons', array() );
@@ -1281,13 +1281,13 @@  discard block
 block discarded – undo
 					</ul>
 					<?php
 						// create our add-on settings pages
-						if ( !empty( $installed_addons ) ) {
+						if ( !empty( $installed_addons ) ) {
 							?>
 							<hr class="add-on-settings-divider" />
 							<strong><?php _e( 'Addon Settings', 'yikes-inc-easy-mailchimp-extender' ); ?></strong>
 							<ul id="addon-settings-nav">
 							<?php
-							foreach( $installed_addons as $addon_name ) {
+							foreach( $installed_addons as $addon_name ) {
 								?>
 									<li>
 										<?php if ( isset( $_REQUEST['section'] ) && $_REQUEST['section'] ==  $addon_name ) { ?><div class="option-menu-selected-arrow"></div><?php } ?><a href="<?php echo esc_url_raw( add_query_arg( array( 'section' => $addon_name, 'addon' => 'true' ) , admin_url( 'admin.php?page=yikes-inc-easy-mailchimp-settings&section='.$addon_name ) ) ); ?>"><?php echo ucwords( str_replace( '-', ' ', $addon_name ) ); ?></a></li>
@@ -1307,7 +1307,7 @@  discard block
 block discarded – undo
 		*	Render our sidebar menu on all of the setings pages (general, form, checkbox, recaptcha, popup, debug etc. )
 		*	@since v5.6 - complete re-write
 		*/
-		public function generate_manage_forms_sidebar( $lists ) {
+		public function generate_manage_forms_sidebar( $lists ) {
 			// create a custom URL to allow for creating fields
 			$url = esc_url_raw(
 				add_query_arg(
@@ -1338,18 +1338,18 @@  discard block
 block discarded – undo
 					<label for="associated-list"><strong><?php _e( 'Associated List', 'yikes-inc-easy-mailchimp-extender' ); ?></strong>
 						<select name="associated-list" id="associated-list" class=" input-field" <?php $this->is_user_mc_api_valid_form( true ); disabled( true, empty( $lists ) ); ?>>
 							<?php
-							if ( ! empty( $lists ) ) {
-								foreach( $lists as $mailing_list ) {
+							if ( ! empty( $lists ) ) {
+								foreach( $lists as $mailing_list ) {
 									?>
 									<option value="<?php echo $mailing_list['id']; ?>"><?php echo stripslashes( $mailing_list['name'] ) . ' (' . $mailing_list['stats']['member_count'] . ') '; ?></option>
 									<?php
 								}
-							} else {
-								if ( get_option( 'yikes-mc-api-validation', 'invalid_api_key' ) == 'invalid_api_key' ) {
+							} else {
+								if ( get_option( 'yikes-mc-api-validation', 'invalid_api_key' ) == 'invalid_api_key' ) {
 									?>
 									<option><?php echo __( "Please enter a valid API key." , 'yikes-inc-easy-mailchimp-extender' ); ?></option>
 									<?php
-								} else {
+								} else {
 									?>
 									<option><?php echo __( "No lists were found on the account." , 'yikes-inc-easy-mailchimp-extender' ); ?></option>
 									<?php
@@ -1360,8 +1360,8 @@  discard block
 block discarded – undo
 						</select>
 
 						<?php
-						if ( isset( $_GET['transient-cleared'] ) ) {
-							if ( 'true' === $_GET['transient-cleared'] ) {
+						if ( isset( $_GET['transient-cleared'] ) ) {
+							if ( 'true' === $_GET['transient-cleared'] ) {
 								?>
 								<div class="yikes-list-refreshed-notice">
 									<p><?php esc_attr_e( 'Mailchimp list data has been succesfully refreshed.', 'yikes-inc-easy-mailchimp-extender' ); ?></p>
@@ -1370,8 +1370,8 @@  discard block
 block discarded – undo
 							}
 						}
 
-						if ( isset( $lists ) && empty( $lists ) ) {
-							if ( get_option( 'yikes-mc-api-validation', 'invalid_api_key' ) != 'invalid_api_key' ) {
+						if ( isset( $lists ) && empty( $lists ) ) {
+							if ( get_option( 'yikes-mc-api-validation', 'invalid_api_key' ) != 'invalid_api_key' ) {
 								?>
 									<p class="description">
 										<?php printf( __( 'Head over to <a href="http://www.Mailchimp.com" title="%s">Mailchimp</a> to create a new list.', 'yikes-inc-easy-mailchimp-extender' ) , __( 'Create a list', 'yikes-inc-easy-mailchimp-extender' ) ); ?>
@@ -1382,9 +1382,9 @@  discard block
 block discarded – undo
 						?>
 					</label>
 					<?php
-						if ( $this->is_user_mc_api_valid_form( false ) ) {
+						if ( $this->is_user_mc_api_valid_form( false ) ) {
 							echo submit_button( __( 'Create', 'yikes-inc-easy-mailchimp-extender' ) , 'primary', '', false , array( 'style' => 'margin:.75em 0 .5em 0;' ) );
-						} else {
+						} else {
 							echo '<p class="description">' . __( "Please enter a valid Mailchimp API key to get started." , 'yikes-inc-easy-mailchimp-extender' ) . '</p>';
 							?>
 								<a href="<?php echo esc_url_raw( admin_url( 'admin.php?page=yikes-inc-easy-mailchimp-settings&settings-updated=true' ) ); ?>"><?php _e( 'general settings', 'yikes-inc-easy-mailchimp-extender' ); ?></a>
@@ -1395,7 +1395,7 @@  discard block
 block discarded – undo
 
 				<!-- Clear API CACHE -->
 				<?php
-				if ( isset( $lists ) && ! empty( $lists ) ) {
+				if ( isset( $lists ) && ! empty( $lists ) ) {
 					if ( false !== get_transient( 'yikes-easy-mailchimp-list-data' ) ) { ?>
 						<form action="<?php echo esc_url_raw( add_query_arg( array( 'action' => 'yikes-easy-mc-clear-transient-data', 'nonce' => wp_create_nonce( 'clear-mc-transient-data' ) ) ) ); ?>" method="post">
 							<input type="submit" class="button-secondary clear-mailchimp-api-cache" value="<?php _e( 'Refresh Lists', 'yikes-inc-easy-mailchimp-extender' ); ?>" />
@@ -1411,7 +1411,7 @@  discard block
 block discarded – undo
 		*	Generate a dropdown of post and pages
 		*	so the user can send the user to on form submission
 		*/
-		public function generate_page_redirect_dropdown( $redirect, $redirect_page, $custom_redirect_url ) {
+		public function generate_page_redirect_dropdown( $redirect, $redirect_page, $custom_redirect_url ) {
 				$post_types = get_post_types();
 				?>
 				<label id="redirect-user-to-selection-label" for="redirect-user-to-selection" class="<?php if ( $redirect == '0' ) { echo 'yikes-easy-mc-hidden'; } ?>">
@@ -1431,10 +1431,10 @@  discard block
 block discarded – undo
 					$excluded_post_types = apply_filters( 'yikes-mailchimp-excluded-redirect-post-types', $excluded_post_types );
 
 						// loop over registered post types, and query!
-						foreach( $post_types as $registered_post_type ) {
+						foreach( $post_types as $registered_post_type ) {
 
 							// exclude a few built in custom post types and any defined by the filter
-							if ( ! in_array( $registered_post_type, $excluded_post_types ) ) {
+							if ( ! in_array( $registered_post_type, $excluded_post_types ) ) {
 
 								// Grab only the post IDs - in the past we've created timeout issues on some servers with lots of posts
 								$wp_query_args = array(
@@ -1449,11 +1449,11 @@  discard block
 block discarded – undo
 
 								$post_ids = ! empty( $wp_query_result->posts ) ? $wp_query_result->posts : array();
 
-								if ( ! empty ( $post_ids ) ) {
+								if ( ! empty ( $post_ids ) ) {
 									?>
 										<optgroup label="<?php echo ucwords( str_replace( '_', ' ', $registered_post_type ) ); ?>">
 									<?php
-											foreach( $post_ids as $post_id ) {
+											foreach( $post_ids as $post_id ) {
 												?><option <?php selected( $redirect_page , $post_id ); ?> value="<?php echo $post_id; ?>"><?php echo get_the_title( $post_id ) ?></option><?php
 											}
 									?>
@@ -1484,15 +1484,15 @@  discard block
 block discarded – undo
 		*
 		* 	Displayed in sidebars
 		*/
-		public function generate_show_some_love_container() {
+		public function generate_show_some_love_container() {
 			// if no active add-ons are installed,
 			// lets display our branding and add-on sidebar
 			$options = get_option( 'yikes-easy-mc-active-addons', array() );
-			if ( empty( $options ) ) {
+			if ( empty( $options ) ) {
 
 				/* On Edit Forms Page Display Upsell to Customizer */
 				$screen = get_current_screen();
-				if ( isset( $screen ) && $screen->base == 'admin_page_yikes-mailchimp-edit-form' ) {
+				if ( isset( $screen ) && $screen->base == 'admin_page_yikes-mailchimp-edit-form' ) {
 				?>
 
 					<div class="postbox yikes-easy-mc-postbox show-some-love-container">
@@ -1570,18 +1570,18 @@  discard block
 block discarded – undo
 		*	-
 		* @parameters - $list_id - pass in the list ID to retreive merge variables from
 		*/
-		public function generate_form_editor( $form_fields, $list_id, $merge_variables, $interest_groups ) {
+		public function generate_form_editor( $form_fields, $list_id, $merge_variables, $interest_groups ) {
 
 			// if no list id, die!
-			if ( ! $list_id ) {
+			if ( ! $list_id ) {
 				wp_die( __( "We've encountered an error. No list ID was sent." , 'yikes-inc-easy-mailchimp-extender' ) );
 			}
 
-			if ( ! $merge_variables ) {
+			if ( ! $merge_variables ) {
 				wp_die( __( "We've encountered an error. Reload the page and try again. If the error persists, please reach out to support." , 'yikes-inc-easy-mailchimp-extender' ) );
 			}
 
-			if ( ! empty( $form_fields ) ) {
+			if ( ! empty( $form_fields ) ) {
 
 				// find any fields that are assigned to this form, that don't exist in Mailchimp
 				// or else were going to run into issues when we submit the form
@@ -1593,18 +1593,18 @@  discard block
 block discarded – undo
 				$mailchimp_merge_field_ids	= array();
 
 				// loop over merge variables
-				if ( ! empty( $merge_variables['merge_fields'] ) ) {
+				if ( ! empty( $merge_variables['merge_fields'] ) ) {
 					$available_merge_variables = wp_list_pluck( $merge_variables['merge_fields'], 'tag' );
 					$mailchimp_merge_field_ids = wp_list_pluck( $merge_variables['merge_fields'], 'merge_id' );
 
 					// Array will look like $merge_tag => $merge_id
-					foreach( $available_merge_variables as $index => $merge_tag ) {
+					foreach( $available_merge_variables as $index => $merge_tag ) {
 						$merge_field_ids[$merge_tag] = $mailchimp_merge_field_ids[$index];
 					}
 				}
 
 				// loop over interest groups
-				if ( ! empty( $interest_groups ) ) {
+				if ( ! empty( $interest_groups ) ) {
 					$available_interest_groups = array_keys( $interest_groups );
 				}
 
@@ -1613,14 +1613,14 @@  discard block
 block discarded – undo
 				$merged_fields   = array_merge( $available_merge_variables, $available_interest_groups );
 				$excluded_fields = array_diff( $assigned_fields, $merged_fields );
 
-				$form_fields = array_filter($form_fields, function($field){
+				$form_fields = array_filter($form_fields, function($field) {
 					return isset($field['type']);
 				});
 
 				$i = 1;
-				foreach( $form_fields as $field ) {
+				foreach( $form_fields as $field ) {
 
-					if ( isset( $field['merge'] ) ) {
+					if ( isset( $field['merge'] ) ) {
 						// @todo: don't use in_array()
 						$excluded_field = in_array( $field['merge'], $excluded_fields, true );
 						?>
@@ -1654,7 +1654,7 @@  discard block
 block discarded – undo
 									<input type="hidden" class="yikes-mc-merge-field-id" name="field[<?php echo $field['merge']; ?>][id]" value="<?php echo $merge_field_ids[ $field['merge'] ] ?>" />
 								<?php } ?>
 
-								<?php if ( $field['type'] == 'radio' || $field['type'] == 'dropdown' || $field['type'] == 'select' ) {
+								<?php if ( $field['type'] == 'radio' || $field['type'] == 'dropdown' || $field['type'] == 'select' ) {
 									$choices = json_decode( $field['choices'], true );
 								?>
 									<input type="hidden" name="field[<?php echo $field['merge']; ?>][choices]" value='<?php echo esc_attr( json_encode( $choices ) ); ?>' />
@@ -1678,7 +1678,7 @@  discard block
 block discarded – undo
 										</tr>
 
 										<!-- Placeholder Value -->
-										<?php switch( $field['type'] ) {
+										<?php switch( $field['type'] ) {
 
 											case 'text':
 											case 'email':
@@ -1725,7 +1725,7 @@  discard block
 block discarded – undo
 										?>
 
 										<!-- Default Value -->
-										<?php switch( $field['type'] ) {
+										<?php switch( $field['type'] ) {
 											default:
 											case 'text':
 											case 'number':
@@ -1741,7 +1741,7 @@  discard block
 block discarded – undo
 													<input id="default_value_<?php echo esc_attr( $field['merge'] ); ?>" <?php if ( $field['type'] != 'number' ) { ?> type="text" <?php } else { ?> type="number" <?php } ?> class="widefat" name="field[<?php echo $field['merge']; ?>][default]" <?php if ( $field['type'] != 'url' ) { ?> value="<?php echo isset( $field['default'] ) ? stripslashes( wp_strip_all_tags( $field['default'] ) ) : ''; ?>" <?php } else { ?> value="<?php echo isset( $field['default'] ) ? stripslashes( wp_strip_all_tags( esc_url_raw( $field['default'] ) ) ) : ''; ?>" <?php } ?> />
 													<p class="description"><small><?php _e( "Assign a default value to populate this field with on initial page load.", 'yikes-inc-easy-mailchimp-extender' );?></small></p>
 													<?php
-													switch( $field['type'] ) {
+													switch( $field['type'] ) {
 														case 'text':
 															?>
 																<p><small class="pre-defined-tag-link"><a href="#TB_inline?width=600&height=550&inlineId=pre-defined-tag-container" onclick="storeGlobalClicked( jQuery( this ) );" class="thickbox"><?php _e( 'View Pre-Defined Tags', 'yikes-inc-easy-mailchimp-extender' ); ?></a></small></p>
@@ -1910,7 +1910,7 @@  discard block
 block discarded – undo
 										<!-- Display Phone/Date Formats back to the user -->
 										<!-- Phone Format Initial Load -->
 										<?php
-											switch( $field['type'] ) {
+											switch( $field['type'] ) {
 												/* Store the phone format, for properly regex pattern */
 												case 'phone':
 												case 'birthday':
@@ -1920,7 +1920,7 @@  discard block
 block discarded – undo
 															<td scope="row">
 																<label for="placeholder">
 																	<?php
-																		switch( $field['type'] ) {
+																		switch( $field['type'] ) {
 																			default:
 																			case 'birthday':
 																				$type = __( 'Date Format', 'yikes-inc-easy-mailchimp-extender' );
@@ -1981,7 +1981,7 @@  discard block
 block discarded – undo
 
 
 
-					} else {
+					} else {
 
 						/**** Interest Group ****/
 
@@ -2014,7 +2014,7 @@  discard block
 block discarded – undo
 
 									<table class="form-table form-field-container">
 										<!-- Default Value -->
-										<?php switch( $field['type'] ) {
+										<?php switch( $field['type'] ) {
 											default:
 											case 'radio':
 											case 'checkboxes':
@@ -2031,7 +2031,7 @@  discard block
 block discarded – undo
 
 														$default_shown = false;
 
-														foreach ( json_decode( $field['groups'], true ) as $id => $group ) {
+														foreach ( json_decode( $field['groups'], true ) as $id => $group ) {
 															$field_id   = "{$field['group_id']}-{$id}";
 															$field_type = 'hidden' == $field['type'] ? 'checkbox' : $field['type'];
 															$field_type = 'checkboxes' == $field_type ? 'checkbox' : $field_type;
@@ -2040,7 +2040,7 @@  discard block
 block discarded – undo
 
 															// Determine if the current group is checked.
 															$checked = '';
-															switch ( $field_type ) {
+															switch ( $field_type ) {
 																case 'radio':
 																default:
 																	$default = is_array( $field['default_choice'] ) ? current( $field['default_choice'] ) : $field['default_choice'];
@@ -2049,14 +2049,14 @@  discard block
 block discarded – undo
 
 																case 'checkbox':
 																case 'hidden':
-																	if ( is_array( $field['default_choice'] ) && in_array( $id, $field['default_choice'] ) ) {
+																	if ( is_array( $field['default_choice'] ) && in_array( $id, $field['default_choice'] ) ) {
 																		$checked = checked( true, true, false );
 																	}
 																break;
 															}
 
 															// Allow users to not set a default choice for radio buttons.
-															if ( $field_type === 'radio' && $default_shown === false ) {
+															if ( $field_type === 'radio' && $default_shown === false ) {
 																$default_shown = true;
 																?>
 																<label for="<?php echo $field_id . 'no-default'; ?>">
@@ -2221,7 +2221,7 @@  discard block
 block discarded – undo
 						<?php
 					}
 				}
-			} else {
+			} else {
 				?>
 					<h4 class="no-fields-assigned-notice non-draggable-yikes"><em><?php _e( 'No fields are assigned to this form. Select fields from the right hand column to add to this form.', 'yikes-inc-easy-mailchimp-extender' ); ?></em></h4>
 				<?php
@@ -2308,18 +2308,18 @@  discard block
 block discarded – undo
 		 *	-
 		 * @parameters - $list_id - pass in the list ID to retreive merge variables from
 		 */
-		public function build_available_merge_vars( $form_fields, $available_merge_variables ) {
+		public function build_available_merge_vars( $form_fields, $available_merge_variables ) {
 			$fields_assigned_to_form = array();
-			foreach ( $form_fields as $field ) {
-				if ( isset( $field['merge'] ) ) {
+			foreach ( $form_fields as $field ) {
+				if ( isset( $field['merge'] ) ) {
 					$fields_assigned_to_form[ $field['merge'] ] = true;
 				}
 			}
 
-			if ( ! empty( $available_merge_variables['merge_fields'] ) ) {
+			if ( ! empty( $available_merge_variables['merge_fields'] ) ) {
 				?>
 				<ul id="available-fields"><?php
-				foreach ( $available_merge_variables['merge_fields'] as $merge_var ) {
+				foreach ( $available_merge_variables['merge_fields'] as $merge_var ) {
 					$not_available = isset( $fields_assigned_to_form[ $merge_var['tag'] ] );
 					?>
 					<li class="available-field <?php echo $not_available ? 'not-available' : ''; ?>"
@@ -2332,7 +2332,7 @@  discard block
 block discarded – undo
 					>
 						<?php
 							echo esc_html( stripslashes( $merge_var['name'] ) );
-							if ( $merge_var['required'] ) {
+							if ( $merge_var['required'] ) {
 								echo ' <span class="field-required" title="' . __( 'required field', 'yikes-inc-easy-mailchimp-extender' ) . '">*</span>';
 							}
 						?>
@@ -2357,21 +2357,21 @@  discard block
 block discarded – undo
 		 *	-
 		 * @parameters - $list_id - pass in the list ID to retreive merge variables from
 		 */
-		public function build_available_interest_groups( $form_fields, $available_interest_groups, $list_id ) {
+		public function build_available_interest_groups( $form_fields, $available_interest_groups, $list_id ) {
 			$fields_assigned_to_form = array();
-			if ( ! empty( $form_fields ) ) {
-				foreach ( $form_fields as $field ) {
-					if ( isset( $field['group_id'] ) ) {
+			if ( ! empty( $form_fields ) ) {
+				foreach ( $form_fields as $field ) {
+					if ( isset( $field['group_id'] ) ) {
 						$fields_assigned_to_form[ $field['group_id'] ] = true;
 					}
 				}
 			}
 
-			if ( ! empty( $available_interest_groups ) ) {
+			if ( ! empty( $available_interest_groups ) ) {
 			?>
 				<ul id="available-interest-groups">
 				<?php
-					foreach ( $available_interest_groups as $interest_group ) {
+					foreach ( $available_interest_groups as $interest_group ) {
 						$not_available = isset( $fields_assigned_to_form[ $interest_group['id'] ] );
 						?>
 						<li class="available-field <?php echo $not_available ? 'not-available' : ''; ?>"
@@ -2402,11 +2402,11 @@  discard block
 block discarded – undo
 		/**
 		 * Smt.
 		 */
-		public function build_available_tags( $form_tags, $tags, $list_id ) {
+		public function build_available_tags( $form_tags, $tags, $list_id ) {
 			?>
 			<ul id="available-tags">
 			<?php
-			foreach ( $tags as $tag_id => $tag ) {
+			foreach ( $tags as $tag_id => $tag ) {
 				$not_available = isset( $form_tags[ $tag_id ] );
 				?>
 				<li class="available-field <?php echo $not_available ? 'not-available' : ''; ?>"
@@ -2436,9 +2436,9 @@  discard block
 block discarded – undo
 		*	and include it here for easy maintenance
 		*	- must clean up db tables , ensure what data is going in and what is needed...
 		*/
-		public function yikes_easy_mailchimp_create_form() {
+		public function yikes_easy_mailchimp_create_form() {
 			$nonce = $_REQUEST['nonce'];
-			if ( ! wp_verify_nonce( $nonce, 'create_mailchimp_form' ) ) {
+			if ( ! wp_verify_nonce( $nonce, 'create_mailchimp_form' ) ) {
 				wp_die( __( "We've run into an error. The security check didn't pass. Please try again." , 'yikes-inc-easy-mailchimp-extender' ) );
 			}
 
@@ -2449,13 +2449,13 @@  discard block
 block discarded – undo
 			) );
 
 			// if an error occurs during the form creation process
-			if ( false == $result ) {
+			if ( false == $result ) {
 				// write it to the error log
 				// if the form was not created successfully
 				$error_logging = new Yikes_Inc_Easy_Mailchimp_Error_Logging();
 				$error_logging->maybe_write_to_log( __( 'Error creating a new form', 'yikes-inc-easy-mailchimp-extender') , __( "Creating a new form" , 'yikes-inc-easy-mailchimp-extender' ) , __( "Forms" , 'yikes-inc-easy-mailchimp-extender' ) );
 				wp_redirect( esc_url_raw( admin_url( 'admin.php?page=yikes-mailchimp-edit-form&sql_error=' . urlencode( __( 'Error creating a new form', 'yikes-inc-easy-mailchimp-extender' ) ) ) ) );
-			} else {
+			} else {
 				// redirect the user to the new form edit page
 				wp_redirect( esc_url_raw( admin_url( 'admin.php?page=yikes-mailchimp-edit-form&id=' . $result) ) );
 			}
@@ -2468,12 +2468,12 @@  discard block
 block discarded – undo
 		*	and include it here for easy maintenance
 		*	- must clean up db tables , ensure what data is going in and what is needed...
 		*/
-		public function yikes_easy_mailchimp_delete_form() {
+		public function yikes_easy_mailchimp_delete_form() {
 			// grab & store our variables ( associated list & form name )
 			$nonce = $_REQUEST['nonce'];
 			$post_id_to_delete = $_REQUEST['mailchimp-form'];
 			// verify our nonce
-			if ( ! wp_verify_nonce( $nonce, 'delete-mailchimp-form-'.$post_id_to_delete ) ) {
+			if ( ! wp_verify_nonce( $nonce, 'delete-mailchimp-form-'.$post_id_to_delete ) ) {
 				wp_die( __( "We've run into an error. The security check didn't pass. Please try again." , 'yikes-inc-easy-mailchimp-extender' ) , __( "Failed nonce validation" , 'yikes-inc-easy-mailchimp-extender' ) , array( 'response' => 500 , 'back_link' => true ) );
 			}
 
@@ -2488,12 +2488,12 @@  discard block
 block discarded – undo
 		*	Duplicate an entire form !
 		*	Probably Move these to its own file,
 		*/
-		public function yikes_easy_mailchimp_duplicate_form() {
+		public function yikes_easy_mailchimp_duplicate_form() {
 			// grab & store our variables ( associated list & form name )
 			$nonce = $_REQUEST['nonce'];
 			$post_id_to_clone = $_REQUEST['mailchimp-form'];
 			// verify our nonce
-			if ( ! wp_verify_nonce( $nonce, 'duplicate-mailchimp-form-'.$post_id_to_clone ) ) {
+			if ( ! wp_verify_nonce( $nonce, 'duplicate-mailchimp-form-'.$post_id_to_clone ) ) {
 				wp_die( __( "We've run into an error. The security check didn't pass. Please try again." , 'yikes-inc-easy-mailchimp-extender' ) , __( "Failed nonce validation" , 'yikes-inc-easy-mailchimp-extender' ) , array( 'response' => 500 , 'back_link' => true ) );
 			}
 
@@ -2517,10 +2517,10 @@  discard block
 block discarded – undo
 			*/
 			do_action( 'yikes-mailchimp-after-duplicating-form', $post_id_to_clone, $result, $form_data );
 
-			if ( false === $result ) {
+			if ( false === $result ) {
 				// redirect the user to the manage forms page, display error
 				wp_redirect( esc_url_raw( admin_url( 'admin.php?page=yikes-inc-easy-mailchimp&duplicated-form=false' ) ) );
-			} else {
+			} else {
 				// redirect the user to the manage forms page, display confirmation
 				wp_redirect( esc_url_raw( admin_url( 'admin.php?page=yikes-inc-easy-mailchimp&duplicated-form=true' ) ) );
 			}
@@ -2531,12 +2531,12 @@  discard block
 block discarded – undo
 		/*
 		*	Reset a forms impression stats
 		*/
-		public function yikes_easy_mailchimp_reset_impression_stats() {
+		public function yikes_easy_mailchimp_reset_impression_stats() {
 			// grab & store our variables ( associated list & form name )
 			$nonce = $_REQUEST['nonce'];
 			$form_id_to_reset = $_REQUEST['mailchimp-form'];
 			// verify our nonce
-			if ( ! wp_verify_nonce( $nonce, 'reset-stats-mailchimp-form-'.$form_id_to_reset ) ) {
+			if ( ! wp_verify_nonce( $nonce, 'reset-stats-mailchimp-form-'.$form_id_to_reset ) ) {
 				wp_die( __( "We've run into an error. The security check didn't pass. Please try again." , 'yikes-inc-easy-mailchimp-extender' ) , __( "Failed nonce validation" , 'yikes-inc-easy-mailchimp-extender' ) , array( 'response' => 500 , 'back_link' => true ) );
 			}
 
@@ -2548,10 +2548,10 @@  discard block
 block discarded – undo
 				)
 			);
 
-			if ( false === $result ) {
+			if ( false === $result ) {
 				// redirect the user to the manage forms page, display error
 				wp_redirect( esc_url_raw( admin_url( 'admin.php?page=yikes-inc-easy-mailchimp&reset-stats=false' ) ) );
-			} else {
+			} else {
 				// redirect the user to the manage forms page, display confirmation
 				wp_redirect( esc_url_raw( admin_url( 'admin.php?page=yikes-inc-easy-mailchimp&reset-stats=true' ) ) );
 			}
@@ -2563,13 +2563,13 @@  discard block
 block discarded – undo
 		*	Update an entire form !
 		*	Probably Move these to its own file,
 		*/
-		public function yikes_easy_mailchimp_update_form() {
+		public function yikes_easy_mailchimp_update_form() {
 
 			$nonce   = $_REQUEST['nonce'];
 			$form_id = $_REQUEST['id'];
 
 			// verify our nonce
-			if ( ! wp_verify_nonce( $nonce, 'update-mailchimp-form-' . $form_id ) ) {
+			if ( ! wp_verify_nonce( $nonce, 'update-mailchimp-form-' . $form_id ) ) {
 				wp_die(
 					__( "We've run into an error. The security check didn't pass. Please try again.", 'yikes-inc-easy-mailchimp-extender' ),
 					__( "Failed nonce validation", 'yikes-inc-easy-mailchimp-extender' ),
@@ -2642,11 +2642,11 @@  discard block
 block discarded – undo
 
 			// additional custom fields (extensions / user defined fields)
 			$custom_fields = array();
-			if ( isset( $_POST['custom-field'] ) ) {
-				foreach ( $_POST['custom-field'] as $custom_field => $custom_value ) {
-					if ( is_array( $custom_value ) ) {
+			if ( isset( $_POST['custom-field'] ) ) {
+				foreach ( $_POST['custom-field'] as $custom_field => $custom_value ) {
+					if ( is_array( $custom_value ) ) {
 						$custom_fields[ $custom_field ] = array_filter( stripslashes_deep( $custom_value ) ); // array_filters to remove empty items (don't save them!)
-					} else {
+					} else {
 						$custom_fields[ $custom_field ] = stripslashes( $custom_value );
 					}
 				}
@@ -2682,7 +2682,7 @@  discard block
 block discarded – undo
 			exit();
 		}
 
-		public static function generate_default_email_body() {
+		public static function generate_default_email_body() {
 			$email_body  = '<p>' . __( 'Greetings,', 'yikes-inc-easy-mailchimp-extender' ) . '</p>';
 
 			$email_body .= '<p>';
@@ -2705,18 +2705,18 @@  discard block
 block discarded – undo
 		}
 
 		/* Unsubscribe a given user from our list */
-		public function yikes_easy_mailchimp_unsubscribe_user() {
+		public function yikes_easy_mailchimp_unsubscribe_user() {
 			$nonce    = $_REQUEST['nonce'];
 			$list_id  = $_REQUEST['mailchimp-list'];
 			$email_id = $_REQUEST['email_id'];
 
 			// verify our nonce
-			if ( ! wp_verify_nonce( $nonce, 'unsubscribe-user-' . $email_id ) ) {
+			if ( ! wp_verify_nonce( $nonce, 'unsubscribe-user-' . $email_id ) ) {
 				wp_die( __( "We've run into an error. The security check didn't pass. Please try again." , 'yikes-inc-easy-mailchimp-extender' ) , __( "Failed nonce validation" , 'yikes-inc-easy-mailchimp-extender' ) , array( 'response' => 500 , 'back_link' => true ) );
 			}
 
 			$response = yikes_get_mc_api_manager()->get_list_handler()->member_unsubscribe( $list_id, $email_id );
-			if ( is_wp_error( $response ) ) {
+			if ( is_wp_error( $response ) ) {
 				$error_logging = new Yikes_Inc_Easy_Mailchimp_Error_Logging();
 				$error_logging->maybe_write_to_log(
 					$response->get_error_code(),
@@ -2729,22 +2729,22 @@  discard block
 block discarded – undo
 			exit;
 		}
 
-		public function yikes_easy_mailchimp_create_missing_error_log() {
+		public function yikes_easy_mailchimp_create_missing_error_log() {
 			// grab our nonnce
 			$nonce = $_REQUEST['nonce'];
 			// validate nonce
-			if ( !wp_verify_nonce( $nonce, 'create_error_log' ) ) {
+			if ( !wp_verify_nonce( $nonce, 'create_error_log' ) ) {
 				wp_die( __( "We've run into an error. The security check didn't pass. Please try again." , 'yikes-inc-easy-mailchimp-extender' ) , __( "Failed nonce validation" , 'yikes-inc-easy-mailchimp-extender' ) , array( 'response' => 500 , 'back_link' => true ) );
 			}
 			// setup the path to the error log
 			$error_log = fopen( plugin_dir_path( __FILE__ ) . '../includes/error_log/yikes-easy-mailchimp-error-log.php', 'w' );
-			try {
+			try {
 				// create the file
 				fwrite( $error_log , '' );
 				// close out
 				fclose( $error_log );
 				wp_redirect( esc_url_raw( admin_url( 'admin.php?page=yikes-inc-easy-mailchimp-settings&section=debug-settings&error_log_created=true' ) ) );
-			} catch ( Exception $e ) {
+			} catch ( Exception $e ) {
 				wp_redirect( esc_url_raw( admin_url( 'admin.php?page=yikes-inc-easy-mailchimp-settings&section=debug-settings&error_log_created=false&error_message='.urlencode( $e->getMessage() ) ) ) );
 			}
 		}
@@ -2753,11 +2753,11 @@  discard block
 block discarded – undo
 		*	Clear Transient Data !
 		*	Probably Move these to its own file,
 		*/
-		public function yikes_easy_mailchimp_clear_transient_data() {
+		public function yikes_easy_mailchimp_clear_transient_data() {
 
 			// verify our nonce
 			$nonce = $_REQUEST['nonce'];
-			if ( ! wp_verify_nonce( $nonce, 'clear-mc-transient-data' ) ) {
+			if ( ! wp_verify_nonce( $nonce, 'clear-mc-transient-data' ) ) {
 				wp_die( __( "We've run into an error. The security check didn't pass. Please try again." , 'yikes-inc-easy-mailchimp-extender' ) , __( "Failed nonce validation" , 'yikes-inc-easy-mailchimp-extender' ) , array( 'response' => 500 , 'back_link' => true ) );
 			}
 
@@ -2765,14 +2765,14 @@  discard block
 block discarded – undo
 
 			// if the request came from the settings page, redirect to the settings page.
 			$referer = wp_get_referer();
-			if ( $referer && ( strpos( $referer, 'yikes-inc-easy-mailchimp-settings' ) > 0 ) ) {
+			if ( $referer && ( strpos( $referer, 'yikes-inc-easy-mailchimp-settings' ) > 0 ) ) {
 				wp_redirect( esc_url_raw( admin_url( 'admin.php?page=yikes-inc-easy-mailchimp-settings&section=api-cache-settings&transient-cleared=true' ) ) );
-			} elseif ( isset( $_REQUEST['page'] ) && $_REQUEST['page'] === 'yikes-mailchimp-edit-form' && isset( $_REQUEST['id'] ) && ! empty( $_REQUEST['id'] ) ) {
+			} elseif ( isset( $_REQUEST['page'] ) && $_REQUEST['page'] === 'yikes-mailchimp-edit-form' && isset( $_REQUEST['id'] ) && ! empty( $_REQUEST['id'] ) ) {
 
 				// else check if we were editing a form.
 				$id = filter_var( $_REQUEST['id'], FILTER_SANITIZE_NUMBER_INT );
 				wp_redirect( esc_url_raw( admin_url( 'admin.php?page=yikes-mailchimp-edit-form&id=' . $id ) ) );
-			} else {
+			} else {
 				// else redirect to the manage forms page.
 				wp_redirect( esc_url_raw( admin_url( 'admin.php?page=yikes-inc-easy-mailchimp&transient-cleared=true' ) ) );
 			}
@@ -2788,17 +2788,17 @@  discard block
 block discarded – undo
 		 * @since 6.0.2
 		 * @return $list_id_array - array of list id's to loop over
 		 */
-		public function get_mailchimp_list_ids_on_account() {
+		public function get_mailchimp_list_ids_on_account() {
 			$api_key = yikes_get_mc_api_key();
-			if ( ! $api_key ) {
+			if ( ! $api_key ) {
 				// if no api key is set/site is not connected, return an empty array.
 				return array();
 			}
 
 			$lists = get_transient( 'yikesinc_eme_list_ids' );
-			if ( false === $lists ) {
+			if ( false === $lists ) {
 				$lists = yikes_get_mc_api_manager()->get_list_handler()->get_list_ids();
-				if ( is_wp_error( $lists ) ) {
+				if ( is_wp_error( $lists ) ) {
 					return array();
 				}
 				set_transient( 'yikesinc_eme_list_ids', $lists, HOUR_IN_SECONDS );
@@ -2812,9 +2812,9 @@  discard block
 block discarded – undo
 		 *
 		 *	@since 6.0
 		 */
-		public function yikes_mailchimp_load_helper_class() {
+		public function yikes_mailchimp_load_helper_class() {
 			// check to see if it's already loaded up.
-			if ( !class_exists( 'Yikes_Inc_Easy_Mailchimp_Forms_Helper' ) ) {
+			if ( !class_exists( 'Yikes_Inc_Easy_Mailchimp_Forms_Helper' ) ) {
 				// Include our main helper class file
 				include_once( YIKES_MC_PATH . 'admin/partials/helpers/init.php' );
 			}
@@ -2827,11 +2827,11 @@  discard block
 block discarded – undo
 		 * @order requires that yikes-inc-easy-mailchimp-extender-admin.min.css be enqueued, so we can override the defaults (handle: yikes-inc-easy-mailchimp-extender-admin)
 		 * @return print out custom styles to the admin header to alter the default blue color
 		 */
-		public function alter_yikes_easy_mc_color_scheme() {
+		public function alter_yikes_easy_mc_color_scheme() {
 			// get the current set color scheme for the logged in user
 			$current_color_scheme = get_user_option( 'admin_color' );
 			// switch over each color scheme, and set our variable
-			switch ( $current_color_scheme ) {
+			switch ( $current_color_scheme ) {
 				default:
 				case 'fresh': // default blue (defined by this plugin)
 					$main_color = '#00a0d2';
@@ -2879,16 +2879,16 @@  discard block
 block discarded – undo
 		/**
 		 *	Display premium support page if any add-ons are installed, otherwise display free support page
 		 */
-		public function display_support_page_content() {
+		public function display_support_page_content() {
 
 			$addons = get_option( 'yikes-easy-mc-active-addons', array() );
 
 			// If we have premium add-ons...
-			if ( ! empty( $addons ) ) {
+			if ( ! empty( $addons ) ) {
 
 				// Add our premium support partial.
 				include_once( YIKES_MC_PATH . 'admin/partials/helpers/premium-support.php' );
-			} else {
+			} else {
 
 				// Otherwise add our free support partial.
 				include_once( YIKES_MC_PATH . 'admin/partials/helpers/free-support.php' );
@@ -2900,8 +2900,8 @@  discard block
 block discarded – undo
 		 *
 		 * @since 6.0.4
 		 */
-		public function check_yikes_mc_table_version() {
-			if ( get_option( 'yikes_mc_database_version', '0.00' ) < '1.0' ) {
+		public function check_yikes_mc_table_version() {
+			if ( get_option( 'yikes_mc_database_version', '0.00' ) < '1.0' ) {
 				require_once YIKES_MC_PATH . 'includes/class-yikes-inc-easy-mailchimp-extender-activator.php';
 				global $wpdb;
 				Yikes_Inc_Easy_Mailchimp_Extender_Activator::_activate_yikes_easy_mailchimp( $wpdb );
@@ -2915,7 +2915,7 @@  discard block
 block discarded – undo
 		 *
 		 * @since 6.0.4.4
 		 */
-		public function process_subscriber_count_shortcode_in_form_descriptions( $form_description, $form_id ) {
+		public function process_subscriber_count_shortcode_in_form_descriptions( $form_description, $form_id ) {
 			$form_description = str_replace( '[yikes-mailchimp-subscriber-count]', do_shortcode( '[yikes-mailchimp-subscriber-count form="' . $form_id . '"]' ), $form_description );
 			return $form_description;
 		}
@@ -2925,9 +2925,9 @@  discard block
 block discarded – undo
 		 *
 		 * @since 6.0.3
 		 */
-		public function generate_edit_forms_upsell_ad() {
+		public function generate_edit_forms_upsell_ad() {
 		$upsell_ads = glob( YIKES_MC_PATH . 'includes/upsells/*.php' );
-		if ( $upsell_ads && ! empty( $upsell_ads ) ) {
+		if ( $upsell_ads && ! empty( $upsell_ads ) ) {
 			$ad_count = absint( count( $upsell_ads ) - 1 );
 			$ad       = $upsell_ads[ mt_rand( 0, $ad_count ) ];
 			ob_start();
@@ -2944,11 +2944,11 @@  discard block
 block discarded – undo
 		 * Mainly used when the API key is altered, changed or removed.
 		 * @since 6.1.3
 		 */
-		public function delete_yikes_mailchimp_transients() {
+		public function delete_yikes_mailchimp_transients() {
 
 		// delete all of the list_id transients.
 		$list_ids = $this->get_mailchimp_list_ids_on_account();
-		foreach ( $list_ids as $id ) {
+		foreach ( $list_ids as $id ) {
 			delete_transient( "yikes_eme_list_{$id}" );
 			delete_transient( "yikes_eme_merge_variables_{$id}" );
 			delete_transient( "yikes_eme_interest_categories_{$id}" );
@@ -2970,7 +2970,7 @@  discard block
 block discarded – undo
 	 *
 	 * @author Jeremy Pry
 	 */
-	public function register_optin_widget() {
+	public function register_optin_widget() {
 		register_widget( 'Yikes_Inc_Easy_Mailchimp_Extender_Widget' );
 	}
 }

Please login to merge, or discard this patch.

		@@ -581,7 +581,7 @@ discard block
		block discarded – undo
581	581	yikes_easy_mailchimp_stop_bugging_me()
582	582	Remove the Review us notification when user clicks 'Dismiss'
583	583	@since v3.1.1
584		- */
	584	+ */
585	585	public function yikes_easy_mailchimp_stop_bugging_me() {
586	586	if ( isset( $_GET['yikes_easy_mc_icons_nobug'] ) && (int) filter_var( $_GET['yikes_easy_mc_icons_nobug'], FILTER_SANITIZE_NUMBER_INT ) === 1 ) {
587	587	add_option( 'yikes_easy_mailchimp_review_stop_bugging_me', true );
		@@ -843,9 +843,9 @@ discard block
		block discarded – undo
843	843	}
844	844
845	845	/**
846		- * Register our admin pages
847		- * used to display data back to the user
848		- **/
	846	+ * Register our admin pages
	847	+ * used to display data back to the user
	848	+ **/
849	849	public function register_admin_pages() {
850	850
851	851	/* Top Level Menu 'Easy Mailchimp' */
		@@ -964,28 +964,28 @@ discard block
		block discarded – undo
964	964	}
965	965
966	966	/**
967		- * Generate Us Easy Mailchimp Manage Forms Page
968		- *
969		- * @since 1.0.0
970		- */
	967	+ * Generate Us Easy Mailchimp Manage Forms Page
	968	+ *
	969	+ * @since 1.0.0
	970	+ */
971	971	function generateManageFormsPage() {
972	972	require_once YIKES_MC_PATH . 'admin/partials/menu/manage-forms.php'; // include our manage forms page
973	973	}
974	974
975	975	/**
976		- * Generate Us Easy Mailchimp Manage Lists Page
977		- *
978		- * @since 1.0.0
979		- */
	976	+ * Generate Us Easy Mailchimp Manage Lists Page
	977	+ *
	978	+ * @since 1.0.0
	979	+ */
980	980	function generateManageListsPage() {
981	981	require_once YIKES_MC_PATH . 'admin/partials/menu/manage-lists.php'; // include our lists page
982	982	}
983	983
984	984	/**
985		- * Generate Us Easy Mailchimp Support Page
986		- *
987		- * @since 1.0.0
988		- */
	985	+ * Generate Us Easy Mailchimp Support Page
	986	+ *
	987	+ * @since 1.0.0
	988	+ */
989	989	function generateSupportPage() {
990	990
991	991	wp_enqueue_script( 'yikes-inc-easy-mailchimp-extender-support-scripts', plugin_dir_url( __FILE__ ) . 'js/support.js', array( 'jquery' ), $this->version, false );
		@@ -993,37 +993,37 @@ discard block
		block discarded – undo
993	993	}
994	994
995	995	/**
996		- * Generate Us Easy Mailchimp Edit Form Page
997		- *
998		- * @since 1.0.0
999		- */
	996	+ * Generate Us Easy Mailchimp Edit Form Page
	997	+ *
	998	+ * @since 1.0.0
	999	+ */
1000	1000	function generateEditFormPage() {
1001	1001	require_once YIKES_MC_PATH . 'admin/partials/edit-form.php'; // include our options page
1002	1002	}
1003	1003
1004	1004	/**
1005		- * Generate Us Easy Mailchimp View List Page
1006		- *
1007		- * @since 1.0.0
1008		- */
	1005	+ * Generate Us Easy Mailchimp View List Page
	1006	+ *
	1007	+ * @since 1.0.0
	1008	+ */
1009	1009	function generateViewListPage() {
1010	1010	require_once YIKES_MC_PATH . 'admin/partials/view-list.php'; // include our options page
1011	1011	}
1012	1012
1013	1013	/**
1014		- * Generate Us Easy Mailchimp View User Page
1015		- *
1016		- * @since 1.0.0
1017		- */
	1014	+ * Generate Us Easy Mailchimp View User Page
	1015	+ *
	1016	+ * @since 1.0.0
	1017	+ */
1018	1018	function generateViewUserPage() {
1019	1019	require_once YIKES_MC_PATH . 'admin/partials/view-user.php'; // include our options page
1020	1020	}
1021	1021
1022	1022	/**
1023		- * Register our plugin settings, and display them on our settings page
1024		- *
1025		- * @since v.5.4
1026		- **/
	1023	+ * Register our plugin settings, and display them on our settings page
	1024	+ *
	1025	+ * @since v.5.4
	1026	+ **/
1027	1027	function yikes_easy_mc_settings_init() {
1028	1028
1029	1029	/* Register General Settings Section */
		@@ -1167,9 +1167,9 @@ discard block
		block discarded – undo
1167	1167	}
1168	1168
1169	1169	/**
1170		- * Options Sanitization & Validation
1171		- * @since complete re-write
1172		- **/
	1170	+ * Options Sanitization & Validation
	1171	+ * @since complete re-write
	1172	+ **/
1173	1173	function yikes_mc_validate_api_key( $input ) {
1174	1174	if ( $input === '' ) {
1175	1175	update_option( 'yikes-mc-api-validation', 'invalid_api_key' );
		@@ -1201,20 +1201,20 @@ discard block
		block discarded – undo
1201	1201	}
1202	1202
1203	1203	/**
1204		- * Generate Us Easy Forms for Mailchimp Options Page
1205		- *
1206		- * @since 1.0.0
1207		- */
	1204	+ * Generate Us Easy Forms for Mailchimp Options Page
	1205	+ *
	1206	+ * @since 1.0.0
	1207	+ */
1208	1208	function generatePageOptions() {
1209	1209	require_once YIKES_MC_PATH . 'admin/partials/menu/options.php'; // include our options page
1210	1210	}
1211	1211
1212	1212	/**
1213		- * Check if users API key is valid, if not
1214		- * this function will apply a disabled attribute
1215		- * to form fields. (input, dropdowns, buttons etc.)
1216		- * @since v5.5 re-write
1217		- **/
	1213	+ * Check if users API key is valid, if not
	1214	+ * this function will apply a disabled attribute
	1215	+ * to form fields. (input, dropdowns, buttons etc.)
	1216	+ * @since v5.5 re-write
	1217	+ **/
1218	1218	public function is_user_mc_api_valid_form( $echo = true ) {
1219	1219	if ( $echo == true ) {
1220	1220	if ( get_option( 'yikes-mc-api-validation', 'invalid_api_key' ) == 'invalid_api_key' ) {
		@@ -1240,12 +1240,12 @@ discard block
		block discarded – undo
1240	1240	* - http://stackoverflow.com/questions/6661530/php-multi-dimensional-array-search
1241	1241	*/
1242	1242	function findMCListID($id, $array) {
1243		- foreach ($array as $key => $val) {
1244		- if ($val['id'] === $id) {
1245		- return $key;
1246		- }
1247		- }
1248		- return null;
	1243	+ foreach ($array as $key => $val) {
	1244	+ if ($val['id'] === $id) {
	1245	+ return $key;
	1246	+ }
	1247	+ }
	1248	+ return null;
1249	1249	} // end
1250	1250
1251	1251	/*
		@@ -1420,13 +1420,13 @@ discard block
		block discarded – undo
1420	1420	<?php
1421	1421
1422	1422	/**
1423		- * yikes-mailchimp-excluded-redirect-post-types
1424		- *
1425		- * Filter the post types that will not show on the redirect list dropdown.
1426		- *
1427		- * @param array \| $excluded_post_types \| The array of default excluded post types
1428		- * @return array\| $excluded_post_types \| The array of user-defined excluded post types
1429		- */
	1423	+ * yikes-mailchimp-excluded-redirect-post-types
	1424	+ *
	1425	+ * Filter the post types that will not show on the redirect list dropdown.
	1426	+ *
	1427	+ * @param array \| $excluded_post_types \| The array of default excluded post types
	1428	+ * @return array\| $excluded_post_types \| The array of user-defined excluded post types
	1429	+ */
1430	1430	$excluded_post_types = array( 'attachment', 'revision', 'nav_menu_item', 'shop_order', 'shop_order_refund', 'custom_css', 'customize_changeset', 'forum', 'topic', 'reply' );
1431	1431	$excluded_post_types = apply_filters( 'yikes-mailchimp-excluded-redirect-post-types', $excluded_post_types );
1432	1432
		@@ -1556,9 +1556,9 @@ discard block
		block discarded – undo
1556	1556	}
1557	1557
1558	1558	/**
1559		- * Custom action hook for our extensions to hook into
1560		- * @parameter get_current_screen() current screen information
1561		- */
	1559	+ * Custom action hook for our extensions to hook into
	1560	+ * @parameter get_current_screen() current screen information
	1561	+ */
1562	1562	do_action( 'yikes-mailchimp-admin-sidebar', get_current_screen() );
1563	1563
1564	1564	}
		@@ -2508,13 +2508,13 @@ discard block
		block discarded – undo
2508	2508	$result = $this->form_interface->create_form( $form_data );
2509	2509
2510	2510	/**
2511		- * `yikes-mailchimp-after-duplicating-form`
2512		- *
2513		- * @param $post_id_to_clone \| int \| ID of the original form
2514		- * @param $result \| mixed \| ID of the new form OR false if the operation failed
2515		- * @param $form_data \| array \| Array of the form data
2516		- *
2517		- */
	2511	+ * `yikes-mailchimp-after-duplicating-form`
	2512	+ *
	2513	+ * @param $post_id_to_clone \| int \| ID of the original form
	2514	+ * @param $result \| mixed \| ID of the new form OR false if the operation failed
	2515	+ * @param $form_data \| array \| Array of the form data
	2516	+ *
	2517	+ */
2518	2518	do_action( 'yikes-mailchimp-after-duplicating-form', $post_id_to_clone, $result, $form_data );
2519	2519
2520	2520	if ( false === $result ) {

yikesinc / yikes-inc-easy-mailchimp-extender

Push — master ( 3d2fa9...bff9f7 )

Status

Category

Indentation +67 added lines, -67 removed lines patch added patch discarded remove patch

Spacing +346 added lines, -346 removed lines patch added patch discarded remove patch

Braces +217 added lines, -217 removed lines patch added patch discarded remove patch