View GitHub Repository yikes-inc-easy-mailchimp-extender

Schedule Inspection
Subscribe
Completed
Push — staging ( 46c850...daec56 )
by
unknown
05:33
created
Status
Category
Toggle Patches
admin/class-yikes-inc-easy-mailchimp-extender-admin.php 3 patches
Indentation   +73 added lines, -73 removed lines patch added patch discarded remove patch 
@@ -510,10 +510,10 @@  discard block
 
 block discarded – undo
510 510 
 		}
511 511
512 512 
 		/**
513 
-		*	Dismiss the migrate options notice (incase the user wants to do things manually)
514 
-		*
515 
-		*	@since 6.0.0
516 
-		**/
513 
+		 *	Dismiss the migrate options notice (incase the user wants to do things manually)
514 
+		 *
515 
+		 *	@since 6.0.0
516 
+		 **/
517 517 
 		public function yikes_easy_mailchimp_dismiss_option_migrate() {
518 518 
 			// delete the options and allow the user to manually update things.
519 519 
 

@@ -618,7 +618,7 @@  discard block
 
 block discarded – undo
618 618 
 			yikes_easy_mailchimp_stop_bugging_me()
619 619 
 			Remove the Review us notification when user clicks 'Dismiss'
620 620 
 			@since v3.1.1
621 
-		*/
621 
+		 */
622 622 
 		public function yikes_easy_mailchimp_stop_bugging_me() {
623 623 
 			if ( isset( $_GET['yikes_easy_mc_icons_nobug'] ) && (int) filter_var( $_GET['yikes_easy_mc_icons_nobug'], FILTER_SANITIZE_NUMBER_INT ) === 1 ) {
624 624 
 				add_option( 'yikes_easy_mailchimp_review_stop_bugging_me', true );

@@ -885,9 +885,9 @@  discard block
 
 block discarded – undo
885 885 
 	}
886 886
887 887 
 	/**
888 
-	*	Register our admin pages
889 
-	*	used to display data back to the user
890 
-	**/
888 
+	 *	Register our admin pages
889 
+	 *	used to display data back to the user
890 
+	 **/
891 891 
 	public function register_admin_pages() {
892 892
893 893 
 		/* Top Level Menu 'Easy MailChimp' */

@@ -1016,28 +1016,28 @@  discard block
 
 block discarded – undo
1016 1016 
 	}
1017 1017
1018 1018 
 	/**
1019 
-	* Generate Us Easy MailChimp Manage Forms Page
1020 
-	*
1021 
-	* @since    1.0.0
1022 
-	*/
1019 
+	 * Generate Us Easy MailChimp Manage Forms Page
1020 
+	 *
1021 
+	 * @since    1.0.0
1022 
+	 */
1023 1023 
 	function generateManageFormsPage() {
1024 1024 
 		require_once YIKES_MC_PATH . 'admin/partials/menu/manage-forms.php'; // include our manage forms page
1025 1025 
 	}
1026 1026
1027 1027 
 	/**
1028 
-	* Generate Us Easy MailChimp Manage Lists Page
1029 
-	*
1030 
-	* @since    1.0.0
1031 
-	*/
1028 
+	 * Generate Us Easy MailChimp Manage Lists Page
1029 
+	 *
1030 
+	 * @since    1.0.0
1031 
+	 */
1032 1032 
 	function generateManageListsPage() {
1033 1033 
 		require_once YIKES_MC_PATH . 'admin/partials/menu/manage-lists.php'; // include our lists page
1034 1034 
 	}
1035 1035
1036 1036 
 	/**
1037 
-	* Generate Us Easy MailChimp Support Page
1038 
-	*
1039 
-	* @since    1.0.0
1040 
-	*/
1037 
+	 * Generate Us Easy MailChimp Support Page
1038 
+	 *
1039 
+	 * @since    1.0.0
1040 
+	 */
1041 1041 
 	function generateSupportPage() {
1042 1042
1043 1043 
 		wp_enqueue_script( 'yikes-inc-easy-mailchimp-extender-support-scripts', plugin_dir_url( __FILE__ ) . 'js/support.js', array( 'jquery' ), $this->version, false );	

@@ -1045,37 +1045,37 @@  discard block
 
 block discarded – undo
1045 1045 
 	}
1046 1046
1047 1047 
 	/**
1048 
-	* Generate Us Easy MailChimp Edit Form Page
1049 
-	*
1050 
-	* @since    1.0.0
1051 
-	*/
1048 
+	 * Generate Us Easy MailChimp Edit Form Page
1049 
+	 *
1050 
+	 * @since    1.0.0
1051 
+	 */
1052 1052 
 	function generateEditFormPage() {
1053 1053 
 		require_once YIKES_MC_PATH . 'admin/partials/edit-form.php'; // include our options page
1054 1054 
 	}
1055 1055
1056 1056 
 	/**
1057 
-	* Generate Us Easy MailChimp View List Page
1058 
-	*
1059 
-	* @since    1.0.0
1060 
-	*/
1057 
+	 * Generate Us Easy MailChimp View List Page
1058 
+	 *
1059 
+	 * @since    1.0.0
1060 
+	 */
1061 1061 
 	function generateViewListPage() {
1062 1062 
 		require_once YIKES_MC_PATH . 'admin/partials/view-list.php'; // include our options page
1063 1063 
 	}
1064 1064
1065 1065 
 	/**
1066 
-	* Generate Us Easy MailChimp View User Page
1067 
-	*
1068 
-	* @since    1.0.0
1069 
-	*/
1066 
+	 * Generate Us Easy MailChimp View User Page
1067 
+	 *
1068 
+	 * @since    1.0.0
1069 
+	 */
1070 1070 
 	function generateViewUserPage() {
1071 1071 
 		require_once YIKES_MC_PATH . 'admin/partials/view-user.php'; // include our options page
1072 1072 
 	}
1073 1073
1074 1074 
 	/**
1075 
-	*	Register our plugin settings, and display them on our settings page
1076 
-	*
1077 
-	* @since v.5.4
1078 
-	**/
1075 
+	 *	Register our plugin settings, and display them on our settings page
1076 
+	 *
1077 
+	 * @since v.5.4
1078 
+	 **/
1079 1079 
 	function yikes_easy_mc_settings_init() {
1080 1080
1081 1081 
 		/* Register General Settings Section */

@@ -1193,9 +1193,9 @@  discard block
 
 block discarded – undo
1193 1193 
 	}
1194 1194
1195 1195 
 	/**
1196 
-	*	Options Sanitization & Validation
1197 
-	*	@since complete re-write
1198 
-	**/
1196 
+	 *	Options Sanitization & Validation
1197 
+	 *	@since complete re-write
1198 
+	 **/
1199 1199 
 	function yikes_mc_validate_api_key( $input ) {
1200 1200 
 		if ( $input === '' ) {
1201 1201 
 			update_option( 'yikes-mc-api-validation', 'invalid_api_key' );

@@ -1227,20 +1227,20 @@  discard block
 
 block discarded – undo
1227 1227 
 	}
1228 1228
1229 1229 
 	/**
1230 
-	* Generate Us Easy Forms for MailChimp Options Page
1231 
-	*
1232 
-	* @since    1.0.0
1233 
-	*/
1230 
+	 * Generate Us Easy Forms for MailChimp Options Page
1231 
+	 *
1232 
+	 * @since    1.0.0
1233 
+	 */
1234 1234 
 	function generatePageOptions() {
1235 1235 
 		require_once YIKES_MC_PATH . 'admin/partials/menu/options.php'; // include our options page
1236 1236 
 	}
1237 1237
1238 1238 
 	/**
1239 
-	*	Check if users API key is valid, if not
1240 
-	*	this function will apply a disabled attribute
1241 
-	*	to form fields. (input, dropdowns, buttons etc.)
1242 
-	* 	@since v5.5 re-write
1243 
-	**/
1239 
+	 *	Check if users API key is valid, if not
1240 
+	 *	this function will apply a disabled attribute
1241 
+	 *	to form fields. (input, dropdowns, buttons etc.)
1242 
+	 * 	@since v5.5 re-write
1243 
+	 **/
1244 1244 
 	public function is_user_mc_api_valid_form( $echo = true ) {
1245 1245 
 		if ( $echo == true ) {
1246 1246 
 			if ( get_option( 'yikes-mc-api-validation', 'invalid_api_key' ) == 'invalid_api_key' ) {

@@ -1280,7 +1280,7 @@  discard block
 
 block discarded – undo
1280 1280 
 	 * Migrate our old options , to the new options API
1281 1281 
 	 * moving from 5.5 and beyond..
1282 1282 
 	 * @since
1283 
-	*/
1283 
+	 */
1284 1284 
 	public function migrate_old_yks_mc_options() {
1285 1285 
 		// include our migrate options helper file
1286 1286 
 		include_once YIKES_MC_PATH . 'admin/partials/upgrade-helpers/upgrade-migrate-options.php';

@@ -1289,7 +1289,7 @@  discard block
 
 block discarded – undo
1289 1289 
 	/**
1290 1290 
 		Admin Notices
1291 1291 
 		- Notifications displayed at the top of admin pages, back to the user
1292 
-	**/
1292 
+	 **/
1293 1293
1294 1294 
 		/**
1295 1295 
 		 * Check for existing plugin options

@@ -1348,12 +1348,12 @@  discard block
 
 block discarded – undo
1348 1348 
 		*	- http://stackoverflow.com/questions/6661530/php-multi-dimensional-array-search
1349 1349 
 		*/
1350 1350 
 		function findMCListID($id, $array) {
1351 
-		   foreach ($array as $key => $val) {
1352 
-			   if ($val['id'] === $id) {
1353 
-				   return $key;
1354 
-			   }
1355 
-		   }
1356 
-		   return null;
1351 
+			foreach ($array as $key => $val) {
1352 
+				if ($val['id'] === $id) {
1353 
+					return $key;
1354 
+				}
1355 
+			}
1356 
+			return null;
1357 1357 
 		} // end
1358 1358
1359 1359 
 		/* Ajax Migrate Options */

@@ -1591,13 +1591,13 @@  discard block
 
 block discarded – undo
1591 1591 
 				<?php
1592 1592
1593 1593 
 					/**
1594 
-					*	yikes-mailchimp-excluded-redirect-post-types
1595 
-					*
1596 
-					*	Filter the post types that will not show on the redirect list dropdown.
1597 
-					*
1598 
-					* 	@param array | $excluded_post_types | The array of default excluded post types
1599 
-					*	@return array| $excluded_post_types | The array of user-defined excluded post types
1600 
-					*/
1594 
+					 *	yikes-mailchimp-excluded-redirect-post-types
1595 
+					 *
1596 
+					 *	Filter the post types that will not show on the redirect list dropdown.
1597 
+					 *
1598 
+					 * 	@param array | $excluded_post_types | The array of default excluded post types
1599 
+					 *	@return array| $excluded_post_types | The array of user-defined excluded post types
1600 
+					 */
1601 1601 
 					$excluded_post_types = array( 'attachment', 'revision', 'nav_menu_item', 'shop_order', 'shop_order_refund', 'custom_css', 'customize_changeset', 'forum', 'topic', 'reply' );
1602 1602 
 					$excluded_post_types = apply_filters( 'yikes-mailchimp-excluded-redirect-post-types', $excluded_post_types );
1603 1603 
 

@@ -1733,9 +1733,9 @@  discard block
 
 block discarded – undo
1733 1733 
 			}
1734 1734
1735 1735 
 			/**
1736 
-			*	Custom action hook for our extensions to hook into
1737 
-			*	@parameter	get_current_screen()	current screen information
1738 
-			*/
1736 
+			 *	Custom action hook for our extensions to hook into
1737 
+			 *	@parameter	get_current_screen()	current screen information
1738 
+			 */
1739 1739 
 			do_action( 'yikes-mailchimp-admin-sidebar', get_current_screen() );
1740 1740
1741 1741 
 		}

@@ -2646,13 +2646,13 @@  discard block
 
 block discarded – undo
2646 2646 
 			$result = $this->form_interface->create_form( $form_data );
2647 2647
2648 2648 
 			/**
2649 
-			* `yikes-mailchimp-after-duplicating-form`
2650 
-			*
2651 
-			* @param $post_id_to_clone | int   | ID of the original form
2652 
-			* @param $result           | mixed | ID of the new form OR false if the operation failed
2653 
-			* @param $form_data        | array | Array of the form data
2654 
-			*
2655 
-			*/
2649 
+			 * `yikes-mailchimp-after-duplicating-form`
2650 
+			 *
2651 
+			 * @param $post_id_to_clone | int   | ID of the original form
2652 
+			 * @param $result           | mixed | ID of the new form OR false if the operation failed
2653 
+			 * @param $form_data        | array | Array of the form data
2654 
+			 *
2655 
+			 */
2656 2656 
 			do_action( 'yikes-mailchimp-after-duplicating-form', $post_id_to_clone, $result, $form_data );
2657 2657
2658 2658 
 			if ( false === $result ) {
Please login to merge, or discard this patch.
Spacing   +361 added lines, -361 removed lines patch added patch discarded remove patch 
@@ -101,7 +101,7 @@  discard block
 
 block discarded – undo
101 101 
 		/***********************/
102 102 
 		/** Create A Form **/
103 103 
 		/**********************/
104 
-		if ( isset( $_REQUEST['action'] ) && $_REQUEST['action'] == 'yikes-easy-mc-create-form' ) {
104 
+		if ( isset( $_REQUEST[ 'action' ] ) && $_REQUEST[ 'action' ] == 'yikes-easy-mc-create-form' ) {
105 105
106 106 
 			add_action( 'init', array( $this, 'yikes_easy_mailchimp_create_form' ) );
107 107 
 

@@ -110,7 +110,7 @@  discard block
 
 block discarded – undo
110 110 
 		/***********************/
111 111 
 		/** Delete A Form **/
112 112 
 		/**********************/
113 
-		if ( isset( $_REQUEST['action'] ) && $_REQUEST['action'] == 'yikes-easy-mc-delete-form' ) {
113 
+		if ( isset( $_REQUEST[ 'action' ] ) && $_REQUEST[ 'action' ] == 'yikes-easy-mc-delete-form' ) {
114 114
115 115 
 			add_action( 'init', array( $this, 'yikes_easy_mailchimp_delete_form' ) );
116 116 
 

@@ -119,7 +119,7 @@  discard block
 
 block discarded – undo
119 119 
 		/**********************************/
120 120 
 		/** Duplicate/Clone A Form    **/
121 121 
 		/********************************/
122 
-		if ( isset( $_REQUEST['action'] ) && $_REQUEST['action'] == 'yikes-easy-mc-duplicate-form' ) {
122 
+		if ( isset( $_REQUEST[ 'action' ] ) && $_REQUEST[ 'action' ] == 'yikes-easy-mc-duplicate-form' ) {
123 123
124 124 
 			add_action( 'init', array( $this, 'yikes_easy_mailchimp_duplicate_form' ) );
125 125 
 

@@ -128,7 +128,7 @@  discard block
 
 block discarded – undo
128 128 
 		/*************************************/
129 129 
 		/**  Reset Form Impression Stats **/
130 130 
 		/***********************************/
131 
-		if ( isset( $_REQUEST['action'] ) && $_REQUEST['action'] == 'yikes-easy-mc-reset-stats' ) {
131 
+		if ( isset( $_REQUEST[ 'action' ] ) && $_REQUEST[ 'action' ] == 'yikes-easy-mc-reset-stats' ) {
132 132
133 133 
 			add_action( 'init', array( $this, 'yikes_easy_mailchimp_reset_impression_stats' ) );
134 134 
 

@@ -137,7 +137,7 @@  discard block
 
 block discarded – undo
137 137 
 		/**********************************/
138 138 
 		/**         Update A Form        **/
139 139 
 		/********************************/
140 
-		if ( isset( $_REQUEST['action'] ) && $_REQUEST['action'] == 'yikes-easy-mc-update-form' ) {
140 
+		if ( isset( $_REQUEST[ 'action' ] ) && $_REQUEST[ 'action' ] == 'yikes-easy-mc-update-form' ) {
141 141
142 142 
 			add_action( 'init', array( $this, 'yikes_easy_mailchimp_update_form' ) );
143 143 
 

@@ -146,7 +146,7 @@  discard block
 
 block discarded – undo
146 146 
 		/**************************************************/
147 147 
 		/**     Clear Store MailChimp Transient Data   **/
148 148 
 		/*************************************************/
149 
-		if ( isset( $_REQUEST['action'] ) && $_REQUEST['action'] == 'yikes-easy-mc-clear-transient-data' ) {
149 
+		if ( isset( $_REQUEST[ 'action' ] ) && $_REQUEST[ 'action' ] == 'yikes-easy-mc-clear-transient-data' ) {
150 150
151 151 
 			add_action( 'init', array( $this, 'yikes_easy_mailchimp_clear_transient_data' ) );
152 152 
 

@@ -155,7 +155,7 @@  discard block
 
 block discarded – undo
155 155 
 		/*******************************************/
156 156 
 		/** Remove a user from a mailing list     **/
157 157 
 		/*****************************************/
158 
-		if ( isset( $_REQUEST['action'] ) && $_REQUEST['action'] == 'yikes-easy-mc-unsubscribe-user' ) {
158 
+		if ( isset( $_REQUEST[ 'action' ] ) && $_REQUEST[ 'action' ] == 'yikes-easy-mc-unsubscribe-user' ) {
159 159
160 160 
 			add_action( 'init', array( $this, 'yikes_easy_mailchimp_unsubscribe_user' ) );
161 161 
 

@@ -164,7 +164,7 @@  discard block
 
 block discarded – undo
164 164 
 		/*******************************************/
165 165 
 		/**    Create misisng error log file  **/
166 166 
 		/*****************************************/
167 
-		if ( isset( $_REQUEST['action'] ) && $_REQUEST['action'] == 'yikes-easy-mc-create-error-log' ) {
167 
+		if ( isset( $_REQUEST[ 'action' ] ) && $_REQUEST[ 'action' ] == 'yikes-easy-mc-create-error-log' ) {
168 168
169 169 
 			add_action( 'init', array( $this, 'yikes_easy_mailchimp_create_missing_error_log' ) );
170 170 
 

@@ -196,7 +196,7 @@  discard block
 
 block discarded – undo
196 196 
 		/**************************************************/
197 197 
 		/**        Clear MailChimp Error Log Data        **/
198 198 
 		/*************************************************/
199 
-		if ( isset( $_REQUEST['action'] ) && $_REQUEST['action'] == 'yikes-easy-mc-clear-error-log' ) {
199 
+		if ( isset( $_REQUEST[ 'action' ] ) && $_REQUEST[ 'action' ] == 'yikes-easy-mc-clear-error-log' ) {
200 200
201 201 
 			add_action( 'init', array( $this, 'yikes_easy_mailchimp_clear_error_log' ) );
202 202 
 

@@ -205,7 +205,7 @@  discard block
 
 block discarded – undo
205 205 
 		/*********************************************/
206 206 
 		/**        Export MailChimp Opt-in Forms   **/
207 207 
 		/*******************************************/
208 
-		if ( isset( $_REQUEST['action'] ) && $_REQUEST['action'] == 'yikes-easy-mc-export-forms' ) {
208 
+		if ( isset( $_REQUEST[ 'action' ] ) && $_REQUEST[ 'action' ] == 'yikes-easy-mc-export-forms' ) {
209 209
210 210 
 			add_action( 'init', array( $this, 'yikes_easy_mailchimp_export_forms' ) );
211 211 
 

@@ -214,7 +214,7 @@  discard block
 
 block discarded – undo
214 214 
 		/*********************************************/
215 215 
 		/**                Export Plugin Settings           **/
216 216 
 		/*******************************************/
217 
-		if ( isset( $_REQUEST['action'] ) && $_REQUEST['action'] == 'yikes-easy-mc-export-settings' ) {
217 
+		if ( isset( $_REQUEST[ 'action' ] ) && $_REQUEST[ 'action' ] == 'yikes-easy-mc-export-settings' ) {
218 218
219 219 
 			add_action( 'init', array( $this, 'yikes_easy_mailchimp_export_plugin_settings' ) );
220 220 
 

@@ -223,7 +223,7 @@  discard block
 
 block discarded – undo
223 223 
 		/*******************************************/
224 224 
 		/**        Import Class Inclusion       **/
225 225 
 		/*****************************************/
226 
-		if ( isset( $_REQUEST['action'] ) && $_REQUEST['action'] == 'yikes-easy-mc-import-forms' ) {
226 
+		if ( isset( $_REQUEST[ 'action' ] ) && $_REQUEST[ 'action' ] == 'yikes-easy-mc-import-forms' ) {
227 227
228 228 
 			add_action( 'init', array( $this, 'yikes_easy_mailchimp_import_forms' ) );
229 229 
 

@@ -232,7 +232,7 @@  discard block
 
 block discarded – undo
232 232 
 		/*******************************************/
233 233 
 		/**    Premium Support Request     **/
234 234 
 		/*****************************************/
235 
-		if ( isset( $_POST['submit-premium-support-request'] ) ) {
235 
+		if ( isset( $_POST[ 'submit-premium-support-request' ] ) ) {
236 236
237 237 
 			add_action( 'init', array( $this, 'yikes_easy_mailchimp_premium_support_request' ) );
238 238 
 

@@ -241,7 +241,7 @@  discard block
 
 block discarded – undo
241 241 
 		/****************************************/
242 242 
 		/**    Dismiss Options Migrations        **/
243 243 
 		/****************************************/
244 
-		if ( isset( $_REQUEST['dismiss_migration_nonce'] ) ) {
244 
+		if ( isset( $_REQUEST[ 'dismiss_migration_nonce' ] ) ) {
245 245
246 246 
 			add_action( 'init', array( $this, 'yikes_easy_mailchimp_dismiss_option_migrate' ) );
247 247 
 

@@ -277,8 +277,8 @@  discard block
 
 block discarded – undo
277 277 
 		 * @ return array  $links  New array of plugin actions
278 278 
 		 */
279 279 
 		public function easy_forms_plugin_action_links( $links ) {
280 
-			$links[] = '<a href="'. esc_url( get_admin_url(null, 'admin.php?page=yikes-inc-easy-mailchimp-settings') ) .'">' . __( 'Settings', 'yikes-inc-easy-mailchimp-extender' ) . '</a>';
281 
-			$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>';
280 
+			$links[ ] = '<a href="' . esc_url( get_admin_url( null, 'admin.php?page=yikes-inc-easy-mailchimp-settings' ) ) . '">' . __( 'Settings', 'yikes-inc-easy-mailchimp-extender' ) . '</a>';
281 
+			$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>';
282 282 
 			return $links;
283 283 
 		}
284 284 
 

@@ -379,17 +379,17 @@  discard block
 
 block discarded – undo
379 379 
 		*/
380 380 
 		public function yikes_easy_mailchimp_export_forms() {
381 381 
 			// grab our nonce.
382 
-			$nonce = $_REQUEST['nonce'];
382 
+			$nonce = $_REQUEST[ 'nonce' ];
383 383 
 			// grab the forms.
384 
-			$forms = isset( $_REQUEST['export_forms'] ) ? $_REQUEST['export_forms'] : array();
384 
+			$forms = isset( $_REQUEST[ 'export_forms' ] ) ? $_REQUEST[ 'export_forms' ] : array();
385 385 
 			// validate nonce.
386 386 
 			if ( ! wp_verify_nonce( $nonce, 'export-forms' ) ) {
387 
-				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 ) );
387 
+				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 ) );
388 388 
 			}
389 389
390 390 
 			// run the export function.
391 391 
 			// parameters: ( $table_name, $form_ids, $file_name ).
392 
-			Yikes_Inc_Easy_MailChimp_Export_Class::yikes_mailchimp_form_export('Yikes-Inc-Easy-MailChimp-Forms-Export', $forms );
392 
+			Yikes_Inc_Easy_MailChimp_Export_Class::yikes_mailchimp_form_export( 'Yikes-Inc-Easy-MailChimp-Forms-Export', $forms );
393 393 
 			// re-direct the user back to the page.
394 394 
 			wp_redirect( esc_url_raw( admin_url( 'admin.php?page=yikes-inc-easy-mailchimp-settings&section=import-export-forms' ) ) );
395 395 
 			die();

@@ -403,10 +403,10 @@  discard block
 
 block discarded – undo
403 403 
 		*/
404 404 
 		public function yikes_easy_mailchimp_export_plugin_settings() {
405 405 
 			// grab our nonce
406 
-			$nonce = $_REQUEST['nonce'];
406 
+			$nonce = $_REQUEST[ 'nonce' ];
407 407 
 			// validate nonce.
408 408 
 			if ( ! wp_verify_nonce( $nonce, 'export-settings' ) ) {
409 
-				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 ) );
409 
+				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 ) );
410 410 
 			}
411 411
412 412 
 			// run the export function.

@@ -423,10 +423,10 @@  discard block
 
 block discarded – undo
423 423 
 		*/
424 424 
 		public function yikes_easy_mailchimp_import_forms() {
425 425 
 			// grab our nonce.
426 
-			$nonce = $_REQUEST['nonce'];
426 
+			$nonce = $_REQUEST[ 'nonce' ];
427 427 
 			// validate nonce.
428 428 
 			if ( ! wp_verify_nonce( $nonce, 'import-forms' ) ) {
429 
-				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 ) );
429 
+				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 ) );
430 430 
 			}
431 431 
 			// include the export class.
432 432 
 			if ( ! class_exists( 'Yikes_Inc_Easy_MailChimp_Import_Class' ) ) {

@@ -447,18 +447,18 @@  discard block
 
 block discarded – undo
447 447 
 		*/
448 448 
 		public function yikes_easy_mailchimp_premium_support_request() {
449 449
450 
-			if ( isset( $_POST['action'] ) && $_POST['action'] != 'yikes-support-request' ) {
450 
+			if ( isset( $_POST[ 'action' ] ) && $_POST[ 'action' ] != 'yikes-support-request' ) {
451 451 
 				return __( 'We encountered an error. Please contact the YIKES Inc. support team.', 'yikes-inc-easy-mailchimp-extender' );
452 452 
 			}
453 453
454 
-			$email       = isset( $_POST['user-email'] ) ? $_POST['user-email'] : '';
455 
-			$topic       = isset( $_POST['support-topic'] ) ? $_POST['support-topic'] : '';
456 
-			$issue       = isset( $_POST['support-content'] ) ? $_POST['support-content'] : '';
457 
-			$priority    = isset( $_POST['support-priority'] ) ? $_POST['support-priority'] : 1;
458 
-			$license     = isset( $_POST['license_key'] ) ? $_POST['license_key'] : '';
459 
-			$plugin_name = isset( $_POST['plugin-name'] ) ? $_POST['plugin-name'] : '';
460 
-			$plugin_slug = isset( $_POST['plugin-slug'] ) ? $_POST['plugin-slug'] : '';
461 
-			$name        = isset( $_POST['user-name'] ) ? $_POST['user-name'] : 'MailChimp Support';
454 
+			$email       = isset( $_POST[ 'user-email' ] ) ? $_POST[ 'user-email' ] : '';
455 
+			$topic       = isset( $_POST[ 'support-topic' ] ) ? $_POST[ 'support-topic' ] : '';
456 
+			$issue       = isset( $_POST[ 'support-content' ] ) ? $_POST[ 'support-content' ] : '';
457 
+			$priority    = isset( $_POST[ 'support-priority' ] ) ? $_POST[ 'support-priority' ] : 1;
458 
+			$license     = isset( $_POST[ 'license_key' ] ) ? $_POST[ 'license_key' ] : '';
459 
+			$plugin_name = isset( $_POST[ 'plugin-name' ] ) ? $_POST[ 'plugin-name' ] : '';
460 
+			$plugin_slug = isset( $_POST[ 'plugin-slug' ] ) ? $_POST[ 'plugin-slug' ] : '';
461 
+			$name        = isset( $_POST[ 'user-name' ] ) ? $_POST[ 'user-name' ] : 'MailChimp Support';
462 462
463 463 
 			$edd_item_id = $this->get_premium_license( $plugin_slug );
464 464 
 

@@ -493,7 +493,7 @@  discard block
 
 block discarded – undo
493 493
494 494 
 		public function get_premium_license( $plugin_slug ) {
495 495
496 
-			switch( $plugin_slug ) {
496 
+			switch ( $plugin_slug ) {
497 497
498 498 
 				case 'form-customizer':
499 499 
 					return defined( 'YIKES_CUSTOMIZER_EDD_ITEM_ID' ) ? YIKES_CUSTOMIZER_EDD_ITEM_ID : '';

@@ -553,7 +553,7 @@  discard block
 
 block discarded – undo
553 553 
 			// add a new option to store the plugin activation date/time.
554 554 
 			// @since v6.0.0.
555 555 
 			// this is used to notify the user that they should review after 2 weeks.
556 
-			if ( !get_option( 'yikes_easy_mailchimp_activation_date' ) ) {
556 
+			if ( ! get_option( 'yikes_easy_mailchimp_activation_date' ) ) {
557 557 
 				add_option( 'yikes_easy_mailchimp_activation_date', strtotime( "now" ) );
558 558 
 			}
559 559 
 

@@ -563,7 +563,7 @@  discard block
 
 block discarded – undo
563 563 
 				$install_date = get_option( 'yikes_easy_mailchimp_activation_date' );
564 564 
 				$past_date = strtotime( '-14 days' );
565 565 
 				if ( $past_date >= $install_date && current_user_can( 'install_plugins' ) ) {
566 
-					add_action( 'admin_notices', array( $this , 'yikes_easy_mailchimp_display_review_us_notice' ) );
566 
+					add_action( 'admin_notices', array( $this, 'yikes_easy_mailchimp_display_review_us_notice' ) );
567 567 
 				}
568 568 
 			}
569 569 
 

@@ -576,13 +576,13 @@  discard block
 
 block discarded – undo
576 576 
 		*/
577 577 
 		public function yikes_easy_mailchimp_display_review_us_notice() {
578 578 
 			/* Lets only display our admin notice on YT4WP pages to not annoy the hell out of people :) */
579 
-			if ( in_array( get_current_screen()->base , array( 'dashboard', 'post', 'edit' ) ) || strpos( get_current_screen()->base ,'yikes-inc-easy-mailchimp') !== false ) {
579 
+			if ( in_array( get_current_screen()->base, array( 'dashboard', 'post', 'edit' ) ) || strpos( get_current_screen()->base, 'yikes-inc-easy-mailchimp' ) !== false ) {
580 580
581 581 
 				// The URL of the page the user is currently on
582 
-				$current_uri  	  = isset( $_SERVER['REQUEST_URI'] ) && ! empty( $_SERVER['REQUEST_URI'] ) ? $_SERVER['REQUEST_URI'] : false;
583 
-				$current_host	  = isset( $_SERVER['HTTP_HOST'] ) && ! empty( $_SERVER['HTTP_HOST'] ) ? $_SERVER['HTTP_HOST'] : false;
582 
+				$current_uri = isset( $_SERVER[ 'REQUEST_URI' ] ) && ! empty( $_SERVER[ 'REQUEST_URI' ] ) ? $_SERVER[ 'REQUEST_URI' ] : false;
583 
+				$current_host = isset( $_SERVER[ 'HTTP_HOST' ] ) && ! empty( $_SERVER[ 'HTTP_HOST' ] ) ? $_SERVER[ 'HTTP_HOST' ] : false;
584 584 
 				$current_protocol = is_ssl() === true ? 'https://' : 'http://';
585 
-				$current_url	  = ( $current_uri !== false && $current_host !== false ) ? $current_protocol . $current_host . $current_uri : admin_url();
585 
+				$current_url = ( $current_uri !== false && $current_host !== false ) ? $current_protocol . $current_host . $current_uri : admin_url();
586 586
587 587 
 				$plugin_name = '<strong>Easy Forms for MailChimp</strong>';
588 588 
 				// Review URL - Change to the URL of your plugin on WordPress.org.

@@ -593,17 +593,17 @@  discard block
 
 block discarded – undo
593 593 
 				// Make sure all of our variables have values.
594 594 
 				$reviewurl  = ( ! empty( $reviewurl ) ) ? $reviewurl : '';
595 595 
 				$addons_url = ( ! empty( $addons_url ) ) ? $addons_url : '';
596 
-				$nobugurl	= ( ! empty( $nobugurl ) ) ? $nobugurl : '';
596 
+				$nobugurl = ( ! empty( $nobugurl ) ) ? $nobugurl : '';
597 597
598 598 
 				$review_message = '<div id="yikes-mailchimp-logo"></div>';
599 599 
 				$review_message .= sprintf(
600 600 
 					__( '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' )
601 601 
 					. '<span class="button-container"> <a href="%2$s" target="_blank" class="button-secondary"><span class="dashicons dashicons-star-filled"></span>'
602 
-						. __( "Leave A Review" , 'yikes-inc-easy-mailchimp-extender' )
602 
+						. __( "Leave A Review", 'yikes-inc-easy-mailchimp-extender' )
603 603 
 					. '</a> <a href="%3$s" class="button-secondary"><span class="dashicons dashicons-upload"></span>'
604 
-						. __( "View Addons" , 'yikes-inc-easy-mailchimp-extender' )
604 
+						. __( "View Addons", 'yikes-inc-easy-mailchimp-extender' )
605 605 
 					. '</a> <a href="%4$s" class="button-secondary"><span class="dashicons dashicons-no-alt"></span>'
606 
-						. __( "Dismiss" , 'yikes-inc-easy-mailchimp-extender' )
606 
+						. __( "Dismiss", 'yikes-inc-easy-mailchimp-extender' )
607 607 
 					. "</a> </span>",
608 608 
 				$plugin_name, $reviewurl, $addons_url, $nobugurl );
609 609 
 				?>

@@ -620,7 +620,7 @@  discard block
 
 block discarded – undo
620 620 
 			@since v3.1.1
621 621 
 		*/
622 622 
 		public function yikes_easy_mailchimp_stop_bugging_me() {
623 
-			if ( isset( $_GET['yikes_easy_mc_icons_nobug'] ) && (int) filter_var( $_GET['yikes_easy_mc_icons_nobug'], FILTER_SANITIZE_NUMBER_INT ) === 1 ) {
623 
+			if ( isset( $_GET[ 'yikes_easy_mc_icons_nobug' ] ) && (int) filter_var( $_GET[ 'yikes_easy_mc_icons_nobug' ], FILTER_SANITIZE_NUMBER_INT ) === 1 ) {
624 624 
 				add_option( 'yikes_easy_mailchimp_review_stop_bugging_me', true );
625 625 
 			}
626 626 
 		}

@@ -658,7 +658,7 @@  discard block
 
 block discarded – undo
658 658 
 	// inlcude the js for tinymce.
659 659 
 	public function yks_mc_add_tinymce_plugin( $plugin_array ) {
660 660
661 
-		$plugin_array['yks_mc_tinymce_button'] = plugins_url( '/js/min/yikes-inc-easy-mailchimp-tinymce-button.min.js', __FILE__ );
661 
+		$plugin_array[ 'yks_mc_tinymce_button' ] = plugins_url( '/js/min/yikes-inc-easy-mailchimp-tinymce-button.min.js', __FILE__ );
662 662
663 663 
 		return $plugin_array;
664 664 
 	}

@@ -679,13 +679,13 @@  discard block
 
 block discarded – undo
679 679 
 		if ( ! empty( $list_data ) ) {
680 680 
 			// build an array to pass to our javascript.
681 681 
 			foreach ( $list_data as $id => $form ) {
682 
-				$lists[] = array(
683 
-					'text'  => urlencode( $form['form_name'] ),
682 
+				$lists[ ] = array(
683 
+					'text'  => urlencode( $form[ 'form_name' ] ),
684 684 
 					'value' => $id,
685 685 
 				);
686 686 
 			}
687 687 
 		} else {
688 
-			$lists[0] = array(
688 
+			$lists[ 0 ] = array(
689 689 
 				'text'  => __( 'Please Import Some MailChimp Lists', 'yikes-inc-easy-mailchimp-extender' ),
690 690 
 				'value' => '-',
691 691 
 			);

@@ -773,8 +773,8 @@  discard block
 
 block discarded – undo
773 773
774 774 
 		wp_enqueue_style( 'wp-color-picker' );
775 775 
 		wp_enqueue_script( 'wp-color-picker' );
776 
-		wp_enqueue_script( 'jquery.timepicker.js',YIKES_MC_URL . 'admin/js/jquery.timepicker.min.js', array( 'jquery' ) , $this->version, false );
777 
-		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 );
776 
+		wp_enqueue_script( 'jquery.timepicker.js', YIKES_MC_URL . 'admin/js/jquery.timepicker.min.js', array( 'jquery' ), $this->version, false );
777 
+		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 );
778 778
779 779 
 		$localized_data = array(
780 780 
 			'ajax_url'                          => esc_url_raw( admin_url( 'admin-ajax.php' ) ),

@@ -868,7 +868,7 @@  discard block
 
 block discarded – undo
868 868 
 	 * Convert the php date format string to a js date format
869 869 
 	 */
870 870 
 	public function yikes_jQuery_datepicker_date_format( $site_option ) {
871 
-		switch( $site_option ) {
871 
+		switch ( $site_option ) {
872 872 
 			//Predefined WP date formats
873 873 
 			default:
874 874 
 			case 'F j, Y':

@@ -1080,7 +1080,7 @@  discard block
 
 block discarded – undo
1080 1080
1081 1081 
 		/* Register General Settings Section */
1082 1082
1083 
-		register_setting( 'yikes_inc_easy_mc_general_settings_page', 'yikes-mc-api-key', array( $this , 'yikes_mc_validate_api_key' ) );
1083 
+		register_setting( 'yikes_inc_easy_mc_general_settings_page', 'yikes-mc-api-key', array( $this, 'yikes_mc_validate_api_key' ) );
1084 1084
1085 1085 
 		register_setting( 'yikes_inc_easy_mc_general_settings_page', 'yikes-mailchimp-use-nonce' );
1086 1086 
 

@@ -1125,7 +1125,7 @@  discard block
 
 block discarded – undo
1125 1125 
 		add_settings_field(
1126 1126 
 			'optin-checkbox-init',
1127 1127 
 			__( 'Select Checkboxes to Generate', 'yikes-inc-easy-mailchimp-extender' ),
1128 
-			'',  // callback + validation inside of admin/partials/menu/options.php
1128 
+			'', // callback + validation inside of admin/partials/menu/options.php
1129 1129 
 			'yikes_inc_easy_mc_checkbox_settings'
1130 1130 
 		);
1131 1131 
 		/* End Checkbox Settings */

@@ -1147,21 +1147,21 @@  discard block
 
 block discarded – undo
1147 1147 
 			add_settings_field(
1148 1148 
 				'yikes-mc-recaptcha-site-key',
1149 1149 
 				__( 'Enter reCAPTCHA Site Key', 'yikes-inc-easy-mailchimp-extender' ),
1150 
-				'',  // callback + validation inside of admin/partials/menu/options.php
1150 
+				'', // callback + validation inside of admin/partials/menu/options.php
1151 1151 
 				'yikes_easy_mc_settings_recpatcha_section'
1152 1152 
 			);
1153 1153
1154 1154 
 			add_settings_field(
1155 1155 
 				'yikes-mc-recaptcha-secret-key',
1156 1156 
 				__( 'Enter reCAPTCHA Secret Key', 'yikes-inc-easy-mailchimp-extender' ),
1157 
-				'',  // callback + validation inside of admin/partials/menu/options.php
1157 
+				'', // callback + validation inside of admin/partials/menu/options.php
1158 1158 
 				'yikes_easy_mc_settings_recpatcha_section'
1159 1159 
 			);
1160 1160
1161 1161 
 			add_settings_field(
1162 1162 
 				'yikes-mc-recaptcha-status',
1163 1163 
 				__( 'Enable ReCaptcha', 'yikes-inc-easy-mailchimp-extender' ),
1164 
-				'',  // callback + validation inside of admin/partials/menu/options.php
1164 
+				'', // callback + validation inside of admin/partials/menu/options.php
1165 1165 
 				'yikes_easy_mc_settings_recpatcha_section'
1166 1166 
 			);
1167 1167 
 

@@ -1181,7 +1181,7 @@  discard block
 
 block discarded – undo
1181 1181 
 			add_settings_field(
1182 1182 
 				'yikes-mailchimp-debug-status',
1183 1183 
 				__( 'Enable Debugging', 'yikes-inc-easy-mailchimp-extender' ),
1184 
-				'',  // callback + validation inside of admin/partials/menu/options.php
1184 
+				'', // callback + validation inside of admin/partials/menu/options.php
1185 1185 
 				'yikes_easy_mc_settings_debug_section'
1186 1186 
 			);
1187 1187 
 

@@ -1201,7 +1201,7 @@  discard block
 
 block discarded – undo
1201 1201 
 			update_option( 'yikes-mc-api-validation', 'invalid_api_key' );
1202 1202 
 			return '';
1203 1203 
 		}
1204 
-		$api_key = strip_tags ( trim( $input ) );
1204 
+		$api_key = strip_tags( trim( $input ) );
1205 1205 
 		$dash_position = strpos( trim( $input ), '-' );
1206 1206 
 		if ( $dash_position !== false ) {
1207 1207 
 			$manager = new Yikes_Inc_Easy_MailChimp_API_Manager( $api_key );

@@ -1216,9 +1216,9 @@  discard block
 
 block discarded – undo
1216 1216 
 			update_option( 'yikes-mc-api-validation', 'valid_api_key' );
1217 1217 
 				// Clear the API key transient data
1218 1218 
 			$this->delete_yikes_mailchimp_transients();
1219 
-		}  else {
1219 
+		} else {
1220 1220 
 			$error_logging = new Yikes_Inc_Easy_Mailchimp_Error_Logging();
1221 
-			$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' ) );
1221 
+			$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' ) );
1222 1222 
 			update_option( 'yikes-mc-api-invalid-key-response', $response->get_error_message() );
1223 1223 
 			update_option( 'yikes-mc-api-validation', 'invalid_api_key' );
1224 1224 
 		}

@@ -1267,11 +1267,11 @@  discard block
 
 block discarded – undo
1267 1267 
 	public function check_for_old_yks_mc_options() {
1268 1268 
 		$old_plugin_options = get_option( 'ykseme_storage' );
1269 1269 
 		// only perform options migrations if the site is not a multi-site setup
1270 
-		if ( !is_multisite() ) {
1270 
+		if ( ! is_multisite() ) {
1271 1271 
 			if ( apply_filters( 'yikes_mc_old_options_filter', $old_plugin_options ) ) {
1272 1272 
 				// display a notice to the user that they should 'migrate'
1273 1273 
 				// from the old plugin settings to the new ones
1274 
-				add_action( 'admin_notices', array( $this , 'display_options_migrate_notice' ) , 11 );
1274 
+				add_action( 'admin_notices', array( $this, 'display_options_migrate_notice' ), 11 );
1275 1275 
 			}
1276 1276 
 		}
1277 1277 
 	}

@@ -1304,11 +1304,11 @@  discard block
 
 block discarded – undo
1304 1304
1305 1305 
 			// Confirm that the necessary forms table in the database exists, else bail
1306 1306 
 			global $wpdb;
1307 
-			if ( $wpdb->get_var("show tables like '" . $wpdb->prefix . "yikes_easy_mc_forms'") != $wpdb->prefix . "yikes_easy_mc_forms" ) {
1307 
+			if ( $wpdb->get_var( "show tables like '" . $wpdb->prefix . "yikes_easy_mc_forms'" ) != $wpdb->prefix . "yikes_easy_mc_forms" ) {
1308 1308 
 				return;
1309 1309 
 			}
1310 1310
1311 
-			if ( isset( $_GET['yikes-mc-options-migration-dismissed'] ) && $_GET['yikes-mc-options-migration-dismissed'] == 'true' ) {
1311 
+			if ( isset( $_GET[ 'yikes-mc-options-migration-dismissed' ] ) && $_GET[ 'yikes-mc-options-migration-dismissed' ] == 'true' ) {
1312 1312 
 					// Delete the options, start a-new! (this will disable the migration notice altogether)
1313 1313 
 					delete_option( 'widget_yikes_mc_widget' );
1314 1314 
 					delete_option( 'api_validation' );

@@ -1322,7 +1322,7 @@  discard block
 
 block discarded – undo
1322 1322 
 			} else {
1323 1323 
 			?>
1324 1324 
 				<div class="yikes-easy-mc-updated migrate-options-notice">
1325 
-					<p><?php printf( __( "It looks like you're upgrading from a previous version of %s.", 'yikes-inc-easy-mailchimp-extender' ), '<strong>Us Easy Forms for MailChimp</strong>' ); ?> <?php printf( __( "In the newest version of %s, the options data structure has changed. We've also moved the mailing lists into its own database table to allow for some higher level customization. Now you can easily create multiple forms and assign them to the same mailing list." , 'yikes-inc-easy-mailchimp-extender' ), '<strong>Us Easy Forms for MailChimp</strong>' ); ?></p>
1325 
+					<p><?php printf( __( "It looks like you're upgrading from a previous version of %s.", 'yikes-inc-easy-mailchimp-extender' ), '<strong>Us Easy Forms for MailChimp</strong>' ); ?> <?php printf( __( "In the newest version of %s, the options data structure has changed. We've also moved the mailing lists into its own database table to allow for some higher level customization. Now you can easily create multiple forms and assign them to the same mailing list.", 'yikes-inc-easy-mailchimp-extender' ), '<strong>Us Easy Forms for MailChimp</strong>' ); ?></p>
1326 1326 
 					<p><?php _e( "Before you continue, it's strongly recommended you the perform the migration to ensure the plugin continues to function properly.", 'yikes-inc-easy-mailchimp-extender' ); ?></p>
1327 1327 
 					<p><em><?php _e( "It's also strongly recommended that you take a backup of your database.", 'yikes-inc-easy-mailchimp-extender' ); ?></em></p>
1328 1328 
 					<section id="migration-buttons">

@@ -1347,9 +1347,9 @@  discard block
 
 block discarded – undo
1347 1347 
 		*	and return the index ( used to find the list name assigned to a form )
1348 1348 
 		*	- http://stackoverflow.com/questions/6661530/php-multi-dimensional-array-search
1349 1349 
 		*/
1350 
-		function findMCListID($id, $array) {
1351 
-		   foreach ($array as $key => $val) {
1352 
-			   if ($val['id'] === $id) {
1350 
+		function findMCListID( $id, $array ) {
1351 
+		   foreach ( $array as $key => $val ) {
1352 
+			   if ( $val[ 'id' ] === $id ) {
1353 1353 
 				   return $key;
1354 1354 
 			   }
1355 1355 
 		   }

@@ -1359,8 +1359,8 @@  discard block
 
 block discarded – undo
1359 1359 
 		/* Ajax Migrate Options */
1360 1360 
 		function migrate_archived_options() {
1361 1361 
 			// all options prefixed with 'yikes-mc-'
1362 
-			$option_name = 'yikes-mc-'.$_POST['option_name'];
1363 
-			$option_value = $_POST['option_value'];
1362 
+			$option_name = 'yikes-mc-' . $_POST[ 'option_name' ];
1363 
+			$option_value = $_POST[ 'option_value' ];
1364 1364 
 			if ( json_decode( $option_value ) ) {
1365 1365 
 				// decode our lists() array, and store it
1366 1366 
 				$opt_value = json_decode( $option_value, true );

@@ -1374,22 +1374,22 @@  discard block
 
 block discarded – undo
1374 1374
1375 1375 
 		/* Ajax Migrate Forms */
1376 1376 
 		function migrate_previously_setup_forms() {
1377 
-			$option_name = $_POST['option_name'];
1378 
-			$done = $_POST['done_import'];
1377 
+			$option_name = $_POST[ 'option_name' ];
1378 
+			$done = $_POST[ 'done_import' ];
1379 1379 
 			// Create some starter forms for the user
1380 1380 
 			// based on previously imported lists (to our old version)
1381 1381 
 			if ( $option_name == 'yikes-mc-lists' ) {
1382 
-				$option_value = $_POST['option_value'];
1383 
-				$new_options = json_decode( stripslashes_deep( $option_value ) , true );
1382 
+				$option_value = $_POST[ 'option_value' ];
1383 
+				$new_options = json_decode( stripslashes_deep( $option_value ), true );
1384 1384
1385 
-				$list_id = $new_options['id'];
1386 
-				$form_name = $new_options['name'];
1387 
-				$fields = $new_options['fields']; // our fields array
1385 
+				$list_id = $new_options[ 'id' ];
1386 
+				$form_name = $new_options[ 'name' ];
1387 
+				$fields = $new_options[ 'fields' ]; // our fields array
1388 1388
1389 
-				$custom_styles = isset( $new_options['custom_styles'] ) ? $new_options['custom_styles']: '0'; // store as an array with all of our styles
1390 
-				$custom_template = isset( $new_options['custom_template'] ) ? $new_options['custom_template'] : '0'; // store template data as an array ( active , template used )
1391 
-				$redirect_user_on_submit = isset( $new_options['yks_mailchimp_redirect_'.$list_id] ) ? '1' : '0';
1392 
-				$redirect_page = isset( $new_options['page_id_'.$list_id] ) ? $new_options['page_id_'.$list_id] : '';
1389 
+				$custom_styles = isset( $new_options[ 'custom_styles' ] ) ? $new_options[ 'custom_styles' ] : '0'; // store as an array with all of our styles
1390 
+				$custom_template = isset( $new_options[ 'custom_template' ] ) ? $new_options[ 'custom_template' ] : '0'; // store template data as an array ( active , template used )
1391 
+				$redirect_user_on_submit = isset( $new_options[ 'yks_mailchimp_redirect_' . $list_id ] ) ? '1' : '0';
1392 
+				$redirect_page = isset( $new_options[ 'page_id_' . $list_id ] ) ? $new_options[ 'page_id_' . $list_id ] : '';
1393 1393
1394 1394 
 				/* Insert Forms Function  */
1395 1395 
 				$this->form_interface->create_form( array(

@@ -1425,8 +1425,8 @@  discard block
 
 block discarded – undo
1425 1425 
 		*	@since v5.6 - complete re-write
1426 1426 
 		*/
1427 1427 
 		public function generate_options_pages_sidebar_menu() {
1428 
-			if ( isset( $_REQUEST['section'] ) ) {
1429 
-				$selected = $_REQUEST['section'];
1428 
+			if ( isset( $_REQUEST[ 'section' ] ) ) {
1429 
+				$selected = $_REQUEST[ 'section' ];
1430 1430 
 			}
1431 1431 
 			$installed_addons = get_option( 'yikes-easy-mc-active-addons', array() );
1432 1432 
 

@@ -1443,25 +1443,25 @@  discard block
 
 block discarded – undo
1443 1443 
 				<h3><span><?php _e( 'Additional Settings', 'yikes-inc-easy-mailchimp-extender' ); ?></span></h3>
1444 1444 
 				<div class="inside">
1445 1445 
 					<ul id="settings-nav">
1446 
-						<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>
1447 
-						<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>
1448 
-						<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>
1449 
-						<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>
1450 
-						<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>
1451 
-						<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>
1446 
+						<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>
1447 
+						<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>
1448 
+						<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>
1449 
+						<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>
1450 
+						<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>
1451 
+						<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>
1452 1452 
 					</ul>
1453 1453 
 					<?php
1454 1454 
 						// create our add-on settings pages
1455 
-						if ( !empty( $installed_addons ) ) {
1455 
+						if ( ! empty( $installed_addons ) ) {
1456 1456 
 							?>
1457 1457 
 							<hr class="add-on-settings-divider" />
1458 1458 
 							<strong><?php _e( 'Addon Settings', 'yikes-inc-easy-mailchimp-extender' ); ?></strong>
1459 1459 
 							<ul id="addon-settings-nav">
1460 1460 
 							<?php
1461 
-							foreach( $installed_addons as $addon_name ) {
1461 
+							foreach ( $installed_addons as $addon_name ) {
1462 1462 
 								?>
1463 1463 
 									<li>
1464 
-										<?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>
1464 
+										<?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>
1465 1465 
 								<?php
1466 1466 
 							}
1467 1467 
 							?>

@@ -1510,19 +1510,19 @@  discard block
 
 block discarded – undo
1510 1510 
 						<select name="associated-list" id="associated-list" class=" input-field" <?php $this->is_user_mc_api_valid_form( true ); disabled( true, empty( $lists ) ); ?>>
1511 1511 
 							<?php
1512 1512 
 							if ( ! empty( $lists ) ) {
1513 
-								foreach( $lists as $mailing_list ) {
1513 
+								foreach ( $lists as $mailing_list ) {
1514 1514 
 									?>
1515 
-									<option value="<?php echo $mailing_list['id']; ?>"><?php echo stripslashes( $mailing_list['name'] ) . ' (' . $mailing_list['stats']['member_count'] . ') '; ?></option>
1515 
+									<option value="<?php echo $mailing_list[ 'id' ]; ?>"><?php echo stripslashes( $mailing_list[ 'name' ] ) . ' (' . $mailing_list[ 'stats' ][ 'member_count' ] . ') '; ?></option>
1516 1516 
 									<?php
1517 1517 
 								}
1518 1518 
 							} else {
1519 1519 
 								if ( get_option( 'yikes-mc-api-validation', 'invalid_api_key' ) == 'invalid_api_key' ) {
1520 1520 
 									?>
1521 
-									<option><?php echo __( "Please enter a valid API key." , 'yikes-inc-easy-mailchimp-extender' ); ?></option>
1521 
+									<option><?php echo __( "Please enter a valid API key.", 'yikes-inc-easy-mailchimp-extender' ); ?></option>
1522 1522 
 									<?php
1523 1523 
 								} else {
1524 1524 
 									?>
1525 
-									<option><?php echo __( "No lists were found on the account." , 'yikes-inc-easy-mailchimp-extender' ); ?></option>
1525 
+									<option><?php echo __( "No lists were found on the account.", 'yikes-inc-easy-mailchimp-extender' ); ?></option>
1526 1526 
 									<?php
1527 1527
1528 1528 
 								}

@@ -1531,8 +1531,8 @@  discard block
 
 block discarded – undo
1531 1531 
 						</select>
1532 1532
1533 1533 
 						<?php
1534 
-						if ( isset( $_GET['transient-cleared'] ) ) {
1535 
-							if ( 'true' === $_GET['transient-cleared'] ) {
1534 
+						if ( isset( $_GET[ 'transient-cleared' ] ) ) {
1535 
+							if ( 'true' === $_GET[ 'transient-cleared' ] ) {
1536 1536 
 								?>
1537 1537 
 								<div class="yikes-list-refreshed-notice">
1538 1538 
 									<p><?php esc_attr_e( 'MailChimp list data has been succesfully refreshed.', 'yikes-inc-easy-mailchimp-extender' ); ?></p>

@@ -1545,7 +1545,7 @@  discard block
 
 block discarded – undo
1545 1545 
 							if ( get_option( 'yikes-mc-api-validation', 'invalid_api_key' ) != 'invalid_api_key' ) {
1546 1546 
 								?>
1547 1547 
 									<p class="description">
1548 
-										<?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' ) ); ?>
1548 
+										<?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' ) ); ?>
1549 1549 
 									</p>
1550 1550 
 								<?php
1551 1551 
 							}

@@ -1554,9 +1554,9 @@  discard block
 
 block discarded – undo
1554 1554 
 					</label>
1555 1555 
 					<?php
1556 1556 
 						if ( $this->is_user_mc_api_valid_form( false ) ) {
1557 
-							echo submit_button( __( 'Create', 'yikes-inc-easy-mailchimp-extender' ) , 'primary', '', false , array( 'style' => 'margin:.75em 0 .5em 0;' ) );
1557 
+							echo submit_button( __( 'Create', 'yikes-inc-easy-mailchimp-extender' ), 'primary', '', false, array( 'style' => 'margin:.75em 0 .5em 0;' ) );
1558 1558 
 						} else {
1559 
-							echo '<p class="description">' . __( "Please enter a valid MailChimp API key to get started." , 'yikes-inc-easy-mailchimp-extender' ) . '</p>';
1559 
+							echo '<p class="description">' . __( "Please enter a valid MailChimp API key to get started.", 'yikes-inc-easy-mailchimp-extender' ) . '</p>';
1560 1560 
 							?>
1561 1561 
 								<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>
1562 1562 
 							<?php

@@ -1586,7 +1586,7 @@  discard block
 
 block discarded – undo
1586 1586 
 				$post_types = get_post_types();
1587 1587 
 				?>
1588 1588 
 				<label id="redirect-user-to-selection-label" for="redirect-user-to-selection" class="<?php if ( $redirect == '0' ) { echo 'yikes-easy-mc-hidden'; } ?>">
1589 
-					<?php _e( "Select A Page or Post" , 'yikes-inc-easy-mailchimp-extender' ); ?>
1589 
+					<?php _e( "Select A Page or Post", 'yikes-inc-easy-mailchimp-extender' ); ?>
1590 1590 
 					<select id="redirect-user-to-selection" name="redirect-user-to-selection" onchange="shouldWeDisplayCustomURL( this );return;">
1591 1591 
 				<?php
1592 1592 
 

@@ -1602,7 +1602,7 @@  discard block
 
 block discarded – undo
1602 1602 
 					$excluded_post_types = apply_filters( 'yikes-mailchimp-excluded-redirect-post-types', $excluded_post_types );
1603 1603
1604 1604 
 						// loop over registered post types, and query!
1605 
-						foreach( $post_types as $registered_post_type ) {
1605 
+						foreach ( $post_types as $registered_post_type ) {
1606 1606
1607 1607 
 							// exclude a few built in custom post types and any defined by the filter
1608 1608 
 							if ( ! in_array( $registered_post_type, $excluded_post_types ) ) {

@@ -1624,8 +1624,8 @@  discard block
 
 block discarded – undo
1624 1624 
 									?>
1625 1625 
 										<optgroup label="<?php echo ucwords( str_replace( '_', ' ', $registered_post_type ) ); ?>">
1626 1626 
 									<?php
1627 
-											foreach( $post_ids as $post_id ) {
1628 
-												?><option <?php selected( $redirect_page , $post_id ); ?> value="<?php echo $post_id; ?>"><?php echo get_the_title( $post_id ) ?></option><?php
1627 
+											foreach ( $post_ids as $post_id ) {
1628 
+												?><option <?php selected( $redirect_page, $post_id ); ?> value="<?php echo $post_id; ?>"><?php echo get_the_title( $post_id ) ?></option><?php
1629 1629 
 											}
1630 1630 
 									?>
1631 1631 
 										</optgroup>

@@ -1641,7 +1641,7 @@  discard block
 
 block discarded – undo
1641 1641 
 					</select>
1642 1642
1643 1643 
 					<label name="custom-redirect-url" class="custom_redirect_url_label" <?php if ( ! isset( $redirect_page ) || $redirect_page != 'custom_url' ) { echo 'style="display:none;"'; } ?>>
1644 
-						<?php _e( "Enter Custom URL" , 'yikes-inc-easy-mailchimp-extender' ); ?>
1644 
+						<?php _e( "Enter Custom URL", 'yikes-inc-easy-mailchimp-extender' ); ?>
1645 1645 
 						<input type="text" class="widefat custom-redirect-url" name="custom-redirect-url" value="<?php echo $custom_redirect_url; ?>" />
1646 1646 
 					</label>
1647 1647 
 

@@ -1706,7 +1706,7 @@  discard block
 
 block discarded – undo
1706 1706 
 							</p>
1707 1707 
 						</div>
1708 1708
1709 
-						<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>
1709 
+						<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>
1710 1710
1711 1711 
 						<section id="about-yikes-inc" class="inside">
1712 1712 
 							<a href="https://www.yikesinc.com" target="_blank" title="YIKES Inc.">

@@ -1724,7 +1724,7 @@  discard block
 
 block discarded – undo
1724 1724 
 						<!-- review us container -->
1725 1725 
 						<h3><?php _e( 'Easy Forms for MailChimp Add-Ons', 'yikes-inc-easy-mailchimp-extender' ); ?></h3>
1726 1726 
 						<div id="review-yikes-easy-mc" class="inside">
1727 
-							<p><?php _e( "Check out available add-ons for some seriously enhanced features." , 'yikes-inc-easy-mailchimp-extender' ); ?></p>
1727 
+							<p><?php _e( "Check out available add-ons for some seriously enhanced features.", 'yikes-inc-easy-mailchimp-extender' ); ?></p>
1728 1728 
 							<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>
1729 1729 
 						</div>
1730 1730 
 

@@ -1751,11 +1751,11 @@  discard block
 
 block discarded – undo
1751 1751
1752 1752 
 			// if no list id, die!
1753 1753 
 			if ( ! $list_id ) {
1754 
-				wp_die( __( "We've encountered an error. No list ID was sent." , 'yikes-inc-easy-mailchimp-extender' ) );
1754 
+				wp_die( __( "We've encountered an error. No list ID was sent.", 'yikes-inc-easy-mailchimp-extender' ) );
1755 1755 
 			}
1756 1756
1757 1757 
 			if ( ! $merge_variables ) {
1758 
-				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' ) );
1758 
+				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' ) );
1759 1759 
 			}
1760 1760
1761 1761 
 			if ( ! empty( $form_fields ) ) {

@@ -1766,17 +1766,17 @@  discard block
 
 block discarded – undo
1766 1766 
 				$available_interest_groups	= array();
1767 1767
1768 1768 
 				// Default variables as arrays - these are used for holding the MailChimp merge field ID
1769 
-				$merge_field_ids			= array();
1770 
-				$mailchimp_merge_field_ids	= array();
1769 
+				$merge_field_ids = array();
1770 
+				$mailchimp_merge_field_ids = array();
1771 1771
1772 1772 
 				// loop over merge variables
1773 
-				if ( ! empty( $merge_variables['merge_fields'] ) ) {
1774 
-					$available_merge_variables = wp_list_pluck( $merge_variables['merge_fields'], 'tag' );
1775 
-					$mailchimp_merge_field_ids = wp_list_pluck( $merge_variables['merge_fields'], 'merge_id' );
1773 
+				if ( ! empty( $merge_variables[ 'merge_fields' ] ) ) {
1774 
+					$available_merge_variables = wp_list_pluck( $merge_variables[ 'merge_fields' ], 'tag' );
1775 
+					$mailchimp_merge_field_ids = wp_list_pluck( $merge_variables[ 'merge_fields' ], 'merge_id' );
1776 1776
1777 1777 
 					// Array will look like $merge_tag => $merge_id
1778 
-					foreach( $available_merge_variables as $index => $merge_tag ) {
1779 
-						$merge_field_ids[$merge_tag] = $mailchimp_merge_field_ids[$index];
1778 
+					foreach ( $available_merge_variables as $index => $merge_tag ) {
1779 
+						$merge_field_ids[ $merge_tag ] = $mailchimp_merge_field_ids[ $index ];
1780 1780 
 					}
1781 1781 
 				}
1782 1782 
 

@@ -1791,46 +1791,46 @@  discard block
 
 block discarded – undo
1791 1791 
 				$excluded_fields = array_diff( $assigned_fields, $merged_fields );
1792 1792
1793 1793 
 				$i = 1;
1794 
-				foreach( $form_fields as $field ) {
1794 
+				foreach ( $form_fields as $field ) {
1795 1795
1796 
-					if ( isset( $field['merge'] ) ) {
1796 
+					if ( isset( $field[ 'merge' ] ) ) {
1797 1797 
 						// @todo: don't use in_array()
1798 
-						$excluded_field = in_array( $field['merge'], $excluded_fields, true );
1798 
+						$excluded_field = in_array( $field[ 'merge' ], $excluded_fields, true );
1799 1799 
 						?>
1800 
-						<section class="draggable" id="<?php echo $field['merge']; ?>">
1800 
+						<section class="draggable" id="<?php echo $field[ 'merge' ]; ?>">
1801 1801 
 							<!-- top -->
1802 1802 
 							<a class="expansion-section-title settings-sidebar">
1803 1803 
 								<span class="dashicons dashicons-plus yikes-mc-expansion-toggle"></span>
1804 
-								<span class="yikes-mc-expansion-section-field-label"> <?php echo stripslashes( $field['label'] ); ?> </span>
1804 
+								<span class="yikes-mc-expansion-section-field-label"> <?php echo stripslashes( $field[ 'label' ] ); ?> </span>
1805 1805 
 								<?php if ( $excluded_field ) { ?>
1806 1806 
 									<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' ); ?>">
1807 1807 
 								<?php } ?>
1808 
-								<input maxlength="45" type="text" class="yikes-mc-edit-field-label-input" value="<?php echo stripslashes( $field['label'] ); ?>" />
1808 
+								<input maxlength="45" type="text" class="yikes-mc-edit-field-label-input" value="<?php echo stripslashes( $field[ 'label' ] ); ?>" />
1809 1809 
 								<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>
1810 1810 
 								<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>
1811 1811 
 								<span class="yikes-mc-edit-field-label-message"></span>
1812 
-								<span class="field-type-text"><small><?php echo __( 'type', 'yikes-inc-easy-mailchimp-extender' ) . ' : ' . $field['type']; ?></small></span>
1812 
+								<span class="field-type-text"><small><?php echo __( 'type', 'yikes-inc-easy-mailchimp-extender' ) . ' : ' . $field[ 'type' ]; ?></small></span>
1813 1813 
 							</a>
1814 1814 
 							<!-- expansion section -->
1815 1815 
 							<div class="yikes-mc-settings-expansion-section">
1816 1816
1817 1817 
 								<?php if ( $excluded_field ) { ?>
1818 
-									<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>
1818 
+									<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>
1819 1819 
 								<?php } ?>
1820 1820
1821 1821 
 								<!-- store field data -->
1822 
-								<input type="hidden" class="yikes-mc-merge-field-label" name="field[<?php echo $field['merge']; ?>][label]" value="<?php echo htmlspecialchars( $field['label'] ); ?>" />
1823 
-								<input type="hidden" class="yikes-mc-merge-field-type" name="field[<?php echo $field['merge']; ?>][type]" value="<?php echo $field['type']; ?>" />
1824 
-								<input type="hidden" class="yikes-mc-merge-field-tag" name="field[<?php echo $field['merge']; ?>][merge]" value="<?php echo $field['merge']; ?>" />
1825 
-								<input type="hidden" class="field-<?php echo $field['merge']; ?>-position position-input" name="field[<?php echo $field['merge']; ?>][position]" value="<?php echo $i++; ?>" />
1826 
-								<?php if ( isset( $merge_field_ids[ $field['merge'] ] ) && is_int( $merge_field_ids[ $field['merge'] ] ) ) { ?>
1827 
-									<input type="hidden" class="yikes-mc-merge-field-id" name="field[<?php echo $field['merge']; ?>][id]" value="<?php echo $merge_field_ids[ $field['merge'] ] ?>" />
1822 
+								<input type="hidden" class="yikes-mc-merge-field-label" name="field[<?php echo $field[ 'merge' ]; ?>][label]" value="<?php echo htmlspecialchars( $field[ 'label' ] ); ?>" />
1823 
+								<input type="hidden" class="yikes-mc-merge-field-type" name="field[<?php echo $field[ 'merge' ]; ?>][type]" value="<?php echo $field[ 'type' ]; ?>" />
1824 
+								<input type="hidden" class="yikes-mc-merge-field-tag" name="field[<?php echo $field[ 'merge' ]; ?>][merge]" value="<?php echo $field[ 'merge' ]; ?>" />
1825 
+								<input type="hidden" class="field-<?php echo $field[ 'merge' ]; ?>-position position-input" name="field[<?php echo $field[ 'merge' ]; ?>][position]" value="<?php echo $i++; ?>" />
1826 
+								<?php if ( isset( $merge_field_ids[ $field[ 'merge' ] ] ) && is_int( $merge_field_ids[ $field[ 'merge' ] ] ) ) { ?>
1827 
+									<input type="hidden" class="yikes-mc-merge-field-id" name="field[<?php echo $field[ 'merge' ]; ?>][id]" value="<?php echo $merge_field_ids[ $field[ 'merge' ] ] ?>" />
1828 1828 
 								<?php } ?>
1829 1829
1830 
-								<?php if ( $field['type'] == 'radio' || $field['type'] == 'dropdown' || $field['type'] == 'select' ) {
1831 
-									$choices = json_decode( $field['choices'], true );
1830 
+								<?php if ( $field[ 'type' ] == 'radio' || $field[ 'type' ] == 'dropdown' || $field[ 'type' ] == 'select' ) {
1831 
+									$choices = json_decode( $field[ 'choices' ], true );
1832 1832 
 								?>
1833 
-									<input type="hidden" name="field[<?php echo $field['merge']; ?>][choices]" value='<?php echo esc_attr( json_encode( $choices ) ); ?>' />
1833 
+									<input type="hidden" name="field[<?php echo $field[ 'merge' ]; ?>][choices]" value='<?php echo esc_attr( json_encode( $choices ) ); ?>' />
1834 1834 
 								<?php } ?>
1835 1835
1836 1836 
 								<!-- Single or Double Opt-in -->

@@ -1846,12 +1846,12 @@  discard block
 
 block discarded – undo
1846 1846 
 												</label>
1847 1847 
 											</td>
1848 1848 
 											<td>
1849 
-												<input class="widefat merge-tag-text" type="text" readonly value="<?php echo $field['merge']; ?>">
1849 
+												<input class="widefat merge-tag-text" type="text" readonly value="<?php echo $field[ 'merge' ]; ?>">
1850 1850 
 											</td>
1851 1851 
 										</tr>
1852 1852
1853 1853 
 										<!-- Placeholder Value -->
1854 
-										<?php switch( $field['type'] ) {
1854 
+										<?php switch ( $field[ 'type' ] ) {
1855 1855
1856 1856 
 											case 'text':
1857 1857 
 											case 'email':

@@ -1865,13 +1865,13 @@  discard block
 
 block discarded – undo
1865 1865 
 										<!-- Placeholder -->
1866 1866 
 										<tr valign="top">
1867 1867 
 											<td scope="row">
1868 
-												<label for="placeholder_<?php echo esc_attr( $field['merge'] ); ?>">
1868 
+												<label for="placeholder_<?php echo esc_attr( $field[ 'merge' ] ); ?>">
1869 1869 
 													<?php _e( 'Placeholder', 'yikes-inc-easy-mailchimp-extender' ); ?>
1870 1870 
 												</label>
1871 1871 
 											</td>
1872 1872 
 											<td>
1873 
-												<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'] : '' ; ?>" />
1874 
-												<p class="description"><small><?php _e( "Assign a placeholder value to this field.", 'yikes-inc-easy-mailchimp-extender' );?></small></p>
1873 
+												<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' ] : ''; ?>" />
1874 
+												<p class="description"><small><?php _e( "Assign a placeholder value to this field.", 'yikes-inc-easy-mailchimp-extender' ); ?></small></p>
1875 1875 
 											</td>
1876 1876 
 										</tr>
1877 1877 
 										<?php

@@ -1882,13 +1882,13 @@  discard block
 
 block discarded – undo
1882 1882 
 											?>
1883 1883 
 												<tr valign="top">
1884 1884 
 													<td scope="row">
1885 
-														<label for="placeholder_<?php echo esc_attr( $field['merge'] ); ?>">
1885 
+														<label for="placeholder_<?php echo esc_attr( $field[ 'merge' ] ); ?>">
1886 1886 
 															<?php _e( 'Placeholder', 'yikes-inc-easy-mailchimp-extender' ); ?>
1887 1887 
 														</label>
1888 1888 
 													</td>
1889 1889 
 													<td>
1890 
-														<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"' : '' ; ?> />
1891 
-														<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>
1890 
+														<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"' : ''; ?> />
1891 
+														<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>
1892 1892 
 													</td>
1893 1893 
 												</tr>
1894 1894 
 											<?php

@@ -1898,7 +1898,7 @@  discard block
 
 block discarded – undo
1898 1898 
 										?>
1899 1899
1900 1900 
 										<!-- Default Value -->
1901 
-										<?php switch( $field['type'] ) {
1901 
+										<?php switch ( $field[ 'type' ] ) {
1902 1902 
 											default:
1903 1903 
 											case 'text':
1904 1904 
 											case 'number':

@@ -1906,15 +1906,15 @@  discard block
 
 block discarded – undo
1906 1906 
 										?>
1907 1907 
 											<tr valign="top">
1908 1908 
 												<td scope="row">
1909 
-													<label for="default_value_<?php echo esc_attr( $field['merge'] ); ?>">
1909 
+													<label for="default_value_<?php echo esc_attr( $field[ 'merge' ] ); ?>">
1910 1910 
 														<?php _e( 'Default Value', 'yikes-inc-easy-mailchimp-extender' ); ?>
1911 1911 
 													</label>
1912 1912 
 												</td>
1913 1913 
 												<td>
1914 
-													<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 } ?> />
1915 
-													<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>
1914 
+													<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 } ?> />
1915 
+													<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>
1916 1916 
 													<?php
1917 
-													switch( $field['type'] ) {
1917 
+													switch ( $field[ 'type' ] ) {
1918 1918 
 														case 'text':
1919 1919 
 															?>
1920 1920 
 																<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>

@@ -1936,28 +1936,28 @@  discard block
 
 block discarded – undo
1936 1936 
 													</td>
1937 1937 
 													<td>
1938 1938 
 														<?php
1939 
-															$field['default_choice'] = ! isset( $field['default_choice'] ) ? 'no-default' : $field['default_choice'];
1939 
+															$field[ 'default_choice' ] = ! isset( $field[ 'default_choice' ] ) ? 'no-default' : $field[ 'default_choice' ];
1940 1940 
 															$x = 0;
1941 1941 
 														?>
1942 
-														<label for="<?php echo $field['merge'] . '-no-default'; ?>">
1943 
-															<input id="<?php echo $field['merge'] . '-no-default'; ?>"
1942 
+														<label for="<?php echo $field[ 'merge' ] . '-no-default'; ?>">
1943 
+															<input id="<?php echo $field[ 'merge' ] . '-no-default'; ?>"
1944 1944 
 															       type="radio"
1945 
-															       name="field[<?php echo $field['merge']; ?>][default_choice]"
1946 
-															       value="no-default" <?php checked( $field['default_choice'], 'no-default' ); ?>
1945 
+															       name="field[<?php echo $field[ 'merge' ]; ?>][default_choice]"
1946 
+															       value="no-default" <?php checked( $field[ 'default_choice' ], 'no-default' ); ?>
1947 1947 
 															>
1948 1948 
 															No Default&nbsp;
1949 1949 
 														</label>
1950 1950 
 														<?php
1951 1951 
 														foreach ( $choices as $choice => $value ) { ?>
1952 
-															<label for="<?php echo $field['merge'].'-'.$x; ?>">
1953 
-																<input id="<?php echo $field['merge'].'-'.$x; ?>"
1952 
+															<label for="<?php echo $field[ 'merge' ] . '-' . $x; ?>">
1953 
+																<input id="<?php echo $field[ 'merge' ] . '-' . $x; ?>"
1954 1954 
 																       type="radio"
1955 
-																       name="field[<?php echo $field['merge']; ?>][default_choice]"
1956 
-																       value="<?php echo $x; ?>" <?php checked( $field['default_choice'], $x ); ?>>
1955 
+																       name="field[<?php echo $field[ 'merge' ]; ?>][default_choice]"
1956 
+																       value="<?php echo $x; ?>" <?php checked( $field[ 'default_choice' ], $x ); ?>>
1957 1957 
 																<?php echo $value; ?>&nbsp;
1958 1958 
 															</label>
1959 1959 
 														<?php $x++; } ?>
1960 
-														<p class="description"><small><?php _e( "Select the option that should be selected by default.", 'yikes-inc-easy-mailchimp-extender' );?></small></p>
1960 
+														<p class="description"><small><?php _e( "Select the option that should be selected by default.", 'yikes-inc-easy-mailchimp-extender' ); ?></small></p>
1961 1961 
 													</td>
1962 1962 
 												</tr>
1963 1963 
 

@@ -1973,13 +1973,13 @@  discard block
 
 block discarded – undo
1973 1973 
 														</label>
1974 1974 
 													</td>
1975 1975 
 													<td>
1976 
-														<select type="default" name="field[<?php echo $field['merge']; ?>][default_choice]">
1977 
-															<option value="no-default" <?php selected( $field['default_choice'] , 'no-default' ); ?>>No Default</option>
1978 
-															<?php foreach( json_decode( $field['choices'], true ) as $choice => $value ) { ?>
1979 
-																<option value="<?php echo $choice; ?>" <?php selected( $field['default_choice'] , $choice ); ?>><?php echo $value; ?></option>
1976 
+														<select type="default" name="field[<?php echo $field[ 'merge' ]; ?>][default_choice]">
1977 
+															<option value="no-default" <?php selected( $field[ 'default_choice' ], 'no-default' ); ?>>No Default</option>
1978 
+															<?php foreach ( json_decode( $field[ 'choices' ], true ) as $choice => $value ) { ?>
1979 
+																<option value="<?php echo $choice; ?>" <?php selected( $field[ 'default_choice' ], $choice ); ?>><?php echo $value; ?></option>
1980 1980 
 															<?php } ?>
1981 1981 
 														</select>
1982 
-														<p class="description"><small><?php _e( "Which option should be selected by default?", 'yikes-inc-easy-mailchimp-extender' );?></small></p>
1982 
+														<p class="description"><small><?php _e( "Which option should be selected by default?", 'yikes-inc-easy-mailchimp-extender' ); ?></small></p>
1983 1983 
 													</td>
1984 1984 
 												</tr>
1985 1985 
 

@@ -1996,82 +1996,82 @@  discard block
 
 block discarded – undo
1996 1996 
 										<!-- Field Description -->
1997 1997 
 										<tr valign="top">
1998 1998 
 											<td scope="row">
1999 
-												<label for="description_<?php echo esc_attr( $field['merge'] ); ?>">
1999 
+												<label for="description_<?php echo esc_attr( $field[ 'merge' ] ); ?>">
2000 2000 
 													<?php _e( 'Description', 'yikes-inc-easy-mailchimp-extender' ); ?>
2001 2001 
 												</label>
2002 2002 
 											</td>
2003 2003 
 											<td>
2004 
-												<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>
2005 
-												<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>
2004 
+												<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>
2005 
+												<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>
2006 2006 
 											</td>
2007 2007 
 										</tr>
2008 2008 
 										<!-- Description Above Field -->
2009 2009 
 										<tr valign="top">
2010 2010 
 											<td scope="row">
2011 
-												<label for="description_above_<?php echo esc_attr( $field['merge'] ); ?>">
2011 
+												<label for="description_above_<?php echo esc_attr( $field[ 'merge' ] ); ?>">
2012 2012 
 													<?php _e( 'Description Above Field', 'yikes-inc-easy-mailchimp-extender' ); ?>
2013 2013 
 												</label>
2014 2014 
 											</td>
2015 2015 
 											<td>
2016 
-												<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"' : ''; ?> />
2017 
-												<span 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></span>
2016 
+												<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"' : ''; ?> />
2017 
+												<span 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></span>
2018 2018 
 											</td>
2019 2019 
 										</tr>
2020 2020 
 										<!-- Additional Classes -->
2021 2021 
 										<tr valign="top">
2022 2022 
 											<td scope="row">
2023 
-												<label for="classes_<?php echo esc_attr( $field['merge'] ); ?>">
2023 
+												<label for="classes_<?php echo esc_attr( $field[ 'merge' ] ); ?>">
2024 2024 
 													<?php _e( 'Additional Classes', 'yikes-inc-easy-mailchimp-extender' ); ?>
2025 2025 
 												</label>
2026 2026 
 											</td>
2027 2027 
 											<td>
2028 
-												<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'] ) ) : '' ; ?>" />
2029 
-												<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>
2028 
+												<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' ] ) ) : ''; ?>" />
2029 
+												<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>
2030 2030 
 											</td>
2031 2031 
 										</tr>
2032 2032 
 										<!-- Required Toggle -->
2033 2033 
 										<tr valign="top" class="yikes-checkbox-container yikes-checkbox-container-first">
2034 2034 
 											<td scope="row">
2035 
-												<label for="field-required-<?php echo esc_attr( $field['merge'] ); ?>">
2035 
+												<label for="field-required-<?php echo esc_attr( $field[ 'merge' ] ); ?>">
2036 2036 
 													<?php _e( 'Field Required?', 'yikes-inc-easy-mailchimp-extender' ); ?>
2037 2037 
 												</label>
2038 2038 
 											</td>
2039 2039 
 											<td>
2040 
-												<?php $checked = isset( $field['require'] ) ? $field['require'] : '0'; ?>
2041 
-												<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' ); } ?>">
2042 
-												<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>
2040 
+												<?php $checked = isset( $field[ 'require' ] ) ? $field[ 'require' ] : '0'; ?>
2041 
+												<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' ); } ?>">
2042 
+												<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>
2043 2043 
 											</td>
2044 2044 
 										</tr>
2045 2045 
 										<!-- Visible Toggle -->
2046 2046 
 										<tr valign="top" class="yikes-checkbox-container">
2047 2047 
 											<td scope="row">
2048 
-												<label for="hide-field-<?php echo esc_attr( $field['merge'] ); ?>">
2048 
+												<label for="hide-field-<?php echo esc_attr( $field[ 'merge' ] ); ?>">
2049 2049 
 													<?php _e( 'Hide Field', 'yikes-inc-easy-mailchimp-extender' ); ?>
2050 2050 
 												</label>
2051 2051 
 											</td>
2052 2052 
 											<td>
2053 
-												<?php $hide = isset( $field['hide'] ) ? $field['hide'] : '0'; ?>
2054 
-												<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' ); } ?>">
2055 
-												<p class="description"><small><?php _e( "Hide this field from being displayed on the front end.", 'yikes-inc-easy-mailchimp-extender' );?></small></p>
2053 
+												<?php $hide = isset( $field[ 'hide' ] ) ? $field[ 'hide' ] : '0'; ?>
2054 
+												<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' ); } ?>">
2055 
+												<p class="description"><small><?php _e( "Hide this field from being displayed on the front end.", 'yikes-inc-easy-mailchimp-extender' ); ?></small></p>
2056 2056 
 											</td>
2057 2057 
 										</tr>
2058 2058 
 										<!-- Toggle Field Label Visibility -->
2059 2059 
 										<tr valign="top" class="yikes-checkbox-container">
2060 2060 
 											<td scope="row">
2061 
-												<label for="hide-label-<?php echo esc_attr( $field['merge'] ); ?>">
2061 
+												<label for="hide-label-<?php echo esc_attr( $field[ 'merge' ] ); ?>">
2062 2062 
 													<?php _e( 'Hide Label', 'yikes-inc-easy-mailchimp-extender' ); ?>
2063 2063 
 												</label>
2064 2064 
 											</td>
2065 2065 
 											<td>
2066 
-												<?php $hide_label = isset( $field['hide-label'] ) ? $field['hide-label'] : '0'; ?>
2067 
-												<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 ); ?>/>
2068 
-												<p class="description"><small><?php _e( "Toggle field label visibility.", 'yikes-inc-easy-mailchimp-extender' );?></small></p>
2066 
+												<?php $hide_label = isset( $field[ 'hide-label' ] ) ? $field[ 'hide-label' ] : '0'; ?>
2067 
+												<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 ); ?>/>
2068 
+												<p class="description"><small><?php _e( "Toggle field label visibility.", 'yikes-inc-easy-mailchimp-extender' ); ?></small></p>
2069 2069 
 											</td>
2070 2070 
 										</tr>
2071 2071 
 										<!-- Display Phone/Date Formats back to the user -->
2072 2072 
 										<!-- Phone Format Initial Load -->
2073 2073 
 										<?php
2074 
-											switch( $field['type'] ) {
2074 
+											switch ( $field[ 'type' ] ) {
2075 2075 
 												/* Store the phone format, for properly regex pattern */
2076 2076 
 												case 'phone':
2077 2077 
 												case 'birthday':

@@ -2081,23 +2081,23 @@  discard block
 
 block discarded – undo
2081 2081 
 															<td scope="row">
2082 2082 
 																<label for="placeholder">
2083 2083 
 																	<?php
2084 
-																		switch( $field['type'] ) {
2084 
+																		switch ( $field[ 'type' ] ) {
2085 2085 
 																			default:
2086 2086 
 																			case 'birthday':
2087 2087 
 																				$type = __( 'Date Format', 'yikes-inc-easy-mailchimp-extender' );
2088 
-																				$format = ( isset( $field['date_format'] ) ) ? $field['date_format'] : 'MM/DD';
2088 
+																				$format = ( isset( $field[ 'date_format' ] ) ) ? $field[ 'date_format' ] : 'MM/DD';
2089 2089 
 																				$format_name = 'date_format';
2090 2090 
 																				break;
2091 2091
2092 2092 
 																			case 'date':
2093 2093 
 																				$type = __( 'Date Format', 'yikes-inc-easy-mailchimp-extender' );
2094 
-																				$format = ( isset( $field['date_format'] ) ) ? $field['date_format'] : 'MM/DD/YYYY';
2094 
+																				$format = ( isset( $field[ 'date_format' ] ) ) ? $field[ 'date_format' ] : 'MM/DD/YYYY';
2095 2095 
 																				$format_name = 'date_format';
2096 2096 
 																				break;
2097 2097
2098 2098 
 																			case 'phone':
2099 2099 
 																				$type = __( 'Phone Format', 'yikes-inc-easy-mailchimp-extender' );
2100 
-																				$format = isset( $field['phone_format'] ) && ! empty( $field['phone_format'] ) ? $field['phone_format'] : __( 'International', 'yikes-inc-easy-mailchimp-extender' );
2100 
+																				$format = isset( $field[ 'phone_format' ] ) && ! empty( $field[ 'phone_format' ] ) ? $field[ 'phone_format' ] : __( 'International', 'yikes-inc-easy-mailchimp-extender' );
2101 2101 
 																				$format_name = 'phone_format';
2102 2102 
 																				break;
2103 2103 
 																		}

@@ -2107,7 +2107,7 @@  discard block
 
 block discarded – undo
2107 2107 
 															</td>
2108 2108 
 															<td>
2109 2109 
 																<strong><?php echo $format; ?></strong>
2110 
-																<input type="hidden" name="field[<?php echo $field['merge']; ?>][<?php echo $format_name; ?>]" value="<?php echo $format; ?>" />
2110 
+																<input type="hidden" name="field[<?php echo $field[ 'merge' ]; ?>][<?php echo $format_name; ?>]" value="<?php echo $format; ?>" />
2111 2111 
 																<p class="description"><small>
2112 2112 
 																	<?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' ) ); ?>
2113 2113 
 																</small></p>

@@ -2128,8 +2128,8 @@  discard block
 
 block discarded – undo
2128 2128 
 											</td>
2129 2129 
 											<td>
2130 2130 
 												<span class="toggle-container">
2131 
-													<a href="#" class="close-form-expansion"><?php _e( "Close" , 'yikes-inc-easy-mailchimp-extender' ); ?></a> |
2132 
-													<a href="#" class="remove-field" alt="<?php echo $field['merge']; ?>"><?php _e( "Remove Field" , 'yikes-inc-easy-mailchimp-extender' ); ?></a>
2131 
+													<a href="#" class="close-form-expansion"><?php _e( "Close", 'yikes-inc-easy-mailchimp-extender' ); ?></a> |
2132 
+													<a href="#" class="remove-field" alt="<?php echo $field[ 'merge' ]; ?>"><?php _e( "Remove Field", 'yikes-inc-easy-mailchimp-extender' ); ?></a>
2133 2133 
 												</span>
2134 2134 
 											</td>
2135 2135 
 										</tr>

@@ -2147,35 +2147,35 @@  discard block
 
 block discarded – undo
2147 2147 
 						/**** Interest Group ****/
2148 2148
2149 2149 
 						?>
2150 
-						<section class="draggable" id="<?php echo $field['group_id']; ?>">
2150 
+						<section class="draggable" id="<?php echo $field[ 'group_id' ]; ?>">
2151 2151 
 							<!-- top -->
2152 2152 
 							<a href="#" class="expansion-section-title settings-sidebar">
2153 
-								<span class="dashicons dashicons-plus yikes-mc-expansion-toggle"></span><?php echo stripslashes( $field['label'] ); ?>
2154 
-								<?php if ( in_array( $field['group_id'] , $excluded_fields ) ) { ?>
2153 
+								<span class="dashicons dashicons-plus yikes-mc-expansion-toggle"></span><?php echo stripslashes( $field[ 'label' ] ); ?>
2154 
+								<?php if ( in_array( $field[ 'group_id' ], $excluded_fields ) ) { ?>
2155 2155 
 									<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' ); ?>">
2156 2156 
 								<?php } ?>
2157 
-								<span class="field-type-text"><small><?php echo __( 'type', 'yikes-inc-easy-mailchimp-extender' ) . ' : ' . $field['type']; ?></small></span>
2157 
+								<span class="field-type-text"><small><?php echo __( 'type', 'yikes-inc-easy-mailchimp-extender' ) . ' : ' . $field[ 'type' ]; ?></small></span>
2158 2158 
 							</a>
2159 2159 
 							<!-- expansion section -->
2160 2160 
 							<div class="yikes-mc-settings-expansion-section">
2161 2161
2162 2162 
 								<!-- check if this field exists in the available interest group array -->
2163 
-								<?php if ( in_array( $field['group_id'] , $excluded_fields ) ) { ?>
2164 
-									<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>
2163 
+								<?php if ( in_array( $field[ 'group_id' ], $excluded_fields ) ) { ?>
2164 
+									<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>
2165 2165 
 								<?php } ?>
2166 2166
2167 2167 
 								<!-- store the label -->
2168 
-								<input type="hidden" name="field[<?php echo $field['group_id']; ?>][label]" value="<?php echo htmlspecialchars( $field['label'] ); ?>" />
2169 
-								<input type="hidden" name="field[<?php echo $field['group_id']; ?>][type]" value="<?php echo $field['type']; ?>" />
2170 
-								<input type="hidden" name="field[<?php echo $field['group_id']; ?>][group_id]" value="<?php echo $field['group_id']; ?>" />
2171 
-								<input type="hidden" name="field[<?php echo $field['group_id']; ?>][groups]" value='<?php echo esc_attr( json_encode( json_decode( $field['groups'], true ) ) ); ?>' />
2168 
+								<input type="hidden" name="field[<?php echo $field[ 'group_id' ]; ?>][label]" value="<?php echo htmlspecialchars( $field[ 'label' ] ); ?>" />
2169 
+								<input type="hidden" name="field[<?php echo $field[ 'group_id' ]; ?>][type]" value="<?php echo $field[ 'type' ]; ?>" />
2170 
+								<input type="hidden" name="field[<?php echo $field[ 'group_id' ]; ?>][group_id]" value="<?php echo $field[ 'group_id' ]; ?>" />
2171 
+								<input type="hidden" name="field[<?php echo $field[ 'group_id' ]; ?>][groups]" value='<?php echo esc_attr( json_encode( json_decode( $field[ 'groups' ], true ) ) ); ?>' />
2172 2172
2173 2173 
 								<!-- Single or Double Opt-in -->
2174 2174 
 								<p class="type-container"><!-- necessary to prevent skipping on slideToggle(); -->
2175 2175
2176 2176 
 									<table class="form-table form-field-container">
2177 2177 
 										<!-- Default Value -->
2178 
-										<?php switch( $field['type'] ) {
2178 
+										<?php switch ( $field[ 'type' ] ) {
2179 2179 
 											default:
2180 2180 
 											case 'radio':
2181 2181 
 											case 'checkboxes':

@@ -2188,15 +2188,15 @@  discard block
 
 block discarded – undo
2188 2188 
 													</td>
2189 2189 
 													<td>
2190 2190 
 														<?php
2191 
-														$field['default_choice'] = isset( $field['default_choice'] ) ? $field['default_choice'] : '';
2191 
+														$field[ 'default_choice' ] = isset( $field[ 'default_choice' ] ) ? $field[ 'default_choice' ] : '';
2192 2192
2193 2193 
 														$default_shown = false;
2194 2194
2195 
-														foreach ( json_decode( $field['groups'], true ) as $id => $group ) {
2196 
-															$field_id   = "{$field['group_id']}-{$id}";
2197 
-															$field_type = 'hidden' == $field['type'] ? 'checkbox' : $field['type'];
2195 
+														foreach ( json_decode( $field[ 'groups' ], true ) as $id => $group ) {
2196 
+															$field_id   = "{$field[ 'group_id' ]}-{$id}";
2197 
+															$field_type = 'hidden' == $field[ 'type' ] ? 'checkbox' : $field[ 'type' ];
2198 2198 
 															$field_type = 'checkboxes' == $field_type ? 'checkbox' : $field_type;
2199 
-															$field_name = "field[{$field['group_id']}][default_choice]";
2199 
+															$field_name = "field[{$field[ 'group_id' ]}][default_choice]";
2200 2200 
 															$field_name = 'checkbox' == $field_type ? $field_name . '[]' : $field_name;
2201 2201
2202 2202 
 															// Determine if the current group is checked.

@@ -2204,12 +2204,12 @@  discard block
 
 block discarded – undo
2204 2204 
 															switch ( $field_type ) {
2205 2205 
 																case 'radio':
2206 2206 
 																default:
2207 
-																	$checked = checked( $field['default_choice'], $id, false );
2207 
+																	$checked = checked( $field[ 'default_choice' ], $id, false );
2208 2208 
 																break;
2209 2209
2210 2210 
 																case 'checkbox':
2211 2211 
 																case 'hidden':
2212 
-																	if ( is_array( $field['default_choice'] ) && in_array( $id, $field['default_choice'] ) ) {
2212 
+																	if ( is_array( $field[ 'default_choice' ] ) && in_array( $id, $field[ 'default_choice' ] ) ) {
2213 2213 
 																		$checked = checked( true, true, false );
2214 2214 
 																	}
2215 2215 
 																break;

@@ -2224,7 +2224,7 @@  discard block
 
 block discarded – undo
2224 2224 
 																	    type="<?php echo $field_type; ?>"
2225 2225 
 																	    name="<?php echo $field_name; ?>"
2226 2226 
 																	    value="no-default"
2227 
-																	    <?php checked( $field['default_choice'], 'no-default' ); ?>>
2227 
+																	    <?php checked( $field[ 'default_choice' ], 'no-default' ); ?>>
2228 2228 
 																	No Default&nbsp;
2229 2229 
 																</label>
2230 2230 
 																<?php

@@ -2240,7 +2240,7 @@  discard block
 
 block discarded – undo
2240 2240 
 															</label>
2241 2241 
 															<?php
2242 2242 
 														} ?>
2243 
-														<p class="description"><small><?php _e( "Select the option that should be selected by default.", 'yikes-inc-easy-mailchimp-extender' );?></small></p>
2243 
+														<p class="description"><small><?php _e( "Select the option that should be selected by default.", 'yikes-inc-easy-mailchimp-extender' ); ?></small></p>
2244 2244 
 													</td>
2245 2245 
 												</tr>
2246 2246 
 

@@ -2256,13 +2256,13 @@  discard block
 
 block discarded – undo
2256 2256 
 														</label>
2257 2257 
 													</td>
2258 2258 
 													<td>
2259 
-														<select type="default" name="field[<?php echo $field['group_id']; ?>][default_choice]">
2259 
+														<select type="default" name="field[<?php echo $field[ 'group_id' ]; ?>][default_choice]">
2260 2260 
 															<option value="no-default">No Default</option>
2261 
-															<?php foreach( json_decode( stripslashes_deep( $field['groups'] ) , true ) as $id => $group ) { ?>
2262 
-																<option value="<?php echo $id; ?>" <?php selected( $field['default_choice'] , $id ); ?>><?php echo stripslashes( $group ); ?></option>
2261 
+															<?php foreach ( json_decode( stripslashes_deep( $field[ 'groups' ] ), true ) as $id => $group ) { ?>
2262 
+																<option value="<?php echo $id; ?>" <?php selected( $field[ 'default_choice' ], $id ); ?>><?php echo stripslashes( $group ); ?></option>
2263 2263 
 															<?php } ?>
2264 2264 
 														</select>
2265 
-														<p class="description"><small><?php _e( "Which option should be selected by default?", 'yikes-inc-easy-mailchimp-extender' );?></small></p>
2265 
+														<p class="description"><small><?php _e( "Which option should be selected by default?", 'yikes-inc-easy-mailchimp-extender' ); ?></small></p>
2266 2266 
 													</td>
2267 2267 
 												</tr>
2268 2268 
 

@@ -2275,78 +2275,78 @@  discard block
 
 block discarded – undo
2275 2275 
 										<!-- Field Description -->
2276 2276 
 										<tr valign="top">
2277 2277 
 											<td scope="row">
2278 
-												<label for="description_<?php echo esc_attr( $field['group_id'] ); ?>">
2278 
+												<label for="description_<?php echo esc_attr( $field[ 'group_id' ] ); ?>">
2279 2279 
 													<?php _e( 'Description', 'yikes-inc-easy-mailchimp-extender' ); ?>
2280 2280 
 												</label>
2281 2281 
 											</td>
2282 2282 
 											<td>
2283 
-												<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>
2284 
-												<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>
2283 
+												<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>
2284 
+												<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>
2285 2285 
 											</td>
2286 2286 
 										</tr>
2287 2287
2288 2288 
 										<!-- Description Above Field -->
2289 2289 
 										<tr valign="top">
2290 2290 
 											<td scope="row">
2291 
-												<label for="description_above_<?php echo $field['group_id']; ?>">
2291 
+												<label for="description_above_<?php echo $field[ 'group_id' ]; ?>">
2292 2292 
 													<?php _e( 'Description Above Field', 'yikes-inc-easy-mailchimp-extender' ); ?>
2293 2293 
 												</label>
2294 2294 
 											</td>
2295 2295 
 											<td>
2296 
-												<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"' : ''; ?> />
2297 
-												<span 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></span>
2296 
+												<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"' : ''; ?> />
2297 
+												<span 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></span>
2298 2298 
 											</td>
2299 2299 
 										</tr>
2300 2300
2301 2301 
 										<!-- Additional Classes -->
2302 2302 
 										<tr valign="top">
2303 2303 
 											<td scope="row">
2304 
-												<label for="classes_<?php echo esc_attr( $field['group_id'] ); ?>">
2304 
+												<label for="classes_<?php echo esc_attr( $field[ 'group_id' ] ); ?>">
2305 2305 
 													<?php _e( 'Additional Classes', 'yikes-inc-easy-mailchimp-extender' ); ?>
2306 2306 
 												</label>
2307 2307 
 											</td>
2308 2308 
 											<td>
2309 
-												<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'] ) ) : '' ; ?>" />
2310 
-												<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>
2309 
+												<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' ] ) ) : ''; ?>" />
2310 
+												<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>
2311 2311 
 											</td>
2312 2312 
 										</tr>
2313 2313 
 										<!-- Required Toggle -->
2314 2314 
 										<tr valign="top">
2315 2315 
 											<td scope="row">
2316 
-												<label for="field-required-<?php echo esc_attr( $field['group_id'] ); ?>">
2316 
+												<label for="field-required-<?php echo esc_attr( $field[ 'group_id' ] ); ?>">
2317 2317 
 													<?php _e( 'Field Required?', 'yikes-inc-easy-mailchimp-extender' ); ?>
2318 2318 
 												</label>
2319 2319 
 											</td>
2320 2320 
 											<td>
2321 
-												<?php $checked = isset( $field['require'] ) ? $field['require'] : '0'; ?>
2322 
-												<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 ); ?>>
2323 
-												<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>
2321 
+												<?php $checked = isset( $field[ 'require' ] ) ? $field[ 'require' ] : '0'; ?>
2322 
+												<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 ); ?>>
2323 
+												<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>
2324 2324 
 											</td>
2325 2325 
 										</tr>
2326 2326 
 										<!-- Visible Toggle -->
2327 2327 
 										<tr valign="top">
2328 2328 
 											<td scope="row">
2329 
-												<label for="hide-field-<?php echo esc_attr( $field['group_id'] ); ?>">
2329 
+												<label for="hide-field-<?php echo esc_attr( $field[ 'group_id' ] ); ?>">
2330 2330 
 													<?php _e( 'Hide Field', 'yikes-inc-easy-mailchimp-extender' ); ?>
2331 2331 
 												</label>
2332 2332 
 											</td>
2333 2333 
 											<td>
2334 
-												<?php $hide = isset( $field['hide'] ) ? $field['hide'] : '0'; ?>
2335 
-												<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 ); ?>>
2336 
-												<p class="description"><small><?php _e( "Hide this field from being displayed on the front end.", 'yikes-inc-easy-mailchimp-extender' );?></small></p>
2334 
+												<?php $hide = isset( $field[ 'hide' ] ) ? $field[ 'hide' ] : '0'; ?>
2335 
+												<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 ); ?>>
2336 
+												<p class="description"><small><?php _e( "Hide this field from being displayed on the front end.", 'yikes-inc-easy-mailchimp-extender' ); ?></small></p>
2337 2337 
 											</td>
2338 2338 
 										</tr>
2339 2339 
 										<!-- Toggle Field Label Visibility -->
2340 2340 
 										<tr valign="top">
2341 2341 
 											<td scope="row">
2342 
-												<label for="hide-label-<?php echo esc_attr( $field['group_id'] ); ?>">
2342 
+												<label for="hide-label-<?php echo esc_attr( $field[ 'group_id' ] ); ?>">
2343 2343 
 													<?php _e( 'Hide Label', 'yikes-inc-easy-mailchimp-extender' ); ?>
2344 2344 
 												</label>
2345 2345 
 											</td>
2346 2346 
 											<td>
2347 
-												<?php $hide = isset( $field['hide-label'] ) ? $field['hide-label'] : '0'; ?>
2348 
-												<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 ); ?>/>
2349 
-												<p class="description"><small><?php _e( "Toggle field label visibility.", 'yikes-inc-easy-mailchimp-extender' );?></small></p>
2347 
+												<?php $hide = isset( $field[ 'hide-label' ] ) ? $field[ 'hide-label' ] : '0'; ?>
2348 
+												<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 ); ?>/>
2349 
+												<p class="description"><small><?php _e( "Toggle field label visibility.", 'yikes-inc-easy-mailchimp-extender' ); ?></small></p>
2350 2350 
 											</td>
2351 2351 
 										</tr>
2352 2352 
 										<!-- Toggle Buttons -->

@@ -2356,8 +2356,8 @@  discard block
 
 block discarded – undo
2356 2356 
 											</td>
2357 2357 
 											<td>
2358 2358 
 												<span class="toggle-container">
2359 
-													<a href="#" class="close-form-expansion"><?php _e( "Close" , 'yikes-inc-easy-mailchimp-extender' ); ?></a> |
2360 
-													<a href="#" class="remove-field" alt="<?php echo $field['group_id']; ?>"><?php _e( "Remove Field" , 'yikes-inc-easy-mailchimp-extender' ); ?></a>
2359 
+													<a href="#" class="close-form-expansion"><?php _e( "Close", 'yikes-inc-easy-mailchimp-extender' ); ?></a> |
2360 
+													<a href="#" class="remove-field" alt="<?php echo $field[ 'group_id' ]; ?>"><?php _e( "Remove Field", 'yikes-inc-easy-mailchimp-extender' ); ?></a>
2361 2361 
 												</span>
2362 2362 
 											</td>
2363 2363 
 										</tr>

@@ -2378,7 +2378,7 @@  discard block
 
 block discarded – undo
2378 2378 
 				add_thickbox();
2379 2379 
 				// enqueue jquery qtip for our tooltip
2380 2380 
 				wp_enqueue_script( 'jquery-qtip-tooltip', YIKES_MC_URL . 'admin/js/min/jquery.qtip.min.js', array( 'jquery' ) );
2381 
-				wp_enqueue_style( 'jquery-qtip-style',  YIKES_MC_URL . 'admin/css/jquery.qtip.min.css' );
2381 
+				wp_enqueue_style( 'jquery-qtip-style', YIKES_MC_URL . 'admin/css/jquery.qtip.min.css' );
2382 2382 
 					$available_tags = array(
2383 2383 
 						array(
2384 2384 
 							'tag' => '{page_title}',

@@ -2433,14 +2433,14 @@  discard block
 
 block discarded – undo
2433 2433 
 						<h3><?php _e( 'Pre Defined Tags', 'yikes-inc-easy-mailchimp-extender' ); ?></h3>
2434 2434 
 						<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>
2435 2435 
 						<ul>
2436 
-							<?php foreach( apply_filters( 'yikes-mailchimp-custom-default-value-tags', $available_tags ) as $tag ) { ?>
2436 
+							<?php foreach ( apply_filters( 'yikes-mailchimp-custom-default-value-tags', $available_tags ) as $tag ) { ?>
2437 2437 
 								<li class="tooltop-tag">
2438 2438 
 									<!-- link/tag -->
2439 
-									<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>
2439 
+									<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>
2440 2440 
 									<!-- help icon -->
2441 2441 
 									<span class="dashicons dashicons-editor-help"></span>
2442 2442 
 									<!-- tooltip -->
2443 
-									<div class="tooltiptext qtip-bootstrap yikes-easy-mc-hidden"><?php echo $tag['description']; ?></div>
2443 
+									<div class="tooltiptext qtip-bootstrap yikes-easy-mc-hidden"><?php echo $tag[ 'description' ]; ?></div>
2444 2444 
 								</li>
2445 2445 
 							<?php } ?>
2446 2446 
 						</ul>

@@ -2456,46 +2456,46 @@  discard block
 
 block discarded – undo
2456 2456 
 		*	-
2457 2457 
 		* @parameters - $list_id - pass in the list ID to retreive merge variables from
2458 2458 
 		*/
2459 
-		public function build_available_merge_vars( $form_fields , $available_merge_variables ) {
2459 
+		public function build_available_merge_vars( $form_fields, $available_merge_variables ) {
2460 2460 
 			$fields_assigned_to_form = array();
2461 2461 
 			foreach ( $form_fields as $field ) {
2462 
-				if ( isset( $field['merge'] ) ) {
2463 
-					$fields_assigned_to_form[ $field['merge'] ] = true;
2462 
+				if ( isset( $field[ 'merge' ] ) ) {
2463 
+					$fields_assigned_to_form[ $field[ 'merge' ] ] = true;
2464 2464 
 				}
2465 2465 
 			}
2466 2466
2467 
-			if ( ! empty( $available_merge_variables['merge_fields'] ) ) {
2467 
+			if ( ! empty( $available_merge_variables[ 'merge_fields' ] ) ) {
2468 2468 
 				?>
2469 2469 
 				<ul id="available-fields"><?php
2470 
-				foreach ( $available_merge_variables['merge_fields'] as $merge_var ) {
2471 
-					if ( isset( $fields_assigned_to_form[ $merge_var['tag'] ] ) ) {
2470 
+				foreach ( $available_merge_variables[ 'merge_fields' ] as $merge_var ) {
2471 
+					if ( isset( $fields_assigned_to_form[ $merge_var[ 'tag' ] ] ) ) {
2472 2472 
 						?>
2473 2473 
 						<li class="available-form-field not-available"
2474 
-						    alt="<?php echo $merge_var['tag']; ?>"
2475 
-						    data-attr-field-type="<?php echo esc_attr( $merge_var['type'] ); ?>"
2476 
-						    data-attr-field-name="<?php echo esc_attr( $merge_var['name'] ); ?>"
2477 
-						    data-attr-form-id="<?php echo esc_attr( $available_merge_variables['list_id'] ); ?>"
2474 
+						    alt="<?php echo $merge_var[ 'tag' ]; ?>"
2475 
+						    data-attr-field-type="<?php echo esc_attr( $merge_var[ 'type' ] ); ?>"
2476 
+						    data-attr-field-name="<?php echo esc_attr( $merge_var[ 'name' ] ); ?>"
2477 
+						    data-attr-form-id="<?php echo esc_attr( $available_merge_variables[ 'list_id' ] ); ?>"
2478 2478 
 						    title="<?php esc_attr_e( 'Already assigned to your form', 'yikes-inc-easy-mailchimp-extender' ); ?>"
2479 2479 
 						    disabled="disabled">
2480 
-							<?php echo stripslashes( $merge_var['name'] );
2481 
-							if ( $merge_var['required'] ) {
2480 
+							<?php echo stripslashes( $merge_var[ 'name' ] );
2481 
+							if ( $merge_var[ 'required' ] ) {
2482 2482 
 								echo ' <span class="field-required" title="' . __( 'required field', 'yikes-inc-easy-mailchimp-extender' ) . '">*</span>';
2483 2483 
 							} ?>
2484 
-							<small class="field-type-text"><?php echo $merge_var['type']; ?></small>
2484 
+							<small class="field-type-text"><?php echo $merge_var[ 'type' ]; ?></small>
2485 2485 
 						</li>
2486 2486 
 						<?php
2487 2487 
 					} else {
2488 2488 
 						?>
2489 2489 
 						<li class="available-form-field"
2490 
-						    alt="<?php echo $merge_var['tag']; ?>"
2491 
-						    data-attr-field-type="<?php echo esc_attr( $merge_var['type'] ); ?>"
2492 
-						    data-attr-field-name="<?php echo esc_attr( $merge_var['name'] ); ?>"
2493 
-						    data-attr-form-id="<?php echo esc_attr( $available_merge_variables['list_id'] ); ?>">
2494 
-							<?php echo stripslashes( $merge_var['name'] );
2495 
-							if ( $merge_var['required'] ) {
2490 
+						    alt="<?php echo $merge_var[ 'tag' ]; ?>"
2491 
+						    data-attr-field-type="<?php echo esc_attr( $merge_var[ 'type' ] ); ?>"
2492 
+						    data-attr-field-name="<?php echo esc_attr( $merge_var[ 'name' ] ); ?>"
2493 
+						    data-attr-form-id="<?php echo esc_attr( $available_merge_variables[ 'list_id' ] ); ?>">
2494 
+							<?php echo stripslashes( $merge_var[ 'name' ] );
2495 
+							if ( $merge_var[ 'required' ] ) {
2496 2496 
 								echo ' <span class="field-required" title="' . __( 'required field', 'yikes-inc-easy-mailchimp-extender' ) . '">*</span>';
2497 2497 
 							} ?>
2498 
-							<small class="field-type-text"><?php echo $merge_var['type']; ?></small>
2498 
+							<small class="field-type-text"><?php echo $merge_var[ 'type' ]; ?></small>
2499 2499 
 						</li>
2500 2500 
 						<?php
2501 2501 
 					}

@@ -2517,12 +2517,12 @@  discard block
 
 block discarded – undo
2517 2517 
 		*	-
2518 2518 
 		* @parameters - $list_id - pass in the list ID to retreive merge variables from
2519 2519 
 		*/
2520 
-		public function build_available_interest_groups( $form_fields , $available_interest_groups , $list_id ) {
2520 
+		public function build_available_interest_groups( $form_fields, $available_interest_groups, $list_id ) {
2521 2521 
 			$fields_assigned_to_form = array();
2522 2522 
 			if ( ! empty( $form_fields ) ) {
2523 2523 
 				foreach ( $form_fields as $field ) {
2524 
-					if ( isset( $field['group_id'] ) ) {
2525 
-						$fields_assigned_to_form[ $field['group_id'] ] = true;
2524 
+					if ( isset( $field[ 'group_id' ] ) ) {
2525 
+						$fields_assigned_to_form[ $field[ 'group_id' ] ] = true;
2526 2526 
 					}
2527 2527 
 				}
2528 2528 
 			}

@@ -2531,29 +2531,29 @@  discard block
 
 block discarded – undo
2531 2531 
 				?>
2532 2532 
 				<ul id="available-interest-groups"><?php
2533 2533 
 				foreach ( $available_interest_groups as $interest_group ) {
2534 
-					if ( isset( $fields_assigned_to_form[ $interest_group['id'] ] ) ) {
2534 
+					if ( isset( $fields_assigned_to_form[ $interest_group[ 'id' ] ] ) ) {
2535 2535 
 						?>
2536 2536 
 						<li class="available-interest-group not-available"
2537 
-							alt="<?php echo $interest_group['id']; ?>"
2538 
-							data-attr-field-name="<?php echo htmlspecialchars( $interest_group['title'] ); ?>"
2539 
-							data-attr-field-type="<?php echo $interest_group['type']; ?>"
2537 
+							alt="<?php echo $interest_group[ 'id' ]; ?>"
2538 
+							data-attr-field-name="<?php echo htmlspecialchars( $interest_group[ 'title' ] ); ?>"
2539 
+							data-attr-field-type="<?php echo $interest_group[ 'type' ]; ?>"
2540 2540 
 							data-attr-form-id="<?php echo $list_id; ?>" title="<?php _e( 'Already assigned to your form', 'yikes-inc-easy-mailchimp-extender' ); ?>"
2541 2541 
 							disabled="disabled"
2542 2542 
 						>
2543 
-							<?php echo stripslashes( $interest_group['title'] ); ?>
2544 
-							<small class="field-type-text"><?php echo $interest_group['type']; ?></small>
2543 
+							<?php echo stripslashes( $interest_group[ 'title' ] ); ?>
2544 
+							<small class="field-type-text"><?php echo $interest_group[ 'type' ]; ?></small>
2545 2545 
 						</li>
2546 2546 
 						<?php
2547 2547 
 					} else {
2548 2548 
 						?>
2549 2549 
 						<li class="available-interest-group"
2550 
-							alt="<?php echo $interest_group['id']; ?>"
2551 
-							data-attr-field-name="<?php echo htmlspecialchars( $interest_group['title'] ); ?>"
2552 
-							data-attr-field-type="<?php echo $interest_group['type']; ?>"
2550 
+							alt="<?php echo $interest_group[ 'id' ]; ?>"
2551 
+							data-attr-field-name="<?php echo htmlspecialchars( $interest_group[ 'title' ] ); ?>"
2552 
+							data-attr-field-type="<?php echo $interest_group[ 'type' ]; ?>"
2553 2553 
 							data-attr-form-id="<?php echo $list_id; ?>"
2554 2554 
 						>
2555 
-							<?php echo stripslashes( $interest_group['title'] ); ?>
2556 
-							<small class="field-type-text"><?php echo $interest_group['type']; ?></small>
2555 
+							<?php echo stripslashes( $interest_group[ 'title' ] ); ?>
2556 
+							<small class="field-type-text"><?php echo $interest_group[ 'type' ]; ?></small>
2557 2557 
 						</li>
2558 2558 
 						<?php
2559 2559 
 					}

@@ -2575,15 +2575,15 @@  discard block
 
 block discarded – undo
2575 2575 
 		*	- must clean up db tables , ensure what data is going in and what is needed...
2576 2576 
 		*/
2577 2577 
 		public function yikes_easy_mailchimp_create_form() {
2578 
-			$nonce = $_REQUEST['nonce'];
2578 
+			$nonce = $_REQUEST[ 'nonce' ];
2579 2579 
 			if ( ! wp_verify_nonce( $nonce, 'create_mailchimp_form' ) ) {
2580 
-				wp_die( __( "We've run into an error. The security check didn't pass. Please try again." , 'yikes-inc-easy-mailchimp-extender' ) );
2580 
+				wp_die( __( "We've run into an error. The security check didn't pass. Please try again.", 'yikes-inc-easy-mailchimp-extender' ) );
2581 2581 
 			}
2582 2582
2583 2583 
 			$result = $this->form_interface->create_form( array(
2584 
-				'list_id'          => sanitize_key( $_POST['associated-list'] ),
2585 
-				'form_name'        => stripslashes( $_POST['form-name'] ),
2586 
-				'form_description' => stripslashes( $_POST['form-description'] ),
2584 
+				'list_id'          => sanitize_key( $_POST[ 'associated-list' ] ),
2585 
+				'form_name'        => stripslashes( $_POST[ 'form-name' ] ),
2586 
+				'form_description' => stripslashes( $_POST[ 'form-description' ] ),
2587 2587 
 			) );
2588 2588
2589 2589 
 			// if an error occurs during the form creation process

@@ -2591,11 +2591,11 @@  discard block
 
 block discarded – undo
2591 2591 
 				// write it to the error log
2592 2592 
 				// if the form was not created successfully
2593 2593 
 				$error_logging = new Yikes_Inc_Easy_Mailchimp_Error_Logging();
2594 
-				$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' ) );
2594 
+				$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' ) );
2595 2595 
 				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' ) ) ) ) );
2596 2596 
 			} else {
2597 2597 
 				// redirect the user to the new form edit page
2598 
-				wp_redirect( esc_url_raw( admin_url( 'admin.php?page=yikes-mailchimp-edit-form&id=' . $result) ) );
2598 
+				wp_redirect( esc_url_raw( admin_url( 'admin.php?page=yikes-mailchimp-edit-form&id=' . $result ) ) );
2599 2599 
 			}
2600 2600 
 			exit();
2601 2601 
 		}

@@ -2608,11 +2608,11 @@  discard block
 
 block discarded – undo
2608 2608 
 		*/
2609 2609 
 		public function yikes_easy_mailchimp_delete_form() {
2610 2610 
 			// grab & store our variables ( associated list & form name )
2611 
-			$nonce = $_REQUEST['nonce'];
2612 
-			$post_id_to_delete = $_REQUEST['mailchimp-form'];
2611 
+			$nonce = $_REQUEST[ 'nonce' ];
2612 
+			$post_id_to_delete = $_REQUEST[ 'mailchimp-form' ];
2613 2613 
 			// verify our nonce
2614 
-			if ( ! wp_verify_nonce( $nonce, 'delete-mailchimp-form-'.$post_id_to_delete ) ) {
2615 
-				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 ) );
2614 
+			if ( ! wp_verify_nonce( $nonce, 'delete-mailchimp-form-' . $post_id_to_delete ) ) {
2615 
+				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 ) );
2616 2616 
 			}
2617 2617
2618 2618 
 			$this->form_interface->delete_form( $post_id_to_delete );

@@ -2628,19 +2628,19 @@  discard block
 
 block discarded – undo
2628 2628 
 		*/
2629 2629 
 		public function yikes_easy_mailchimp_duplicate_form() {
2630 2630 
 			// grab & store our variables ( associated list & form name )
2631 
-			$nonce = $_REQUEST['nonce'];
2632 
-			$post_id_to_clone = $_REQUEST['mailchimp-form'];
2631 
+			$nonce = $_REQUEST[ 'nonce' ];
2632 
+			$post_id_to_clone = $_REQUEST[ 'mailchimp-form' ];
2633 2633 
 			// verify our nonce
2634 
-			if ( ! wp_verify_nonce( $nonce, 'duplicate-mailchimp-form-'.$post_id_to_clone ) ) {
2635 
-				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 ) );
2634 
+			if ( ! wp_verify_nonce( $nonce, 'duplicate-mailchimp-form-' . $post_id_to_clone ) ) {
2635 
+				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 ) );
2636 2636 
 			}
2637 2637
2638 2638 
 			// Get the current form data.
2639 2639 
 			$form_data = $this->form_interface->get_form( $post_id_to_clone );
2640 2640
2641 2641 
 			// Update some of the data before duplication
2642 
-			$form_data['form_name'] .= ' - Copy';
2643 
-			$form_data['impressions'] = $form_data['submissions'] = 0;
2642 
+			$form_data[ 'form_name' ] .= ' - Copy';
2643 
+			$form_data[ 'impressions' ] = $form_data[ 'submissions' ] = 0;
2644 2644
2645 2645 
 			// Create the new form, and handle the result.
2646 2646 
 			$result = $this->form_interface->create_form( $form_data );

@@ -2671,11 +2671,11 @@  discard block
 
 block discarded – undo
2671 2671 
 		*/
2672 2672 
 		public function yikes_easy_mailchimp_reset_impression_stats() {
2673 2673 
 			// grab & store our variables ( associated list & form name )
2674 
-			$nonce = $_REQUEST['nonce'];
2675 
-			$form_id_to_reset = $_REQUEST['mailchimp-form'];
2674 
+			$nonce = $_REQUEST[ 'nonce' ];
2675 
+			$form_id_to_reset = $_REQUEST[ 'mailchimp-form' ];
2676 2676 
 			// verify our nonce
2677 
-			if ( ! wp_verify_nonce( $nonce, 'reset-stats-mailchimp-form-'.$form_id_to_reset ) ) {
2678 
-				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 ) );
2677 
+			if ( ! wp_verify_nonce( $nonce, 'reset-stats-mailchimp-form-' . $form_id_to_reset ) ) {
2678 
+				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 ) );
2679 2679 
 			}
2680 2680
2681 2681 
 			$result = $this->form_interface->update_form(

@@ -2703,8 +2703,8 @@  discard block
 
 block discarded – undo
2703 2703 
 		*/
2704 2704 
 		public function yikes_easy_mailchimp_update_form() {
2705 2705
2706 
-			$nonce   = $_REQUEST['nonce'];
2707 
-			$form_id = $_REQUEST['id'];
2706 
+			$nonce   = $_REQUEST[ 'nonce' ];
2707 
+			$form_id = $_REQUEST[ 'id' ];
2708 2708
2709 2709 
 			// verify our nonce
2710 2710 
 			if ( ! wp_verify_nonce( $nonce, 'update-mailchimp-form-' . $form_id ) ) {

@@ -2718,70 +2718,70 @@  discard block
 
 block discarded – undo
2718 2718 
 			}
2719 2719
2720 2720 
 			// Store our values!
2721 
-			$list_id                 = $_POST['associated-list'];
2722 
-			$form_name               = stripslashes( $_POST['form-name'] );
2723 
-			$form_description        = sanitize_text_field( stripslashes( $_POST['form-description'] ) );
2724 
-			$redirect_user_on_submit = $_POST['redirect-user-on-submission'];
2725 
-			$redirect_page           = $_POST['redirect-user-to-selection'];
2721 
+			$list_id                 = $_POST[ 'associated-list' ];
2722 
+			$form_name               = stripslashes( $_POST[ 'form-name' ] );
2723 
+			$form_description        = sanitize_text_field( stripslashes( $_POST[ 'form-description' ] ) );
2724 
+			$redirect_user_on_submit = $_POST[ 'redirect-user-on-submission' ];
2725 
+			$redirect_page           = $_POST[ 'redirect-user-to-selection' ];
2726 2726
2727 2727 
 			// stripslashes_deep on save, to prevent foreign languages from added excessive backslashes
2728 
-			$assigned_fields = isset( $_POST['field'] ) ? stripslashes_deep( $_POST['field'] ): array();
2728 
+			$assigned_fields = isset( $_POST[ 'field' ] ) ? stripslashes_deep( $_POST[ 'field' ] ) : array();
2729 2729
2730 2730 
 			// setup our submission settings serialized array
2731 2731 
 			$submission_settings = array(
2732 
-				'ajax'                   => $_POST['form-ajax-submission'],
2733 
-				'redirect_on_submission' => $_POST['redirect-user-on-submission'],
2734 
-				'redirect_page'          => $_POST['redirect-user-to-selection'],
2735 
-				'custom_redirect_url'    => esc_url( $_POST['custom-redirect-url'] ),
2736 
-				'redirect_new_window'	 => $_POST['redirect_new_window'],
2737 
-				'hide_form_post_signup'  => $_POST['hide-form-post-signup'],
2738 
-				'replace_interests'      => $_POST['replace-interest-groups'],
2732 
+				'ajax'                   => $_POST[ 'form-ajax-submission' ],
2733 
+				'redirect_on_submission' => $_POST[ 'redirect-user-on-submission' ],
2734 
+				'redirect_page'          => $_POST[ 'redirect-user-to-selection' ],
2735 
+				'custom_redirect_url'    => esc_url( $_POST[ 'custom-redirect-url' ] ),
2736 
+				'redirect_new_window'	 => $_POST[ 'redirect_new_window' ],
2737 
+				'hide_form_post_signup'  => $_POST[ 'hide-form-post-signup' ],
2738 
+				'replace_interests'      => $_POST[ 'replace-interest-groups' ],
2739 2739 
 			);
2740 2740
2741 2741 
 			// setup our opt-in settings serialized array
2742 2742 
 			$optin_settings = array(
2743 
-				'optin'                => $_POST['single-double-optin'],
2744 
-				'update_existing_user' => $_POST['update-existing-user'],
2745 
-				'send_update_email'    => $_POST['update-existing-email'],
2743 
+				'optin'                => $_POST[ 'single-double-optin' ],
2744 
+				'update_existing_user' => $_POST[ 'update-existing-user' ],
2745 
+				'send_update_email'    => $_POST[ 'update-existing-email' ],
2746 2746 
 			);
2747 2747
2748 2748 
 			// Setup our error settings serialized array
2749 2749 
 			$error_settings = array(
2750 
-				'success'				=> trim( $_POST['yikes-easy-mc-success-message'] ) ? trim( stripslashes( $_POST['yikes-easy-mc-success-message'] ) ) : '',
2751 
-				'success-single-optin'	=> trim( $_POST['yikes-easy-mc-success-single-optin-message'] ) ? trim( stripslashes( $_POST['yikes-easy-mc-success-single-optin-message'] ) ) : '',
2752 
-				'success-resubscribed'	=> trim( $_POST['yikes-easy-mc-user-resubscribed-success-message'] ) ? trim( stripslashes( $_POST['yikes-easy-mc-user-resubscribed-success-message'] ) ) : '',
2753 
-				'general-error'			=> trim( $_POST['yikes-easy-mc-general-error-message'] ) ? trim( stripslashes( $_POST['yikes-easy-mc-general-error-message'] ) ) : '',
2754 
-				'already-subscribed'	=> trim( $_POST['yikes-easy-mc-user-subscribed-message'] ) ? trim( stripslashes( $_POST['yikes-easy-mc-user-subscribed-message'] ) ) : '',
2755 
-				'update-link'			=> trim( $_POST['yikes-easy-mc-user-update-link'] ) ? trim( stripslashes( $_POST['yikes-easy-mc-user-update-link'] ) ) : '',
2756 
-				'email-subject'			=> trim( $_POST['yikes-easy-mc-user-email-subject'] ) ? trim( stripslashes( $_POST['yikes-easy-mc-user-email-subject'] ) ) : '',
2757 
-				'email-body'			=> trim( $_POST['yikes-easy-mc-user-email-body'] ) ? trim( stripslashes( $_POST['yikes-easy-mc-user-email-body'] ) ) : '',
2758 
-				'update-email-success'  => trim( $_POST['yikes-easy-mc-update-email-successful'] ) ? trim( stripslashes( $_POST['yikes-easy-mc-update-email-successful'] ) ) : '',
2759 
-				'update-email-failure'  => trim( $_POST['yikes-easy-mc-update-email-failure'] ) ? trim( stripslashes( $_POST['yikes-easy-mc-update-email-failure'] ) ) : '',
2750 
+				'success'				=> trim( $_POST[ 'yikes-easy-mc-success-message' ] ) ? trim( stripslashes( $_POST[ 'yikes-easy-mc-success-message' ] ) ) : '',
2751 
+				'success-single-optin'	=> trim( $_POST[ 'yikes-easy-mc-success-single-optin-message' ] ) ? trim( stripslashes( $_POST[ 'yikes-easy-mc-success-single-optin-message' ] ) ) : '',
2752 
+				'success-resubscribed'	=> trim( $_POST[ 'yikes-easy-mc-user-resubscribed-success-message' ] ) ? trim( stripslashes( $_POST[ 'yikes-easy-mc-user-resubscribed-success-message' ] ) ) : '',
2753 
+				'general-error'			=> trim( $_POST[ 'yikes-easy-mc-general-error-message' ] ) ? trim( stripslashes( $_POST[ 'yikes-easy-mc-general-error-message' ] ) ) : '',
2754 
+				'already-subscribed'	=> trim( $_POST[ 'yikes-easy-mc-user-subscribed-message' ] ) ? trim( stripslashes( $_POST[ 'yikes-easy-mc-user-subscribed-message' ] ) ) : '',
2755 
+				'update-link'			=> trim( $_POST[ 'yikes-easy-mc-user-update-link' ] ) ? trim( stripslashes( $_POST[ 'yikes-easy-mc-user-update-link' ] ) ) : '',
2756 
+				'email-subject'			=> trim( $_POST[ 'yikes-easy-mc-user-email-subject' ] ) ? trim( stripslashes( $_POST[ 'yikes-easy-mc-user-email-subject' ] ) ) : '',
2757 
+				'email-body'			=> trim( $_POST[ 'yikes-easy-mc-user-email-body' ] ) ? trim( stripslashes( $_POST[ 'yikes-easy-mc-user-email-body' ] ) ) : '',
2758 
+				'update-email-success'  => trim( $_POST[ 'yikes-easy-mc-update-email-successful' ] ) ? trim( stripslashes( $_POST[ 'yikes-easy-mc-update-email-successful' ] ) ) : '',
2759 
+				'update-email-failure'  => trim( $_POST[ 'yikes-easy-mc-update-email-failure' ] ) ? trim( stripslashes( $_POST[ 'yikes-easy-mc-update-email-failure' ] ) ) : '',
2760 2760 
 			);
2761 2761
2762 2762 
 			// Setup the new form settings array
2763 2763 
 			// @since 6.0.3.8
2764 2764 
 			// To Do: Combine date & time so it's a single unix timestamp
2765 2765 
 			$form_settings = array(
2766 
-				'yikes-easy-mc-form-class-names'                 => trim( $_POST['yikes-easy-mc-form-class-names'] ),
2767 
-				'yikes-easy-mc-inline-form'                      => $_POST['yikes-easy-mc-inline-form'][0],
2768 
-				'yikes-easy-mc-submit-button-type'               => $_POST['yikes-easy-mc-submit-button-type'][0],
2769 
-				'yikes-easy-mc-submit-button-text'               => trim( $_POST['yikes-easy-mc-submit-button-text'] ),
2770 
-				'yikes-easy-mc-submit-button-image'              => esc_url( trim( $_POST['yikes-easy-mc-submit-button-image'] ) ),
2771 
-				'yikes-easy-mc-submit-button-classes'            => trim( $_POST['yikes-easy-mc-submit-button-classes'] ),
2772 
-				'yikes-easy-mc-form-schedule'                    => ( isset( $_POST['yikes-easy-mc-form-schedule'] ) ) ? '1' : '0',
2773 
-				'yikes-easy-mc-form-restriction-start'           => strtotime( $_POST['yikes-easy-mc-form-restriction-start-date'] . ' ' . $_POST['yikes-easy-mc-form-restriction-start-time'] ),
2774 
-				'yikes-easy-mc-form-restriction-end'             => strtotime( $_POST['yikes-easy-mc-form-restriction-end-date'] . ' ' . $_POST['yikes-easy-mc-form-restriction-end-time'] ),
2775 
-				'yikes-easy-mc-form-restriction-pending-message' => trim( $_POST['yikes-easy-mc-form-restriction-pending-message'] ),
2776 
-				'yikes-easy-mc-form-restriction-expired-message' => trim( $_POST['yikes-easy-mc-form-restriction-expired-message'] ),
2777 
-				'yikes-easy-mc-form-login-required'              => ( isset( $_POST['yikes-easy-mc-form-login-required'] ) ) ? '1' : '0',
2778 
-				'yikes-easy-mc-form-restriction-login-message'   => trim( $_POST['yikes-easy-mc-form-restriction-login-message'] ),
2766 
+				'yikes-easy-mc-form-class-names'                 => trim( $_POST[ 'yikes-easy-mc-form-class-names' ] ),
2767 
+				'yikes-easy-mc-inline-form'                      => $_POST[ 'yikes-easy-mc-inline-form' ][ 0 ],
2768 
+				'yikes-easy-mc-submit-button-type'               => $_POST[ 'yikes-easy-mc-submit-button-type' ][ 0 ],
2769 
+				'yikes-easy-mc-submit-button-text'               => trim( $_POST[ 'yikes-easy-mc-submit-button-text' ] ),
2770 
+				'yikes-easy-mc-submit-button-image'              => esc_url( trim( $_POST[ 'yikes-easy-mc-submit-button-image' ] ) ),
2771 
+				'yikes-easy-mc-submit-button-classes'            => trim( $_POST[ 'yikes-easy-mc-submit-button-classes' ] ),
2772 
+				'yikes-easy-mc-form-schedule'                    => ( isset( $_POST[ 'yikes-easy-mc-form-schedule' ] ) ) ? '1' : '0',
2773 
+				'yikes-easy-mc-form-restriction-start'           => strtotime( $_POST[ 'yikes-easy-mc-form-restriction-start-date' ] . ' ' . $_POST[ 'yikes-easy-mc-form-restriction-start-time' ] ),
2774 
+				'yikes-easy-mc-form-restriction-end'             => strtotime( $_POST[ 'yikes-easy-mc-form-restriction-end-date' ] . ' ' . $_POST[ 'yikes-easy-mc-form-restriction-end-time' ] ),
2775 
+				'yikes-easy-mc-form-restriction-pending-message' => trim( $_POST[ 'yikes-easy-mc-form-restriction-pending-message' ] ),
2776 
+				'yikes-easy-mc-form-restriction-expired-message' => trim( $_POST[ 'yikes-easy-mc-form-restriction-expired-message' ] ),
2777 
+				'yikes-easy-mc-form-login-required'              => ( isset( $_POST[ 'yikes-easy-mc-form-login-required' ] ) ) ? '1' : '0',
2778 
+				'yikes-easy-mc-form-restriction-login-message'   => trim( $_POST[ 'yikes-easy-mc-form-restriction-login-message' ] ),
2779 2779 
 			);
2780 2780
2781 2781 
 			// additional custom fields (extensions / user defined fields)
2782 2782 
 			$custom_fields = array();
2783 
-			if ( isset( $_POST['custom-field'] ) ) {
2784 
-				foreach ( $_POST['custom-field'] as $custom_field => $custom_value ) {
2783 
+			if ( isset( $_POST[ 'custom-field' ] ) ) {
2784 
+				foreach ( $_POST[ 'custom-field' ] as $custom_field => $custom_value ) {
2785 2785 
 					if ( is_array( $custom_value ) ) {
2786 2786 
 						$custom_fields[ $custom_field ] = array_filter( stripslashes_deep( $custom_value ) ); // array_filters to remove empty items (don't save them!)
2787 2787 
 					} else {

@@ -2813,7 +2813,7 @@  discard block
 
 block discarded – undo
2813 2813 
 			$this->form_interface->update_form( $form_id, $form_updates );
2814 2814
2815 2815 
 			/* Custom action hook which allows users to update specific options when a form is updated - used in add ons */
2816 
-			do_action( 'yikes-mailchimp-save-form', $form_id,  $custom_fields );
2816 
+			do_action( 'yikes-mailchimp-save-form', $form_id, $custom_fields );
2817 2817
2818 2818 
 			// redirect the user to the manage forms page, display confirmation
2819 2819 
 			wp_redirect( esc_url_raw( admin_url( 'admin.php?page=yikes-mailchimp-edit-form&id=' . $form_id . '&updated-form=true' ) ) );

@@ -2824,11 +2824,11 @@  discard block
 
 block discarded – undo
2824 2824 
 			$email_body  = '<p>' . __( 'Greetings,', 'yikes-inc-easy-mailchimp-extender' ) . '</p>';
2825 2825
2826 2826 
 			$email_body .= '<p>';
2827 
-			$email_body .= 	__( 'A request has been made to update your MailChimp account profile information.', 'yikes-inc-easy-mailchimp-extender' );
2828 
-			$email_body .=	__( ' To do so please use the following link: ', 'yikes-inc-easy-mailchimp-extender' );
2829 
-			$email_body .=	'[link]';
2830 
-			$email_body .=		__( 'Update MailChimp Profile Info', 'yikes-inc-easy-mailchimp-extender' );
2831 
-			$email_body .= 	'[/link]';
2827 
+			$email_body .= __( 'A request has been made to update your MailChimp account profile information.', 'yikes-inc-easy-mailchimp-extender' );
2828 
+			$email_body .= __( ' To do so please use the following link: ', 'yikes-inc-easy-mailchimp-extender' );
2829 
+			$email_body .= '[link]';
2830 
+			$email_body .= __( 'Update MailChimp Profile Info', 'yikes-inc-easy-mailchimp-extender' );
2831 
+			$email_body .= '[/link]';
2832 2832 
 			$email_body .= '</p>';
2833 2833
2834 2834 
 			$email_body .= '<p>' . __( 'If you did not request this update, please disregard this email.', 'yikes-inc-easy-mailchimp-extender' ) . '</p>';

@@ -2844,13 +2844,13 @@  discard block
 
 block discarded – undo
2844 2844
2845 2845 
 		/* Unsubscribe a given user from our list */
2846 2846 
 		public function yikes_easy_mailchimp_unsubscribe_user() {
2847 
-			$nonce    = $_REQUEST['nonce'];
2848 
-			$list_id  = $_REQUEST['mailchimp-list'];
2849 
-			$email_id = $_REQUEST['email_id'];
2847 
+			$nonce    = $_REQUEST[ 'nonce' ];
2848 
+			$list_id  = $_REQUEST[ 'mailchimp-list' ];
2849 
+			$email_id = $_REQUEST[ 'email_id' ];
2850 2850
2851 2851 
 			// verify our nonce
2852 2852 
 			if ( ! wp_verify_nonce( $nonce, 'unsubscribe-user-' . $email_id ) ) {
2853 
-				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 ) );
2853 
+				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 ) );
2854 2854 
 			}
2855 2855
2856 2856 
 			$response = yikes_get_mc_api_manager()->get_list_handler()->member_unsubscribe( $list_id, $email_id );

@@ -2869,21 +2869,21 @@  discard block
 
 block discarded – undo
2869 2869
2870 2870 
 		public function yikes_easy_mailchimp_create_missing_error_log() {
2871 2871 
 			// grab our nonnce
2872 
-			$nonce = $_REQUEST['nonce'];
2872 
+			$nonce = $_REQUEST[ 'nonce' ];
2873 2873 
 			// validate nonce
2874 
-			if ( !wp_verify_nonce( $nonce, 'create_error_log' ) ) {
2875 
-				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 ) );
2874 
+			if ( ! wp_verify_nonce( $nonce, 'create_error_log' ) ) {
2875 
+				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 ) );
2876 2876 
 			}
2877 2877 
 			// setup the path to the error log
2878 2878 
 			$error_log = fopen( plugin_dir_path( __FILE__ ) . '../includes/error_log/yikes-easy-mailchimp-error-log.php', 'w' );
2879 2879 
 			try {
2880 2880 
 				// create the file
2881 
-				fwrite( $error_log , '' );
2881 
+				fwrite( $error_log, '' );
2882 2882 
 				// close out
2883 2883 
 				fclose( $error_log );
2884 2884 
 				wp_redirect( esc_url_raw( admin_url( 'admin.php?page=yikes-inc-easy-mailchimp-settings&section=debug-settings&error_log_created=true' ) ) );
2885 2885 
 			} catch ( Exception $e ) {
2886 
-				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() ) ) ) );
2886 
+				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() ) ) ) );
2887 2887 
 			}
2888 2888 
 		}
2889 2889 
 

@@ -2894,9 +2894,9 @@  discard block
 
 block discarded – undo
2894 2894 
 		public function yikes_easy_mailchimp_clear_transient_data() {
2895 2895
2896 2896 
 			// verify our nonce
2897 
-			$nonce = $_REQUEST['nonce'];
2897 
+			$nonce = $_REQUEST[ 'nonce' ];
2898 2898 
 			if ( ! wp_verify_nonce( $nonce, 'clear-mc-transient-data' ) ) {
2899 
-				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 ) );
2899 
+				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 ) );
2900 2900 
 			}
2901 2901
2902 2902 
 			$this->delete_yikes_mailchimp_transients();

@@ -2905,10 +2905,10 @@  discard block
 
 block discarded – undo
2905 2905 
 			$referer = wp_get_referer();
2906 2906 
 			if ( $referer && ( strpos( $referer, 'yikes-inc-easy-mailchimp-settings' ) > 0 ) ) {
2907 2907 
 				wp_redirect( esc_url_raw( admin_url( 'admin.php?page=yikes-inc-easy-mailchimp-settings&section=api-cache-settings&transient-cleared=true' ) ) );
2908 
-			} elseif ( isset( $_REQUEST['page'] ) && $_REQUEST['page'] === 'yikes-mailchimp-edit-form' && isset( $_REQUEST['id'] ) && ! empty( $_REQUEST['id'] ) ) {
2908 
+			} elseif ( isset( $_REQUEST[ 'page' ] ) && $_REQUEST[ 'page' ] === 'yikes-mailchimp-edit-form' && isset( $_REQUEST[ 'id' ] ) && ! empty( $_REQUEST[ 'id' ] ) ) {
2909 2909
2910 2910 
 				// else check if we were editing a form.
2911 
-				$id = filter_var( $_REQUEST['id'], FILTER_SANITIZE_NUMBER_INT );
2911 
+				$id = filter_var( $_REQUEST[ 'id' ], FILTER_SANITIZE_NUMBER_INT );
2912 2912 
 				wp_redirect( esc_url_raw( admin_url( 'admin.php?page=yikes-mailchimp-edit-form&id=' . $id ) ) );
2913 2913 
 			} else {
2914 2914 
 				// else redirect to the manage forms page.

@@ -2952,7 +2952,7 @@  discard block
 
 block discarded – undo
2952 2952 
 		 */
2953 2953 
 		public function yikes_mailchimp_load_helper_class() {
2954 2954 
 			// check to see if it's already loaded up.
2955 
-			if ( !class_exists( 'Yikes_Inc_Easy_Mailchimp_Forms_Helper' ) ) {
2955 
+			if ( ! class_exists( 'Yikes_Inc_Easy_Mailchimp_Forms_Helper' ) ) {
2956 2956 
 				// Include our main helper class file
2957 2957 
 				include_once( YIKES_MC_PATH . 'admin/partials/helpers/init.php' );
2958 2958 
 			}
Please login to merge, or discard this patch.
Braces   +243 added lines, -243 removed lines patch added patch discarded remove patch 
@@ -9,7 +9,7 @@  discard block
 
 block discarded – undo
9 9 
  * @subpackage Yikes_Inc_Easy_Mailchimp_Forms/admin
10 10 
  * @author     YIKES, Inc. <[email protected]>
11 11 
  */
12 
-class Yikes_Inc_Easy_Mailchimp_Forms_Admin {
12 
+class Yikes_Inc_Easy_Mailchimp_Forms_Admin {
13 13
14 14 
 	/**
15 15 
 	 * The ID of this plugin.

@@ -49,7 +49,7 @@  discard block
 
 block discarded – undo
49 49 
 		$yikes_inc_easy_mailchimp_extender,
50 50 
 		$version,
51 51 
 		Yikes_Inc_Easy_MailChimp_Extender_Form_Interface $form_interface
52 
-	) {
52 
+	) {
53 53 
 		$this->yikes_inc_easy_mailchimp_extender = $yikes_inc_easy_mailchimp_extender;
54 54 
 		$this->version                           = $version;
55 55 
 		$this->form_interface                    = $form_interface;

@@ -60,7 +60,7 @@  discard block
 
 block discarded – undo
60 60 
 	 *
61 61 
 	 * @author Jeremy Pry
62 62 
 	 */
63 
-	public function hooks() {
63 
+	public function hooks() {
64 64
65 65 
 		// check for old plugin options and migrate if exist.
66 66 
 		add_action( 'admin_menu', array( $this, 'register_admin_pages' ), 11 );

@@ -101,7 +101,7 @@  discard block
 
 block discarded – undo
101 101 
 		/***********************/
102 102 
 		/** Create A Form **/
103 103 
 		/**********************/
104 
-		if ( isset( $_REQUEST['action'] ) && $_REQUEST['action'] == 'yikes-easy-mc-create-form' ) {
104 
+		if ( isset( $_REQUEST['action'] ) && $_REQUEST['action'] == 'yikes-easy-mc-create-form' ) {
105 105
106 106 
 			add_action( 'init', array( $this, 'yikes_easy_mailchimp_create_form' ) );
107 107 
 

@@ -110,7 +110,7 @@  discard block
 
 block discarded – undo
110 110 
 		/***********************/
111 111 
 		/** Delete A Form **/
112 112 
 		/**********************/
113 
-		if ( isset( $_REQUEST['action'] ) && $_REQUEST['action'] == 'yikes-easy-mc-delete-form' ) {
113 
+		if ( isset( $_REQUEST['action'] ) && $_REQUEST['action'] == 'yikes-easy-mc-delete-form' ) {
114 114
115 115 
 			add_action( 'init', array( $this, 'yikes_easy_mailchimp_delete_form' ) );
116 116 
 

@@ -119,7 +119,7 @@  discard block
 
 block discarded – undo
119 119 
 		/**********************************/
120 120 
 		/** Duplicate/Clone A Form    **/
121 121 
 		/********************************/
122 
-		if ( isset( $_REQUEST['action'] ) && $_REQUEST['action'] == 'yikes-easy-mc-duplicate-form' ) {
122 
+		if ( isset( $_REQUEST['action'] ) && $_REQUEST['action'] == 'yikes-easy-mc-duplicate-form' ) {
123 123
124 124 
 			add_action( 'init', array( $this, 'yikes_easy_mailchimp_duplicate_form' ) );
125 125 
 

@@ -128,7 +128,7 @@  discard block
 
 block discarded – undo
128 128 
 		/*************************************/
129 129 
 		/**  Reset Form Impression Stats **/
130 130 
 		/***********************************/
131 
-		if ( isset( $_REQUEST['action'] ) && $_REQUEST['action'] == 'yikes-easy-mc-reset-stats' ) {
131 
+		if ( isset( $_REQUEST['action'] ) && $_REQUEST['action'] == 'yikes-easy-mc-reset-stats' ) {
132 132
133 133 
 			add_action( 'init', array( $this, 'yikes_easy_mailchimp_reset_impression_stats' ) );
134 134 
 

@@ -137,7 +137,7 @@  discard block
 
 block discarded – undo
137 137 
 		/**********************************/
138 138 
 		/**         Update A Form        **/
139 139 
 		/********************************/
140 
-		if ( isset( $_REQUEST['action'] ) && $_REQUEST['action'] == 'yikes-easy-mc-update-form' ) {
140 
+		if ( isset( $_REQUEST['action'] ) && $_REQUEST['action'] == 'yikes-easy-mc-update-form' ) {
141 141
142 142 
 			add_action( 'init', array( $this, 'yikes_easy_mailchimp_update_form' ) );
143 143 
 

@@ -146,7 +146,7 @@  discard block
 
 block discarded – undo
146 146 
 		/**************************************************/
147 147 
 		/**     Clear Store MailChimp Transient Data   **/
148 148 
 		/*************************************************/
149 
-		if ( isset( $_REQUEST['action'] ) && $_REQUEST['action'] == 'yikes-easy-mc-clear-transient-data' ) {
149 
+		if ( isset( $_REQUEST['action'] ) && $_REQUEST['action'] == 'yikes-easy-mc-clear-transient-data' ) {
150 150
151 151 
 			add_action( 'init', array( $this, 'yikes_easy_mailchimp_clear_transient_data' ) );
152 152 
 

@@ -155,7 +155,7 @@  discard block
 
 block discarded – undo
155 155 
 		/*******************************************/
156 156 
 		/** Remove a user from a mailing list     **/
157 157 
 		/*****************************************/
158 
-		if ( isset( $_REQUEST['action'] ) && $_REQUEST['action'] == 'yikes-easy-mc-unsubscribe-user' ) {
158 
+		if ( isset( $_REQUEST['action'] ) && $_REQUEST['action'] == 'yikes-easy-mc-unsubscribe-user' ) {
159 159
160 160 
 			add_action( 'init', array( $this, 'yikes_easy_mailchimp_unsubscribe_user' ) );
161 161 
 

@@ -164,7 +164,7 @@  discard block
 
 block discarded – undo
164 164 
 		/*******************************************/
165 165 
 		/**    Create misisng error log file  **/
166 166 
 		/*****************************************/
167 
-		if ( isset( $_REQUEST['action'] ) && $_REQUEST['action'] == 'yikes-easy-mc-create-error-log' ) {
167 
+		if ( isset( $_REQUEST['action'] ) && $_REQUEST['action'] == 'yikes-easy-mc-create-error-log' ) {
168 168
169 169 
 			add_action( 'init', array( $this, 'yikes_easy_mailchimp_create_missing_error_log' ) );
170 170 
 

@@ -176,14 +176,14 @@  discard block
 
 block discarded – undo
176 176 
 		add_action( 'admin_head', array( $this, 'add_tinyMCE_buttons' ) );
177 177
178 178 
 		// pass our lists data to tinyMCE button for use.
179 
-		foreach ( array( 'post.php', 'post-new.php' ) as $hook ) {
179 
+		foreach ( array( 'post.php', 'post-new.php' ) as $hook ) {
180 180
181 181 
 			add_action( 'admin_enqueue_scripts', array( $this, 'tinymce_yikes_easy_mc' ) );
182 182
183 183 
 		}
184 184
185 185 
 		// display an admin notice for users on PHP < 5.3.
186 
-		if ( phpversion() < '5.3' ) {
186 
+		if ( phpversion() < '5.3' ) {
187 187 
 			add_action( "admin_notices", array( $this, 'display_php_warning' ), 999 );
188 188 
 		}
189 189 
 

@@ -196,7 +196,7 @@  discard block
 
 block discarded – undo
196 196 
 		/**************************************************/
197 197 
 		/**        Clear MailChimp Error Log Data        **/
198 198 
 		/*************************************************/
199 
-		if ( isset( $_REQUEST['action'] ) && $_REQUEST['action'] == 'yikes-easy-mc-clear-error-log' ) {
199 
+		if ( isset( $_REQUEST['action'] ) && $_REQUEST['action'] == 'yikes-easy-mc-clear-error-log' ) {
200 200
201 201 
 			add_action( 'init', array( $this, 'yikes_easy_mailchimp_clear_error_log' ) );
202 202 
 

@@ -205,7 +205,7 @@  discard block
 
 block discarded – undo
205 205 
 		/*********************************************/
206 206 
 		/**        Export MailChimp Opt-in Forms   **/
207 207 
 		/*******************************************/
208 
-		if ( isset( $_REQUEST['action'] ) && $_REQUEST['action'] == 'yikes-easy-mc-export-forms' ) {
208 
+		if ( isset( $_REQUEST['action'] ) && $_REQUEST['action'] == 'yikes-easy-mc-export-forms' ) {
209 209
210 210 
 			add_action( 'init', array( $this, 'yikes_easy_mailchimp_export_forms' ) );
211 211 
 

@@ -214,7 +214,7 @@  discard block
 
 block discarded – undo
214 214 
 		/*********************************************/
215 215 
 		/**                Export Plugin Settings           **/
216 216 
 		/*******************************************/
217 
-		if ( isset( $_REQUEST['action'] ) && $_REQUEST['action'] == 'yikes-easy-mc-export-settings' ) {
217 
+		if ( isset( $_REQUEST['action'] ) && $_REQUEST['action'] == 'yikes-easy-mc-export-settings' ) {
218 218
219 219 
 			add_action( 'init', array( $this, 'yikes_easy_mailchimp_export_plugin_settings' ) );
220 220 
 

@@ -223,7 +223,7 @@  discard block
 
 block discarded – undo
223 223 
 		/*******************************************/
224 224 
 		/**        Import Class Inclusion       **/
225 225 
 		/*****************************************/
226 
-		if ( isset( $_REQUEST['action'] ) && $_REQUEST['action'] == 'yikes-easy-mc-import-forms' ) {
226 
+		if ( isset( $_REQUEST['action'] ) && $_REQUEST['action'] == 'yikes-easy-mc-import-forms' ) {
227 227
228 228 
 			add_action( 'init', array( $this, 'yikes_easy_mailchimp_import_forms' ) );
229 229 
 

@@ -232,7 +232,7 @@  discard block
 
 block discarded – undo
232 232 
 		/*******************************************/
233 233 
 		/**    Premium Support Request     **/
234 234 
 		/*****************************************/
235 
-		if ( isset( $_POST['submit-premium-support-request'] ) ) {
235 
+		if ( isset( $_POST['submit-premium-support-request'] ) ) {
236 236
237 237 
 			add_action( 'init', array( $this, 'yikes_easy_mailchimp_premium_support_request' ) );
238 238 
 

@@ -241,7 +241,7 @@  discard block
 
 block discarded – undo
241 241 
 		/****************************************/
242 242 
 		/**    Dismiss Options Migrations        **/
243 243 
 		/****************************************/
244 
-		if ( isset( $_REQUEST['dismiss_migration_nonce'] ) ) {
244 
+		if ( isset( $_REQUEST['dismiss_migration_nonce'] ) ) {
245 245
246 246 
 			add_action( 'init', array( $this, 'yikes_easy_mailchimp_dismiss_option_migrate' ) );
247 247 
 

@@ -276,7 +276,7 @@  discard block
 
 block discarded – undo
276 276 
 		 * @ param  array  $links  Pre-existing plugin action links
277 277 
 		 * @ return array  $links  New array of plugin actions
278 278 
 		 */
279 
-		public function easy_forms_plugin_action_links( $links ) {
279 
+		public function easy_forms_plugin_action_links( $links ) {
280 280 
 			$links[] = '<a href="'. esc_url( get_admin_url(null, 'admin.php?page=yikes-inc-easy-mailchimp-settings') ) .'">' . __( 'Settings', 'yikes-inc-easy-mailchimp-extender' ) . '</a>';
281 281 
 			$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>';
282 282 
 			return $links;

@@ -292,13 +292,13 @@  discard block
 
 block discarded – undo
292 292 
 		 *
293 293 
 		 * @return string
294 294 
 		 */
295 
-		public function yikes_easy_forms_admin_disclaimer( $footer_text ) {
295 
+		public function yikes_easy_forms_admin_disclaimer( $footer_text ) {
296 296 
 			$page = get_current_screen();
297 297 
 			$base = $page->base;
298 
-			if ( strpos( $base, 'yikes-inc-easy-mailchimp' ) !== false || strpos( $base, 'yikes-mailchimp' ) !== false ) {
298 
+			if ( strpos( $base, 'yikes-inc-easy-mailchimp' ) !== false || strpos( $base, 'yikes-mailchimp' ) !== false ) {
299 299 
 				$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>' );
300 300 
 				return $disclaimer_text;
301 
-			} else {
301 
+			} else {
302 302 
 				return $footer_text;
303 303 
 			}
304 304 
 		}

@@ -310,32 +310,32 @@  discard block
 
 block discarded – undo
310 310 
 		*	@since 6.0.0
311 311 
 		*	@return	parsed tag content
312 312 
 		*/
313 
-		public function parse_mailchimp_default_tag( $default_tag ) {
314 
-			if ( ! $default_tag || $default_tag == '' ) {
313 
+		public function parse_mailchimp_default_tag( $default_tag ) {
314 
+			if ( ! $default_tag || $default_tag == '' ) {
315 315 
 				return $default_tag;
316 316 
 			}
317 317 
 			global $post;
318 318 
 			// page title.
319 
-			if ( $default_tag == '{page_title}' ) {
319 
+			if ( $default_tag == '{page_title}' ) {
320 320 
 				$default_tag = get_the_title( $post->ID );
321 321 
 			}
322 322 
 			// page id.
323 
-			if ( $default_tag == '{page_id}' ) {
323 
+			if ( $default_tag == '{page_id}' ) {
324 324 
 				$default_tag = $post->ID;
325 325 
 			}
326 326 
 			// page url.
327 
-			if ( $default_tag == '{page_url}' ) {
327 
+			if ( $default_tag == '{page_url}' ) {
328 328 
 				$default_tag = get_permalink( $post->ID );
329 329 
 			}
330 330 
 			// blog name.
331 
-			if ( $default_tag == '{blog_name}' ) {
331 
+			if ( $default_tag == '{blog_name}' ) {
332 332 
 				$default_tag = get_bloginfo( 'name' );
333 333 
 			}
334 334 
 			// is user logged in.
335 
-			if ( $default_tag == '{user_logged_in}' ) {
336 
-				if ( is_user_logged_in() ) {
335 
+			if ( $default_tag == '{user_logged_in}' ) {
336 
+				if ( is_user_logged_in() ) {
337 337 
 					$default_tag = 'Registered User';
338 
-				} else {
338 
+				} else {
339 339 
 					$default_tag = 'Guest User';
340 340 
 				}
341 341 
 			}

@@ -349,21 +349,21 @@  discard block
 
 block discarded – undo
349 349 
 		*	When a user clicks 'Clear Log' on the debug settings page, this funciton
350 350 
 		*	is used to clear the data out of our php file.
351 351 
 		*/
352 
-		public function yikes_easy_mailchimp_clear_error_log() {
352 
+		public function yikes_easy_mailchimp_clear_error_log() {
353 353
354 354 
 			// Get our error log class.
355 355 
 			$error_logging = new Yikes_Inc_Easy_Mailchimp_Error_Logging();
356 356
357 357 
 			// file put contents $returned error + other data.
358 
-			if ( file_exists( $error_logging->error_log_file_path ) ) {
358 
+			if ( file_exists( $error_logging->error_log_file_path ) ) {
359 359
360 360 
 				$clear_log = file_put_contents( $error_logging->error_log_file_path, '' );
361 361
362 
-				if ( $clear_log === false ) {
362 
+				if ( $clear_log === false ) {
363 363
364 364 
 					// redirect the user to the manage forms page, display error message.
365 365 
 					wp_redirect( esc_url_raw( admin_url( 'admin.php?page=yikes-inc-easy-mailchimp-settings&section=debug-settings&error-log-cleared=false' ) ) );
366 
-				} else {
366 
+				} else {
367 367
368 368 
 					// redirect the user to the manage forms page, display confirmation.
369 369 
 					wp_redirect( esc_url_raw( admin_url( 'admin.php?page=yikes-inc-easy-mailchimp-settings&section=debug-settings&error-log-cleared=true' ) ) );

@@ -377,13 +377,13 @@  discard block
 
 block discarded – undo
377 377 
 		*	@since 		6.0.0
378 378 
 		*	@return 	CSV export file
379 379 
 		*/
380 
-		public function yikes_easy_mailchimp_export_forms() {
380 
+		public function yikes_easy_mailchimp_export_forms() {
381 381 
 			// grab our nonce.
382 382 
 			$nonce = $_REQUEST['nonce'];
383 383 
 			// grab the forms.
384 384 
 			$forms = isset( $_REQUEST['export_forms'] ) ? $_REQUEST['export_forms'] : array();
385 385 
 			// validate nonce.
386 
-			if ( ! wp_verify_nonce( $nonce, 'export-forms' ) ) {
386 
+			if ( ! wp_verify_nonce( $nonce, 'export-forms' ) ) {
387 387 
 				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 ) );
388 388 
 			}
389 389 
 

@@ -401,11 +401,11 @@  discard block
 
 block discarded – undo
401 401 
 		*	@since 		6.0.0
402 402 
 		*	@return 	CSV export file
403 403 
 		*/
404 
-		public function yikes_easy_mailchimp_export_plugin_settings() {
404 
+		public function yikes_easy_mailchimp_export_plugin_settings() {
405 405 
 			// grab our nonce
406 406 
 			$nonce = $_REQUEST['nonce'];
407 407 
 			// validate nonce.
408 
-			if ( ! wp_verify_nonce( $nonce, 'export-settings' ) ) {
408 
+			if ( ! wp_verify_nonce( $nonce, 'export-settings' ) ) {
409 409 
 				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 ) );
410 410 
 			}
411 411 
 

@@ -421,15 +421,15 @@  discard block
 
 block discarded – undo
421 421 
 		*	Custom import function to import all or specific forms
422 422 
 		*	@since 6.0.0
423 423 
 		*/
424 
-		public function yikes_easy_mailchimp_import_forms() {
424 
+		public function yikes_easy_mailchimp_import_forms() {
425 425 
 			// grab our nonce.
426 426 
 			$nonce = $_REQUEST['nonce'];
427 427 
 			// validate nonce.
428 
-			if ( ! wp_verify_nonce( $nonce, 'import-forms' ) ) {
428 
+			if ( ! wp_verify_nonce( $nonce, 'import-forms' ) ) {
429 429 
 				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 ) );
430 430 
 			}
431 431 
 			// include the export class.
432 
-			if ( ! class_exists( 'Yikes_Inc_Easy_MailChimp_Import_Class' ) ) {
432 
+			if ( ! class_exists( 'Yikes_Inc_Easy_MailChimp_Import_Class' ) ) {
433 433 
 				include_once( YIKES_MC_PATH . 'includes/import-export/yikes-easy-mailchimp-import.class.php' );
434 434 
 			}
435 435 
 			// run the import function.

@@ -445,9 +445,9 @@  discard block
 
 block discarded – undo
445 445 
 		*	Premium Support Request
446 446 
 		*	@since 6.0.0
447 447 
 		*/
448 
-		public function yikes_easy_mailchimp_premium_support_request() {
448 
+		public function yikes_easy_mailchimp_premium_support_request() {
449 449
450 
-			if ( isset( $_POST['action'] ) && $_POST['action'] != 'yikes-support-request' ) {
450 
+			if ( isset( $_POST['action'] ) && $_POST['action'] != 'yikes-support-request' ) {
451 451 
 				return __( 'We encountered an error. Please contact the YIKES Inc. support team.', 'yikes-inc-easy-mailchimp-extender' );
452 452 
 			}
453 453 
 

@@ -483,7 +483,7 @@  discard block
 
 block discarded – undo
483 483 
 			) );
484 484
485 485 
 			// Catch the error.
486 
-			if ( is_wp_error( $response ) ) {
486 
+			if ( is_wp_error( $response ) ) {
487 487 
 				wp_send_json_error( $response->getMessage() );
488 488 
 			}
489 489 
 

@@ -491,9 +491,9 @@  discard block
 
 block discarded – undo
491 491 
 			$response_body = json_decode( wp_remote_retrieve_body( $response ) );
492 492 
 		}
493 493
494 
-		public function get_premium_license( $plugin_slug ) {
494 
+		public function get_premium_license( $plugin_slug ) {
495 495
496 
-			switch( $plugin_slug ) {
496 
+			switch( $plugin_slug ) {
497 497
498 498 
 				case 'form-customizer':
499 499 
 					return defined( 'YIKES_CUSTOMIZER_EDD_ITEM_ID' ) ? YIKES_CUSTOMIZER_EDD_ITEM_ID : '';

@@ -514,7 +514,7 @@  discard block
 
 block discarded – undo
514 514 
 		*
515 515 
 		*	@since 6.0.0
516 516 
 		**/
517 
-		public function yikes_easy_mailchimp_dismiss_option_migrate() {
517 
+		public function yikes_easy_mailchimp_dismiss_option_migrate() {
518 518 
 			// delete the options and allow the user to manually update things.
519 519
520 520 
 			// Verify the NONCE is valid.

@@ -532,8 +532,8 @@  discard block
 
 block discarded – undo
532 532 
 		 *
533 533 
 		 * @since 6.0.0
534 534 
 		 */
535 
-		public function load_error_logging_class() {
536 
-			if ( get_option( 'yikes-mailchimp-debug-status', '' ) == '1' ) {
535 
+		public function load_error_logging_class() {
536 
+			if ( get_option( 'yikes-mailchimp-debug-status', '' ) == '1' ) {
537 537 
 				// if error logging is enabled we should include our error logging class
538 538 
 				/* Generate oure error logging table */
539 539 
 				require_once YIKES_MC_PATH . '/includes/error_log/class-yikes-inc-easy-mailchimp-error-logging.php';

@@ -548,21 +548,21 @@  discard block
 
 block discarded – undo
548 548 
 		 *
549 549 
 		 * @since v6.0.0
550 550 
 		 */
551 
-		public function yikes_easy_mailchimp_check_installation_date() {
551 
+		public function yikes_easy_mailchimp_check_installation_date() {
552 552
553 553 
 			// add a new option to store the plugin activation date/time.
554 554 
 			// @since v6.0.0.
555 555 
 			// this is used to notify the user that they should review after 2 weeks.
556 
-			if ( !get_option( 'yikes_easy_mailchimp_activation_date' ) ) {
556 
+			if ( !get_option( 'yikes_easy_mailchimp_activation_date' ) ) {
557 557 
 				add_option( 'yikes_easy_mailchimp_activation_date', strtotime( "now" ) );
558 558 
 			}
559 559
560 560 
 			$stop_bugging_me = get_option( 'yikes_easy_mailchimp_review_stop_bugging_me' );
561 561
562 
-			if ( ! $stop_bugging_me ) {
562 
+			if ( ! $stop_bugging_me ) {
563 563 
 				$install_date = get_option( 'yikes_easy_mailchimp_activation_date' );
564 564 
 				$past_date = strtotime( '-14 days' );
565 
-				if ( $past_date >= $install_date && current_user_can( 'install_plugins' ) ) {
565 
+				if ( $past_date >= $install_date && current_user_can( 'install_plugins' ) ) {
566 566 
 					add_action( 'admin_notices', array( $this , 'yikes_easy_mailchimp_display_review_us_notice' ) );
567 567 
 				}
568 568 
 			}

@@ -574,9 +574,9 @@  discard block
 
 block discarded – undo
574 574 
 			asking for a review, and for user feedback
575 575 
 			@since v6.0.0
576 576 
 		*/
577 
-		public function yikes_easy_mailchimp_display_review_us_notice() {
577 
+		public function yikes_easy_mailchimp_display_review_us_notice() {
578 578 
 			/* Lets only display our admin notice on YT4WP pages to not annoy the hell out of people :) */
579 
-			if ( in_array( get_current_screen()->base , array( 'dashboard', 'post', 'edit' ) ) || strpos( get_current_screen()->base ,'yikes-inc-easy-mailchimp') !== false ) {
579 
+			if ( in_array( get_current_screen()->base , array( 'dashboard', 'post', 'edit' ) ) || strpos( get_current_screen()->base ,'yikes-inc-easy-mailchimp') !== false ) {
580 580
581 581 
 				// The URL of the page the user is currently on
582 582 
 				$current_uri  	  = isset( $_SERVER['REQUEST_URI'] ) && ! empty( $_SERVER['REQUEST_URI'] ) ? $_SERVER['REQUEST_URI'] : false;

@@ -619,8 +619,8 @@  discard block
 
 block discarded – undo
619 619 
 			Remove the Review us notification when user clicks 'Dismiss'
620 620 
 			@since v3.1.1
621 621 
 		*/
622 
-		public function yikes_easy_mailchimp_stop_bugging_me() {
623 
-			if ( isset( $_GET['yikes_easy_mc_icons_nobug'] ) && (int) filter_var( $_GET['yikes_easy_mc_icons_nobug'], FILTER_SANITIZE_NUMBER_INT ) === 1 ) {
622 
+		public function yikes_easy_mailchimp_stop_bugging_me() {
623 
+			if ( isset( $_GET['yikes_easy_mc_icons_nobug'] ) && (int) filter_var( $_GET['yikes_easy_mc_icons_nobug'], FILTER_SANITIZE_NUMBER_INT ) === 1 ) {
624 624 
 				add_option( 'yikes_easy_mailchimp_review_stop_bugging_me', true );
625 625 
 			}
626 626 
 		}

@@ -628,7 +628,7 @@  discard block
 
 block discarded – undo
628 628 
 	/* End Two Week Notification */
629 629
630 630 
 		/* Display a warning users who are using PHP < 5.3 */
631 
-		public function display_php_warning() {
631 
+		public function display_php_warning() {
632 632 
 			$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' );
633 633 
 			echo "<div class='error'> <p><span class='dashicons dashicons-no-alt' style='color:rgb(231, 98, 98)'></span> $message</p></div>";
634 634 
 		}

@@ -638,10 +638,10 @@  discard block
 
 block discarded – undo
638 638 
 	 * TinyMCE Functions
639 639 
 	 */
640 640 
 	// load our button and pass in the JS form data variable.
641 
-	public function add_tinyMCE_buttons() {
641 
+	public function add_tinyMCE_buttons() {
642 642 
 		global $typenow;
643 643 
 		// only on Post Type: post and page.
644 
-		if ( ! in_array( $typenow, array( 'post', 'page' ) ) ) {
644 
+		if ( ! in_array( $typenow, array( 'post', 'page' ) ) ) {
645 645 
 			return;
646 646 
 		}
647 647 
 		add_filter( 'mce_buttons', array( $this, 'yks_mc_add_tinymce_button' ) );

@@ -649,14 +649,14 @@  discard block
 
 block discarded – undo
649 649 
 	}
650 650
651 651 
 	// Add the button key for address via JS.
652 
-	public function yks_mc_add_tinymce_button( $buttons ) {
652 
+	public function yks_mc_add_tinymce_button( $buttons ) {
653 653 
 		array_push( $buttons, 'yks_mc_tinymce_button_key' );
654 654 
 		// Print all buttons.
655 655 
 		return $buttons;
656 656 
 	}
657 657
658 658 
 	// inlcude the js for tinymce.
659 
-	public function yks_mc_add_tinymce_plugin( $plugin_array ) {
659 
+	public function yks_mc_add_tinymce_plugin( $plugin_array ) {
660 660
661 661 
 		$plugin_array['yks_mc_tinymce_button'] = plugins_url( '/js/min/yikes-inc-easy-mailchimp-tinymce-button.min.js', __FILE__ );
662 662 
 

@@ -668,23 +668,23 @@  discard block
 
 block discarded – undo
668 668 
 		 * Pass our imported list data, to the JS file
669 669 
 		 * to build the drop down list in the modal
670 670 
 		 */
671 
-	public function tinymce_yikes_easy_mc() {
671 
+	public function tinymce_yikes_easy_mc() {
672 672 
 		// check capabilities.
673 
-		if ( ! current_user_can( apply_filters( 'yikes-mailchimp-user-role-access', 'manage_options' ) ) ) {
673 
+		if ( ! current_user_can( apply_filters( 'yikes-mailchimp-user-role-access', 'manage_options' ) ) ) {
674 674 
 			return;
675 675 
 		}
676 676
677 677 
 		$list_data = $this->form_interface->get_all_forms();
678 678 
 		$lists     = array();
679 
-		if ( ! empty( $list_data ) ) {
679 
+		if ( ! empty( $list_data ) ) {
680 680 
 			// build an array to pass to our javascript.
681 
-			foreach ( $list_data as $id => $form ) {
681 
+			foreach ( $list_data as $id => $form ) {
682 682 
 				$lists[] = array(
683 683 
 					'text'  => urlencode( $form['form_name'] ),
684 684 
 					'value' => $id,
685 685 
 				);
686 686 
 			}
687 
-		} else {
687 
+		} else {
688 688 
 			$lists[0] = array(
689 689 
 				'text'  => __( 'Please Import Some MailChimp Lists', 'yikes-inc-easy-mailchimp-extender' ),
690 690 
 				'value' => '-',

@@ -709,7 +709,7 @@  discard block
 
 block discarded – undo
709 709 
 	/**
710 710 
 	 *  Fix the MailChimp icon spacing in the admin menu.
711 711 
 	 */
712 
-	public function fix_menu_icon_spacing() {
712 
+	public function fix_menu_icon_spacing() {
713 713 
 		?>
714 714 
 			<style>
715 715 
 			a[href="admin.php?page=yikes-inc-easy-mailchimp"] .wp-menu-image img {

@@ -724,7 +724,7 @@  discard block
 
 block discarded – undo
724 724 
 	 *
725 725 
 	 * @since    6.0.0
726 726 
 	 */
727 
-	public function enqueue_styles() {
727 
+	public function enqueue_styles() {
728 728 
 		/**
729 729 
 		 *	Enqueue our global dashboard styles.
730 730 
 		 */

@@ -733,14 +733,14 @@  discard block
 
 block discarded – undo
733 733 
 		/*
734 734 
 		*	Enqueue Add-ons styles.
735 735 
 		*/
736 
-		if ( get_current_screen()->base == 'easy-forms_page_yikes-inc-easy-mailchimp-addons' ) {
736 
+		if ( get_current_screen()->base == 'easy-forms_page_yikes-inc-easy-mailchimp-addons' ) {
737 737 
 			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' );
738 738 
 		}
739 739
740 740 
 		/*
741 741 
 		*	Enqueue Subscriber Profile Flags.
742 742 
 		*/
743 
-		if ( get_current_screen()->base == 'admin_page_yikes-mailchimp-view-user' ) {
743 
+		if ( get_current_screen()->base == 'admin_page_yikes-mailchimp-view-user' ) {
744 744 
 			wp_enqueue_style( 'yikes-inc-easy-mailchimp-extender-subscriber-flags', plugin_dir_url( __FILE__ ) . 'css/flag-icon.min.css', array(), $this->version, 'all' );
745 745 
 		}
746 746 
 	}

@@ -749,7 +749,7 @@  discard block
 
 block discarded – undo
749 749 
 	 *
750 750 
 	 * @since    6.0.0
751 751 
 	 */
752 
-	public function enqueue_scripts() {
752 
+	public function enqueue_scripts() {
753 753 
 		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 );
754 754
755 755 
 		$localized_data = array(

@@ -764,7 +764,7 @@  discard block
 
 block discarded – undo
764 764
765 765 
 		// Enqueue required scripts for the form editor
766 766 
 		$screen = get_current_screen();
767 
-		if ( ! isset( $screen->base ) || 'admin_page_yikes-mailchimp-edit-form' !== $screen->base ) {
767 
+		if ( ! isset( $screen->base ) || 'admin_page_yikes-mailchimp-edit-form' !== $screen->base ) {
768 768 
 			return;
769 769 
 		}
770 770 
 

@@ -810,12 +810,12 @@  discard block
 
 block discarded – undo
810 810 
 	/**
811 811 
 	 * Convert the php date format string to a js date format
812 812 
 	 */
813 
-	public function yikes_jQuery_datepicker_date_format_php_to_js( $sFormat, $type ) {
814 
-		switch ( $type ) {
813 
+	public function yikes_jQuery_datepicker_date_format_php_to_js( $sFormat, $type ) {
814 
+		switch ( $type ) {
815 815 
 			default:
816 816 
 			case 'date':
817 817 
 				// Standard Date Fields
818 
-				switch ( $sFormat ) {
818 
+				switch ( $sFormat ) {
819 819 
 					//Predefined WP date formats
820 820 
 					case 'F j, Y':
821 821 
 					case 'j F Y':

@@ -838,7 +838,7 @@  discard block
 
 block discarded – undo
838 838 
 				break;
839 839 
 			// Birthday Fields
840 840 
 			case 'birthday':
841 
-				switch ( $sFormat ) {
841 
+				switch ( $sFormat ) {
842 842 
 					//Predefined WP date formats
843 843 
 					case 'F j, Y':
844 844 
 					case 'j F Y':

@@ -867,8 +867,8 @@  discard block
 
 block discarded – undo
867 867 
 	/**
868 868 
 	 * Convert the php date format string to a js date format
869 869 
 	 */
870 
-	public function yikes_jQuery_datepicker_date_format( $site_option ) {
871 
-		switch( $site_option ) {
870 
+	public function yikes_jQuery_datepicker_date_format( $site_option ) {
871 
+		switch( $site_option ) {
872 872 
 			//Predefined WP date formats
873 873 
 			default:
874 874 
 			case 'F j, Y':

@@ -888,7 +888,7 @@  discard block
 
 block discarded – undo
888 888 
 	*	Register our admin pages
889 889 
 	*	used to display data back to the user
890 890 
 	**/
891 
-	public function register_admin_pages() {
891 
+	public function register_admin_pages() {
892 892
893 893 
 		/* Top Level Menu 'Easy MailChimp' */
894 894 
 		add_menu_page(

@@ -1011,7 +1011,7 @@  discard block
 
 block discarded – undo
1011 1011 
 	*	when they click 'Go Pro' in the admin menu
1012 1012 
 	*	to do: populate with sales URL
1013 1013 
 	*/
1014 
-	public function generateAddOnsPage() {
1014 
+	public function generateAddOnsPage() {
1015 1015 
 		require_once YIKES_MC_PATH . 'admin/partials/menu/add-ons.php'; // include our add-ons page
1016 1016 
 	}
1017 1017 
 

@@ -1020,7 +1020,7 @@  discard block
 
 block discarded – undo
1020 1020 
 	*
1021 1021 
 	* @since    1.0.0
1022 1022 
 	*/
1023 
-	function generateManageFormsPage() {
1023 
+	function generateManageFormsPage() {
1024 1024 
 		require_once YIKES_MC_PATH . 'admin/partials/menu/manage-forms.php'; // include our manage forms page
1025 1025 
 	}
1026 1026 
 

@@ -1029,7 +1029,7 @@  discard block
 
 block discarded – undo
1029 1029 
 	*
1030 1030 
 	* @since    1.0.0
1031 1031 
 	*/
1032 
-	function generateManageListsPage() {
1032 
+	function generateManageListsPage() {
1033 1033 
 		require_once YIKES_MC_PATH . 'admin/partials/menu/manage-lists.php'; // include our lists page
1034 1034 
 	}
1035 1035 
 

@@ -1038,7 +1038,7 @@  discard block
 
 block discarded – undo
1038 1038 
 	*
1039 1039 
 	* @since    1.0.0
1040 1040 
 	*/
1041 
-	function generateSupportPage() {
1041 
+	function generateSupportPage() {
1042 1042
1043 1043 
 		wp_enqueue_script( 'yikes-inc-easy-mailchimp-extender-support-scripts', plugin_dir_url( __FILE__ ) . 'js/support.js', array( 'jquery' ), $this->version, false );
1044 1044 
 		require_once YIKES_MC_PATH . 'admin/partials/menu/support.php';

@@ -1049,7 +1049,7 @@  discard block
 
 block discarded – undo
1049 1049 
 	*
1050 1050 
 	* @since    1.0.0
1051 1051 
 	*/
1052 
-	function generateEditFormPage() {
1052 
+	function generateEditFormPage() {
1053 1053 
 		require_once YIKES_MC_PATH . 'admin/partials/edit-form.php'; // include our options page
1054 1054 
 	}
1055 1055 
 

@@ -1058,7 +1058,7 @@  discard block
 
 block discarded – undo
1058 1058 
 	*
1059 1059 
 	* @since    1.0.0
1060 1060 
 	*/
1061 
-	function generateViewListPage() {
1061 
+	function generateViewListPage() {
1062 1062 
 		require_once YIKES_MC_PATH . 'admin/partials/view-list.php'; // include our options page
1063 1063 
 	}
1064 1064 
 

@@ -1067,7 +1067,7 @@  discard block
 
 block discarded – undo
1067 1067 
 	*
1068 1068 
 	* @since    1.0.0
1069 1069 
 	*/
1070 
-	function generateViewUserPage() {
1070 
+	function generateViewUserPage() {
1071 1071 
 		require_once YIKES_MC_PATH . 'admin/partials/view-user.php'; // include our options page
1072 1072 
 	}
1073 1073 
 

@@ -1076,7 +1076,7 @@  discard block
 
 block discarded – undo
1076 1076 
 	*
1077 1077 
 	* @since v.5.4
1078 1078 
 	**/
1079 
-	function yikes_easy_mc_settings_init() {
1079 
+	function yikes_easy_mc_settings_init() {
1080 1080
1081 1081 
 		/* Register General Settings Section */
1082 1082 
 

@@ -1196,27 +1196,27 @@  discard block
 
 block discarded – undo
1196 1196 
 	*	Options Sanitization & Validation
1197 1197 
 	*	@since complete re-write
1198 1198 
 	**/
1199 
-	function yikes_mc_validate_api_key( $input ) {
1200 
-		if ( $input === '' ) {
1199 
+	function yikes_mc_validate_api_key( $input ) {
1200 
+		if ( $input === '' ) {
1201 1201 
 			update_option( 'yikes-mc-api-validation', 'invalid_api_key' );
1202 1202 
 			return '';
1203 1203 
 		}
1204 1204 
 		$api_key = strip_tags ( trim( $input ) );
1205 1205 
 		$dash_position = strpos( trim( $input ), '-' );
1206 
-		if ( $dash_position !== false ) {
1206 
+		if ( $dash_position !== false ) {
1207 1207 
 			$manager = new Yikes_Inc_Easy_MailChimp_API_Manager( $api_key );
1208 
-		} else {
1208 
+		} else {
1209 1209 
 			update_option( 'yikes-mc-api-invalid-key-response', __( 'Your API key appears to be invalid.', 'yikes-inc-easy-mailchimp-extender' ) );
1210 1210 
 			update_option( 'yikes-mc-api-validation', 'invalid_api_key' );
1211 1211 
 			return $api_key;
1212 1212 
 		}
1213 1213
1214 1214 
 		$response = $manager->get_account_handler()->get_account( false );
1215 
-		if ( ! is_wp_error( $response ) ) {
1215 
+		if ( ! is_wp_error( $response ) ) {
1216 1216 
 			update_option( 'yikes-mc-api-validation', 'valid_api_key' );
1217 1217 
 				// Clear the API key transient data
1218 1218 
 			$this->delete_yikes_mailchimp_transients();
1219 
-		}  else {
1219 
+		} else {
1220 1220 
 			$error_logging = new Yikes_Inc_Easy_Mailchimp_Error_Logging();
1221 1221 
 			$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' ) );
1222 1222 
 			update_option( 'yikes-mc-api-invalid-key-response', $response->get_error_message() );

@@ -1231,7 +1231,7 @@  discard block
 
 block discarded – undo
1231 1231 
 	*
1232 1232 
 	* @since    1.0.0
1233 1233 
 	*/
1234 
-	function generatePageOptions() {
1234 
+	function generatePageOptions() {
1235 1235 
 		require_once YIKES_MC_PATH . 'admin/partials/menu/options.php'; // include our options page
1236 1236 
 	}
1237 1237 
 

@@ -1241,15 +1241,15 @@  discard block
 
 block discarded – undo
1241 1241 
 	*	to form fields. (input, dropdowns, buttons etc.)
1242 1242 
 	* 	@since v5.5 re-write
1243 1243 
 	**/
1244 
-	public function is_user_mc_api_valid_form( $echo = true ) {
1245 
-		if ( $echo == true ) {
1246 
-			if ( get_option( 'yikes-mc-api-validation', 'invalid_api_key' ) == 'invalid_api_key' ) {
1244 
+	public function is_user_mc_api_valid_form( $echo = true ) {
1245 
+		if ( $echo == true ) {
1246 
+			if ( get_option( 'yikes-mc-api-validation', 'invalid_api_key' ) == 'invalid_api_key' ) {
1247 1247 
 				echo 'disabled="disabled"';
1248 1248 
 			}
1249 
-		} else {
1250 
-			if ( get_option( 'yikes-mc-api-validation', 'invalid_api_key' ) == 'invalid_api_key' ) {
1249 
+		} else {
1250 
+			if ( get_option( 'yikes-mc-api-validation', 'invalid_api_key' ) == 'invalid_api_key' ) {
1251 1251 
 				return false;
1252 
-			} else {
1252 
+			} else {
1253 1253 
 				return true;
1254 1254 
 			}
1255 1255 
 		}

@@ -1264,11 +1264,11 @@  discard block
 
 block discarded – undo
1264 1264 
 	 * @param      string    $yikes_inc_easy_mailchimp_extender       The name of this plugin.
1265 1265 
 	 * @param      string    $version    The version of this plugin.
1266 1266 
 	 */
1267 
-	public function check_for_old_yks_mc_options() {
1267 
+	public function check_for_old_yks_mc_options() {
1268 1268 
 		$old_plugin_options = get_option( 'ykseme_storage' );
1269 1269 
 		// only perform options migrations if the site is not a multi-site setup
1270 
-		if ( !is_multisite() ) {
1271 
-			if ( apply_filters( 'yikes_mc_old_options_filter', $old_plugin_options ) ) {
1270 
+		if ( !is_multisite() ) {
1271 
+			if ( apply_filters( 'yikes_mc_old_options_filter', $old_plugin_options ) ) {
1272 1272 
 				// display a notice to the user that they should 'migrate'
1273 1273 
 				// from the old plugin settings to the new ones
1274 1274 
 				add_action( 'admin_notices', array( $this , 'display_options_migrate_notice' ) , 11 );

@@ -1281,7 +1281,7 @@  discard block
 
 block discarded – undo
1281 1281 
 	 * moving from 5.5 and beyond..
1282 1282 
 	 * @since
1283 1283 
 	*/
1284 
-	public function migrate_old_yks_mc_options() {
1284 
+	public function migrate_old_yks_mc_options() {
1285 1285 
 		// include our migrate options helper file
1286 1286 
 		include_once YIKES_MC_PATH . 'admin/partials/upgrade-helpers/upgrade-migrate-options.php';
1287 1287 
 	}

@@ -1300,15 +1300,15 @@  discard block
 
 block discarded – undo
1300 1300 
 		 * @param      string    $yikes_inc_easy_mailchimp_extender       The name of this plugin.
1301 1301 
 		 * @param      string    $version    The version of this plugin.
1302 1302 
 		 */
1303 
-		public function display_options_migrate_notice() {
1303 
+		public function display_options_migrate_notice() {
1304 1304
1305 1305 
 			// Confirm that the necessary forms table in the database exists, else bail
1306 1306 
 			global $wpdb;
1307 
-			if ( $wpdb->get_var("show tables like '" . $wpdb->prefix . "yikes_easy_mc_forms'") != $wpdb->prefix . "yikes_easy_mc_forms" ) {
1307 
+			if ( $wpdb->get_var("show tables like '" . $wpdb->prefix . "yikes_easy_mc_forms'") != $wpdb->prefix . "yikes_easy_mc_forms" ) {
1308 1308 
 				return;
1309 1309 
 			}
1310 1310
1311 
-			if ( isset( $_GET['yikes-mc-options-migration-dismissed'] ) && $_GET['yikes-mc-options-migration-dismissed'] == 'true' ) {
1311 
+			if ( isset( $_GET['yikes-mc-options-migration-dismissed'] ) && $_GET['yikes-mc-options-migration-dismissed'] == 'true' ) {
1312 1312 
 					// Delete the options, start a-new! (this will disable the migration notice altogether)
1313 1313 
 					delete_option( 'widget_yikes_mc_widget' );
1314 1314 
 					delete_option( 'api_validation' );

@@ -1319,7 +1319,7 @@  discard block
 
 block discarded – undo
1319 1319 
 						<p><?php printf( __( "The previously stored options for %s have been cleared from the database. You should update the plugin options on the <a href='%s' title='Settings Page'>settings page</a> before continuing. You should also update the shortcodes used to generate your forms, and any widgets you may have previously set-up.", 'yikes-inc-easy-mailchimp-extender' ), '<strong>Us Easy Forms for MailChimp</strong>', admin_url( 'admin.php?page=yikes-inc-easy-mailchimp-settings' ) ); ?></p>
1320 1320 
 					</div>
1321 1321 
 				<?php
1322 
-			} else {
1322 
+			} else {
1323 1323 
 			?>
1324 1324 
 				<div class="yikes-easy-mc-updated migrate-options-notice">
1325 1325 
 					<p><?php printf( __( "It looks like you're upgrading from a previous version of %s.", 'yikes-inc-easy-mailchimp-extender' ), '<strong>Us Easy Forms for MailChimp</strong>' ); ?> <?php printf( __( "In the newest version of %s, the options data structure has changed. We've also moved the mailing lists into its own database table to allow for some higher level customization. Now you can easily create multiple forms and assign them to the same mailing list." , 'yikes-inc-easy-mailchimp-extender' ), '<strong>Us Easy Forms for MailChimp</strong>' ); ?></p>

@@ -1347,9 +1347,9 @@  discard block
 
 block discarded – undo
1347 1347 
 		*	and return the index ( used to find the list name assigned to a form )
1348 1348 
 		*	- http://stackoverflow.com/questions/6661530/php-multi-dimensional-array-search
1349 1349 
 		*/
1350 
-		function findMCListID($id, $array) {
1351 
-		   foreach ($array as $key => $val) {
1352 
-			   if ($val['id'] === $id) {
1350 
+		function findMCListID($id, $array) {
1351 
+		   foreach ($array as $key => $val) {
1352 
+			   if ($val['id'] === $id) {
1353 1353 
 				   return $key;
1354 1354 
 			   }
1355 1355 
 		   }

@@ -1357,14 +1357,14 @@  discard block
 
 block discarded – undo
1357 1357 
 		} // end
1358 1358
1359 1359 
 		/* Ajax Migrate Options */
1360 
-		function migrate_archived_options() {
1360 
+		function migrate_archived_options() {
1361 1361 
 			// all options prefixed with 'yikes-mc-'
1362 1362 
 			$option_name = 'yikes-mc-'.$_POST['option_name'];
1363 1363 
 			$option_value = $_POST['option_value'];
1364 
-			if ( json_decode( $option_value ) ) {
1364 
+			if ( json_decode( $option_value ) ) {
1365 1365 
 				// decode our lists() array, and store it
1366 1366 
 				$opt_value = json_decode( $option_value, true );
1367 
-			} else {
1367 
+			} else {
1368 1368 
 				$opt_value = $option_value;
1369 1369 
 			}
1370 1370 
 			update_option( $option_name, $opt_value );

@@ -1373,12 +1373,12 @@  discard block
 
 block discarded – undo
1373 1373 
 		}
1374 1374
1375 1375 
 		/* Ajax Migrate Forms */
1376 
-		function migrate_previously_setup_forms() {
1376 
+		function migrate_previously_setup_forms() {
1377 1377 
 			$option_name = $_POST['option_name'];
1378 1378 
 			$done = $_POST['done_import'];
1379 1379 
 			// Create some starter forms for the user
1380 1380 
 			// based on previously imported lists (to our old version)
1381 
-			if ( $option_name == 'yikes-mc-lists' ) {
1381 
+			if ( $option_name == 'yikes-mc-lists' ) {
1382 1382 
 				$option_value = $_POST['option_value'];
1383 1383 
 				$new_options = json_decode( stripslashes_deep( $option_value ) , true );
1384 1384 
 

@@ -1410,9 +1410,9 @@  discard block
 
 block discarded – undo
1410 1410 
 					'custom_fields'           => '',
1411 1411 
 				) );
1412 1412 
 			}
1413 
-			if ( $done == 'done' ) {
1413 
+			if ( $done == 'done' ) {
1414 1414 
 				wp_send_json( array( 'form_name' => $form_name, 'completed_import' => true ) );
1415 
-			} else {
1415 
+			} else {
1416 1416 
 				wp_send_json( array( 'form_name' => $form_name, 'completed_import' => false ) );
1417 1417 
 			}
1418 1418 
 			wp_die();

@@ -1424,8 +1424,8 @@  discard block
 
 block discarded – undo
1424 1424 
 		*	Render our sidebar menu on all of the setings pages (general, form, checkbox, recaptcha, popup, debug etc. )
1425 1425 
 		*	@since v5.6 - complete re-write
1426 1426 
 		*/
1427 
-		public function generate_options_pages_sidebar_menu() {
1428 
-			if ( isset( $_REQUEST['section'] ) ) {
1427 
+		public function generate_options_pages_sidebar_menu() {
1428 
+			if ( isset( $_REQUEST['section'] ) ) {
1429 1429 
 				$selected = $_REQUEST['section'];
1430 1430 
 			}
1431 1431 
 			$installed_addons = get_option( 'yikes-easy-mc-active-addons', array() );

@@ -1452,13 +1452,13 @@  discard block
 
 block discarded – undo
1452 1452 
 					</ul>
1453 1453 
 					<?php
1454 1454 
 						// create our add-on settings pages
1455 
-						if ( !empty( $installed_addons ) ) {
1455 
+						if ( !empty( $installed_addons ) ) {
1456 1456 
 							?>
1457 1457 
 							<hr class="add-on-settings-divider" />
1458 1458 
 							<strong><?php _e( 'Addon Settings', 'yikes-inc-easy-mailchimp-extender' ); ?></strong>
1459 1459 
 							<ul id="addon-settings-nav">
1460 1460 
 							<?php
1461 
-							foreach( $installed_addons as $addon_name ) {
1461 
+							foreach( $installed_addons as $addon_name ) {
1462 1462 
 								?>
1463 1463 
 									<li>
1464 1464 
 										<?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>

@@ -1478,7 +1478,7 @@  discard block
 
 block discarded – undo
1478 1478 
 		*	Render our sidebar menu on all of the setings pages (general, form, checkbox, recaptcha, popup, debug etc. )
1479 1479 
 		*	@since v5.6 - complete re-write
1480 1480 
 		*/
1481 
-		public function generate_manage_forms_sidebar( $lists ) {
1481 
+		public function generate_manage_forms_sidebar( $lists ) {
1482 1482 
 			// create a custom URL to allow for creating fields
1483 1483 
 			$url = esc_url_raw(
1484 1484 
 				add_query_arg(

@@ -1509,18 +1509,18 @@  discard block
 
 block discarded – undo
1509 1509 
 					<label for="associated-list"><strong><?php _e( 'Associated List', 'yikes-inc-easy-mailchimp-extender' ); ?></strong>
1510 1510 
 						<select name="associated-list" id="associated-list" class=" input-field" <?php $this->is_user_mc_api_valid_form( true ); disabled( true, empty( $lists ) ); ?>>
1511 1511 
 							<?php
1512 
-							if ( ! empty( $lists ) ) {
1513 
-								foreach( $lists as $mailing_list ) {
1512 
+							if ( ! empty( $lists ) ) {
1513 
+								foreach( $lists as $mailing_list ) {
1514 1514 
 									?>
1515 1515 
 									<option value="<?php echo $mailing_list['id']; ?>"><?php echo stripslashes( $mailing_list['name'] ) . ' (' . $mailing_list['stats']['member_count'] . ') '; ?></option>
1516 1516 
 									<?php
1517 1517 
 								}
1518 
-							} else {
1519 
-								if ( get_option( 'yikes-mc-api-validation', 'invalid_api_key' ) == 'invalid_api_key' ) {
1518 
+							} else {
1519 
+								if ( get_option( 'yikes-mc-api-validation', 'invalid_api_key' ) == 'invalid_api_key' ) {
1520 1520 
 									?>
1521 1521 
 									<option><?php echo __( "Please enter a valid API key." , 'yikes-inc-easy-mailchimp-extender' ); ?></option>
1522 1522 
 									<?php
1523 
-								} else {
1523 
+								} else {
1524 1524 
 									?>
1525 1525 
 									<option><?php echo __( "No lists were found on the account." , 'yikes-inc-easy-mailchimp-extender' ); ?></option>
1526 1526 
 									<?php

@@ -1531,8 +1531,8 @@  discard block
 
 block discarded – undo
1531 1531 
 						</select>
1532 1532
1533 1533 
 						<?php
1534 
-						if ( isset( $_GET['transient-cleared'] ) ) {
1535 
-							if ( 'true' === $_GET['transient-cleared'] ) {
1534 
+						if ( isset( $_GET['transient-cleared'] ) ) {
1535 
+							if ( 'true' === $_GET['transient-cleared'] ) {
1536 1536 
 								?>
1537 1537 
 								<div class="yikes-list-refreshed-notice">
1538 1538 
 									<p><?php esc_attr_e( 'MailChimp list data has been succesfully refreshed.', 'yikes-inc-easy-mailchimp-extender' ); ?></p>

@@ -1541,8 +1541,8 @@  discard block
 
 block discarded – undo
1541 1541 
 							}
1542 1542 
 						}
1543 1543
1544 
-						if ( isset( $lists ) && empty( $lists ) ) {
1545 
-							if ( get_option( 'yikes-mc-api-validation', 'invalid_api_key' ) != 'invalid_api_key' ) {
1544 
+						if ( isset( $lists ) && empty( $lists ) ) {
1545 
+							if ( get_option( 'yikes-mc-api-validation', 'invalid_api_key' ) != 'invalid_api_key' ) {
1546 1546 
 								?>
1547 1547 
 									<p class="description">
1548 1548 
 										<?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' ) ); ?>

@@ -1553,9 +1553,9 @@  discard block
 
 block discarded – undo
1553 1553 
 						?>
1554 1554 
 					</label>
1555 1555 
 					<?php
1556 
-						if ( $this->is_user_mc_api_valid_form( false ) ) {
1556 
+						if ( $this->is_user_mc_api_valid_form( false ) ) {
1557 1557 
 							echo submit_button( __( 'Create', 'yikes-inc-easy-mailchimp-extender' ) , 'primary', '', false , array( 'style' => 'margin:.75em 0 .5em 0;' ) );
1558 
-						} else {
1558 
+						} else {
1559 1559 
 							echo '<p class="description">' . __( "Please enter a valid MailChimp API key to get started." , 'yikes-inc-easy-mailchimp-extender' ) . '</p>';
1560 1560 
 							?>
1561 1561 
 								<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>

@@ -1566,7 +1566,7 @@  discard block
 
 block discarded – undo
1566 1566
1567 1567 
 				<!-- Clear API CACHE -->
1568 1568 
 				<?php
1569 
-				if ( isset( $lists ) && ! empty( $lists ) ) {
1569 
+				if ( isset( $lists ) && ! empty( $lists ) ) {
1570 1570 
 					if ( false !== get_transient( 'yikes-easy-mailchimp-list-data' ) ) { ?>
1571 1571 
 						<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">
1572 1572 
 							<input type="submit" class="button-secondary clear-mailchimp-api-cache" value="<?php _e( 'Refresh Lists', 'yikes-inc-easy-mailchimp-extender' ); ?>" />

@@ -1582,7 +1582,7 @@  discard block
 
 block discarded – undo
1582 1582 
 		*	Generate a dropdown of post and pages
1583 1583 
 		*	so the user can send the user to on form submission
1584 1584 
 		*/
1585 
-		public function generate_page_redirect_dropdown( $redirect, $redirect_page, $custom_redirect_url ) {
1585 
+		public function generate_page_redirect_dropdown( $redirect, $redirect_page, $custom_redirect_url ) {
1586 1586 
 				$post_types = get_post_types();
1587 1587 
 				?>
1588 1588 
 				<label id="redirect-user-to-selection-label" for="redirect-user-to-selection" class="<?php if ( $redirect == '0' ) { echo 'yikes-easy-mc-hidden'; } ?>">

@@ -1602,10 +1602,10 @@  discard block
 
 block discarded – undo
1602 1602 
 					$excluded_post_types = apply_filters( 'yikes-mailchimp-excluded-redirect-post-types', $excluded_post_types );
1603 1603
1604 1604 
 						// loop over registered post types, and query!
1605 
-						foreach( $post_types as $registered_post_type ) {
1605 
+						foreach( $post_types as $registered_post_type ) {
1606 1606
1607 1607 
 							// exclude a few built in custom post types and any defined by the filter
1608 
-							if ( ! in_array( $registered_post_type, $excluded_post_types ) ) {
1608 
+							if ( ! in_array( $registered_post_type, $excluded_post_types ) ) {
1609 1609
1610 1610 
 								// Grab only the post IDs - in the past we've created timeout issues on some servers with lots of posts
1611 1611 
 								$wp_query_args = array(

@@ -1620,11 +1620,11 @@  discard block
 
 block discarded – undo
1620 1620
1621 1621 
 								$post_ids = ! empty( $wp_query_result->posts ) ? $wp_query_result->posts : array();
1622 1622
1623 
-								if ( ! empty ( $post_ids ) ) {
1623 
+								if ( ! empty ( $post_ids ) ) {
1624 1624 
 									?>
1625 1625 
 										<optgroup label="<?php echo ucwords( str_replace( '_', ' ', $registered_post_type ) ); ?>">
1626 1626 
 									<?php
1627 
-											foreach( $post_ids as $post_id ) {
1627 
+											foreach( $post_ids as $post_id ) {
1628 1628 
 												?><option <?php selected( $redirect_page , $post_id ); ?> value="<?php echo $post_id; ?>"><?php echo get_the_title( $post_id ) ?></option><?php
1629 1629 
 											}
1630 1630 
 									?>

@@ -1655,14 +1655,14 @@  discard block
 
 block discarded – undo
1655 1655 
 		*
1656 1656 
 		* 	Displayed in sidebars
1657 1657 
 		*/
1658 
-		public function generate_show_some_love_container() {
1658 
+		public function generate_show_some_love_container() {
1659 1659 
 			// if no active add-ons are installed,
1660 1660 
 			// lets display our branding and add-on sidebar
1661 
-			if ( get_option( 'yikes-easy-mc-active-addons', array() ) == array() ) {
1661 
+			if ( get_option( 'yikes-easy-mc-active-addons', array() ) == array() ) {
1662 1662
1663 1663 
 				/* On Edit Forms Page Display Upsell to Customizer */
1664 1664 
 				$screen = get_current_screen();
1665 
-				if ( isset( $screen ) && $screen->base == 'admin_page_yikes-mailchimp-edit-form' ) {
1665 
+				if ( isset( $screen ) && $screen->base == 'admin_page_yikes-mailchimp-edit-form' ) {
1666 1666 
 				?>
1667 1667
1668 1668 
 					<div class="postbox yikes-easy-mc-postbox show-some-love-container">

@@ -1747,18 +1747,18 @@  discard block
 
 block discarded – undo
1747 1747 
 		*	-
1748 1748 
 		* @parameters - $list_id - pass in the list ID to retreive merge variables from
1749 1749 
 		*/
1750 
-		public function generate_form_editor( $form_fields, $list_id, $merge_variables, $interest_groups ) {
1750 
+		public function generate_form_editor( $form_fields, $list_id, $merge_variables, $interest_groups ) {
1751 1751
1752 1752 
 			// if no list id, die!
1753 
-			if ( ! $list_id ) {
1753 
+			if ( ! $list_id ) {
1754 1754 
 				wp_die( __( "We've encountered an error. No list ID was sent." , 'yikes-inc-easy-mailchimp-extender' ) );
1755 1755 
 			}
1756 1756
1757 
-			if ( ! $merge_variables ) {
1757 
+			if ( ! $merge_variables ) {
1758 1758 
 				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' ) );
1759 1759 
 			}
1760 1760
1761 
-			if ( ! empty( $form_fields ) ) {
1761 
+			if ( ! empty( $form_fields ) ) {
1762 1762
1763 1763 
 				// find any fields that are assigned to this form, that don't exist in MailChimp
1764 1764 
 				// or else were going to run into issues when we submit the form

@@ -1770,18 +1770,18 @@  discard block
 
 block discarded – undo
1770 1770 
 				$mailchimp_merge_field_ids	= array();
1771 1771
1772 1772 
 				// loop over merge variables
1773 
-				if ( ! empty( $merge_variables['merge_fields'] ) ) {
1773 
+				if ( ! empty( $merge_variables['merge_fields'] ) ) {
1774 1774 
 					$available_merge_variables = wp_list_pluck( $merge_variables['merge_fields'], 'tag' );
1775 1775 
 					$mailchimp_merge_field_ids = wp_list_pluck( $merge_variables['merge_fields'], 'merge_id' );
1776 1776
1777 1777 
 					// Array will look like $merge_tag => $merge_id
1778 
-					foreach( $available_merge_variables as $index => $merge_tag ) {
1778 
+					foreach( $available_merge_variables as $index => $merge_tag ) {
1779 1779 
 						$merge_field_ids[$merge_tag] = $mailchimp_merge_field_ids[$index];
1780 1780 
 					}
1781 1781 
 				}
1782 1782
1783 1783 
 				// loop over interest groups
1784 
-				if ( ! empty( $interest_groups ) ) {
1784 
+				if ( ! empty( $interest_groups ) ) {
1785 1785 
 					$available_interest_groups = array_keys( $interest_groups );
1786 1786 
 				}
1787 1787 
 

@@ -1791,9 +1791,9 @@  discard block
 
 block discarded – undo
1791 1791 
 				$excluded_fields = array_diff( $assigned_fields, $merged_fields );
1792 1792
1793 1793 
 				$i = 1;
1794 
-				foreach( $form_fields as $field ) {
1794 
+				foreach( $form_fields as $field ) {
1795 1795
1796 
-					if ( isset( $field['merge'] ) ) {
1796 
+					if ( isset( $field['merge'] ) ) {
1797 1797 
 						// @todo: don't use in_array()
1798 1798 
 						$excluded_field = in_array( $field['merge'], $excluded_fields, true );
1799 1799 
 						?>

@@ -1827,7 +1827,7 @@  discard block
 
 block discarded – undo
1827 1827 
 									<input type="hidden" class="yikes-mc-merge-field-id" name="field[<?php echo $field['merge']; ?>][id]" value="<?php echo $merge_field_ids[ $field['merge'] ] ?>" />
1828 1828 
 								<?php } ?>
1829 1829
1830 
-								<?php if ( $field['type'] == 'radio' || $field['type'] == 'dropdown' || $field['type'] == 'select' ) {
1830 
+								<?php if ( $field['type'] == 'radio' || $field['type'] == 'dropdown' || $field['type'] == 'select' ) {
1831 1831 
 									$choices = json_decode( $field['choices'], true );
1832 1832 
 								?>
1833 1833 
 									<input type="hidden" name="field[<?php echo $field['merge']; ?>][choices]" value='<?php echo esc_attr( json_encode( $choices ) ); ?>' />

@@ -1851,7 +1851,7 @@  discard block
 
 block discarded – undo
1851 1851 
 										</tr>
1852 1852
1853 1853 
 										<!-- Placeholder Value -->
1854 
-										<?php switch( $field['type'] ) {
1854 
+										<?php switch( $field['type'] ) {
1855 1855
1856 1856 
 											case 'text':
1857 1857 
 											case 'email':

@@ -1898,7 +1898,7 @@  discard block
 
 block discarded – undo
1898 1898 
 										?>
1899 1899
1900 1900 
 										<!-- Default Value -->
1901 
-										<?php switch( $field['type'] ) {
1901 
+										<?php switch( $field['type'] ) {
1902 1902 
 											default:
1903 1903 
 											case 'text':
1904 1904 
 											case 'number':

@@ -1914,7 +1914,7 @@  discard block
 
 block discarded – undo
1914 1914 
 													<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 } ?> />
1915 1915 
 													<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>
1916 1916 
 													<?php
1917 
-													switch( $field['type'] ) {
1917 
+													switch( $field['type'] ) {
1918 1918 
 														case 'text':
1919 1919 
 															?>
1920 1920 
 																<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>

@@ -2071,7 +2071,7 @@  discard block
 
 block discarded – undo
2071 2071 
 										<!-- Display Phone/Date Formats back to the user -->
2072 2072 
 										<!-- Phone Format Initial Load -->
2073 2073 
 										<?php
2074 
-											switch( $field['type'] ) {
2074 
+											switch( $field['type'] ) {
2075 2075 
 												/* Store the phone format, for properly regex pattern */
2076 2076 
 												case 'phone':
2077 2077 
 												case 'birthday':

@@ -2081,7 +2081,7 @@  discard block
 
 block discarded – undo
2081 2081 
 															<td scope="row">
2082 2082 
 																<label for="placeholder">
2083 2083 
 																	<?php
2084 
-																		switch( $field['type'] ) {
2084 
+																		switch( $field['type'] ) {
2085 2085 
 																			default:
2086 2086 
 																			case 'birthday':
2087 2087 
 																				$type = __( 'Date Format', 'yikes-inc-easy-mailchimp-extender' );

@@ -2142,7 +2142,7 @@  discard block
 
 block discarded – undo
2142 2142
2143 2143
2144 2144
2145 
-					} else {
2145 
+					} else {
2146 2146
2147 2147 
 						/**** Interest Group ****/
2148 2148 
 

@@ -2175,7 +2175,7 @@  discard block
 
 block discarded – undo
2175 2175
2176 2176 
 									<table class="form-table form-field-container">
2177 2177 
 										<!-- Default Value -->
2178 
-										<?php switch( $field['type'] ) {
2178 
+										<?php switch( $field['type'] ) {
2179 2179 
 											default:
2180 2180 
 											case 'radio':
2181 2181 
 											case 'checkboxes':

@@ -2192,7 +2192,7 @@  discard block
 
 block discarded – undo
2192 2192
2193 2193 
 														$default_shown = false;
2194 2194
2195 
-														foreach ( json_decode( $field['groups'], true ) as $id => $group ) {
2195 
+														foreach ( json_decode( $field['groups'], true ) as $id => $group ) {
2196 2196 
 															$field_id   = "{$field['group_id']}-{$id}";
2197 2197 
 															$field_type = 'hidden' == $field['type'] ? 'checkbox' : $field['type'];
2198 2198 
 															$field_type = 'checkboxes' == $field_type ? 'checkbox' : $field_type;

@@ -2201,7 +2201,7 @@  discard block
 
 block discarded – undo
2201 2201
2202 2202 
 															// Determine if the current group is checked.
2203 2203 
 															$checked = '';
2204 
-															switch ( $field_type ) {
2204 
+															switch ( $field_type ) {
2205 2205 
 																case 'radio':
2206 2206 
 																default:
2207 2207 
 																	$checked = checked( $field['default_choice'], $id, false );

@@ -2209,14 +2209,14 @@  discard block
 
 block discarded – undo
2209 2209
2210 2210 
 																case 'checkbox':
2211 2211 
 																case 'hidden':
2212 
-																	if ( is_array( $field['default_choice'] ) && in_array( $id, $field['default_choice'] ) ) {
2212 
+																	if ( is_array( $field['default_choice'] ) && in_array( $id, $field['default_choice'] ) ) {
2213 2213 
 																		$checked = checked( true, true, false );
2214 2214 
 																	}
2215 2215 
 																break;
2216 2216 
 															}
2217 2217
2218 2218 
 															// Allow users to not set a default choice for radio buttons.
2219 
-															if ( $field_type === 'radio' && $default_shown === false ) {
2219 
+															if ( $field_type === 'radio' && $default_shown === false ) {
2220 2220 
 																$default_shown = true;
2221 2221 
 																?>
2222 2222 
 																<label for="<?php echo $field_id . 'no-default'; ?>">

@@ -2369,7 +2369,7 @@  discard block
 
 block discarded – undo
2369 2369 
 						<?php
2370 2370 
 					}
2371 2371 
 				}
2372 
-			} else {
2372 
+			} else {
2373 2373 
 				?>
2374 2374 
 					<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>
2375 2375 
 				<?php

@@ -2456,19 +2456,19 @@  discard block
 
 block discarded – undo
2456 2456 
 		*	-
2457 2457 
 		* @parameters - $list_id - pass in the list ID to retreive merge variables from
2458 2458 
 		*/
2459 
-		public function build_available_merge_vars( $form_fields , $available_merge_variables ) {
2459 
+		public function build_available_merge_vars( $form_fields , $available_merge_variables ) {
2460 2460 
 			$fields_assigned_to_form = array();
2461 
-			foreach ( $form_fields as $field ) {
2462 
-				if ( isset( $field['merge'] ) ) {
2461 
+			foreach ( $form_fields as $field ) {
2462 
+				if ( isset( $field['merge'] ) ) {
2463 2463 
 					$fields_assigned_to_form[ $field['merge'] ] = true;
2464 2464 
 				}
2465 2465 
 			}
2466 2466
2467 
-			if ( ! empty( $available_merge_variables['merge_fields'] ) ) {
2467 
+			if ( ! empty( $available_merge_variables['merge_fields'] ) ) {
2468 2468 
 				?>
2469 2469 
 				<ul id="available-fields"><?php
2470 
-				foreach ( $available_merge_variables['merge_fields'] as $merge_var ) {
2471 
-					if ( isset( $fields_assigned_to_form[ $merge_var['tag'] ] ) ) {
2470 
+				foreach ( $available_merge_variables['merge_fields'] as $merge_var ) {
2471 
+					if ( isset( $fields_assigned_to_form[ $merge_var['tag'] ] ) ) {
2472 2472 
 						?>
2473 2473 
 						<li class="available-form-field not-available"
2474 2474 
 						    alt="<?php echo $merge_var['tag']; ?>"

@@ -2478,13 +2478,13 @@  discard block
 
 block discarded – undo
2478 2478 
 						    title="<?php esc_attr_e( 'Already assigned to your form', 'yikes-inc-easy-mailchimp-extender' ); ?>"
2479 2479 
 						    disabled="disabled">
2480 2480 
 							<?php echo stripslashes( $merge_var['name'] );
2481 
-							if ( $merge_var['required'] ) {
2481 
+							if ( $merge_var['required'] ) {
2482 2482 
 								echo ' <span class="field-required" title="' . __( 'required field', 'yikes-inc-easy-mailchimp-extender' ) . '">*</span>';
2483 2483 
 							} ?>
2484 2484 
 							<small class="field-type-text"><?php echo $merge_var['type']; ?></small>
2485 2485 
 						</li>
2486 2486 
 						<?php
2487 
-					} else {
2487 
+					} else {
2488 2488 
 						?>
2489 2489 
 						<li class="available-form-field"
2490 2490 
 						    alt="<?php echo $merge_var['tag']; ?>"

@@ -2492,7 +2492,7 @@  discard block
 
 block discarded – undo
2492 2492 
 						    data-attr-field-name="<?php echo esc_attr( $merge_var['name'] ); ?>"
2493 2493 
 						    data-attr-form-id="<?php echo esc_attr( $available_merge_variables['list_id'] ); ?>">
2494 2494 
 							<?php echo stripslashes( $merge_var['name'] );
2495 
-							if ( $merge_var['required'] ) {
2495 
+							if ( $merge_var['required'] ) {
2496 2496 
 								echo ' <span class="field-required" title="' . __( 'required field', 'yikes-inc-easy-mailchimp-extender' ) . '">*</span>';
2497 2497 
 							} ?>
2498 2498 
 							<small class="field-type-text"><?php echo $merge_var['type']; ?></small>

@@ -2517,21 +2517,21 @@  discard block
 
 block discarded – undo
2517 2517 
 		*	-
2518 2518 
 		* @parameters - $list_id - pass in the list ID to retreive merge variables from
2519 2519 
 		*/
2520 
-		public function build_available_interest_groups( $form_fields , $available_interest_groups , $list_id ) {
2520 
+		public function build_available_interest_groups( $form_fields , $available_interest_groups , $list_id ) {
2521 2521 
 			$fields_assigned_to_form = array();
2522 
-			if ( ! empty( $form_fields ) ) {
2523 
-				foreach ( $form_fields as $field ) {
2524 
-					if ( isset( $field['group_id'] ) ) {
2522 
+			if ( ! empty( $form_fields ) ) {
2523 
+				foreach ( $form_fields as $field ) {
2524 
+					if ( isset( $field['group_id'] ) ) {
2525 2525 
 						$fields_assigned_to_form[ $field['group_id'] ] = true;
2526 2526 
 					}
2527 2527 
 				}
2528 2528 
 			}
2529 2529
2530 
-			if ( ! empty( $available_interest_groups ) ) {
2530 
+			if ( ! empty( $available_interest_groups ) ) {
2531 2531 
 				?>
2532 2532 
 				<ul id="available-interest-groups"><?php
2533 
-				foreach ( $available_interest_groups as $interest_group ) {
2534 
-					if ( isset( $fields_assigned_to_form[ $interest_group['id'] ] ) ) {
2533 
+				foreach ( $available_interest_groups as $interest_group ) {
2534 
+					if ( isset( $fields_assigned_to_form[ $interest_group['id'] ] ) ) {
2535 2535 
 						?>
2536 2536 
 						<li class="available-interest-group not-available"
2537 2537 
 							alt="<?php echo $interest_group['id']; ?>" 

@@ -2544,7 +2544,7 @@  discard block
 
 block discarded – undo
2544 2544 
 							<small class="field-type-text"><?php echo $interest_group['type']; ?></small>
2545 2545 
 						</li>
2546 2546 
 						<?php
2547 
-					} else {
2547 
+					} else {
2548 2548 
 						?>
2549 2549 
 						<li class="available-interest-group"
2550 2550 
 							alt="<?php echo $interest_group['id']; ?>" 

@@ -2574,9 +2574,9 @@  discard block
 
 block discarded – undo
2574 2574 
 		*	and include it here for easy maintenance
2575 2575 
 		*	- must clean up db tables , ensure what data is going in and what is needed...
2576 2576 
 		*/
2577 
-		public function yikes_easy_mailchimp_create_form() {
2577 
+		public function yikes_easy_mailchimp_create_form() {
2578 2578 
 			$nonce = $_REQUEST['nonce'];
2579 
-			if ( ! wp_verify_nonce( $nonce, 'create_mailchimp_form' ) ) {
2579 
+			if ( ! wp_verify_nonce( $nonce, 'create_mailchimp_form' ) ) {
2580 2580 
 				wp_die( __( "We've run into an error. The security check didn't pass. Please try again." , 'yikes-inc-easy-mailchimp-extender' ) );
2581 2581 
 			}
2582 2582 
 

@@ -2587,13 +2587,13 @@  discard block
 
 block discarded – undo
2587 2587 
 			) );
2588 2588
2589 2589 
 			// if an error occurs during the form creation process
2590 
-			if ( false == $result ) {
2590 
+			if ( false == $result ) {
2591 2591 
 				// write it to the error log
2592 2592 
 				// if the form was not created successfully
2593 2593 
 				$error_logging = new Yikes_Inc_Easy_Mailchimp_Error_Logging();
2594 2594 
 				$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' ) );
2595 2595 
 				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' ) ) ) ) );
2596 
-			} else {
2596 
+			} else {
2597 2597 
 				// redirect the user to the new form edit page
2598 2598 
 				wp_redirect( esc_url_raw( admin_url( 'admin.php?page=yikes-mailchimp-edit-form&id=' . $result) ) );
2599 2599 
 			}

@@ -2606,12 +2606,12 @@  discard block
 
 block discarded – undo
2606 2606 
 		*	and include it here for easy maintenance
2607 2607 
 		*	- must clean up db tables , ensure what data is going in and what is needed...
2608 2608 
 		*/
2609 
-		public function yikes_easy_mailchimp_delete_form() {
2609 
+		public function yikes_easy_mailchimp_delete_form() {
2610 2610 
 			// grab & store our variables ( associated list & form name )
2611 2611 
 			$nonce = $_REQUEST['nonce'];
2612 2612 
 			$post_id_to_delete = $_REQUEST['mailchimp-form'];
2613 2613 
 			// verify our nonce
2614 
-			if ( ! wp_verify_nonce( $nonce, 'delete-mailchimp-form-'.$post_id_to_delete ) ) {
2614 
+			if ( ! wp_verify_nonce( $nonce, 'delete-mailchimp-form-'.$post_id_to_delete ) ) {
2615 2615 
 				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 ) );
2616 2616 
 			}
2617 2617 
 

@@ -2626,12 +2626,12 @@  discard block
 
 block discarded – undo
2626 2626 
 		*	Duplicate an entire form !
2627 2627 
 		*	Probably Move these to its own file,
2628 2628 
 		*/
2629 
-		public function yikes_easy_mailchimp_duplicate_form() {
2629 
+		public function yikes_easy_mailchimp_duplicate_form() {
2630 2630 
 			// grab & store our variables ( associated list & form name )
2631 2631 
 			$nonce = $_REQUEST['nonce'];
2632 2632 
 			$post_id_to_clone = $_REQUEST['mailchimp-form'];
2633 2633 
 			// verify our nonce
2634 
-			if ( ! wp_verify_nonce( $nonce, 'duplicate-mailchimp-form-'.$post_id_to_clone ) ) {
2634 
+			if ( ! wp_verify_nonce( $nonce, 'duplicate-mailchimp-form-'.$post_id_to_clone ) ) {
2635 2635 
 				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 ) );
2636 2636 
 			}
2637 2637 
 

@@ -2655,10 +2655,10 @@  discard block
 
 block discarded – undo
2655 2655 
 			*/
2656 2656 
 			do_action( 'yikes-mailchimp-after-duplicating-form', $post_id_to_clone, $result, $form_data );
2657 2657
2658 
-			if ( false === $result ) {
2658 
+			if ( false === $result ) {
2659 2659 
 				// redirect the user to the manage forms page, display error
2660 2660 
 				wp_redirect( esc_url_raw( admin_url( 'admin.php?page=yikes-inc-easy-mailchimp&duplicated-form=false' ) ) );
2661 
-			} else {
2661 
+			} else {
2662 2662 
 				// redirect the user to the manage forms page, display confirmation
2663 2663 
 				wp_redirect( esc_url_raw( admin_url( 'admin.php?page=yikes-inc-easy-mailchimp&duplicated-form=true' ) ) );
2664 2664 
 			}

@@ -2669,12 +2669,12 @@  discard block
 
 block discarded – undo
2669 2669 
 		/*
2670 2670 
 		*	Reset a forms impression stats
2671 2671 
 		*/
2672 
-		public function yikes_easy_mailchimp_reset_impression_stats() {
2672 
+		public function yikes_easy_mailchimp_reset_impression_stats() {
2673 2673 
 			// grab & store our variables ( associated list & form name )
2674 2674 
 			$nonce = $_REQUEST['nonce'];
2675 2675 
 			$form_id_to_reset = $_REQUEST['mailchimp-form'];
2676 2676 
 			// verify our nonce
2677 
-			if ( ! wp_verify_nonce( $nonce, 'reset-stats-mailchimp-form-'.$form_id_to_reset ) ) {
2677 
+			if ( ! wp_verify_nonce( $nonce, 'reset-stats-mailchimp-form-'.$form_id_to_reset ) ) {
2678 2678 
 				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 ) );
2679 2679 
 			}
2680 2680 
 

@@ -2686,10 +2686,10 @@  discard block
 
 block discarded – undo
2686 2686 
 				)
2687 2687 
 			);
2688 2688
2689 
-			if ( false === $result ) {
2689 
+			if ( false === $result ) {
2690 2690 
 				// redirect the user to the manage forms page, display error
2691 2691 
 				wp_redirect( esc_url_raw( admin_url( 'admin.php?page=yikes-inc-easy-mailchimp&reset-stats=false' ) ) );
2692 
-			} else {
2692 
+			} else {
2693 2693 
 				// redirect the user to the manage forms page, display confirmation
2694 2694 
 				wp_redirect( esc_url_raw( admin_url( 'admin.php?page=yikes-inc-easy-mailchimp&reset-stats=true' ) ) );
2695 2695 
 			}

@@ -2701,13 +2701,13 @@  discard block
 
 block discarded – undo
2701 2701 
 		*	Update an entire form !
2702 2702 
 		*	Probably Move these to its own file,
2703 2703 
 		*/
2704 
-		public function yikes_easy_mailchimp_update_form() {
2704 
+		public function yikes_easy_mailchimp_update_form() {
2705 2705
2706 2706 
 			$nonce   = $_REQUEST['nonce'];
2707 2707 
 			$form_id = $_REQUEST['id'];
2708 2708
2709 2709 
 			// verify our nonce
2710 
-			if ( ! wp_verify_nonce( $nonce, 'update-mailchimp-form-' . $form_id ) ) {
2710 
+			if ( ! wp_verify_nonce( $nonce, 'update-mailchimp-form-' . $form_id ) ) {
2711 2711 
 				wp_die(
2712 2712 
 					__( "We've run into an error. The security check didn't pass. Please try again.", 'yikes-inc-easy-mailchimp-extender' ),
2713 2713 
 					__( "Failed nonce validation", 'yikes-inc-easy-mailchimp-extender' ),

@@ -2780,11 +2780,11 @@  discard block
 
 block discarded – undo
2780 2780
2781 2781 
 			// additional custom fields (extensions / user defined fields)
2782 2782 
 			$custom_fields = array();
2783 
-			if ( isset( $_POST['custom-field'] ) ) {
2784 
-				foreach ( $_POST['custom-field'] as $custom_field => $custom_value ) {
2785 
-					if ( is_array( $custom_value ) ) {
2783 
+			if ( isset( $_POST['custom-field'] ) ) {
2784 
+				foreach ( $_POST['custom-field'] as $custom_field => $custom_value ) {
2785 
+					if ( is_array( $custom_value ) ) {
2786 2786 
 						$custom_fields[ $custom_field ] = array_filter( stripslashes_deep( $custom_value ) ); // array_filters to remove empty items (don't save them!)
2787 
-					} else {
2787 
+					} else {
2788 2788 
 						$custom_fields[ $custom_field ] = stripslashes( $custom_value );
2789 2789 
 					}
2790 2790 
 				}

@@ -2820,7 +2820,7 @@  discard block
 
 block discarded – undo
2820 2820 
 			exit();
2821 2821 
 		}
2822 2822
2823 
-		public static function generate_default_email_body() {
2823 
+		public static function generate_default_email_body() {
2824 2824 
 			$email_body  = '<p>' . __( 'Greetings,', 'yikes-inc-easy-mailchimp-extender' ) . '</p>';
2825 2825
2826 2826 
 			$email_body .= '<p>';

@@ -2843,18 +2843,18 @@  discard block
 
 block discarded – undo
2843 2843 
 		}
2844 2844
2845 2845 
 		/* Unsubscribe a given user from our list */
2846 
-		public function yikes_easy_mailchimp_unsubscribe_user() {
2846 
+		public function yikes_easy_mailchimp_unsubscribe_user() {
2847 2847 
 			$nonce    = $_REQUEST['nonce'];
2848 2848 
 			$list_id  = $_REQUEST['mailchimp-list'];
2849 2849 
 			$email_id = $_REQUEST['email_id'];
2850 2850
2851 2851 
 			// verify our nonce
2852 
-			if ( ! wp_verify_nonce( $nonce, 'unsubscribe-user-' . $email_id ) ) {
2852 
+			if ( ! wp_verify_nonce( $nonce, 'unsubscribe-user-' . $email_id ) ) {
2853 2853 
 				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 ) );
2854 2854 
 			}
2855 2855
2856 2856 
 			$response = yikes_get_mc_api_manager()->get_list_handler()->member_unsubscribe( $list_id, $email_id );
2857 
-			if ( is_wp_error( $response ) ) {
2857 
+			if ( is_wp_error( $response ) ) {
2858 2858 
 				$error_logging = new Yikes_Inc_Easy_Mailchimp_Error_Logging();
2859 2859 
 				$error_logging->maybe_write_to_log(
2860 2860 
 					$response->get_error_code(),

@@ -2867,22 +2867,22 @@  discard block
 
 block discarded – undo
2867 2867 
 			exit;
2868 2868 
 		}
2869 2869
2870 
-		public function yikes_easy_mailchimp_create_missing_error_log() {
2870 
+		public function yikes_easy_mailchimp_create_missing_error_log() {
2871 2871 
 			// grab our nonnce
2872 2872 
 			$nonce = $_REQUEST['nonce'];
2873 2873 
 			// validate nonce
2874 
-			if ( !wp_verify_nonce( $nonce, 'create_error_log' ) ) {
2874 
+			if ( !wp_verify_nonce( $nonce, 'create_error_log' ) ) {
2875 2875 
 				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 ) );
2876 2876 
 			}
2877 2877 
 			// setup the path to the error log
2878 2878 
 			$error_log = fopen( plugin_dir_path( __FILE__ ) . '../includes/error_log/yikes-easy-mailchimp-error-log.php', 'w' );
2879 
-			try {
2879 
+			try {
2880 2880 
 				// create the file
2881 2881 
 				fwrite( $error_log , '' );
2882 2882 
 				// close out
2883 2883 
 				fclose( $error_log );
2884 2884 
 				wp_redirect( esc_url_raw( admin_url( 'admin.php?page=yikes-inc-easy-mailchimp-settings&section=debug-settings&error_log_created=true' ) ) );
2885 
-			} catch ( Exception $e ) {
2885 
+			} catch ( Exception $e ) {
2886 2886 
 				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() ) ) ) );
2887 2887 
 			}
2888 2888 
 		}

@@ -2891,11 +2891,11 @@  discard block
 
 block discarded – undo
2891 2891 
 		*	Clear Transient Data !
2892 2892 
 		*	Probably Move these to its own file,
2893 2893 
 		*/
2894 
-		public function yikes_easy_mailchimp_clear_transient_data() {
2894 
+		public function yikes_easy_mailchimp_clear_transient_data() {
2895 2895
2896 2896 
 			// verify our nonce
2897 2897 
 			$nonce = $_REQUEST['nonce'];
2898 
-			if ( ! wp_verify_nonce( $nonce, 'clear-mc-transient-data' ) ) {
2898 
+			if ( ! wp_verify_nonce( $nonce, 'clear-mc-transient-data' ) ) {
2899 2899 
 				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 ) );
2900 2900 
 			}
2901 2901 
 

@@ -2903,14 +2903,14 @@  discard block
 
 block discarded – undo
2903 2903
2904 2904 
 			// if the request came from the settings page, redirect to the settings page.
2905 2905 
 			$referer = wp_get_referer();
2906 
-			if ( $referer && ( strpos( $referer, 'yikes-inc-easy-mailchimp-settings' ) > 0 ) ) {
2906 
+			if ( $referer && ( strpos( $referer, 'yikes-inc-easy-mailchimp-settings' ) > 0 ) ) {
2907 2907 
 				wp_redirect( esc_url_raw( admin_url( 'admin.php?page=yikes-inc-easy-mailchimp-settings&section=api-cache-settings&transient-cleared=true' ) ) );
2908 
-			} elseif ( isset( $_REQUEST['page'] ) && $_REQUEST['page'] === 'yikes-mailchimp-edit-form' && isset( $_REQUEST['id'] ) && ! empty( $_REQUEST['id'] ) ) {
2908 
+			} elseif ( isset( $_REQUEST['page'] ) && $_REQUEST['page'] === 'yikes-mailchimp-edit-form' && isset( $_REQUEST['id'] ) && ! empty( $_REQUEST['id'] ) ) {
2909 2909
2910 2910 
 				// else check if we were editing a form.
2911 2911 
 				$id = filter_var( $_REQUEST['id'], FILTER_SANITIZE_NUMBER_INT );
2912 2912 
 				wp_redirect( esc_url_raw( admin_url( 'admin.php?page=yikes-mailchimp-edit-form&id=' . $id ) ) );
2913 
-			} else {
2913 
+			} else {
2914 2914 
 				// else redirect to the manage forms page.
2915 2915 
 				wp_redirect( esc_url_raw( admin_url( 'admin.php?page=yikes-inc-easy-mailchimp&transient-cleared=true' ) ) );
2916 2916 
 			}

@@ -2926,17 +2926,17 @@  discard block
 
 block discarded – undo
2926 2926 
 		 * @since 6.0.2
2927 2927 
 		 * @return $list_id_array - array of list id's to loop over
2928 2928 
 		 */
2929 
-		public function get_mailchimp_list_ids_on_account() {
2929 
+		public function get_mailchimp_list_ids_on_account() {
2930 2930 
 			$api_key = yikes_get_mc_api_key();
2931 
-			if ( ! $api_key ) {
2931 
+			if ( ! $api_key ) {
2932 2932 
 				// if no api key is set/site is not connected, return an empty array.
2933 2933 
 				return array();
2934 2934 
 			}
2935 2935
2936 2936 
 			$lists = get_transient( 'yikesinc_eme_list_ids' );
2937 
-			if ( false === $lists ) {
2937 
+			if ( false === $lists ) {
2938 2938 
 				$lists = yikes_get_mc_api_manager()->get_list_handler()->get_list_ids();
2939 
-				if ( is_wp_error( $lists ) ) {
2939 
+				if ( is_wp_error( $lists ) ) {
2940 2940 
 					return array();
2941 2941 
 				}
2942 2942 
 				set_transient( 'yikesinc_eme_list_ids', $lists, HOUR_IN_SECONDS );

@@ -2950,9 +2950,9 @@  discard block
 
 block discarded – undo
2950 2950 
 		 *
2951 2951 
 		 *	@since 6.0
2952 2952 
 		 */
2953 
-		public function yikes_mailchimp_load_helper_class() {
2953 
+		public function yikes_mailchimp_load_helper_class() {
2954 2954 
 			// check to see if it's already loaded up.
2955 
-			if ( !class_exists( 'Yikes_Inc_Easy_Mailchimp_Forms_Helper' ) ) {
2955 
+			if ( !class_exists( 'Yikes_Inc_Easy_Mailchimp_Forms_Helper' ) ) {
2956 2956 
 				// Include our main helper class file
2957 2957 
 				include_once( YIKES_MC_PATH . 'admin/partials/helpers/init.php' );
2958 2958 
 			}

@@ -2965,11 +2965,11 @@  discard block
 
 block discarded – undo
2965 2965 
 		 * @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)
2966 2966 
 		 * @return print out custom styles to the admin header to alter the default blue color
2967 2967 
 		 */
2968 
-		public function alter_yikes_easy_mc_color_scheme() {
2968 
+		public function alter_yikes_easy_mc_color_scheme() {
2969 2969 
 			// get the current set color scheme for the logged in user
2970 2970 
 			$current_color_scheme = get_user_option( 'admin_color' );
2971 2971 
 			// switch over each color scheme, and set our variable
2972 
-			switch ( $current_color_scheme ) {
2972 
+			switch ( $current_color_scheme ) {
2973 2973 
 				default:
2974 2974 
 				case 'fresh': // default blue (defined by this plugin)
2975 2975 
 					$main_color = '#00a0d2';

@@ -3017,16 +3017,16 @@  discard block
 
 block discarded – undo
3017 3017 
 		/**
3018 3018 
 		 *	Display premium support page if any add-ons are installed, otherwise display free support page
3019 3019 
 		 */
3020 
-		public function display_support_page_content() {
3020 
+		public function display_support_page_content() {
3021 3021
3022 3022 
 			$addons = get_option( 'yikes-easy-mc-active-addons', array() );
3023 3023
3024 3024 
 			// If we have premium add-ons...
3025 
-			if ( ! empty( $addons ) ) {
3025 
+			if ( ! empty( $addons ) ) {
3026 3026
3027 3027 
 				// Add our premium support partial.
3028 3028 
 				include_once( YIKES_MC_PATH . 'admin/partials/helpers/premium-support.php' );
3029 
-			} else {
3029 
+			} else {
3030 3030
3031 3031 
 				// Otherwise add our free support partial.
3032 3032 
 				include_once( YIKES_MC_PATH . 'admin/partials/helpers/free-support.php' );

@@ -3038,8 +3038,8 @@  discard block
 
 block discarded – undo
3038 3038 
 		 *
3039 3039 
 		 * @since 6.0.4
3040 3040 
 		 */
3041 
-		public function check_yikes_mc_table_version() {
3042 
-			if ( get_option( 'yikes_mc_database_version', '0.00' ) < '1.0' ) {
3041 
+		public function check_yikes_mc_table_version() {
3042 
+			if ( get_option( 'yikes_mc_database_version', '0.00' ) < '1.0' ) {
3043 3043 
 				require_once YIKES_MC_PATH . 'includes/class-yikes-inc-easy-mailchimp-extender-activator.php';
3044 3044 
 				global $wpdb;
3045 3045 
 				Yikes_Inc_Easy_Mailchimp_Extender_Activator::_activate_yikes_easy_mailchimp( $wpdb );

@@ -3053,7 +3053,7 @@  discard block
 
 block discarded – undo
3053 3053 
 		 *
3054 3054 
 		 * @since 6.0.4.4
3055 3055 
 		 */
3056 
-		public function process_subscriber_count_shortcode_in_form_descriptions( $form_description, $form_id ) {
3056 
+		public function process_subscriber_count_shortcode_in_form_descriptions( $form_description, $form_id ) {
3057 3057 
 			$form_description = str_replace( '[yikes-mailchimp-subscriber-count]', do_shortcode( '[yikes-mailchimp-subscriber-count form="' . $form_id . '"]' ), $form_description );
3058 3058 
 			return $form_description;
3059 3059 
 		}

@@ -3063,9 +3063,9 @@  discard block
 
 block discarded – undo
3063 3063 
 		 *
3064 3064 
 		 * @since 6.0.3
3065 3065 
 		 */
3066 
-		public function generate_edit_forms_upsell_ad() {
3066 
+		public function generate_edit_forms_upsell_ad() {
3067 3067 
 		$upsell_ads = glob( YIKES_MC_PATH . 'includes/upsells/*.php' );
3068 
-		if ( $upsell_ads && ! empty( $upsell_ads ) ) {
3068 
+		if ( $upsell_ads && ! empty( $upsell_ads ) ) {
3069 3069 
 			$ad_count = absint( count( $upsell_ads ) - 1 );
3070 3070 
 			$ad       = $upsell_ads[ mt_rand( 0, $ad_count ) ];
3071 3071 
 			ob_start();

@@ -3082,11 +3082,11 @@  discard block
 
 block discarded – undo
3082 3082 
 		 * Mainly used when the API key is altered, changed or removed.
3083 3083 
 		 * @since 6.1.3
3084 3084 
 		 */
3085 
-		public function delete_yikes_mailchimp_transients() {
3085 
+		public function delete_yikes_mailchimp_transients() {
3086 3086
3087 3087 
 		// delete all of the list_id transients.
3088 3088 
 		$list_ids = $this->get_mailchimp_list_ids_on_account();
3089 
-		foreach ( $list_ids as $id ) {
3089 
+		foreach ( $list_ids as $id ) {
3090 3090 
 			delete_transient( "yikes_eme_list_{$id}" );
3091 3091 
 			delete_transient( "yikes_eme_merge_variables_{$id}" );
3092 3092 
 			delete_transient( "yikes_eme_interest_categories_{$id}" );

@@ -3106,13 +3106,13 @@  discard block
 
 block discarded – undo
3106 3106 
 	 *
3107 3107 
 	 * @author Jeremy Pry
3108 3108 
 	 */
3109 
-	public function check_db_version() {
3109 
+	public function check_db_version() {
3110 3110 
 		$option = get_option( 'yikes_easy_mailchimp_extender_version', '0.0.0' );
3111 
-		if ( version_compare( $option, '6.2.0', '<' ) ) {
3111 
+		if ( version_compare( $option, '6.2.0', '<' ) ) {
3112 3112 
 			$this->convert_db_to_option();
3113 3113 
 		}
3114 3114
3115 
-		if ( version_compare( $option, YIKES_MC_VERSION, '<' ) ) {
3115 
+		if ( version_compare( $option, YIKES_MC_VERSION, '<' ) ) {
3116 3116 
 			update_option( 'yikes_easy_mailchimp_extender_version', YIKES_MC_VERSION );
3117 3117 
 		}
3118 3118 
 	}

@@ -3122,7 +3122,7 @@  discard block
 
 block discarded – undo
3122 3122 
 	 *
3123 3123 
 	 * @author Jeremy Pry
3124 3124 
 	 */
3125 
-	public function convert_db_to_option() {
3125 
+	public function convert_db_to_option() {
3126 3126 
 		/** @var wpdb */
3127 3127 
 		global $wpdb;
3128 3128 
 

@@ -3131,11 +3131,11 @@  discard block
 
 block discarded – undo
3131 3131 
 		$form_option      = array();
3132 3132 
 		$form_ids         = $db_interface->get_form_ids();
3133 3133
3134 
-		if ( empty( $form_ids ) ) {
3134 
+		if ( empty( $form_ids ) ) {
3135 3135 
 			return;
3136 3136 
 		}
3137 3137
3138 
-		foreach ( $form_ids as $form_id ) {
3138 
+		foreach ( $form_ids as $form_id ) {
3139 3139 
 			$form_option[ $form_id ] = $db_interface->get_form( $form_id );
3140 3140 
 		}
3141 3141 
 

@@ -3147,7 +3147,7 @@  discard block
 
 block discarded – undo
3147 3147 
 	 *
3148 3148 
 	 * @author Jeremy Pry
3149 3149 
 	 */
3150 
-	public function register_optin_widget() {
3150 
+	public function register_optin_widget() {
3151 3151 
 		register_widget( 'Yikes_Inc_Easy_Mailchimp_Extender_Widget' );
3152 3152 
 	}
3153 3153 
 }
Please login to merge, or discard this patch.