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

Schedule Inspection
Subscribe
Completed
Push — master ( 1c055b...40e26a )
by
unknown
76:32 queued 56:33
created
Status
Category
Toggle Patches
admin/class-yikes-inc-easy-mailchimp-extender-admin.php 4 patches
Doc Comments   +4 added lines patch added patch discarded remove patch 
@@ -470,6 +470,9 @@  discard block
 
 block discarded – undo
470 470 
 			$response_body = json_decode( wp_remote_retrieve_body( $response ) );
471 471 
 		}
472 472
473 
+		/**
474 
+		 * @return string
475 
+		 */
473 476 
 		public function get_premium_license( $plugin_slug ) {
474 477
475 478 
 			switch( $plugin_slug ) {

@@ -767,6 +770,7 @@  discard block
 
 block discarded – undo
767 770
768 771 
 	/**
769 772 
 	 * Convert the php date format string to a js date format
773 
+	 * @param string $type
770 774 
 	 */
771 775 
 	public function yikes_jQuery_datepicker_date_format_php_to_js( $sFormat, $type ) {
772 776 
 		switch ( $type ) {
Please login to merge, or discard this patch.
Indentation   +67 added lines, -67 removed lines patch added patch discarded remove patch 
@@ -581,7 +581,7 @@  discard block
 
 block discarded – undo
581 581 
 			yikes_easy_mailchimp_stop_bugging_me()
582 582 
 			Remove the Review us notification when user clicks 'Dismiss'
583 583 
 			@since v3.1.1
584 
-		*/
584 
+		 */
585 585 
 		public function yikes_easy_mailchimp_stop_bugging_me() {
586 586 
 			if ( isset( $_GET['yikes_easy_mc_icons_nobug'] ) && (int) filter_var( $_GET['yikes_easy_mc_icons_nobug'], FILTER_SANITIZE_NUMBER_INT ) === 1 ) {
587 587 
 				add_option( 'yikes_easy_mailchimp_review_stop_bugging_me', true );

@@ -843,9 +843,9 @@  discard block
 
 block discarded – undo
843 843 
 	}
844 844
845 845 
 	/**
846 
-	*	Register our admin pages
847 
-	*	used to display data back to the user
848 
-	**/
846 
+	 *	Register our admin pages
847 
+	 *	used to display data back to the user
848 
+	 **/
849 849 
 	public function register_admin_pages() {
850 850
851 851 
 		/* Top Level Menu 'Easy Mailchimp' */

@@ -964,28 +964,28 @@  discard block
 
 block discarded – undo
964 964 
 	}
965 965
966 966 
 	/**
967 
-	* Generate Us Easy Mailchimp Manage Forms Page
968 
-	*
969 
-	* @since    1.0.0
970 
-	*/
967 
+	 * Generate Us Easy Mailchimp Manage Forms Page
968 
+	 *
969 
+	 * @since    1.0.0
970 
+	 */
971 971 
 	function generateManageFormsPage() {
972 972 
 		require_once YIKES_MC_PATH . 'admin/partials/menu/manage-forms.php'; // include our manage forms page
973 973 
 	}
974 974
975 975 
 	/**
976 
-	* Generate Us Easy Mailchimp Manage Lists Page
977 
-	*
978 
-	* @since    1.0.0
979 
-	*/
976 
+	 * Generate Us Easy Mailchimp Manage Lists Page
977 
+	 *
978 
+	 * @since    1.0.0
979 
+	 */
980 980 
 	function generateManageListsPage() {
981 981 
 		require_once YIKES_MC_PATH . 'admin/partials/menu/manage-lists.php'; // include our lists page
982 982 
 	}
983 983
984 984 
 	/**
985 
-	* Generate Us Easy Mailchimp Support Page
986 
-	*
987 
-	* @since    1.0.0
988 
-	*/
985 
+	 * Generate Us Easy Mailchimp Support Page
986 
+	 *
987 
+	 * @since    1.0.0
988 
+	 */
989 989 
 	function generateSupportPage() {
990 990
991 991 
 		wp_enqueue_script( 'yikes-inc-easy-mailchimp-extender-support-scripts', plugin_dir_url( __FILE__ ) . 'js/support.js', array( 'jquery' ), $this->version, false );	

@@ -993,37 +993,37 @@  discard block
 
 block discarded – undo
993 993 
 	}
994 994
995 995 
 	/**
996 
-	* Generate Us Easy Mailchimp Edit Form Page
997 
-	*
998 
-	* @since    1.0.0
999 
-	*/
996 
+	 * Generate Us Easy Mailchimp Edit Form Page
997 
+	 *
998 
+	 * @since    1.0.0
999 
+	 */
1000 1000 
 	function generateEditFormPage() {
1001 1001 
 		require_once YIKES_MC_PATH . 'admin/partials/edit-form.php'; // include our options page
1002 1002 
 	}
1003 1003
1004 1004 
 	/**
1005 
-	* Generate Us Easy Mailchimp View List Page
1006 
-	*
1007 
-	* @since    1.0.0
1008 
-	*/
1005 
+	 * Generate Us Easy Mailchimp View List Page
1006 
+	 *
1007 
+	 * @since    1.0.0
1008 
+	 */
1009 1009 
 	function generateViewListPage() {
1010 1010 
 		require_once YIKES_MC_PATH . 'admin/partials/view-list.php'; // include our options page
1011 1011 
 	}
1012 1012
1013 1013 
 	/**
1014 
-	* Generate Us Easy Mailchimp View User Page
1015 
-	*
1016 
-	* @since    1.0.0
1017 
-	*/
1014 
+	 * Generate Us Easy Mailchimp View User Page
1015 
+	 *
1016 
+	 * @since    1.0.0
1017 
+	 */
1018 1018 
 	function generateViewUserPage() {
1019 1019 
 		require_once YIKES_MC_PATH . 'admin/partials/view-user.php'; // include our options page
1020 1020 
 	}
1021 1021
1022 1022 
 	/**
1023 
-	*	Register our plugin settings, and display them on our settings page
1024 
-	*
1025 
-	* @since v.5.4
1026 
-	**/
1023 
+	 *	Register our plugin settings, and display them on our settings page
1024 
+	 *
1025 
+	 * @since v.5.4
1026 
+	 **/
1027 1027 
 	function yikes_easy_mc_settings_init() {
1028 1028
1029 1029 
 		/* Register General Settings Section */

@@ -1141,9 +1141,9 @@  discard block
 
 block discarded – undo
1141 1141 
 	}
1142 1142
1143 1143 
 	/**
1144 
-	*	Options Sanitization & Validation
1145 
-	*	@since complete re-write
1146 
-	**/
1144 
+	 *	Options Sanitization & Validation
1145 
+	 *	@since complete re-write
1146 
+	 **/
1147 1147 
 	function yikes_mc_validate_api_key( $input ) {
1148 1148 
 		if ( $input === '' ) {
1149 1149 
 			update_option( 'yikes-mc-api-validation', 'invalid_api_key' );

@@ -1175,20 +1175,20 @@  discard block
 
 block discarded – undo
1175 1175 
 	}
1176 1176
1177 1177 
 	/**
1178 
-	* Generate Us Easy Forms for Mailchimp Options Page
1179 
-	*
1180 
-	* @since    1.0.0
1181 
-	*/
1178 
+	 * Generate Us Easy Forms for Mailchimp Options Page
1179 
+	 *
1180 
+	 * @since    1.0.0
1181 
+	 */
1182 1182 
 	function generatePageOptions() {
1183 1183 
 		require_once YIKES_MC_PATH . 'admin/partials/menu/options.php'; // include our options page
1184 1184 
 	}
1185 1185
1186 1186 
 	/**
1187 
-	*	Check if users API key is valid, if not
1188 
-	*	this function will apply a disabled attribute
1189 
-	*	to form fields. (input, dropdowns, buttons etc.)
1190 
-	* 	@since v5.5 re-write
1191 
-	**/
1187 
+	 *	Check if users API key is valid, if not
1188 
+	 *	this function will apply a disabled attribute
1189 
+	 *	to form fields. (input, dropdowns, buttons etc.)
1190 
+	 * 	@since v5.5 re-write
1191 
+	 **/
1192 1192 
 	public function is_user_mc_api_valid_form( $echo = true ) {
1193 1193 
 		if ( $echo == true ) {
1194 1194 
 			if ( get_option( 'yikes-mc-api-validation', 'invalid_api_key' ) == 'invalid_api_key' ) {

@@ -1214,12 +1214,12 @@  discard block
 
 block discarded – undo
1214 1214 
 		*	- http://stackoverflow.com/questions/6661530/php-multi-dimensional-array-search
1215 1215 
 		*/
1216 1216 
 		function findMCListID($id, $array) {
1217 
-		   foreach ($array as $key => $val) {
1218 
-			   if ($val['id'] === $id) {
1219 
-				   return $key;
1220 
-			   }
1221 
-		   }
1222 
-		   return null;
1217 
+			foreach ($array as $key => $val) {
1218 
+				if ($val['id'] === $id) {
1219 
+					return $key;
1220 
+				}
1221 
+			}
1222 
+			return null;
1223 1223 
 		} // end
1224 1224
1225 1225 
 		/*

@@ -1394,13 +1394,13 @@  discard block
 
 block discarded – undo
1394 1394 
 				<?php
1395 1395
1396 1396 
 					/**
1397 
-					*	yikes-mailchimp-excluded-redirect-post-types
1398 
-					*
1399 
-					*	Filter the post types that will not show on the redirect list dropdown.
1400 
-					*
1401 
-					* 	@param array | $excluded_post_types | The array of default excluded post types
1402 
-					*	@return array| $excluded_post_types | The array of user-defined excluded post types
1403 
-					*/
1397 
+					 *	yikes-mailchimp-excluded-redirect-post-types
1398 
+					 *
1399 
+					 *	Filter the post types that will not show on the redirect list dropdown.
1400 
+					 *
1401 
+					 * 	@param array | $excluded_post_types | The array of default excluded post types
1402 
+					 *	@return array| $excluded_post_types | The array of user-defined excluded post types
1403 
+					 */
1404 1404 
 					$excluded_post_types = array( 'attachment', 'revision', 'nav_menu_item', 'shop_order', 'shop_order_refund', 'custom_css', 'customize_changeset', 'forum', 'topic', 'reply' );
1405 1405 
 					$excluded_post_types = apply_filters( 'yikes-mailchimp-excluded-redirect-post-types', $excluded_post_types );
1406 1406 
 

@@ -1530,9 +1530,9 @@  discard block
 
 block discarded – undo
1530 1530 
 			}
1531 1531
1532 1532 
 			/**
1533 
-			*	Custom action hook for our extensions to hook into
1534 
-			*	@parameter	get_current_screen()	current screen information
1535 
-			*/
1533 
+			 *	Custom action hook for our extensions to hook into
1534 
+			 *	@parameter	get_current_screen()	current screen information
1535 
+			 */
1536 1536 
 			do_action( 'yikes-mailchimp-admin-sidebar', get_current_screen() );
1537 1537
1538 1538 
 		}

@@ -2454,13 +2454,13 @@  discard block
 
 block discarded – undo
2454 2454 
 			$result = $this->form_interface->create_form( $form_data );
2455 2455
2456 2456 
 			/**
2457 
-			* `yikes-mailchimp-after-duplicating-form`
2458 
-			*
2459 
-			* @param $post_id_to_clone | int   | ID of the original form
2460 
-			* @param $result           | mixed | ID of the new form OR false if the operation failed
2461 
-			* @param $form_data        | array | Array of the form data
2462 
-			*
2463 
-			*/
2457 
+			 * `yikes-mailchimp-after-duplicating-form`
2458 
+			 *
2459 
+			 * @param $post_id_to_clone | int   | ID of the original form
2460 
+			 * @param $result           | mixed | ID of the new form OR false if the operation failed
2461 
+			 * @param $form_data        | array | Array of the form data
2462 
+			 *
2463 
+			 */
2464 2464 
 			do_action( 'yikes-mailchimp-after-duplicating-form', $post_id_to_clone, $result, $form_data );
2465 2465
2466 2466 
 			if ( false === $result ) {
Please login to merge, or discard this patch.
Spacing   +335 added lines, -335 removed lines patch added patch discarded remove patch 
@@ -92,7 +92,7 @@  discard block
 
 block discarded – undo
92 92 
 		/***********************/
93 93 
 		/** Create A Form **/
94 94 
 		/**********************/
95 
-		if ( isset( $_REQUEST['action'] ) && $_REQUEST['action'] == 'yikes-easy-mc-create-form' ) {
95 
+		if ( isset( $_REQUEST[ 'action' ] ) && $_REQUEST[ 'action' ] == 'yikes-easy-mc-create-form' ) {
96 96
97 97 
 			add_action( 'init', array( $this, 'yikes_easy_mailchimp_create_form' ) );
98 98 
 

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

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

@@ -119,7 +119,7 @@  discard block
 
 block discarded – undo
119 119 
 		/*************************************/
120 120 
 		/**  Reset Form Impression Stats **/
121 121 
 		/***********************************/
122 
-		if ( isset( $_REQUEST['action'] ) && $_REQUEST['action'] == 'yikes-easy-mc-reset-stats' ) {
122 
+		if ( isset( $_REQUEST[ 'action' ] ) && $_REQUEST[ 'action' ] == 'yikes-easy-mc-reset-stats' ) {
123 123
124 124 
 			add_action( 'init', array( $this, 'yikes_easy_mailchimp_reset_impression_stats' ) );
125 125 
 

@@ -128,7 +128,7 @@  discard block
 
 block discarded – undo
128 128 
 		/**********************************/
129 129 
 		/**         Update A Form        **/
130 130 
 		/********************************/
131 
-		if ( isset( $_REQUEST['action'] ) && $_REQUEST['action'] == 'yikes-easy-mc-update-form' ) {
131 
+		if ( isset( $_REQUEST[ 'action' ] ) && $_REQUEST[ 'action' ] == 'yikes-easy-mc-update-form' ) {
132 132
133 133 
 			add_action( 'init', array( $this, 'yikes_easy_mailchimp_update_form' ) );
134 134 
 

@@ -137,7 +137,7 @@  discard block
 
 block discarded – undo
137 137 
 		/**************************************************/
138 138 
 		/**     Clear Store Mailchimp Transient Data   **/
139 139 
 		/*************************************************/
140 
-		if ( isset( $_REQUEST['action'] ) && $_REQUEST['action'] == 'yikes-easy-mc-clear-transient-data' ) {
140 
+		if ( isset( $_REQUEST[ 'action' ] ) && $_REQUEST[ 'action' ] == 'yikes-easy-mc-clear-transient-data' ) {
141 141
142 142 
 			add_action( 'init', array( $this, 'yikes_easy_mailchimp_clear_transient_data' ) );
143 143 
 

@@ -146,7 +146,7 @@  discard block
 
 block discarded – undo
146 146 
 		/*******************************************/
147 147 
 		/** Remove a user from a mailing list     **/
148 148 
 		/*****************************************/
149 
-		if ( isset( $_REQUEST['action'] ) && $_REQUEST['action'] == 'yikes-easy-mc-unsubscribe-user' ) {
149 
+		if ( isset( $_REQUEST[ 'action' ] ) && $_REQUEST[ 'action' ] == 'yikes-easy-mc-unsubscribe-user' ) {
150 150
151 151 
 			add_action( 'init', array( $this, 'yikes_easy_mailchimp_unsubscribe_user' ) );
152 152 
 

@@ -155,7 +155,7 @@  discard block
 
 block discarded – undo
155 155 
 		/*******************************************/
156 156 
 		/**    Create misisng error log file  **/
157 157 
 		/*****************************************/
158 
-		if ( isset( $_REQUEST['action'] ) && $_REQUEST['action'] == 'yikes-easy-mc-create-error-log' ) {
158 
+		if ( isset( $_REQUEST[ 'action' ] ) && $_REQUEST[ 'action' ] == 'yikes-easy-mc-create-error-log' ) {
159 159
160 160 
 			add_action( 'init', array( $this, 'yikes_easy_mailchimp_create_missing_error_log' ) );
161 161 
 

@@ -187,7 +187,7 @@  discard block
 
 block discarded – undo
187 187 
 		/**************************************************/
188 188 
 		/**        Clear Mailchimp Error Log Data        **/
189 189 
 		/*************************************************/
190 
-		if ( isset( $_REQUEST['action'] ) && $_REQUEST['action'] == 'yikes-easy-mc-clear-error-log' ) {
190 
+		if ( isset( $_REQUEST[ 'action' ] ) && $_REQUEST[ 'action' ] == 'yikes-easy-mc-clear-error-log' ) {
191 191
192 192 
 			add_action( 'init', array( $this, 'yikes_easy_mailchimp_clear_error_log' ) );
193 193 
 

@@ -196,7 +196,7 @@  discard block
 
 block discarded – undo
196 196 
 		/*********************************************/
197 197 
 		/**        Export Mailchimp Opt-in Forms   **/
198 198 
 		/*******************************************/
199 
-		if ( isset( $_REQUEST['action'] ) && $_REQUEST['action'] == 'yikes-easy-mc-export-forms' ) {
199 
+		if ( isset( $_REQUEST[ 'action' ] ) && $_REQUEST[ 'action' ] == 'yikes-easy-mc-export-forms' ) {
200 200
201 201 
 			add_action( 'init', array( $this, 'yikes_easy_mailchimp_export_forms' ) );
202 202 
 

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

@@ -214,7 +214,7 @@  discard block
 
 block discarded – undo
214 214 
 		/*******************************************/
215 215 
 		/**        Import Class Inclusion       **/
216 216 
 		/*****************************************/
217 
-		if ( isset( $_REQUEST['action'] ) && $_REQUEST['action'] == 'yikes-easy-mc-import-forms' ) {
217 
+		if ( isset( $_REQUEST[ 'action' ] ) && $_REQUEST[ 'action' ] == 'yikes-easy-mc-import-forms' ) {
218 218
219 219 
 			add_action( 'init', array( $this, 'yikes_easy_mailchimp_import_forms' ) );
220 220 
 

@@ -223,7 +223,7 @@  discard block
 
 block discarded – undo
223 223 
 		/*******************************************/
224 224 
 		/**    Premium Support Request     **/
225 225 
 		/*****************************************/
226 
-		if ( isset( $_POST['submit-premium-support-request'] ) ) {
226 
+		if ( isset( $_POST[ 'submit-premium-support-request' ] ) ) {
227 227
228 228 
 			add_action( 'init', array( $this, 'yikes_easy_mailchimp_premium_support_request' ) );
229 229 
 

@@ -256,8 +256,8 @@  discard block
 
 block discarded – undo
256 256 
 		 * @ return array  $links  New array of plugin actions
257 257 
 		 */
258 258 
 		public function easy_forms_plugin_action_links( $links ) {
259 
-			$links[] = '<a href="'. esc_url( get_admin_url(null, 'admin.php?page=yikes-inc-easy-mailchimp-settings') ) .'">' . __( 'Settings', 'yikes-inc-easy-mailchimp-extender' ) . '</a>';
260 
-			$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>';
259 
+			$links[ ] = '<a href="' . esc_url( get_admin_url( null, 'admin.php?page=yikes-inc-easy-mailchimp-settings' ) ) . '">' . __( 'Settings', 'yikes-inc-easy-mailchimp-extender' ) . '</a>';
260 
+			$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>';
261 261 
 			return $links;
262 262 
 		}
263 263 
 

@@ -358,17 +358,17 @@  discard block
 
 block discarded – undo
358 358 
 		*/
359 359 
 		public function yikes_easy_mailchimp_export_forms() {
360 360 
 			// grab our nonce.
361 
-			$nonce = $_REQUEST['nonce'];
361 
+			$nonce = $_REQUEST[ 'nonce' ];
362 362 
 			// grab the forms.
363 
-			$forms = isset( $_REQUEST['yikes_export_forms'] ) ? $_REQUEST['yikes_export_forms'] : array();
363 
+			$forms = isset( $_REQUEST[ 'yikes_export_forms' ] ) ? $_REQUEST[ 'yikes_export_forms' ] : array();
364 364 
 			// validate nonce.
365 365 
 			if ( ! wp_verify_nonce( $nonce, 'export-forms' ) ) {
366 
-				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 ) );
366 
+				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 ) );
367 367 
 			}
368 368
369 369 
 			// run the export function.
370 370 
 			// parameters: ( $table_name, $form_ids, $file_name ).
371 
-			Yikes_Inc_Easy_Mailchimp_Export_Class::yikes_mailchimp_form_export('Yikes-Inc-Easy-Mailchimp-Forms-Export', $forms );
371 
+			Yikes_Inc_Easy_Mailchimp_Export_Class::yikes_mailchimp_form_export( 'Yikes-Inc-Easy-Mailchimp-Forms-Export', $forms );
372 372 
 			// re-direct the user back to the page.
373 373 
 			wp_redirect( esc_url_raw( admin_url( 'admin.php?page=yikes-inc-easy-mailchimp-settings&section=import-export-forms' ) ) );
374 374 
 			die();

@@ -382,10 +382,10 @@  discard block
 
 block discarded – undo
382 382 
 		*/
383 383 
 		public function yikes_easy_mailchimp_export_plugin_settings() {
384 384 
 			// grab our nonce
385 
-			$nonce = $_REQUEST['nonce'];
385 
+			$nonce = $_REQUEST[ 'nonce' ];
386 386 
 			// validate nonce.
387 387 
 			if ( ! wp_verify_nonce( $nonce, 'export-settings' ) ) {
388 
-				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 
+				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 ) );
389 389 
 			}
390 390
391 391 
 			// run the export function.

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

@@ -426,18 +426,18 @@  discard block
 
 block discarded – undo
426 426 
 		*/
427 427 
 		public function yikes_easy_mailchimp_premium_support_request() {
428 428
429 
-			if ( isset( $_POST['action'] ) && $_POST['action'] != 'yikes-support-request' ) {
429 
+			if ( isset( $_POST[ 'action' ] ) && $_POST[ 'action' ] != 'yikes-support-request' ) {
430 430 
 				return __( 'We encountered an error. Please contact the YIKES Inc. support team.', 'yikes-inc-easy-mailchimp-extender' );
431 431 
 			}
432 432
433 
-			$email       = isset( $_POST['user-email'] ) ? $_POST['user-email'] : '';
434 
-			$topic       = isset( $_POST['support-topic'] ) ? $_POST['support-topic'] : '';
435 
-			$issue       = isset( $_POST['support-content'] ) ? $_POST['support-content'] : '';
436 
-			$priority    = isset( $_POST['support-priority'] ) ? $_POST['support-priority'] : 1;
437 
-			$license     = isset( $_POST['license_key'] ) ? $_POST['license_key'] : '';
438 
-			$plugin_name = isset( $_POST['plugin-name'] ) ? $_POST['plugin-name'] : '';
439 
-			$plugin_slug = isset( $_POST['plugin-slug'] ) ? $_POST['plugin-slug'] : '';
440 
-			$name        = isset( $_POST['user-name'] ) ? $_POST['user-name'] : 'Mailchimp Support';
433 
+			$email       = isset( $_POST[ 'user-email' ] ) ? $_POST[ 'user-email' ] : '';
434 
+			$topic       = isset( $_POST[ 'support-topic' ] ) ? $_POST[ 'support-topic' ] : '';
435 
+			$issue       = isset( $_POST[ 'support-content' ] ) ? $_POST[ 'support-content' ] : '';
436 
+			$priority    = isset( $_POST[ 'support-priority' ] ) ? $_POST[ 'support-priority' ] : 1;
437 
+			$license     = isset( $_POST[ 'license_key' ] ) ? $_POST[ 'license_key' ] : '';
438 
+			$plugin_name = isset( $_POST[ 'plugin-name' ] ) ? $_POST[ 'plugin-name' ] : '';
439 
+			$plugin_slug = isset( $_POST[ 'plugin-slug' ] ) ? $_POST[ 'plugin-slug' ] : '';
440 
+			$name        = isset( $_POST[ 'user-name' ] ) ? $_POST[ 'user-name' ] : 'Mailchimp Support';
441 441
442 442 
 			$edd_item_id = $this->get_premium_license( $plugin_slug );
443 443 
 

@@ -472,7 +472,7 @@  discard block
 
 block discarded – undo
472 472
473 473 
 		public function get_premium_license( $plugin_slug ) {
474 474
475 
-			switch( $plugin_slug ) {
475 
+			switch ( $plugin_slug ) {
476 476
477 477 
 				case 'form-customizer':
478 478 
 					return defined( 'YIKES_CUSTOMIZER_EDD_ITEM_ID' ) ? YIKES_CUSTOMIZER_EDD_ITEM_ID : '';

@@ -516,7 +516,7 @@  discard block
 
 block discarded – undo
516 516 
 			// add a new option to store the plugin activation date/time.
517 517 
 			// @since v6.0.0.
518 518 
 			// this is used to notify the user that they should review after 2 weeks.
519 
-			if ( !get_option( 'yikes_easy_mailchimp_activation_date' ) ) {
519 
+			if ( ! get_option( 'yikes_easy_mailchimp_activation_date' ) ) {
520 520 
 				add_option( 'yikes_easy_mailchimp_activation_date', strtotime( "now" ) );
521 521 
 			}
522 522 
 

@@ -526,7 +526,7 @@  discard block
 
 block discarded – undo
526 526 
 				$install_date = get_option( 'yikes_easy_mailchimp_activation_date' );
527 527 
 				$past_date = strtotime( '-14 days' );
528 528 
 				if ( $past_date >= $install_date && current_user_can( 'install_plugins' ) ) {
529 
-					add_action( 'admin_notices', array( $this , 'yikes_easy_mailchimp_display_review_us_notice' ) );
529 
+					add_action( 'admin_notices', array( $this, 'yikes_easy_mailchimp_display_review_us_notice' ) );
530 530 
 				}
531 531 
 			}
532 532 
 

@@ -539,13 +539,13 @@  discard block
 
 block discarded – undo
539 539 
 		*/
540 540 
 		public function yikes_easy_mailchimp_display_review_us_notice() {
541 541 
 			/* Lets only display our admin notice on YT4WP pages to not annoy the hell out of people :) */
542 
-			if ( in_array( get_current_screen()->base , array( 'dashboard', 'post', 'edit' ) ) || strpos( get_current_screen()->base ,'yikes-inc-easy-mailchimp') !== false ) {
542 
+			if ( in_array( get_current_screen()->base, array( 'dashboard', 'post', 'edit' ) ) || strpos( get_current_screen()->base, 'yikes-inc-easy-mailchimp' ) !== false ) {
543 543
544 544 
 				// The URL of the page the user is currently on
545 
-				$current_uri  	  = isset( $_SERVER['REQUEST_URI'] ) && ! empty( $_SERVER['REQUEST_URI'] ) ? $_SERVER['REQUEST_URI'] : false;
546 
-				$current_host	  = isset( $_SERVER['HTTP_HOST'] ) && ! empty( $_SERVER['HTTP_HOST'] ) ? $_SERVER['HTTP_HOST'] : false;
545 
+				$current_uri = isset( $_SERVER[ 'REQUEST_URI' ] ) && ! empty( $_SERVER[ 'REQUEST_URI' ] ) ? $_SERVER[ 'REQUEST_URI' ] : false;
546 
+				$current_host = isset( $_SERVER[ 'HTTP_HOST' ] ) && ! empty( $_SERVER[ 'HTTP_HOST' ] ) ? $_SERVER[ 'HTTP_HOST' ] : false;
547 547 
 				$current_protocol = is_ssl() === true ? 'https://' : 'http://';
548 
-				$current_url	  = ( $current_uri !== false && $current_host !== false ) ? $current_protocol . $current_host . $current_uri : admin_url();
548 
+				$current_url = ( $current_uri !== false && $current_host !== false ) ? $current_protocol . $current_host . $current_uri : admin_url();
549 549
550 550 
 				$plugin_name = '<strong>Easy Forms for Mailchimp</strong>';
551 551 
 				// Review URL - Change to the URL of your plugin on WordPress.org.

@@ -556,17 +556,17 @@  discard block
 
 block discarded – undo
556 556 
 				// Make sure all of our variables have values.
557 557 
 				$reviewurl  = ( ! empty( $reviewurl ) ) ? $reviewurl : '';
558 558 
 				$addons_url = ( ! empty( $addons_url ) ) ? $addons_url : '';
559 
-				$nobugurl	= ( ! empty( $nobugurl ) ) ? $nobugurl : '';
559 
+				$nobugurl = ( ! empty( $nobugurl ) ) ? $nobugurl : '';
560 560
561 561 
 				$review_message = '<div id="yikes-mailchimp-logo"></div>';
562 562 
 				$review_message .= sprintf(
563 563 
 					__( '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' )
564 564 
 					. '<span class="button-container"> <a href="%2$s" target="_blank" class="button-secondary"><span class="dashicons dashicons-star-filled"></span>'
565 
-						. __( "Leave A Review" , 'yikes-inc-easy-mailchimp-extender' )
565 
+						. __( "Leave A Review", 'yikes-inc-easy-mailchimp-extender' )
566 566 
 					. '</a> <a href="%3$s" class="button-secondary"><span class="dashicons dashicons-upload"></span>'
567 
-						. __( "View Addons" , 'yikes-inc-easy-mailchimp-extender' )
567 
+						. __( "View Addons", 'yikes-inc-easy-mailchimp-extender' )
568 568 
 					. '</a> <a href="%4$s" class="button-secondary"><span class="dashicons dashicons-no-alt"></span>'
569 
-						. __( "Dismiss" , 'yikes-inc-easy-mailchimp-extender' )
569 
+						. __( "Dismiss", 'yikes-inc-easy-mailchimp-extender' )
570 570 
 					. "</a> </span>",
571 571 
 				$plugin_name, $reviewurl, $addons_url, $nobugurl );
572 572 
 				?>

@@ -583,7 +583,7 @@  discard block
 
 block discarded – undo
583 583 
 			@since v3.1.1
584 584 
 		*/
585 585 
 		public function yikes_easy_mailchimp_stop_bugging_me() {
586 
-			if ( isset( $_GET['yikes_easy_mc_icons_nobug'] ) && (int) filter_var( $_GET['yikes_easy_mc_icons_nobug'], FILTER_SANITIZE_NUMBER_INT ) === 1 ) {
586 
+			if ( isset( $_GET[ 'yikes_easy_mc_icons_nobug' ] ) && (int) filter_var( $_GET[ 'yikes_easy_mc_icons_nobug' ], FILTER_SANITIZE_NUMBER_INT ) === 1 ) {
587 587 
 				add_option( 'yikes_easy_mailchimp_review_stop_bugging_me', true );
588 588 
 			}
589 589 
 		}

@@ -621,7 +621,7 @@  discard block
 
 block discarded – undo
621 621 
 	// inlcude the js for tinymce.
622 622 
 	public function yks_mc_add_tinymce_plugin( $plugin_array ) {
623 623
624 
-		$plugin_array['yks_mc_tinymce_button'] = plugins_url( '/js/min/yikes-inc-easy-mailchimp-tinymce-button.min.js', __FILE__ );
624 
+		$plugin_array[ 'yks_mc_tinymce_button' ] = plugins_url( '/js/min/yikes-inc-easy-mailchimp-tinymce-button.min.js', __FILE__ );
625 625
626 626 
 		return $plugin_array;
627 627 
 	}

@@ -642,13 +642,13 @@  discard block
 
 block discarded – undo
642 642 
 		if ( ! empty( $list_data ) ) {
643 643 
 			// build an array to pass to our javascript.
644 644 
 			foreach ( $list_data as $id => $form ) {
645 
-				$lists[] = array(
646 
-					'text'  => urlencode( $form['form_name'] ),
645 
+				$lists[ ] = array(
646 
+					'text'  => urlencode( $form[ 'form_name' ] ),
647 647 
 					'value' => $id,
648 648 
 				);
649 649 
 			}
650 650 
 		} else {
651 
-			$lists[0] = array(
651 
+			$lists[ 0 ] = array(
652 652 
 				'text'  => __( 'Please Import Some Mailchimp Lists', 'yikes-inc-easy-mailchimp-extender' ),
653 653 
 				'value' => '-',
654 654 
 			);

@@ -729,8 +729,8 @@  discard block
 
 block discarded – undo
729 729
730 730 
 		wp_enqueue_style( 'wp-color-picker' );
731 731 
 		wp_enqueue_script( 'wp-color-picker' );
732 
-		wp_enqueue_script( 'jquery.timepicker.js',YIKES_MC_URL . 'admin/js/jquery.timepicker.min.js', array( 'jquery' ) , $this->version, false );
733 
-		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 );
732 
+		wp_enqueue_script( 'jquery.timepicker.js', YIKES_MC_URL . 'admin/js/jquery.timepicker.min.js', array( 'jquery' ), $this->version, false );
733 
+		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 );
734 734
735 735 
 		$localized_data = array(
736 736 
 			'add_tag_nonce'                     => wp_create_nonce( 'add-tag' ),

@@ -826,7 +826,7 @@  discard block
 
 block discarded – undo
826 826 
 	 * Convert the php date format string to a js date format
827 827 
 	 */
828 828 
 	public function yikes_jQuery_datepicker_date_format( $site_option ) {
829 
-		switch( $site_option ) {
829 
+		switch ( $site_option ) {
830 830 
 			//Predefined WP date formats
831 831 
 			default:
832 832 
 			case 'F j, Y':

@@ -1028,7 +1028,7 @@  discard block
 
 block discarded – undo
1028 1028
1029 1029 
 		/* Register General Settings Section */
1030 1030
1031 
-		register_setting( 'yikes_inc_easy_mc_general_settings_page', 'yikes-mc-api-key', array( $this , 'yikes_mc_validate_api_key' ) );
1031 
+		register_setting( 'yikes_inc_easy_mc_general_settings_page', 'yikes-mc-api-key', array( $this, 'yikes_mc_validate_api_key' ) );
1032 1032
1033 1033 
 		register_setting( 'yikes_inc_easy_mc_general_settings_page', 'yikes-mailchimp-use-nonce' );
1034 1034 
 

@@ -1073,7 +1073,7 @@  discard block
 
 block discarded – undo
1073 1073 
 		add_settings_field(
1074 1074 
 			'optin-checkbox-init',
1075 1075 
 			__( 'Select Checkboxes to Generate', 'yikes-inc-easy-mailchimp-extender' ),
1076 
-			'',  // callback + validation inside of admin/partials/menu/options.php
1076 
+			'', // callback + validation inside of admin/partials/menu/options.php
1077 1077 
 			'yikes_inc_easy_mc_checkbox_settings'
1078 1078 
 		);
1079 1079 
 		/* End Checkbox Settings */

@@ -1095,21 +1095,21 @@  discard block
 
 block discarded – undo
1095 1095 
 			add_settings_field(
1096 1096 
 				'yikes-mc-recaptcha-site-key',
1097 1097 
 				__( 'Enter reCAPTCHA Site Key', 'yikes-inc-easy-mailchimp-extender' ),
1098 
-				'',  // callback + validation inside of admin/partials/menu/options.php
1098 
+				'', // callback + validation inside of admin/partials/menu/options.php
1099 1099 
 				'yikes_easy_mc_settings_recpatcha_section'
1100 1100 
 			);
1101 1101
1102 1102 
 			add_settings_field(
1103 1103 
 				'yikes-mc-recaptcha-secret-key',
1104 1104 
 				__( 'Enter reCAPTCHA Secret Key', 'yikes-inc-easy-mailchimp-extender' ),
1105 
-				'',  // callback + validation inside of admin/partials/menu/options.php
1105 
+				'', // callback + validation inside of admin/partials/menu/options.php
1106 1106 
 				'yikes_easy_mc_settings_recpatcha_section'
1107 1107 
 			);
1108 1108
1109 1109 
 			add_settings_field(
1110 1110 
 				'yikes-mc-recaptcha-status',
1111 1111 
 				__( 'Enable ReCaptcha', 'yikes-inc-easy-mailchimp-extender' ),
1112 
-				'',  // callback + validation inside of admin/partials/menu/options.php
1112 
+				'', // callback + validation inside of admin/partials/menu/options.php
1113 1113 
 				'yikes_easy_mc_settings_recpatcha_section'
1114 1114 
 			);
1115 1115 
 

@@ -1129,7 +1129,7 @@  discard block
 
 block discarded – undo
1129 1129 
 			add_settings_field(
1130 1130 
 				'yikes-mailchimp-debug-status',
1131 1131 
 				__( 'Enable Debugging', 'yikes-inc-easy-mailchimp-extender' ),
1132 
-				'',  // callback + validation inside of admin/partials/menu/options.php
1132 
+				'', // callback + validation inside of admin/partials/menu/options.php
1133 1133 
 				'yikes_easy_mc_settings_debug_section'
1134 1134 
 			);
1135 1135 
 

@@ -1149,7 +1149,7 @@  discard block
 
 block discarded – undo
1149 1149 
 			update_option( 'yikes-mc-api-validation', 'invalid_api_key' );
1150 1150 
 			return '';
1151 1151 
 		}
1152 
-		$api_key = strip_tags ( trim( $input ) );
1152 
+		$api_key = strip_tags( trim( $input ) );
1153 1153 
 		$dash_position = strpos( trim( $input ), '-' );
1154 1154 
 		if ( $dash_position !== false ) {
1155 1155 
 			$manager = new Yikes_Inc_Easy_Mailchimp_API_Manager( $api_key );

@@ -1164,9 +1164,9 @@  discard block
 
 block discarded – undo
1164 1164 
 			update_option( 'yikes-mc-api-validation', 'valid_api_key' );
1165 1165 
 				// Clear the API key transient data
1166 1166 
 			$this->delete_yikes_mailchimp_transients();
1167 
-		}  else {
1167 
+		} else {
1168 1168 
 			$error_logging = new Yikes_Inc_Easy_Mailchimp_Error_Logging();
1169 
-			$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' ) );
1169 
+			$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' ) );
1170 1170 
 			update_option( 'yikes-mc-api-invalid-key-response', $response->get_error_message() );
1171 1171 
 			update_option( 'yikes-mc-api-validation', 'invalid_api_key' );
1172 1172 
 		}

@@ -1213,9 +1213,9 @@  discard block
 
 block discarded – undo
1213 1213 
 		*	and return the index ( used to find the list name assigned to a form )
1214 1214 
 		*	- http://stackoverflow.com/questions/6661530/php-multi-dimensional-array-search
1215 1215 
 		*/
1216 
-		function findMCListID($id, $array) {
1217 
-		   foreach ($array as $key => $val) {
1218 
-			   if ($val['id'] === $id) {
1216 
+		function findMCListID( $id, $array ) {
1217 
+		   foreach ( $array as $key => $val ) {
1218 
+			   if ( $val[ 'id' ] === $id ) {
1219 1219 
 				   return $key;
1220 1220 
 			   }
1221 1221 
 		   }

@@ -1228,8 +1228,8 @@  discard block
 
 block discarded – undo
1228 1228 
 		*	@since v5.6 - complete re-write
1229 1229 
 		*/
1230 1230 
 		public function generate_options_pages_sidebar_menu() {
1231 
-			if ( isset( $_REQUEST['section'] ) ) {
1232 
-				$selected = $_REQUEST['section'];
1231 
+			if ( isset( $_REQUEST[ 'section' ] ) ) {
1232 
+				$selected = $_REQUEST[ 'section' ];
1233 1233 
 			}
1234 1234 
 			$installed_addons = get_option( 'yikes-easy-mc-active-addons', array() );
1235 1235 
 

@@ -1246,25 +1246,25 @@  discard block
 
 block discarded – undo
1246 1246 
 				<h3><span><?php _e( 'Additional Settings', 'yikes-inc-easy-mailchimp-extender' ); ?></span></h3>
1247 1247 
 				<div class="inside">
1248 1248 
 					<ul id="settings-nav">
1249 
-						<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>
1250 
-						<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>
1251 
-						<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>
1252 
-						<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>
1253 
-						<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>
1254 
-						<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>
1249 
+						<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>
1250 
+						<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>
1251 
+						<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>
1252 
+						<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>
1253 
+						<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>
1254 
+						<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>
1255 1255 
 					</ul>
1256 1256 
 					<?php
1257 1257 
 						// create our add-on settings pages
1258 
-						if ( !empty( $installed_addons ) ) {
1258 
+						if ( ! empty( $installed_addons ) ) {
1259 1259 
 							?>
1260 1260 
 							<hr class="add-on-settings-divider" />
1261 1261 
 							<strong><?php _e( 'Addon Settings', 'yikes-inc-easy-mailchimp-extender' ); ?></strong>
1262 1262 
 							<ul id="addon-settings-nav">
1263 1263 
 							<?php
1264 
-							foreach( $installed_addons as $addon_name ) {
1264 
+							foreach ( $installed_addons as $addon_name ) {
1265 1265 
 								?>
1266 1266 
 									<li>
1267 
-										<?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>
1267 
+										<?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>
1268 1268 
 								<?php
1269 1269 
 							}
1270 1270 
 							?>

@@ -1313,19 +1313,19 @@  discard block
 
 block discarded – undo
1313 1313 
 						<select name="associated-list" id="associated-list" class=" input-field" <?php $this->is_user_mc_api_valid_form( true ); disabled( true, empty( $lists ) ); ?>>
1314 1314 
 							<?php
1315 1315 
 							if ( ! empty( $lists ) ) {
1316 
-								foreach( $lists as $mailing_list ) {
1316 
+								foreach ( $lists as $mailing_list ) {
1317 1317 
 									?>
1318 
-									<option value="<?php echo $mailing_list['id']; ?>"><?php echo stripslashes( $mailing_list['name'] ) . ' (' . $mailing_list['stats']['member_count'] . ') '; ?></option>
1318 
+									<option value="<?php echo $mailing_list[ 'id' ]; ?>"><?php echo stripslashes( $mailing_list[ 'name' ] ) . ' (' . $mailing_list[ 'stats' ][ 'member_count' ] . ') '; ?></option>
1319 1319 
 									<?php
1320 1320 
 								}
1321 1321 
 							} else {
1322 1322 
 								if ( get_option( 'yikes-mc-api-validation', 'invalid_api_key' ) == 'invalid_api_key' ) {
1323 1323 
 									?>
1324 
-									<option><?php echo __( "Please enter a valid API key." , 'yikes-inc-easy-mailchimp-extender' ); ?></option>
1324 
+									<option><?php echo __( "Please enter a valid API key.", 'yikes-inc-easy-mailchimp-extender' ); ?></option>
1325 1325 
 									<?php
1326 1326 
 								} else {
1327 1327 
 									?>
1328 
-									<option><?php echo __( "No lists were found on the account." , 'yikes-inc-easy-mailchimp-extender' ); ?></option>
1328 
+									<option><?php echo __( "No lists were found on the account.", 'yikes-inc-easy-mailchimp-extender' ); ?></option>
1329 1329 
 									<?php
1330 1330
1331 1331 
 								}

@@ -1334,8 +1334,8 @@  discard block
 
 block discarded – undo
1334 1334 
 						</select>
1335 1335
1336 1336 
 						<?php
1337 
-						if ( isset( $_GET['transient-cleared'] ) ) {
1338 
-							if ( 'true' === $_GET['transient-cleared'] ) {
1337 
+						if ( isset( $_GET[ 'transient-cleared' ] ) ) {
1338 
+							if ( 'true' === $_GET[ 'transient-cleared' ] ) {
1339 1339 
 								?>
1340 1340 
 								<div class="yikes-list-refreshed-notice">
1341 1341 
 									<p><?php esc_attr_e( 'Mailchimp list data has been succesfully refreshed.', 'yikes-inc-easy-mailchimp-extender' ); ?></p>

@@ -1348,7 +1348,7 @@  discard block
 
 block discarded – undo
1348 1348 
 							if ( get_option( 'yikes-mc-api-validation', 'invalid_api_key' ) != 'invalid_api_key' ) {
1349 1349 
 								?>
1350 1350 
 									<p class="description">
1351 
-										<?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' ) ); ?>
1351 
+										<?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' ) ); ?>
1352 1352 
 									</p>
1353 1353 
 								<?php
1354 1354 
 							}

@@ -1357,9 +1357,9 @@  discard block
 
 block discarded – undo
1357 1357 
 					</label>
1358 1358 
 					<?php
1359 1359 
 						if ( $this->is_user_mc_api_valid_form( false ) ) {
1360 
-							echo submit_button( __( 'Create', 'yikes-inc-easy-mailchimp-extender' ) , 'primary', '', false , array( 'style' => 'margin:.75em 0 .5em 0;' ) );
1360 
+							echo submit_button( __( 'Create', 'yikes-inc-easy-mailchimp-extender' ), 'primary', '', false, array( 'style' => 'margin:.75em 0 .5em 0;' ) );
1361 1361 
 						} else {
1362 
-							echo '<p class="description">' . __( "Please enter a valid Mailchimp API key to get started." , 'yikes-inc-easy-mailchimp-extender' ) . '</p>';
1362 
+							echo '<p class="description">' . __( "Please enter a valid Mailchimp API key to get started.", 'yikes-inc-easy-mailchimp-extender' ) . '</p>';
1363 1363 
 							?>
1364 1364 
 								<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>
1365 1365 
 							<?php

@@ -1389,7 +1389,7 @@  discard block
 
 block discarded – undo
1389 1389 
 				$post_types = get_post_types();
1390 1390 
 				?>
1391 1391 
 				<label id="redirect-user-to-selection-label" for="redirect-user-to-selection" class="<?php if ( $redirect == '0' ) { echo 'yikes-easy-mc-hidden'; } ?>">
1392 
-					<?php _e( "Select A Page or Post" , 'yikes-inc-easy-mailchimp-extender' ); ?>
1392 
+					<?php _e( "Select A Page or Post", 'yikes-inc-easy-mailchimp-extender' ); ?>
1393 1393 
 					<select id="redirect-user-to-selection" name="redirect-user-to-selection" onchange="shouldWeDisplayCustomURL( this );return;">
1394 1394 
 				<?php
1395 1395 
 

@@ -1405,7 +1405,7 @@  discard block
 
 block discarded – undo
1405 1405 
 					$excluded_post_types = apply_filters( 'yikes-mailchimp-excluded-redirect-post-types', $excluded_post_types );
1406 1406
1407 1407 
 						// loop over registered post types, and query!
1408 
-						foreach( $post_types as $registered_post_type ) {
1408 
+						foreach ( $post_types as $registered_post_type ) {
1409 1409
1410 1410 
 							// exclude a few built in custom post types and any defined by the filter
1411 1411 
 							if ( ! in_array( $registered_post_type, $excluded_post_types ) ) {

@@ -1427,8 +1427,8 @@  discard block
 
 block discarded – undo
1427 1427 
 									?>
1428 1428 
 										<optgroup label="<?php echo ucwords( str_replace( '_', ' ', $registered_post_type ) ); ?>">
1429 1429 
 									<?php
1430 
-											foreach( $post_ids as $post_id ) {
1431 
-												?><option <?php selected( $redirect_page , $post_id ); ?> value="<?php echo $post_id; ?>"><?php echo get_the_title( $post_id ) ?></option><?php
1430 
+											foreach ( $post_ids as $post_id ) {
1431 
+												?><option <?php selected( $redirect_page, $post_id ); ?> value="<?php echo $post_id; ?>"><?php echo get_the_title( $post_id ) ?></option><?php
1432 1432 
 											}
1433 1433 
 									?>
1434 1434 
 										</optgroup>

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

@@ -1503,7 +1503,7 @@  discard block
 
 block discarded – undo
1503 1503 
 							</p>
1504 1504 
 						</div>
1505 1505
1506 
-						<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>
1506 
+						<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>
1507 1507
1508 1508 
 						<section id="about-yikes-inc" class="inside">
1509 1509 
 							<a href="https://www.yikesinc.com" target="_blank" title="YIKES Inc.">

@@ -1521,7 +1521,7 @@  discard block
 
 block discarded – undo
1521 1521 
 						<!-- review us container -->
1522 1522 
 						<h3><?php _e( 'Easy Forms for Mailchimp Add-Ons', 'yikes-inc-easy-mailchimp-extender' ); ?></h3>
1523 1523 
 						<div id="review-yikes-easy-mc" class="inside">
1524 
-							<p><?php _e( "Check out available add-ons for some seriously enhanced features." , 'yikes-inc-easy-mailchimp-extender' ); ?></p>
1524 
+							<p><?php _e( "Check out available add-ons for some seriously enhanced features.", 'yikes-inc-easy-mailchimp-extender' ); ?></p>
1525 1525 
 							<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>
1526 1526 
 						</div>
1527 1527 
 

@@ -1548,11 +1548,11 @@  discard block
 
 block discarded – undo
1548 1548
1549 1549 
 			// if no list id, die!
1550 1550 
 			if ( ! $list_id ) {
1551 
-				wp_die( __( "We've encountered an error. No list ID was sent." , 'yikes-inc-easy-mailchimp-extender' ) );
1551 
+				wp_die( __( "We've encountered an error. No list ID was sent.", 'yikes-inc-easy-mailchimp-extender' ) );
1552 1552 
 			}
1553 1553
1554 1554 
 			if ( ! $merge_variables ) {
1555 
-				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' ) );
1555 
+				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' ) );
1556 1556 
 			}
1557 1557
1558 1558 
 			if ( ! empty( $form_fields ) ) {

@@ -1563,17 +1563,17 @@  discard block
 
 block discarded – undo
1563 1563 
 				$available_interest_groups	= array();
1564 1564
1565 1565 
 				// Default variables as arrays - these are used for holding the Mailchimp merge field ID
1566 
-				$merge_field_ids			= array();
1567 
-				$mailchimp_merge_field_ids	= array();
1566 
+				$merge_field_ids = array();
1567 
+				$mailchimp_merge_field_ids = array();
1568 1568
1569 1569 
 				// loop over merge variables
1570 
-				if ( ! empty( $merge_variables['merge_fields'] ) ) {
1571 
-					$available_merge_variables = wp_list_pluck( $merge_variables['merge_fields'], 'tag' );
1572 
-					$mailchimp_merge_field_ids = wp_list_pluck( $merge_variables['merge_fields'], 'merge_id' );
1570 
+				if ( ! empty( $merge_variables[ 'merge_fields' ] ) ) {
1571 
+					$available_merge_variables = wp_list_pluck( $merge_variables[ 'merge_fields' ], 'tag' );
1572 
+					$mailchimp_merge_field_ids = wp_list_pluck( $merge_variables[ 'merge_fields' ], 'merge_id' );
1573 1573
1574 1574 
 					// Array will look like $merge_tag => $merge_id
1575 
-					foreach( $available_merge_variables as $index => $merge_tag ) {
1576 
-						$merge_field_ids[$merge_tag] = $mailchimp_merge_field_ids[$index];
1575 
+					foreach ( $available_merge_variables as $index => $merge_tag ) {
1576 
+						$merge_field_ids[ $merge_tag ] = $mailchimp_merge_field_ids[ $index ];
1577 1577 
 					}
1578 1578 
 				}
1579 1579 
 

@@ -1588,46 +1588,46 @@  discard block
 
 block discarded – undo
1588 1588 
 				$excluded_fields = array_diff( $assigned_fields, $merged_fields );
1589 1589
1590 1590 
 				$i = 1;
1591 
-				foreach( $form_fields as $field ) {
1591 
+				foreach ( $form_fields as $field ) {
1592 1592
1593 
-					if ( isset( $field['merge'] ) ) {
1593 
+					if ( isset( $field[ 'merge' ] ) ) {
1594 1594 
 						// @todo: don't use in_array()
1595 
-						$excluded_field = in_array( $field['merge'], $excluded_fields, true );
1595 
+						$excluded_field = in_array( $field[ 'merge' ], $excluded_fields, true );
1596 1596 
 						?>
1597 
-						<section class="draggable" id="<?php echo $field['merge']; ?>">
1597 
+						<section class="draggable" id="<?php echo $field[ 'merge' ]; ?>">
1598 1598 
 							<!-- top -->
1599 1599 
 							<a class="expansion-section-title settings-sidebar">
1600 1600 
 								<span class="dashicons dashicons-plus yikes-mc-expansion-toggle"></span>
1601 
-								<span class="yikes-mc-expansion-section-field-label"> <?php echo stripslashes( $field['label'] ); ?> </span>
1601 
+								<span class="yikes-mc-expansion-section-field-label"> <?php echo stripslashes( $field[ 'label' ] ); ?> </span>
1602 1602 
 								<?php if ( $excluded_field ) { ?>
1603 1603 
 									<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' ); ?>">
1604 1604 
 								<?php } ?>
1605 
-								<input maxlength="50" type="text" class="yikes-mc-edit-field-label-input" value="<?php echo stripslashes( $field['label'] ); ?>" />
1605 
+								<input maxlength="50" type="text" class="yikes-mc-edit-field-label-input" value="<?php echo stripslashes( $field[ 'label' ] ); ?>" />
1606 1606 
 								<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>
1607 1607 
 								<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>
1608 1608 
 								<span class="yikes-mc-edit-field-label-message"></span>
1609 
-								<span class="field-type-text"><small><?php echo __( 'type', 'yikes-inc-easy-mailchimp-extender' ) . ' : ' . $field['type']; ?></small></span>
1609 
+								<span class="field-type-text"><small><?php echo __( 'type', 'yikes-inc-easy-mailchimp-extender' ) . ' : ' . $field[ 'type' ]; ?></small></span>
1610 1610 
 							</a>
1611 1611 
 							<!-- expansion section -->
1612 1612 
 							<div class="yikes-mc-settings-expansion-section">
1613 1613
1614 1614 
 								<?php if ( $excluded_field ) { ?>
1615 
-									<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>
1615 
+									<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>
1616 1616 
 								<?php } ?>
1617 1617
1618 1618 
 								<!-- store field data -->
1619 
-								<input type="hidden" class="yikes-mc-merge-field-label" name="field[<?php echo $field['merge']; ?>][label]" value="<?php echo htmlspecialchars( $field['label'] ); ?>" />
1620 
-								<input type="hidden" class="yikes-mc-merge-field-type" name="field[<?php echo $field['merge']; ?>][type]" value="<?php echo $field['type']; ?>" />
1621 
-								<input type="hidden" class="yikes-mc-merge-field-tag" name="field[<?php echo $field['merge']; ?>][merge]" value="<?php echo $field['merge']; ?>" />
1622 
-								<input type="hidden" class="field-<?php echo $field['merge']; ?>-position position-input" name="field[<?php echo $field['merge']; ?>][position]" value="<?php echo $i++; ?>" />
1623 
-								<?php if ( isset( $merge_field_ids[ $field['merge'] ] ) && is_int( $merge_field_ids[ $field['merge'] ] ) ) { ?>
1624 
-									<input type="hidden" class="yikes-mc-merge-field-id" name="field[<?php echo $field['merge']; ?>][id]" value="<?php echo $merge_field_ids[ $field['merge'] ] ?>" />
1619 
+								<input type="hidden" class="yikes-mc-merge-field-label" name="field[<?php echo $field[ 'merge' ]; ?>][label]" value="<?php echo htmlspecialchars( $field[ 'label' ] ); ?>" />
1620 
+								<input type="hidden" class="yikes-mc-merge-field-type" name="field[<?php echo $field[ 'merge' ]; ?>][type]" value="<?php echo $field[ 'type' ]; ?>" />
1621 
+								<input type="hidden" class="yikes-mc-merge-field-tag" name="field[<?php echo $field[ 'merge' ]; ?>][merge]" value="<?php echo $field[ 'merge' ]; ?>" />
1622 
+								<input type="hidden" class="field-<?php echo $field[ 'merge' ]; ?>-position position-input" name="field[<?php echo $field[ 'merge' ]; ?>][position]" value="<?php echo $i++; ?>" />
1623 
+								<?php if ( isset( $merge_field_ids[ $field[ 'merge' ] ] ) && is_int( $merge_field_ids[ $field[ 'merge' ] ] ) ) { ?>
1624 
+									<input type="hidden" class="yikes-mc-merge-field-id" name="field[<?php echo $field[ 'merge' ]; ?>][id]" value="<?php echo $merge_field_ids[ $field[ 'merge' ] ] ?>" />
1625 1625 
 								<?php } ?>
1626 1626
1627 
-								<?php if ( $field['type'] == 'radio' || $field['type'] == 'dropdown' || $field['type'] == 'select' ) {
1628 
-									$choices = json_decode( $field['choices'], true );
1627 
+								<?php if ( $field[ 'type' ] == 'radio' || $field[ 'type' ] == 'dropdown' || $field[ 'type' ] == 'select' ) {
1628 
+									$choices = json_decode( $field[ 'choices' ], true );
1629 1629 
 								?>
1630 
-									<input type="hidden" name="field[<?php echo $field['merge']; ?>][choices]" value='<?php echo esc_attr( json_encode( $choices ) ); ?>' />
1630 
+									<input type="hidden" name="field[<?php echo $field[ 'merge' ]; ?>][choices]" value='<?php echo esc_attr( json_encode( $choices ) ); ?>' />
1631 1631 
 								<?php } ?>
1632 1632
1633 1633 
 								<!-- Single or Double Opt-in -->

@@ -1643,12 +1643,12 @@  discard block
 
 block discarded – undo
1643 1643 
 												</label>
1644 1644 
 											</td>
1645 1645 
 											<td>
1646 
-												<input class="widefat merge-tag-text" type="text" readonly value="<?php echo $field['merge']; ?>">
1646 
+												<input class="widefat merge-tag-text" type="text" readonly value="<?php echo $field[ 'merge' ]; ?>">
1647 1647 
 											</td>
1648 1648 
 										</tr>
1649 1649
1650 1650 
 										<!-- Placeholder Value -->
1651 
-										<?php switch( $field['type'] ) {
1651 
+										<?php switch ( $field[ 'type' ] ) {
1652 1652
1653 1653 
 											case 'text':
1654 1654 
 											case 'email':

@@ -1662,13 +1662,13 @@  discard block
 
 block discarded – undo
1662 1662 
 										<!-- Placeholder -->
1663 1663 
 										<tr valign="top">
1664 1664 
 											<td scope="row">
1665 
-												<label for="placeholder_<?php echo esc_attr( $field['merge'] ); ?>">
1665 
+												<label for="placeholder_<?php echo esc_attr( $field[ 'merge' ] ); ?>">
1666 1666 
 													<?php _e( 'Placeholder', 'yikes-inc-easy-mailchimp-extender' ); ?>
1667 1667 
 												</label>
1668 1668 
 											</td>
1669 1669 
 											<td>
1670 
-												<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'] : '' ; ?>" />
1671 
-												<p class="description"><small><?php _e( "Assign a placeholder value to this field.", 'yikes-inc-easy-mailchimp-extender' );?></small></p>
1670 
+												<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' ] : ''; ?>" />
1671 
+												<p class="description"><small><?php _e( "Assign a placeholder value to this field.", 'yikes-inc-easy-mailchimp-extender' ); ?></small></p>
1672 1672 
 											</td>
1673 1673 
 										</tr>
1674 1674 
 										<?php

@@ -1679,13 +1679,13 @@  discard block
 
 block discarded – undo
1679 1679 
 											?>
1680 1680 
 												<tr valign="top">
1681 1681 
 													<td scope="row">
1682 
-														<label for="placeholder_<?php echo esc_attr( $field['merge'] ); ?>">
1682 
+														<label for="placeholder_<?php echo esc_attr( $field[ 'merge' ] ); ?>">
1683 1683 
 															<?php _e( 'Placeholder', 'yikes-inc-easy-mailchimp-extender' ); ?>
1684 1684 
 														</label>
1685 1685 
 													</td>
1686 1686 
 													<td>
1687 
-														<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"' : '' ; ?> />
1688 
-														<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>
1687 
+														<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"' : ''; ?> />
1688 
+														<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>
1689 1689 
 													</td>
1690 1690 
 												</tr>
1691 1691 
 											<?php

@@ -1695,7 +1695,7 @@  discard block
 
 block discarded – undo
1695 1695 
 										?>
1696 1696
1697 1697 
 										<!-- Default Value -->
1698 
-										<?php switch( $field['type'] ) {
1698 
+										<?php switch ( $field[ 'type' ] ) {
1699 1699 
 											default:
1700 1700 
 											case 'text':
1701 1701 
 											case 'number':

@@ -1703,15 +1703,15 @@  discard block
 
 block discarded – undo
1703 1703 
 										?>
1704 1704 
 											<tr valign="top">
1705 1705 
 												<td scope="row">
1706 
-													<label for="default_value_<?php echo esc_attr( $field['merge'] ); ?>">
1706 
+													<label for="default_value_<?php echo esc_attr( $field[ 'merge' ] ); ?>">
1707 1707 
 														<?php _e( 'Default Value', 'yikes-inc-easy-mailchimp-extender' ); ?>
1708 1708 
 													</label>
1709 1709 
 												</td>
1710 1710 
 												<td>
1711 
-													<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 } ?> />
1712 
-													<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>
1711 
+													<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 } ?> />
1712 
+													<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>
1713 1713 
 													<?php
1714 
-													switch( $field['type'] ) {
1714 
+													switch ( $field[ 'type' ] ) {
1715 1715 
 														case 'text':
1716 1716 
 															?>
1717 1717 
 																<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>

@@ -1733,28 +1733,28 @@  discard block
 
 block discarded – undo
1733 1733 
 													</td>
1734 1734 
 													<td>
1735 1735 
 														<?php
1736 
-															$field['default_choice'] = ! isset( $field['default_choice'] ) ? 'no-default' : $field['default_choice'];
1736 
+															$field[ 'default_choice' ] = ! isset( $field[ 'default_choice' ] ) ? 'no-default' : $field[ 'default_choice' ];
1737 1737 
 															$x = 0;
1738 1738 
 														?>
1739 
-														<label for="<?php echo $field['merge'] . '-no-default'; ?>">
1740 
-															<input id="<?php echo $field['merge'] . '-no-default'; ?>"
1739 
+														<label for="<?php echo $field[ 'merge' ] . '-no-default'; ?>">
1740 
+															<input id="<?php echo $field[ 'merge' ] . '-no-default'; ?>"
1741 1741 
 															       type="radio"
1742 
-															       name="field[<?php echo $field['merge']; ?>][default_choice]"
1743 
-															       value="no-default" <?php checked( $field['default_choice'], 'no-default' ); ?>
1742 
+															       name="field[<?php echo $field[ 'merge' ]; ?>][default_choice]"
1743 
+															       value="no-default" <?php checked( $field[ 'default_choice' ], 'no-default' ); ?>
1744 1744 
 															>
1745 1745 
 															No Default&nbsp;
1746 1746 
 														</label>
1747 1747 
 														<?php
1748 1748 
 														foreach ( $choices as $choice => $value ) { ?>
1749 
-															<label for="<?php echo $field['merge'].'-'.$x; ?>">
1750 
-																<input id="<?php echo $field['merge'].'-'.$x; ?>"
1749 
+															<label for="<?php echo $field[ 'merge' ] . '-' . $x; ?>">
1750 
+																<input id="<?php echo $field[ 'merge' ] . '-' . $x; ?>"
1751 1751 
 																       type="radio"
1752 
-																       name="field[<?php echo $field['merge']; ?>][default_choice]"
1753 
-																       value="<?php echo $x; ?>" <?php checked( $field['default_choice'], $x ); ?>>
1752 
+																       name="field[<?php echo $field[ 'merge' ]; ?>][default_choice]"
1753 
+																       value="<?php echo $x; ?>" <?php checked( $field[ 'default_choice' ], $x ); ?>>
1754 1754 
 																<?php echo $value; ?>&nbsp;
1755 1755 
 															</label>
1756 1756 
 														<?php $x++; } ?>
1757 
-														<p class="description"><small><?php _e( "Select the option that should be selected by default.", 'yikes-inc-easy-mailchimp-extender' );?></small></p>
1757 
+														<p class="description"><small><?php _e( "Select the option that should be selected by default.", 'yikes-inc-easy-mailchimp-extender' ); ?></small></p>
1758 1758 
 													</td>
1759 1759 
 												</tr>
1760 1760 
 

@@ -1770,13 +1770,13 @@  discard block
 
 block discarded – undo
1770 1770 
 														</label>
1771 1771 
 													</td>
1772 1772 
 													<td>
1773 
-														<select type="default" name="field[<?php echo $field['merge']; ?>][default_choice]">
1774 
-															<option value="no-default" <?php selected( $field['default_choice'] , 'no-default' ); ?>>No Default</option>
1775 
-															<?php foreach( json_decode( $field['choices'], true ) as $choice => $value ) { ?>
1776 
-																<option value="<?php echo $choice; ?>" <?php selected( $field['default_choice'] , $choice ); ?>><?php echo $value; ?></option>
1773 
+														<select type="default" name="field[<?php echo $field[ 'merge' ]; ?>][default_choice]">
1774 
+															<option value="no-default" <?php selected( $field[ 'default_choice' ], 'no-default' ); ?>>No Default</option>
1775 
+															<?php foreach ( json_decode( $field[ 'choices' ], true ) as $choice => $value ) { ?>
1776 
+																<option value="<?php echo $choice; ?>" <?php selected( $field[ 'default_choice' ], $choice ); ?>><?php echo $value; ?></option>
1777 1777 
 															<?php } ?>
1778 1778 
 														</select>
1779 
-														<p class="description"><small><?php _e( "Which option should be selected by default?", 'yikes-inc-easy-mailchimp-extender' );?></small></p>
1779 
+														<p class="description"><small><?php _e( "Which option should be selected by default?", 'yikes-inc-easy-mailchimp-extender' ); ?></small></p>
1780 1780 
 													</td>
1781 1781 
 												</tr>
1782 1782 
 

@@ -1793,82 +1793,82 @@  discard block
 
 block discarded – undo
1793 1793 
 										<!-- Field Description -->
1794 1794 
 										<tr valign="top">
1795 1795 
 											<td scope="row">
1796 
-												<label for="description_<?php echo esc_attr( $field['merge'] ); ?>">
1796 
+												<label for="description_<?php echo esc_attr( $field[ 'merge' ] ); ?>">
1797 1797 
 													<?php _e( 'Description', 'yikes-inc-easy-mailchimp-extender' ); ?>
1798 1798 
 												</label>
1799 1799 
 											</td>
1800 1800 
 											<td>
1801 
-												<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>
1802 
-												<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>
1801 
+												<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>
1802 
+												<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>
1803 1803 
 											</td>
1804 1804 
 										</tr>
1805 1805 
 										<!-- Description Above Field -->
1806 1806 
 										<tr valign="top" class="yikes-checkbox-container">
1807 1807 
 											<td scope="row">
1808 
-												<label for="description_above_<?php echo esc_attr( $field['merge'] ); ?>">
1808 
+												<label for="description_above_<?php echo esc_attr( $field[ 'merge' ] ); ?>">
1809 1809 
 													<?php _e( 'Description Above Field', 'yikes-inc-easy-mailchimp-extender' ); ?>
1810 1810 
 												</label>
1811 1811 
 											</td>
1812 1812 
 											<td>
1813 
-												<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"' : ''; ?> />
1814 
-												<p class="description"><small><?php _e( "By default the description will appear undearneath the field. Check this box if you'd like the description to appear above the field.", 'yikes-inc-easy-mailchimp-extender' );?></small></p>
1813 
+												<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"' : ''; ?> />
1814 
+												<p class="description"><small><?php _e( "By default the description will appear undearneath the field. Check this box if you'd like the description to appear above the field.", 'yikes-inc-easy-mailchimp-extender' ); ?></small></p>
1815 1815 
 											</td>
1816 1816 
 										</tr>
1817 1817 
 										<!-- Additional Classes -->
1818 1818 
 										<tr valign="top">
1819 1819 
 											<td scope="row">
1820 
-												<label for="classes_<?php echo esc_attr( $field['merge'] ); ?>">
1820 
+												<label for="classes_<?php echo esc_attr( $field[ 'merge' ] ); ?>">
1821 1821 
 													<?php _e( 'Additional Classes', 'yikes-inc-easy-mailchimp-extender' ); ?>
1822 1822 
 												</label>
1823 1823 
 											</td>
1824 1824 
 											<td>
1825 
-												<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'] ) ) : '' ; ?>" />
1826 
-												<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>
1825 
+												<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' ] ) ) : ''; ?>" />
1826 
+												<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>
1827 1827 
 											</td>
1828 1828 
 										</tr>
1829 1829 
 										<!-- Required Toggle -->
1830 1830 
 										<tr valign="top" class="yikes-checkbox-container yikes-checkbox-container-first">
1831 1831 
 											<td scope="row">
1832 
-												<label for="field-required-<?php echo esc_attr( $field['merge'] ); ?>">
1832 
+												<label for="field-required-<?php echo esc_attr( $field[ 'merge' ] ); ?>">
1833 1833 
 													<?php _e( 'Field Required?', 'yikes-inc-easy-mailchimp-extender' ); ?>
1834 1834 
 												</label>
1835 1835 
 											</td>
1836 1836 
 											<td>
1837 
-												<?php $checked = isset( $field['require'] ) ? $field['require'] : '0'; ?>
1838 
-												<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' ); } ?>">
1839 
-												<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>
1837 
+												<?php $checked = isset( $field[ 'require' ] ) ? $field[ 'require' ] : '0'; ?>
1838 
+												<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' ); } ?>">
1839 
+												<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>
1840 1840 
 											</td>
1841 1841 
 										</tr>
1842 1842 
 										<!-- Visible Toggle -->
1843 1843 
 										<tr valign="top" class="yikes-checkbox-container">
1844 1844 
 											<td scope="row">
1845 
-												<label for="hide-field-<?php echo esc_attr( $field['merge'] ); ?>">
1845 
+												<label for="hide-field-<?php echo esc_attr( $field[ 'merge' ] ); ?>">
1846 1846 
 													<?php _e( 'Hide Field', 'yikes-inc-easy-mailchimp-extender' ); ?>
1847 1847 
 												</label>
1848 1848 
 											</td>
1849 1849 
 											<td>
1850 
-												<?php $hide = isset( $field['hide'] ) ? $field['hide'] : '0'; ?>
1851 
-												<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' ); } ?>">
1852 
-												<p class="description"><small><?php _e( "Hide this field from being displayed on the front end.", 'yikes-inc-easy-mailchimp-extender' );?></small></p>
1850 
+												<?php $hide = isset( $field[ 'hide' ] ) ? $field[ 'hide' ] : '0'; ?>
1851 
+												<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' ); } ?>">
1852 
+												<p class="description"><small><?php _e( "Hide this field from being displayed on the front end.", 'yikes-inc-easy-mailchimp-extender' ); ?></small></p>
1853 1853 
 											</td>
1854 1854 
 										</tr>
1855 1855 
 										<!-- Toggle Field Label Visibility -->
1856 1856 
 										<tr valign="top" class="yikes-checkbox-container">
1857 1857 
 											<td scope="row">
1858 
-												<label for="hide-label-<?php echo esc_attr( $field['merge'] ); ?>">
1858 
+												<label for="hide-label-<?php echo esc_attr( $field[ 'merge' ] ); ?>">
1859 1859 
 													<?php _e( 'Hide Label', 'yikes-inc-easy-mailchimp-extender' ); ?>
1860 1860 
 												</label>
1861 1861 
 											</td>
1862 1862 
 											<td>
1863 
-												<?php $hide_label = isset( $field['hide-label'] ) ? $field['hide-label'] : '0'; ?>
1864 
-												<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 ); ?>/>
1865 
-												<p class="description"><small><?php _e( "Toggle field label visibility.", 'yikes-inc-easy-mailchimp-extender' );?></small></p>
1863 
+												<?php $hide_label = isset( $field[ 'hide-label' ] ) ? $field[ 'hide-label' ] : '0'; ?>
1864 
+												<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 ); ?>/>
1865 
+												<p class="description"><small><?php _e( "Toggle field label visibility.", 'yikes-inc-easy-mailchimp-extender' ); ?></small></p>
1866 1866 
 											</td>
1867 1867 
 										</tr>
1868 1868 
 										<!-- Display Phone/Date Formats back to the user -->
1869 1869 
 										<!-- Phone Format Initial Load -->
1870 1870 
 										<?php
1871 
-											switch( $field['type'] ) {
1871 
+											switch ( $field[ 'type' ] ) {
1872 1872 
 												/* Store the phone format, for properly regex pattern */
1873 1873 
 												case 'phone':
1874 1874 
 												case 'birthday':

@@ -1878,23 +1878,23 @@  discard block
 
 block discarded – undo
1878 1878 
 															<td scope="row">
1879 1879 
 																<label for="placeholder">
1880 1880 
 																	<?php
1881 
-																		switch( $field['type'] ) {
1881 
+																		switch ( $field[ 'type' ] ) {
1882 1882 
 																			default:
1883 1883 
 																			case 'birthday':
1884 1884 
 																				$type = __( 'Date Format', 'yikes-inc-easy-mailchimp-extender' );
1885 
-																				$format = ( isset( $field['date_format'] ) ) ? $field['date_format'] : 'MM/DD';
1885 
+																				$format = ( isset( $field[ 'date_format' ] ) ) ? $field[ 'date_format' ] : 'MM/DD';
1886 1886 
 																				$format_name = 'date_format';
1887 1887 
 																				break;
1888 1888
1889 1889 
 																			case 'date':
1890 1890 
 																				$type = __( 'Date Format', 'yikes-inc-easy-mailchimp-extender' );
1891 
-																				$format = ( isset( $field['date_format'] ) ) ? $field['date_format'] : 'MM/DD/YYYY';
1891 
+																				$format = ( isset( $field[ 'date_format' ] ) ) ? $field[ 'date_format' ] : 'MM/DD/YYYY';
1892 1892 
 																				$format_name = 'date_format';
1893 1893 
 																				break;
1894 1894
1895 1895 
 																			case 'phone':
1896 1896 
 																				$type = __( 'Phone Format', 'yikes-inc-easy-mailchimp-extender' );
1897 
-																				$format = isset( $field['phone_format'] ) && ! empty( $field['phone_format'] ) ? $field['phone_format'] : __( 'International', 'yikes-inc-easy-mailchimp-extender' );
1897 
+																				$format = isset( $field[ 'phone_format' ] ) && ! empty( $field[ 'phone_format' ] ) ? $field[ 'phone_format' ] : __( 'International', 'yikes-inc-easy-mailchimp-extender' );
1898 1898 
 																				$format_name = 'phone_format';
1899 1899 
 																				break;
1900 1900 
 																		}

@@ -1904,7 +1904,7 @@  discard block
 
 block discarded – undo
1904 1904 
 															</td>
1905 1905 
 															<td>
1906 1906 
 																<strong><?php echo $format; ?></strong>
1907 
-																<input type="hidden" name="field[<?php echo $field['merge']; ?>][<?php echo $format_name; ?>]" value="<?php echo $format; ?>" />
1907 
+																<input type="hidden" name="field[<?php echo $field[ 'merge' ]; ?>][<?php echo $format_name; ?>]" value="<?php echo $format; ?>" />
1908 1908 
 																<p class="description"><small>
1909 1909 
 																	<?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' ) ); ?>
1910 1910 
 																</small></p>

@@ -1925,8 +1925,8 @@  discard block
 
 block discarded – undo
1925 1925 
 											</td>
1926 1926 
 											<td>
1927 1927 
 												<span class="toggle-container">
1928 
-													<a href="#" class="close-form-expansion"><?php _e( "Close" , 'yikes-inc-easy-mailchimp-extender' ); ?></a> |
1929 
-													<a href="#" class="remove-field" alt="<?php echo $field['merge']; ?>"><?php _e( "Remove Field" , 'yikes-inc-easy-mailchimp-extender' ); ?></a>
1928 
+													<a href="#" class="close-form-expansion"><?php _e( "Close", 'yikes-inc-easy-mailchimp-extender' ); ?></a> |
1929 
+													<a href="#" class="remove-field" alt="<?php echo $field[ 'merge' ]; ?>"><?php _e( "Remove Field", 'yikes-inc-easy-mailchimp-extender' ); ?></a>
1930 1930 
 												</span>
1931 1931 
 											</td>
1932 1932 
 										</tr>

@@ -1944,35 +1944,35 @@  discard block
 
 block discarded – undo
1944 1944 
 						/**** Interest Group ****/
1945 1945
1946 1946 
 						?>
1947 
-						<section class="draggable" id="<?php echo $field['group_id']; ?>">
1947 
+						<section class="draggable" id="<?php echo $field[ 'group_id' ]; ?>">
1948 1948 
 							<!-- top -->
1949 1949 
 							<a href="#" class="expansion-section-title settings-sidebar">
1950 
-								<span class="dashicons dashicons-plus yikes-mc-expansion-toggle"></span><?php echo stripslashes( $field['label'] ); ?>
1951 
-								<?php if ( in_array( $field['group_id'] , $excluded_fields ) ) { ?>
1950 
+								<span class="dashicons dashicons-plus yikes-mc-expansion-toggle"></span><?php echo stripslashes( $field[ 'label' ] ); ?>
1951 
+								<?php if ( in_array( $field[ 'group_id' ], $excluded_fields ) ) { ?>
1952 1952 
 									<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' ); ?>">
1953 1953 
 								<?php } ?>
1954 
-								<span class="field-type-text"><small><?php echo __( 'type', 'yikes-inc-easy-mailchimp-extender' ) . ' : ' . $field['type']; ?></small></span>
1954 
+								<span class="field-type-text"><small><?php echo __( 'type', 'yikes-inc-easy-mailchimp-extender' ) . ' : ' . $field[ 'type' ]; ?></small></span>
1955 1955 
 							</a>
1956 1956 
 							<!-- expansion section -->
1957 1957 
 							<div class="yikes-mc-settings-expansion-section">
1958 1958
1959 1959 
 								<!-- check if this field exists in the available interest group array -->
1960 
-								<?php if ( in_array( $field['group_id'] , $excluded_fields ) ) { ?>
1961 
-									<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>
1960 
+								<?php if ( in_array( $field[ 'group_id' ], $excluded_fields ) ) { ?>
1961 
+									<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>
1962 1962 
 								<?php } ?>
1963 1963
1964 1964 
 								<!-- store the label -->
1965 
-								<input type="hidden" name="field[<?php echo $field['group_id']; ?>][label]" value="<?php echo htmlspecialchars( $field['label'] ); ?>" />
1966 
-								<input type="hidden" name="field[<?php echo $field['group_id']; ?>][type]" value="<?php echo $field['type']; ?>" />
1967 
-								<input type="hidden" name="field[<?php echo $field['group_id']; ?>][group_id]" value="<?php echo $field['group_id']; ?>" />
1968 
-								<input type="hidden" name="field[<?php echo $field['group_id']; ?>][groups]" value='<?php echo esc_attr( json_encode( json_decode( $field['groups'], true ) ) ); ?>' />
1965 
+								<input type="hidden" name="field[<?php echo $field[ 'group_id' ]; ?>][label]" value="<?php echo htmlspecialchars( $field[ 'label' ] ); ?>" />
1966 
+								<input type="hidden" name="field[<?php echo $field[ 'group_id' ]; ?>][type]" value="<?php echo $field[ 'type' ]; ?>" />
1967 
+								<input type="hidden" name="field[<?php echo $field[ 'group_id' ]; ?>][group_id]" value="<?php echo $field[ 'group_id' ]; ?>" />
1968 
+								<input type="hidden" name="field[<?php echo $field[ 'group_id' ]; ?>][groups]" value='<?php echo esc_attr( json_encode( json_decode( $field[ 'groups' ], true ) ) ); ?>' />
1969 1969
1970 1970 
 								<!-- Single or Double Opt-in -->
1971 1971 
 								<p class="type-container"><!-- necessary to prevent skipping on slideToggle(); -->
1972 1972
1973 1973 
 									<table class="form-table form-field-container">
1974 1974 
 										<!-- Default Value -->
1975 
-										<?php switch( $field['type'] ) {
1975 
+										<?php switch ( $field[ 'type' ] ) {
1976 1976 
 											default:
1977 1977 
 											case 'radio':
1978 1978 
 											case 'checkboxes':

@@ -1985,15 +1985,15 @@  discard block
 
 block discarded – undo
1985 1985 
 													</td>
1986 1986 
 													<td>
1987 1987 
 														<?php
1988 
-														$field['default_choice'] = isset( $field['default_choice'] ) ? $field['default_choice'] : '';
1988 
+														$field[ 'default_choice' ] = isset( $field[ 'default_choice' ] ) ? $field[ 'default_choice' ] : '';
1989 1989
1990 1990 
 														$default_shown = false;
1991 1991
1992 
-														foreach ( json_decode( $field['groups'], true ) as $id => $group ) {
1993 
-															$field_id   = "{$field['group_id']}-{$id}";
1994 
-															$field_type = 'hidden' == $field['type'] ? 'checkbox' : $field['type'];
1992 
+														foreach ( json_decode( $field[ 'groups' ], true ) as $id => $group ) {
1993 
+															$field_id   = "{$field[ 'group_id' ]}-{$id}";
1994 
+															$field_type = 'hidden' == $field[ 'type' ] ? 'checkbox' : $field[ 'type' ];
1995 1995 
 															$field_type = 'checkboxes' == $field_type ? 'checkbox' : $field_type;
1996 
-															$field_name = "field[{$field['group_id']}][default_choice]";
1996 
+															$field_name = "field[{$field[ 'group_id' ]}][default_choice]";
1997 1997 
 															$field_name = 'checkbox' == $field_type ? $field_name . '[]' : $field_name;
1998 1998
1999 1999 
 															// Determine if the current group is checked.

@@ -2001,13 +2001,13 @@  discard block
 
 block discarded – undo
2001 2001 
 															switch ( $field_type ) {
2002 2002 
 																case 'radio':
2003 2003 
 																default:
2004 
-																	$default = is_array( $field['default_choice'] ) ? current( $field['default_choice'] ) : $field['default_choice'];
2005 
-																	$checked = is_array( $field['default_choice'] ) ? checked( current( $field['default_choice'] ), $id, false ) : checked( $field['default_choice'], $id, false );
2004 
+																	$default = is_array( $field[ 'default_choice' ] ) ? current( $field[ 'default_choice' ] ) : $field[ 'default_choice' ];
2005 
+																	$checked = is_array( $field[ 'default_choice' ] ) ? checked( current( $field[ 'default_choice' ] ), $id, false ) : checked( $field[ 'default_choice' ], $id, false );
2006 2006 
 																break;
2007 2007
2008 2008 
 																case 'checkbox':
2009 2009 
 																case 'hidden':
2010 
-																	if ( is_array( $field['default_choice'] ) && in_array( $id, $field['default_choice'] ) ) {
2010 
+																	if ( is_array( $field[ 'default_choice' ] ) && in_array( $id, $field[ 'default_choice' ] ) ) {
2011 2011 
 																		$checked = checked( true, true, false );
2012 2012 
 																	}
2013 2013 
 																break;

@@ -2022,7 +2022,7 @@  discard block
 
 block discarded – undo
2022 2022 
 																	    type="<?php echo $field_type; ?>"
2023 2023 
 																	    name="<?php echo $field_name; ?>"
2024 2024 
 																	    value="no-default"
2025 
-																	    <?php is_array( $field['default_choice'] ) ? checked( current( $field['default_choice'] ), 'no-default' ) : checked( $field['default_choice'], 'no-default' ); ?>>
2025 
+																	    <?php is_array( $field[ 'default_choice' ] ) ? checked( current( $field[ 'default_choice' ] ), 'no-default' ) : checked( $field[ 'default_choice' ], 'no-default' ); ?>>
2026 2026 
 																	No Default&nbsp;
2027 2027 
 																</label>
2028 2028 
 																<?php

@@ -2038,7 +2038,7 @@  discard block
 
 block discarded – undo
2038 2038 
 															</label>
2039 2039 
 															<?php
2040 2040 
 														} ?>
2041 
-														<p class="description"><small><?php _e( "Select the option that should be selected by default.", 'yikes-inc-easy-mailchimp-extender' );?></small></p>
2041 
+														<p class="description"><small><?php _e( "Select the option that should be selected by default.", 'yikes-inc-easy-mailchimp-extender' ); ?></small></p>
2042 2042 
 													</td>
2043 2043 
 												</tr>
2044 2044 
 

@@ -2054,13 +2054,13 @@  discard block
 
 block discarded – undo
2054 2054 
 														</label>
2055 2055 
 													</td>
2056 2056 
 													<td>
2057 
-														<select type="default" name="field[<?php echo $field['group_id']; ?>][default_choice]">
2057 
+														<select type="default" name="field[<?php echo $field[ 'group_id' ]; ?>][default_choice]">
2058 2058 
 															<option value="no-default">No Default</option>
2059 
-															<?php foreach( json_decode( stripslashes_deep( $field['groups'] ) , true ) as $id => $group ) { ?>
2060 
-																<option value="<?php echo $id; ?>" <?php selected( $field['default_choice'] , $id ); ?>><?php echo stripslashes( $group ); ?></option>
2059 
+															<?php foreach ( json_decode( stripslashes_deep( $field[ 'groups' ] ), true ) as $id => $group ) { ?>
2060 
+																<option value="<?php echo $id; ?>" <?php selected( $field[ 'default_choice' ], $id ); ?>><?php echo stripslashes( $group ); ?></option>
2061 2061 
 															<?php } ?>
2062 2062 
 														</select>
2063 
-														<p class="description"><small><?php _e( "Which option should be selected by default?", 'yikes-inc-easy-mailchimp-extender' );?></small></p>
2063 
+														<p class="description"><small><?php _e( "Which option should be selected by default?", 'yikes-inc-easy-mailchimp-extender' ); ?></small></p>
2064 2064 
 													</td>
2065 2065 
 												</tr>
2066 2066 
 

@@ -2073,78 +2073,78 @@  discard block
 
 block discarded – undo
2073 2073 
 										<!-- Field Description -->
2074 2074 
 										<tr valign="top">
2075 2075 
 											<td scope="row">
2076 
-												<label for="description_<?php echo esc_attr( $field['group_id'] ); ?>">
2076 
+												<label for="description_<?php echo esc_attr( $field[ 'group_id' ] ); ?>">
2077 2077 
 													<?php _e( 'Description', 'yikes-inc-easy-mailchimp-extender' ); ?>
2078 2078 
 												</label>
2079 2079 
 											</td>
2080 2080 
 											<td>
2081 
-												<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>
2082 
-												<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>
2081 
+												<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>
2082 
+												<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>
2083 2083 
 											</td>
2084 2084 
 										</tr>
2085 2085
2086 2086 
 										<!-- Description Above Field -->
2087 2087 
 										<tr valign="top" class="yikes-checkbox-container">
2088 2088 
 											<td scope="row">
2089 
-												<label for="description_above_<?php echo $field['group_id']; ?>">
2089 
+												<label for="description_above_<?php echo $field[ 'group_id' ]; ?>">
2090 2090 
 													<?php _e( 'Description Above Field', 'yikes-inc-easy-mailchimp-extender' ); ?>
2091 2091 
 												</label>
2092 2092 
 											</td>
2093 2093 
 											<td>
2094 
-												<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"' : ''; ?> />
2095 
-												<p class="description"><small><?php _e( "By default the description will appear undearneath the field. Check this box if you'd like the description to appear above the field.", 'yikes-inc-easy-mailchimp-extender' );?></small></p>
2094 
+												<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"' : ''; ?> />
2095 
+												<p class="description"><small><?php _e( "By default the description will appear undearneath the field. Check this box if you'd like the description to appear above the field.", 'yikes-inc-easy-mailchimp-extender' ); ?></small></p>
2096 2096 
 											</td>
2097 2097 
 										</tr>
2098 2098
2099 2099 
 										<!-- Additional Classes -->
2100 2100 
 										<tr valign="top">
2101 2101 
 											<td scope="row">
2102 
-												<label for="classes_<?php echo esc_attr( $field['group_id'] ); ?>">
2102 
+												<label for="classes_<?php echo esc_attr( $field[ 'group_id' ] ); ?>">
2103 2103 
 													<?php _e( 'Additional Classes', 'yikes-inc-easy-mailchimp-extender' ); ?>
2104 2104 
 												</label>
2105 2105 
 											</td>
2106 2106 
 											<td>
2107 
-												<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'] ) ) : '' ; ?>" />
2108 
-												<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>
2107 
+												<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' ] ) ) : ''; ?>" />
2108 
+												<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>
2109 2109 
 											</td>
2110 2110 
 										</tr>
2111 2111 
 										<!-- Required Toggle -->
2112 2112 
 										<tr valign="top" class="yikes-checkbox-container">
2113 2113 
 											<td scope="row">
2114 
-												<label for="field-required-<?php echo esc_attr( $field['group_id'] ); ?>">
2114 
+												<label for="field-required-<?php echo esc_attr( $field[ 'group_id' ] ); ?>">
2115 2115 
 													<?php _e( 'Field Required?', 'yikes-inc-easy-mailchimp-extender' ); ?>
2116 2116 
 												</label>
2117 2117 
 											</td>
2118 2118 
 											<td>
2119 
-												<?php $checked = isset( $field['require'] ) ? $field['require'] : '0'; ?>
2120 
-												<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 ); ?>>
2121 
-												<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>
2119 
+												<?php $checked = isset( $field[ 'require' ] ) ? $field[ 'require' ] : '0'; ?>
2120 
+												<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 ); ?>>
2121 
+												<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>
2122 2122 
 											</td>
2123 2123 
 										</tr>
2124 2124 
 										<!-- Visible Toggle -->
2125 2125 
 										<tr valign="top" class="yikes-checkbox-container">
2126 2126 
 											<td scope="row">
2127 
-												<label for="hide-field-<?php echo esc_attr( $field['group_id'] ); ?>">
2127 
+												<label for="hide-field-<?php echo esc_attr( $field[ 'group_id' ] ); ?>">
2128 2128 
 													<?php _e( 'Hide Field', 'yikes-inc-easy-mailchimp-extender' ); ?>
2129 2129 
 												</label>
2130 2130 
 											</td>
2131 2131 
 											<td>
2132 
-												<?php $hide = isset( $field['hide'] ) ? $field['hide'] : '0'; ?>
2133 
-												<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 ); ?>>
2134 
-												<p class="description"><small><?php _e( "Hide this field from being displayed on the front end.", 'yikes-inc-easy-mailchimp-extender' );?></small></p>
2132 
+												<?php $hide = isset( $field[ 'hide' ] ) ? $field[ 'hide' ] : '0'; ?>
2133 
+												<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 ); ?>>
2134 
+												<p class="description"><small><?php _e( "Hide this field from being displayed on the front end.", 'yikes-inc-easy-mailchimp-extender' ); ?></small></p>
2135 2135 
 											</td>
2136 2136 
 										</tr>
2137 2137 
 										<!-- Toggle Field Label Visibility -->
2138 2138 
 										<tr valign="top" class="yikes-checkbox-container">
2139 2139 
 											<td scope="row">
2140 
-												<label for="hide-label-<?php echo esc_attr( $field['group_id'] ); ?>">
2140 
+												<label for="hide-label-<?php echo esc_attr( $field[ 'group_id' ] ); ?>">
2141 2141 
 													<?php _e( 'Hide Label', 'yikes-inc-easy-mailchimp-extender' ); ?>
2142 2142 
 												</label>
2143 2143 
 											</td>
2144 2144 
 											<td>
2145 
-												<?php $hide = isset( $field['hide-label'] ) ? $field['hide-label'] : '0'; ?>
2146 
-												<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 ); ?>/>
2147 
-												<p class="description"><small><?php _e( "Toggle field label visibility.", 'yikes-inc-easy-mailchimp-extender' );?></small></p>
2145 
+												<?php $hide = isset( $field[ 'hide-label' ] ) ? $field[ 'hide-label' ] : '0'; ?>
2146 
+												<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 ); ?>/>
2147 
+												<p class="description"><small><?php _e( "Toggle field label visibility.", 'yikes-inc-easy-mailchimp-extender' ); ?></small></p>
2148 2148 
 											</td>
2149 2149 
 										</tr>
2150 2150 
 										<!-- Toggle Buttons -->

@@ -2154,8 +2154,8 @@  discard block
 
 block discarded – undo
2154 2154 
 											</td>
2155 2155 
 											<td>
2156 2156 
 												<span class="toggle-container">
2157 
-													<a href="#" class="close-form-expansion"><?php _e( "Close" , 'yikes-inc-easy-mailchimp-extender' ); ?></a> |
2158 
-													<a href="#" class="remove-field" alt="<?php echo $field['group_id']; ?>"><?php _e( "Remove Field" , 'yikes-inc-easy-mailchimp-extender' ); ?></a>
2157 
+													<a href="#" class="close-form-expansion"><?php _e( "Close", 'yikes-inc-easy-mailchimp-extender' ); ?></a> |
2158 
+													<a href="#" class="remove-field" alt="<?php echo $field[ 'group_id' ]; ?>"><?php _e( "Remove Field", 'yikes-inc-easy-mailchimp-extender' ); ?></a>
2159 2159 
 												</span>
2160 2160 
 											</td>
2161 2161 
 										</tr>

@@ -2176,7 +2176,7 @@  discard block
 
 block discarded – undo
2176 2176 
 				add_thickbox();
2177 2177 
 				// enqueue jquery qtip for our tooltip
2178 2178 
 				wp_enqueue_script( 'jquery-qtip-tooltip', YIKES_MC_URL . 'admin/js/min/jquery.qtip.min.js', array( 'jquery' ) );
2179 
-				wp_enqueue_style( 'jquery-qtip-style',  YIKES_MC_URL . 'admin/css/jquery.qtip.min.css' );
2179 
+				wp_enqueue_style( 'jquery-qtip-style', YIKES_MC_URL . 'admin/css/jquery.qtip.min.css' );
2180 2180 
 					$available_tags = array(
2181 2181 
 						array(
2182 2182 
 							'tag' => '{page_title}',

@@ -2231,14 +2231,14 @@  discard block
 
 block discarded – undo
2231 2231 
 						<h3><?php _e( 'Pre Defined Tags', 'yikes-inc-easy-mailchimp-extender' ); ?></h3>
2232 2232 
 						<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>
2233 2233 
 						<ul>
2234 
-							<?php foreach( apply_filters( 'yikes-mailchimp-custom-default-value-tags', $available_tags ) as $tag ) { ?>
2234 
+							<?php foreach ( apply_filters( 'yikes-mailchimp-custom-default-value-tags', $available_tags ) as $tag ) { ?>
2235 2235 
 								<li class="tooltop-tag">
2236 2236 
 									<!-- link/tag -->
2237 
-									<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>
2237 
+									<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>
2238 2238 
 									<!-- help icon -->
2239 2239 
 									<span class="dashicons dashicons-editor-help"></span>
2240 2240 
 									<!-- tooltip -->
2241 
-									<div class="tooltiptext qtip-bootstrap yikes-easy-mc-hidden"><?php echo $tag['description']; ?></div>
2241 
+									<div class="tooltiptext qtip-bootstrap yikes-easy-mc-hidden"><?php echo $tag[ 'description' ]; ?></div>
2242 2242 
 								</li>
2243 2243 
 							<?php } ?>
2244 2244 
 						</ul>

@@ -2257,32 +2257,32 @@  discard block
 
 block discarded – undo
2257 2257 
 		public function build_available_merge_vars( $form_fields, $available_merge_variables ) {
2258 2258 
 			$fields_assigned_to_form = array();
2259 2259 
 			foreach ( $form_fields as $field ) {
2260 
-				if ( isset( $field['merge'] ) ) {
2261 
-					$fields_assigned_to_form[ $field['merge'] ] = true;
2260 
+				if ( isset( $field[ 'merge' ] ) ) {
2261 
+					$fields_assigned_to_form[ $field[ 'merge' ] ] = true;
2262 2262 
 				}
2263 2263 
 			}
2264 2264
2265 
-			if ( ! empty( $available_merge_variables['merge_fields'] ) ) {
2265 
+			if ( ! empty( $available_merge_variables[ 'merge_fields' ] ) ) {
2266 2266 
 				?>
2267 2267 
 				<ul id="available-fields"><?php
2268 
-				foreach ( $available_merge_variables['merge_fields'] as $merge_var ) {
2269 
-					$not_available = isset( $fields_assigned_to_form[ $merge_var['tag'] ] );
2268 
+				foreach ( $available_merge_variables[ 'merge_fields' ] as $merge_var ) {
2269 
+					$not_available = isset( $fields_assigned_to_form[ $merge_var[ 'tag' ] ] );
2270 2270 
 					?>
2271 2271 
 					<li class="available-field <?php echo $not_available ? 'not-available' : ''; ?>"
2272 
-						alt="<?php echo esc_attr( $merge_var['tag'] ); ?>"
2273 
-						data-attr-field-type="<?php echo esc_attr( $merge_var['type'] ); ?>"
2274 
-						data-attr-field-name="<?php echo esc_attr( $merge_var['name'] ); ?>"
2275 
-						data-attr-form-id="<?php echo esc_attr( $available_merge_variables['list_id'] ); ?>"
2272 
+						alt="<?php echo esc_attr( $merge_var[ 'tag' ] ); ?>"
2273 
+						data-attr-field-type="<?php echo esc_attr( $merge_var[ 'type' ] ); ?>"
2274 
+						data-attr-field-name="<?php echo esc_attr( $merge_var[ 'name' ] ); ?>"
2275 
+						data-attr-form-id="<?php echo esc_attr( $available_merge_variables[ 'list_id' ] ); ?>"
2276 2276 
 						title="<?php echo $not_available ? esc_attr__( 'Already assigned to your form', 'yikes-inc-easy-mailchimp-extender' ) : ''; ?>"
2277 2277 
 						<?php echo $not_available ? 'disabled="disabled"' : ''; ?>
2278 2278 
 					>
2279 2279 
 						<?php
2280 
-							echo esc_html( stripslashes( $merge_var['name'] ) );
2281 
-							if ( $merge_var['required'] ) {
2280 
+							echo esc_html( stripslashes( $merge_var[ 'name' ] ) );
2281 
+							if ( $merge_var[ 'required' ] ) {
2282 2282 
 								echo ' <span class="field-required" title="' . __( 'required field', 'yikes-inc-easy-mailchimp-extender' ) . '">*</span>';
2283 2283 
 							}
2284 2284 
 						?>
2285 
-						<small class="field-type-text"><?php echo esc_html( $merge_var['type'] ); ?></small>
2285 
+						<small class="field-type-text"><?php echo esc_html( $merge_var[ 'type' ] ); ?></small>
2286 2286 
 					</li>
2287 2287 
 					<?php
2288 2288 
 				}

@@ -2307,8 +2307,8 @@  discard block
 
 block discarded – undo
2307 2307 
 			$fields_assigned_to_form = array();
2308 2308 
 			if ( ! empty( $form_fields ) ) {
2309 2309 
 				foreach ( $form_fields as $field ) {
2310 
-					if ( isset( $field['group_id'] ) ) {
2311 
-						$fields_assigned_to_form[ $field['group_id'] ] = true;
2310 
+					if ( isset( $field[ 'group_id' ] ) ) {
2311 
+						$fields_assigned_to_form[ $field[ 'group_id' ] ] = true;
2312 2312 
 					}
2313 2313 
 				}
2314 2314 
 			}

@@ -2318,19 +2318,19 @@  discard block
 
 block discarded – undo
2318 2318 
 				<ul id="available-interest-groups">
2319 2319 
 				<?php
2320 2320 
 					foreach ( $available_interest_groups as $interest_group ) {
2321 
-						$not_available = isset( $fields_assigned_to_form[ $interest_group['id'] ] );
2321 
+						$not_available = isset( $fields_assigned_to_form[ $interest_group[ 'id' ] ] );
2322 2322 
 						?>
2323 2323 
 						<li class="available-field <?php echo $not_available ? 'not-available' : ''; ?>"
2324 
-							alt="<?php echo esc_attr( $interest_group['id'] ); ?>"
2325 
-							data-group-id="<?php echo esc_attr( $interest_group['id'] ); ?>"
2326 
-							data-attr-field-name="<?php echo esc_attr( htmlspecialchars( $interest_group['title'] ) ); ?>"
2327 
-							data-attr-field-type="<?php echo esc_attr( $interest_group['type'] ); ?>"
2324 
+							alt="<?php echo esc_attr( $interest_group[ 'id' ] ); ?>"
2325 
+							data-group-id="<?php echo esc_attr( $interest_group[ 'id' ] ); ?>"
2326 
+							data-attr-field-name="<?php echo esc_attr( htmlspecialchars( $interest_group[ 'title' ] ) ); ?>"
2327 
+							data-attr-field-type="<?php echo esc_attr( $interest_group[ 'type' ] ); ?>"
2328 2328 
 							data-attr-form-id="<?php echo esc_attr( $list_id ); ?>"
2329 2329 
 							title="<?php echo $not_available ? __( 'Already assigned to your form', 'yikes-inc-easy-mailchimp-extender' ) : ''; ?>"
2330 2330 
 							<?php echo $not_available ? 'disabled="disabled"' : ''; ?>
2331 2331 
 						>
2332 
-							<?php echo esc_html( stripslashes( $interest_group['title'] ) ); ?>
2333 
-							<small class="field-type-text"><?php echo esc_html( $interest_group['type'] ); ?></small>
2332 
+							<?php echo esc_html( stripslashes( $interest_group[ 'title' ] ) ); ?>
2333 
+							<small class="field-type-text"><?php echo esc_html( $interest_group[ 'type' ] ); ?></small>
2334 2334 
 						</li>
2335 2335 
 						<?php
2336 2336 
 					}

@@ -2356,13 +2356,13 @@  discard block
 
 block discarded – undo
2356 2356 
 				$not_available = isset( $form_tags[ $tag_id ] );
2357 2357 
 				?>
2358 2358 
 				<li class="available-field <?php echo $not_available ? 'not-available' : ''; ?>"
2359 
-					id="tag-<?php echo esc_attr( $tag['id'] ); ?>"
2360 
-					data-tag-id="<?php echo esc_attr( $tag['id'] ); ?>"
2361 
-					data-tag-name="<?php echo esc_attr( $tag['name'] ); ?>"
2362 
-					title="<?php echo $not_available ? __( 'Already assigned to your form', 'yikes-inc-easy-mailchimp-extender' ) : esc_attr( $tag['name'] ); ?>"
2359 
+					id="tag-<?php echo esc_attr( $tag[ 'id' ] ); ?>"
2360 
+					data-tag-id="<?php echo esc_attr( $tag[ 'id' ] ); ?>"
2361 
+					data-tag-name="<?php echo esc_attr( $tag[ 'name' ] ); ?>"
2362 
+					title="<?php echo $not_available ? __( 'Already assigned to your form', 'yikes-inc-easy-mailchimp-extender' ) : esc_attr( $tag[ 'name' ] ); ?>"
2363 2363 
 					<?php echo $not_available ? 'disabled="disabled"' : ''; ?>
2364 2364 
 				>
2365 
-					<?php echo esc_html( $tag['name'] ); ?>
2365 
+					<?php echo esc_html( $tag[ 'name' ] ); ?>
2366 2366 
 				</li>
2367 2367 
 				<?php
2368 2368 
 			}

@@ -2383,15 +2383,15 @@  discard block
 
 block discarded – undo
2383 2383 
 		*	- must clean up db tables , ensure what data is going in and what is needed...
2384 2384 
 		*/
2385 2385 
 		public function yikes_easy_mailchimp_create_form() {
2386 
-			$nonce = $_REQUEST['nonce'];
2386 
+			$nonce = $_REQUEST[ 'nonce' ];
2387 2387 
 			if ( ! wp_verify_nonce( $nonce, 'create_mailchimp_form' ) ) {
2388 
-				wp_die( __( "We've run into an error. The security check didn't pass. Please try again." , 'yikes-inc-easy-mailchimp-extender' ) );
2388 
+				wp_die( __( "We've run into an error. The security check didn't pass. Please try again.", 'yikes-inc-easy-mailchimp-extender' ) );
2389 2389 
 			}
2390 2390
2391 2391 
 			$result = $this->form_interface->create_form( array(
2392 
-				'list_id'          => sanitize_key( $_POST['associated-list'] ),
2393 
-				'form_name'        => stripslashes( $_POST['form-name'] ),
2394 
-				'form_description' => stripslashes( $_POST['form-description'] ),
2392 
+				'list_id'          => sanitize_key( $_POST[ 'associated-list' ] ),
2393 
+				'form_name'        => stripslashes( $_POST[ 'form-name' ] ),
2394 
+				'form_description' => stripslashes( $_POST[ 'form-description' ] ),
2395 2395 
 			) );
2396 2396
2397 2397 
 			// if an error occurs during the form creation process

@@ -2399,11 +2399,11 @@  discard block
 
 block discarded – undo
2399 2399 
 				// write it to the error log
2400 2400 
 				// if the form was not created successfully
2401 2401 
 				$error_logging = new Yikes_Inc_Easy_Mailchimp_Error_Logging();
2402 
-				$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' ) );
2402 
+				$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' ) );
2403 2403 
 				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' ) ) ) ) );
2404 2404 
 			} else {
2405 2405 
 				// redirect the user to the new form edit page
2406 
-				wp_redirect( esc_url_raw( admin_url( 'admin.php?page=yikes-mailchimp-edit-form&id=' . $result) ) );
2406 
+				wp_redirect( esc_url_raw( admin_url( 'admin.php?page=yikes-mailchimp-edit-form&id=' . $result ) ) );
2407 2407 
 			}
2408 2408 
 			exit();
2409 2409 
 		}

@@ -2416,11 +2416,11 @@  discard block
 
 block discarded – undo
2416 2416 
 		*/
2417 2417 
 		public function yikes_easy_mailchimp_delete_form() {
2418 2418 
 			// grab & store our variables ( associated list & form name )
2419 
-			$nonce = $_REQUEST['nonce'];
2420 
-			$post_id_to_delete = $_REQUEST['mailchimp-form'];
2419 
+			$nonce = $_REQUEST[ 'nonce' ];
2420 
+			$post_id_to_delete = $_REQUEST[ 'mailchimp-form' ];
2421 2421 
 			// verify our nonce
2422 
-			if ( ! wp_verify_nonce( $nonce, 'delete-mailchimp-form-'.$post_id_to_delete ) ) {
2423 
-				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 ) );
2422 
+			if ( ! wp_verify_nonce( $nonce, 'delete-mailchimp-form-' . $post_id_to_delete ) ) {
2423 
+				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 ) );
2424 2424 
 			}
2425 2425
2426 2426 
 			$this->form_interface->delete_form( $post_id_to_delete );

@@ -2436,19 +2436,19 @@  discard block
 
 block discarded – undo
2436 2436 
 		*/
2437 2437 
 		public function yikes_easy_mailchimp_duplicate_form() {
2438 2438 
 			// grab & store our variables ( associated list & form name )
2439 
-			$nonce = $_REQUEST['nonce'];
2440 
-			$post_id_to_clone = $_REQUEST['mailchimp-form'];
2439 
+			$nonce = $_REQUEST[ 'nonce' ];
2440 
+			$post_id_to_clone = $_REQUEST[ 'mailchimp-form' ];
2441 2441 
 			// verify our nonce
2442 
-			if ( ! wp_verify_nonce( $nonce, 'duplicate-mailchimp-form-'.$post_id_to_clone ) ) {
2443 
-				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 ) );
2442 
+			if ( ! wp_verify_nonce( $nonce, 'duplicate-mailchimp-form-' . $post_id_to_clone ) ) {
2443 
+				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 ) );
2444 2444 
 			}
2445 2445
2446 2446 
 			// Get the current form data.
2447 2447 
 			$form_data = $this->form_interface->get_form( $post_id_to_clone );
2448 2448
2449 2449 
 			// Update some of the data before duplication
2450 
-			$form_data['form_name'] .= ' - Copy';
2451 
-			$form_data['impressions'] = $form_data['submissions'] = 0;
2450 
+			$form_data[ 'form_name' ] .= ' - Copy';
2451 
+			$form_data[ 'impressions' ] = $form_data[ 'submissions' ] = 0;
2452 2452
2453 2453 
 			// Create the new form, and handle the result.
2454 2454 
 			$result = $this->form_interface->create_form( $form_data );

@@ -2479,11 +2479,11 @@  discard block
 
 block discarded – undo
2479 2479 
 		*/
2480 2480 
 		public function yikes_easy_mailchimp_reset_impression_stats() {
2481 2481 
 			// grab & store our variables ( associated list & form name )
2482 
-			$nonce = $_REQUEST['nonce'];
2483 
-			$form_id_to_reset = $_REQUEST['mailchimp-form'];
2482 
+			$nonce = $_REQUEST[ 'nonce' ];
2483 
+			$form_id_to_reset = $_REQUEST[ 'mailchimp-form' ];
2484 2484 
 			// verify our nonce
2485 
-			if ( ! wp_verify_nonce( $nonce, 'reset-stats-mailchimp-form-'.$form_id_to_reset ) ) {
2486 
-				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 ) );
2485 
+			if ( ! wp_verify_nonce( $nonce, 'reset-stats-mailchimp-form-' . $form_id_to_reset ) ) {
2486 
+				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 ) );
2487 2487 
 			}
2488 2488
2489 2489 
 			$result = $this->form_interface->update_form(

@@ -2511,8 +2511,8 @@  discard block
 
 block discarded – undo
2511 2511 
 		*/
2512 2512 
 		public function yikes_easy_mailchimp_update_form() {
2513 2513
2514 
-			$nonce   = $_REQUEST['nonce'];
2515 
-			$form_id = $_REQUEST['id'];
2514 
+			$nonce   = $_REQUEST[ 'nonce' ];
2515 
+			$form_id = $_REQUEST[ 'id' ];
2516 2516
2517 2517 
 			// verify our nonce
2518 2518 
 			if ( ! wp_verify_nonce( $nonce, 'update-mailchimp-form-' . $form_id ) ) {

@@ -2526,70 +2526,70 @@  discard block
 
 block discarded – undo
2526 2526 
 			}
2527 2527
2528 2528 
 			// Store our values!
2529 
-			$list_id                 = $_POST['associated-list'];
2530 
-			$form_name               = stripslashes( $_POST['form-name'] );
2531 
-			$form_description        = sanitize_text_field( stripslashes( $_POST['form-description'] ) );
2532 
-			$redirect_user_on_submit = $_POST['redirect-user-on-submission'];
2533 
-			$redirect_page           = $_POST['redirect-user-to-selection'];
2529 
+			$list_id                 = $_POST[ 'associated-list' ];
2530 
+			$form_name               = stripslashes( $_POST[ 'form-name' ] );
2531 
+			$form_description        = sanitize_text_field( stripslashes( $_POST[ 'form-description' ] ) );
2532 
+			$redirect_user_on_submit = $_POST[ 'redirect-user-on-submission' ];
2533 
+			$redirect_page           = $_POST[ 'redirect-user-to-selection' ];
2534 2534
2535 2535 
 			// stripslashes_deep on save, to prevent foreign languages from added excessive backslashes
2536 
-			$assigned_fields = isset( $_POST['field'] ) ? stripslashes_deep( $_POST['field'] ): array();
2536 
+			$assigned_fields = isset( $_POST[ 'field' ] ) ? stripslashes_deep( $_POST[ 'field' ] ) : array();
2537 2537
2538 2538 
 			// setup our submission settings serialized array
2539 2539 
 			$submission_settings = array(
2540 
-				'ajax'                   => $_POST['form-ajax-submission'],
2541 
-				'redirect_on_submission' => $_POST['redirect-user-on-submission'],
2542 
-				'redirect_page'          => $_POST['redirect-user-to-selection'],
2543 
-				'custom_redirect_url'    => esc_url( $_POST['custom-redirect-url'] ),
2544 
-				'redirect_new_window'	 => $_POST['redirect_new_window'],
2545 
-				'hide_form_post_signup'  => $_POST['hide-form-post-signup'],
2546 
-				'replace_interests'      => $_POST['replace-interest-groups'],
2540 
+				'ajax'                   => $_POST[ 'form-ajax-submission' ],
2541 
+				'redirect_on_submission' => $_POST[ 'redirect-user-on-submission' ],
2542 
+				'redirect_page'          => $_POST[ 'redirect-user-to-selection' ],
2543 
+				'custom_redirect_url'    => esc_url( $_POST[ 'custom-redirect-url' ] ),
2544 
+				'redirect_new_window'	 => $_POST[ 'redirect_new_window' ],
2545 
+				'hide_form_post_signup'  => $_POST[ 'hide-form-post-signup' ],
2546 
+				'replace_interests'      => $_POST[ 'replace-interest-groups' ],
2547 2547 
 			);
2548 2548
2549 2549 
 			// setup our opt-in settings serialized array
2550 2550 
 			$optin_settings = array(
2551 
-				'optin'                => $_POST['single-double-optin'],
2552 
-				'update_existing_user' => $_POST['update-existing-user'],
2553 
-				'send_update_email'    => $_POST['update-existing-email'],
2551 
+				'optin'                => $_POST[ 'single-double-optin' ],
2552 
+				'update_existing_user' => $_POST[ 'update-existing-user' ],
2553 
+				'send_update_email'    => $_POST[ 'update-existing-email' ],
2554 2554 
 			);
2555 2555
2556 2556 
 			// Setup our error settings serialized array
2557 2557 
 			$error_settings = array(
2558 
-				'success'				=> trim( $_POST['yikes-easy-mc-success-message'] ) ? trim( stripslashes( $_POST['yikes-easy-mc-success-message'] ) ) : '',
2559 
-				'success-single-optin'	=> trim( $_POST['yikes-easy-mc-success-single-optin-message'] ) ? trim( stripslashes( $_POST['yikes-easy-mc-success-single-optin-message'] ) ) : '',
2560 
-				'success-resubscribed'	=> trim( $_POST['yikes-easy-mc-user-resubscribed-success-message'] ) ? trim( stripslashes( $_POST['yikes-easy-mc-user-resubscribed-success-message'] ) ) : '',
2561 
-				'general-error'			=> trim( $_POST['yikes-easy-mc-general-error-message'] ) ? trim( stripslashes( $_POST['yikes-easy-mc-general-error-message'] ) ) : '',
2562 
-				'already-subscribed'	=> trim( $_POST['yikes-easy-mc-user-subscribed-message'] ) ? trim( stripslashes( $_POST['yikes-easy-mc-user-subscribed-message'] ) ) : '',
2563 
-				'update-link'			=> trim( $_POST['yikes-easy-mc-user-update-link'] ) ? trim( stripslashes( $_POST['yikes-easy-mc-user-update-link'] ) ) : '',
2564 
-				'email-subject'			=> trim( $_POST['yikes-easy-mc-user-email-subject'] ) ? trim( stripslashes( $_POST['yikes-easy-mc-user-email-subject'] ) ) : '',
2565 
-				'email-body'			=> trim( $_POST['yikes-easy-mc-user-email-body'] ) ? trim( stripslashes( $_POST['yikes-easy-mc-user-email-body'] ) ) : '',
2566 
-				'update-email-success'  => trim( $_POST['yikes-easy-mc-update-email-successful'] ) ? trim( stripslashes( $_POST['yikes-easy-mc-update-email-successful'] ) ) : '',
2567 
-				'update-email-failure'  => trim( $_POST['yikes-easy-mc-update-email-failure'] ) ? trim( stripslashes( $_POST['yikes-easy-mc-update-email-failure'] ) ) : '',
2558 
+				'success'				=> trim( $_POST[ 'yikes-easy-mc-success-message' ] ) ? trim( stripslashes( $_POST[ 'yikes-easy-mc-success-message' ] ) ) : '',
2559 
+				'success-single-optin'	=> trim( $_POST[ 'yikes-easy-mc-success-single-optin-message' ] ) ? trim( stripslashes( $_POST[ 'yikes-easy-mc-success-single-optin-message' ] ) ) : '',
2560 
+				'success-resubscribed'	=> trim( $_POST[ 'yikes-easy-mc-user-resubscribed-success-message' ] ) ? trim( stripslashes( $_POST[ 'yikes-easy-mc-user-resubscribed-success-message' ] ) ) : '',
2561 
+				'general-error'			=> trim( $_POST[ 'yikes-easy-mc-general-error-message' ] ) ? trim( stripslashes( $_POST[ 'yikes-easy-mc-general-error-message' ] ) ) : '',
2562 
+				'already-subscribed'	=> trim( $_POST[ 'yikes-easy-mc-user-subscribed-message' ] ) ? trim( stripslashes( $_POST[ 'yikes-easy-mc-user-subscribed-message' ] ) ) : '',
2563 
+				'update-link'			=> trim( $_POST[ 'yikes-easy-mc-user-update-link' ] ) ? trim( stripslashes( $_POST[ 'yikes-easy-mc-user-update-link' ] ) ) : '',
2564 
+				'email-subject'			=> trim( $_POST[ 'yikes-easy-mc-user-email-subject' ] ) ? trim( stripslashes( $_POST[ 'yikes-easy-mc-user-email-subject' ] ) ) : '',
2565 
+				'email-body'			=> trim( $_POST[ 'yikes-easy-mc-user-email-body' ] ) ? trim( stripslashes( $_POST[ 'yikes-easy-mc-user-email-body' ] ) ) : '',
2566 
+				'update-email-success'  => trim( $_POST[ 'yikes-easy-mc-update-email-successful' ] ) ? trim( stripslashes( $_POST[ 'yikes-easy-mc-update-email-successful' ] ) ) : '',
2567 
+				'update-email-failure'  => trim( $_POST[ 'yikes-easy-mc-update-email-failure' ] ) ? trim( stripslashes( $_POST[ 'yikes-easy-mc-update-email-failure' ] ) ) : '',
2568 2568 
 			);
2569 2569
2570 2570 
 			// Setup the new form settings array
2571 2571 
 			// @since 6.0.3.8
2572 2572 
 			// To Do: Combine date & time so it's a single unix timestamp
2573 2573 
 			$form_settings = array(
2574 
-				'yikes-easy-mc-form-class-names'                 => trim( $_POST['yikes-easy-mc-form-class-names'] ),
2575 
-				'yikes-easy-mc-inline-form'                      => $_POST['yikes-easy-mc-inline-form'][0],
2576 
-				'yikes-easy-mc-submit-button-type'               => $_POST['yikes-easy-mc-submit-button-type'][0],
2577 
-				'yikes-easy-mc-submit-button-text'               => trim( $_POST['yikes-easy-mc-submit-button-text'] ),
2578 
-				'yikes-easy-mc-submit-button-image'              => esc_url( trim( $_POST['yikes-easy-mc-submit-button-image'] ) ),
2579 
-				'yikes-easy-mc-submit-button-classes'            => trim( $_POST['yikes-easy-mc-submit-button-classes'] ),
2580 
-				'yikes-easy-mc-form-schedule'                    => ( isset( $_POST['yikes-easy-mc-form-schedule'] ) ) ? '1' : '0',
2581 
-				'yikes-easy-mc-form-restriction-start'           => strtotime( $_POST['yikes-easy-mc-form-restriction-start-date'] . ' ' . $_POST['yikes-easy-mc-form-restriction-start-time'] ),
2582 
-				'yikes-easy-mc-form-restriction-end'             => strtotime( $_POST['yikes-easy-mc-form-restriction-end-date'] . ' ' . $_POST['yikes-easy-mc-form-restriction-end-time'] ),
2583 
-				'yikes-easy-mc-form-restriction-pending-message' => trim( $_POST['yikes-easy-mc-form-restriction-pending-message'] ),
2584 
-				'yikes-easy-mc-form-restriction-expired-message' => trim( $_POST['yikes-easy-mc-form-restriction-expired-message'] ),
2585 
-				'yikes-easy-mc-form-login-required'              => ( isset( $_POST['yikes-easy-mc-form-login-required'] ) ) ? '1' : '0',
2586 
-				'yikes-easy-mc-form-restriction-login-message'   => trim( $_POST['yikes-easy-mc-form-restriction-login-message'] ),
2574 
+				'yikes-easy-mc-form-class-names'                 => trim( $_POST[ 'yikes-easy-mc-form-class-names' ] ),
2575 
+				'yikes-easy-mc-inline-form'                      => $_POST[ 'yikes-easy-mc-inline-form' ][ 0 ],
2576 
+				'yikes-easy-mc-submit-button-type'               => $_POST[ 'yikes-easy-mc-submit-button-type' ][ 0 ],
2577 
+				'yikes-easy-mc-submit-button-text'               => trim( $_POST[ 'yikes-easy-mc-submit-button-text' ] ),
2578 
+				'yikes-easy-mc-submit-button-image'              => esc_url( trim( $_POST[ 'yikes-easy-mc-submit-button-image' ] ) ),
2579 
+				'yikes-easy-mc-submit-button-classes'            => trim( $_POST[ 'yikes-easy-mc-submit-button-classes' ] ),
2580 
+				'yikes-easy-mc-form-schedule'                    => ( isset( $_POST[ 'yikes-easy-mc-form-schedule' ] ) ) ? '1' : '0',
2581 
+				'yikes-easy-mc-form-restriction-start'           => strtotime( $_POST[ 'yikes-easy-mc-form-restriction-start-date' ] . ' ' . $_POST[ 'yikes-easy-mc-form-restriction-start-time' ] ),
2582 
+				'yikes-easy-mc-form-restriction-end'             => strtotime( $_POST[ 'yikes-easy-mc-form-restriction-end-date' ] . ' ' . $_POST[ 'yikes-easy-mc-form-restriction-end-time' ] ),
2583 
+				'yikes-easy-mc-form-restriction-pending-message' => trim( $_POST[ 'yikes-easy-mc-form-restriction-pending-message' ] ),
2584 
+				'yikes-easy-mc-form-restriction-expired-message' => trim( $_POST[ 'yikes-easy-mc-form-restriction-expired-message' ] ),
2585 
+				'yikes-easy-mc-form-login-required'              => ( isset( $_POST[ 'yikes-easy-mc-form-login-required' ] ) ) ? '1' : '0',
2586 
+				'yikes-easy-mc-form-restriction-login-message'   => trim( $_POST[ 'yikes-easy-mc-form-restriction-login-message' ] ),
2587 2587 
 			);
2588 2588
2589 2589 
 			// additional custom fields (extensions / user defined fields)
2590 2590 
 			$custom_fields = array();
2591 
-			if ( isset( $_POST['custom-field'] ) ) {
2592 
-				foreach ( $_POST['custom-field'] as $custom_field => $custom_value ) {
2591 
+			if ( isset( $_POST[ 'custom-field' ] ) ) {
2592 
+				foreach ( $_POST[ 'custom-field' ] as $custom_field => $custom_value ) {
2593 2593 
 					if ( is_array( $custom_value ) ) {
2594 2594 
 						$custom_fields[ $custom_field ] = array_filter( stripslashes_deep( $custom_value ) ); // array_filters to remove empty items (don't save them!)
2595 2595 
 					} else {

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

@@ -2632,11 +2632,11 @@  discard block
 
 block discarded – undo
2632 2632 
 			$email_body  = '<p>' . __( 'Greetings,', 'yikes-inc-easy-mailchimp-extender' ) . '</p>';
2633 2633
2634 2634 
 			$email_body .= '<p>';
2635 
-			$email_body .= 	__( 'A request has been made to update your Mailchimp account profile information.', 'yikes-inc-easy-mailchimp-extender' );
2636 
-			$email_body .=	__( ' To do so please use the following link: ', 'yikes-inc-easy-mailchimp-extender' );
2637 
-			$email_body .=	'[link]';
2638 
-			$email_body .=		__( 'Update Mailchimp Profile Info', 'yikes-inc-easy-mailchimp-extender' );
2639 
-			$email_body .= 	'[/link]';
2635 
+			$email_body .= __( 'A request has been made to update your Mailchimp account profile information.', 'yikes-inc-easy-mailchimp-extender' );
2636 
+			$email_body .= __( ' To do so please use the following link: ', 'yikes-inc-easy-mailchimp-extender' );
2637 
+			$email_body .= '[link]';
2638 
+			$email_body .= __( 'Update Mailchimp Profile Info', 'yikes-inc-easy-mailchimp-extender' );
2639 
+			$email_body .= '[/link]';
2640 2640 
 			$email_body .= '</p>';
2641 2641
2642 2642 
 			$email_body .= '<p>' . __( 'If you did not request this update, please disregard this email.', 'yikes-inc-easy-mailchimp-extender' ) . '</p>';

@@ -2652,13 +2652,13 @@  discard block
 
 block discarded – undo
2652 2652
2653 2653 
 		/* Unsubscribe a given user from our list */
2654 2654 
 		public function yikes_easy_mailchimp_unsubscribe_user() {
2655 
-			$nonce    = $_REQUEST['nonce'];
2656 
-			$list_id  = $_REQUEST['mailchimp-list'];
2657 
-			$email_id = $_REQUEST['email_id'];
2655 
+			$nonce    = $_REQUEST[ 'nonce' ];
2656 
+			$list_id  = $_REQUEST[ 'mailchimp-list' ];
2657 
+			$email_id = $_REQUEST[ 'email_id' ];
2658 2658
2659 2659 
 			// verify our nonce
2660 2660 
 			if ( ! wp_verify_nonce( $nonce, 'unsubscribe-user-' . $email_id ) ) {
2661 
-				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 ) );
2661 
+				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 ) );
2662 2662 
 			}
2663 2663
2664 2664 
 			$response = yikes_get_mc_api_manager()->get_list_handler()->member_unsubscribe( $list_id, $email_id );

@@ -2677,21 +2677,21 @@  discard block
 
 block discarded – undo
2677 2677
2678 2678 
 		public function yikes_easy_mailchimp_create_missing_error_log() {
2679 2679 
 			// grab our nonnce
2680 
-			$nonce = $_REQUEST['nonce'];
2680 
+			$nonce = $_REQUEST[ 'nonce' ];
2681 2681 
 			// validate nonce
2682 
-			if ( !wp_verify_nonce( $nonce, 'create_error_log' ) ) {
2683 
-				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 ) );
2682 
+			if ( ! wp_verify_nonce( $nonce, 'create_error_log' ) ) {
2683 
+				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 ) );
2684 2684 
 			}
2685 2685 
 			// setup the path to the error log
2686 2686 
 			$error_log = fopen( plugin_dir_path( __FILE__ ) . '../includes/error_log/yikes-easy-mailchimp-error-log.php', 'w' );
2687 2687 
 			try {
2688 2688 
 				// create the file
2689 
-				fwrite( $error_log , '' );
2689 
+				fwrite( $error_log, '' );
2690 2690 
 				// close out
2691 2691 
 				fclose( $error_log );
2692 2692 
 				wp_redirect( esc_url_raw( admin_url( 'admin.php?page=yikes-inc-easy-mailchimp-settings&section=debug-settings&error_log_created=true' ) ) );
2693 2693 
 			} catch ( Exception $e ) {
2694 
-				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() ) ) ) );
2694 
+				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() ) ) ) );
2695 2695 
 			}
2696 2696 
 		}
2697 2697 
 

@@ -2702,9 +2702,9 @@  discard block
 
 block discarded – undo
2702 2702 
 		public function yikes_easy_mailchimp_clear_transient_data() {
2703 2703
2704 2704 
 			// verify our nonce
2705 
-			$nonce = $_REQUEST['nonce'];
2705 
+			$nonce = $_REQUEST[ 'nonce' ];
2706 2706 
 			if ( ! wp_verify_nonce( $nonce, 'clear-mc-transient-data' ) ) {
2707 
-				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 ) );
2707 
+				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 ) );
2708 2708 
 			}
2709 2709
2710 2710 
 			$this->delete_yikes_mailchimp_transients();

@@ -2713,10 +2713,10 @@  discard block
 
 block discarded – undo
2713 2713 
 			$referer = wp_get_referer();
2714 2714 
 			if ( $referer && ( strpos( $referer, 'yikes-inc-easy-mailchimp-settings' ) > 0 ) ) {
2715 2715 
 				wp_redirect( esc_url_raw( admin_url( 'admin.php?page=yikes-inc-easy-mailchimp-settings&section=api-cache-settings&transient-cleared=true' ) ) );
2716 
-			} elseif ( isset( $_REQUEST['page'] ) && $_REQUEST['page'] === 'yikes-mailchimp-edit-form' && isset( $_REQUEST['id'] ) && ! empty( $_REQUEST['id'] ) ) {
2716 
+			} elseif ( isset( $_REQUEST[ 'page' ] ) && $_REQUEST[ 'page' ] === 'yikes-mailchimp-edit-form' && isset( $_REQUEST[ 'id' ] ) && ! empty( $_REQUEST[ 'id' ] ) ) {
2717 2717
2718 2718 
 				// else check if we were editing a form.
2719 
-				$id = filter_var( $_REQUEST['id'], FILTER_SANITIZE_NUMBER_INT );
2719 
+				$id = filter_var( $_REQUEST[ 'id' ], FILTER_SANITIZE_NUMBER_INT );
2720 2720 
 				wp_redirect( esc_url_raw( admin_url( 'admin.php?page=yikes-mailchimp-edit-form&id=' . $id ) ) );
2721 2721 
 			} else {
2722 2722 
 				// else redirect to the manage forms page.

@@ -2760,7 +2760,7 @@  discard block
 
 block discarded – undo
2760 2760 
 		 */
2761 2761 
 		public function yikes_mailchimp_load_helper_class() {
2762 2762 
 			// check to see if it's already loaded up.
2763 
-			if ( !class_exists( 'Yikes_Inc_Easy_Mailchimp_Forms_Helper' ) ) {
2763 
+			if ( ! class_exists( 'Yikes_Inc_Easy_Mailchimp_Forms_Helper' ) ) {
2764 2764 
 				// Include our main helper class file
2765 2765 
 				include_once( YIKES_MC_PATH . 'admin/partials/helpers/init.php' );
2766 2766 
 			}
Please login to merge, or discard this patch.
Braces   +216 added lines, -216 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 
 		// Register admin pages.
66 66 
 		add_action( 'admin_menu', array( $this, 'register_admin_pages' ), 11 );

@@ -92,7 +92,7 @@  discard block
 
 block discarded – undo
92 92 
 		/***********************/
93 93 
 		/** Create A Form **/
94 94 
 		/**********************/
95 
-		if ( isset( $_REQUEST['action'] ) && $_REQUEST['action'] == 'yikes-easy-mc-create-form' ) {
95 
+		if ( isset( $_REQUEST['action'] ) && $_REQUEST['action'] == 'yikes-easy-mc-create-form' ) {
96 96
97 97 
 			add_action( 'init', array( $this, 'yikes_easy_mailchimp_create_form' ) );
98 98 
 

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

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

@@ -119,7 +119,7 @@  discard block
 
 block discarded – undo
119 119 
 		/*************************************/
120 120 
 		/**  Reset Form Impression Stats **/
121 121 
 		/***********************************/
122 
-		if ( isset( $_REQUEST['action'] ) && $_REQUEST['action'] == 'yikes-easy-mc-reset-stats' ) {
122 
+		if ( isset( $_REQUEST['action'] ) && $_REQUEST['action'] == 'yikes-easy-mc-reset-stats' ) {
123 123
124 124 
 			add_action( 'init', array( $this, 'yikes_easy_mailchimp_reset_impression_stats' ) );
125 125 
 

@@ -128,7 +128,7 @@  discard block
 
 block discarded – undo
128 128 
 		/**********************************/
129 129 
 		/**         Update A Form        **/
130 130 
 		/********************************/
131 
-		if ( isset( $_REQUEST['action'] ) && $_REQUEST['action'] == 'yikes-easy-mc-update-form' ) {
131 
+		if ( isset( $_REQUEST['action'] ) && $_REQUEST['action'] == 'yikes-easy-mc-update-form' ) {
132 132
133 133 
 			add_action( 'init', array( $this, 'yikes_easy_mailchimp_update_form' ) );
134 134 
 

@@ -137,7 +137,7 @@  discard block
 
 block discarded – undo
137 137 
 		/**************************************************/
138 138 
 		/**     Clear Store Mailchimp Transient Data   **/
139 139 
 		/*************************************************/
140 
-		if ( isset( $_REQUEST['action'] ) && $_REQUEST['action'] == 'yikes-easy-mc-clear-transient-data' ) {
140 
+		if ( isset( $_REQUEST['action'] ) && $_REQUEST['action'] == 'yikes-easy-mc-clear-transient-data' ) {
141 141
142 142 
 			add_action( 'init', array( $this, 'yikes_easy_mailchimp_clear_transient_data' ) );
143 143 
 

@@ -146,7 +146,7 @@  discard block
 
 block discarded – undo
146 146 
 		/*******************************************/
147 147 
 		/** Remove a user from a mailing list     **/
148 148 
 		/*****************************************/
149 
-		if ( isset( $_REQUEST['action'] ) && $_REQUEST['action'] == 'yikes-easy-mc-unsubscribe-user' ) {
149 
+		if ( isset( $_REQUEST['action'] ) && $_REQUEST['action'] == 'yikes-easy-mc-unsubscribe-user' ) {
150 150
151 151 
 			add_action( 'init', array( $this, 'yikes_easy_mailchimp_unsubscribe_user' ) );
152 152 
 

@@ -155,7 +155,7 @@  discard block
 
 block discarded – undo
155 155 
 		/*******************************************/
156 156 
 		/**    Create misisng error log file  **/
157 157 
 		/*****************************************/
158 
-		if ( isset( $_REQUEST['action'] ) && $_REQUEST['action'] == 'yikes-easy-mc-create-error-log' ) {
158 
+		if ( isset( $_REQUEST['action'] ) && $_REQUEST['action'] == 'yikes-easy-mc-create-error-log' ) {
159 159
160 160 
 			add_action( 'init', array( $this, 'yikes_easy_mailchimp_create_missing_error_log' ) );
161 161 
 

@@ -167,14 +167,14 @@  discard block
 
 block discarded – undo
167 167 
 		add_action( 'admin_head', array( $this, 'add_tinyMCE_buttons' ) );
168 168
169 169 
 		// pass our lists data to tinyMCE button for use.
170 
-		foreach ( array( 'post.php', 'post-new.php' ) as $hook ) {
170 
+		foreach ( array( 'post.php', 'post-new.php' ) as $hook ) {
171 171
172 172 
 			add_action( 'admin_enqueue_scripts', array( $this, 'tinymce_yikes_easy_mc' ) );
173 173
174 174 
 		}
175 175
176 176 
 		// display an admin notice for users on PHP < 5.3.
177 
-		if ( phpversion() < '5.3' ) {
177 
+		if ( phpversion() < '5.3' ) {
178 178 
 			add_action( "admin_notices", array( $this, 'display_php_warning' ), 999 );
179 179 
 		}
180 180 
 

@@ -187,7 +187,7 @@  discard block
 
 block discarded – undo
187 187 
 		/**************************************************/
188 188 
 		/**        Clear Mailchimp Error Log Data        **/
189 189 
 		/*************************************************/
190 
-		if ( isset( $_REQUEST['action'] ) && $_REQUEST['action'] == 'yikes-easy-mc-clear-error-log' ) {
190 
+		if ( isset( $_REQUEST['action'] ) && $_REQUEST['action'] == 'yikes-easy-mc-clear-error-log' ) {
191 191
192 192 
 			add_action( 'init', array( $this, 'yikes_easy_mailchimp_clear_error_log' ) );
193 193 
 

@@ -196,7 +196,7 @@  discard block
 
 block discarded – undo
196 196 
 		/*********************************************/
197 197 
 		/**        Export Mailchimp Opt-in Forms   **/
198 198 
 		/*******************************************/
199 
-		if ( isset( $_REQUEST['action'] ) && $_REQUEST['action'] == 'yikes-easy-mc-export-forms' ) {
199 
+		if ( isset( $_REQUEST['action'] ) && $_REQUEST['action'] == 'yikes-easy-mc-export-forms' ) {
200 200
201 201 
 			add_action( 'init', array( $this, 'yikes_easy_mailchimp_export_forms' ) );
202 202 
 

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

@@ -214,7 +214,7 @@  discard block
 
 block discarded – undo
214 214 
 		/*******************************************/
215 215 
 		/**        Import Class Inclusion       **/
216 216 
 		/*****************************************/
217 
-		if ( isset( $_REQUEST['action'] ) && $_REQUEST['action'] == 'yikes-easy-mc-import-forms' ) {
217 
+		if ( isset( $_REQUEST['action'] ) && $_REQUEST['action'] == 'yikes-easy-mc-import-forms' ) {
218 218
219 219 
 			add_action( 'init', array( $this, 'yikes_easy_mailchimp_import_forms' ) );
220 220 
 

@@ -223,7 +223,7 @@  discard block
 
 block discarded – undo
223 223 
 		/*******************************************/
224 224 
 		/**    Premium Support Request     **/
225 225 
 		/*****************************************/
226 
-		if ( isset( $_POST['submit-premium-support-request'] ) ) {
226 
+		if ( isset( $_POST['submit-premium-support-request'] ) ) {
227 227
228 228 
 			add_action( 'init', array( $this, 'yikes_easy_mailchimp_premium_support_request' ) );
229 229 
 

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

@@ -271,13 +271,13 @@  discard block
 
 block discarded – undo
271 271 
 		 *
272 272 
 		 * @return string
273 273 
 		 */
274 
-		public function yikes_easy_forms_admin_disclaimer( $footer_text ) {
274 
+		public function yikes_easy_forms_admin_disclaimer( $footer_text ) {
275 275 
 			$page = get_current_screen();
276 276 
 			$base = $page->base;
277 
-			if ( strpos( $base, 'yikes-inc-easy-mailchimp' ) !== false || strpos( $base, 'yikes-mailchimp' ) !== false ) {
277 
+			if ( strpos( $base, 'yikes-inc-easy-mailchimp' ) !== false || strpos( $base, 'yikes-mailchimp' ) !== false ) {
278 278 
 				$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>' );
279 279 
 				return $disclaimer_text;
280 
-			} else {
280 
+			} else {
281 281 
 				return $footer_text;
282 282 
 			}
283 283 
 		}

@@ -289,32 +289,32 @@  discard block
 
 block discarded – undo
289 289 
 		*	@since 6.0.0
290 290 
 		*	@return	parsed tag content
291 291 
 		*/
292 
-		public function parse_mailchimp_default_tag( $default_tag ) {
293 
-			if ( ! $default_tag || $default_tag == '' ) {
292 
+		public function parse_mailchimp_default_tag( $default_tag ) {
293 
+			if ( ! $default_tag || $default_tag == '' ) {
294 294 
 				return $default_tag;
295 295 
 			}
296 296 
 			global $post;
297 297 
 			// page title.
298 
-			if ( $default_tag == '{page_title}' ) {
298 
+			if ( $default_tag == '{page_title}' ) {
299 299 
 				$default_tag = get_the_title( $post->ID );
300 300 
 			}
301 301 
 			// page id.
302 
-			if ( $default_tag == '{page_id}' ) {
302 
+			if ( $default_tag == '{page_id}' ) {
303 303 
 				$default_tag = $post->ID;
304 304 
 			}
305 305 
 			// page url.
306 
-			if ( $default_tag == '{page_url}' ) {
306 
+			if ( $default_tag == '{page_url}' ) {
307 307 
 				$default_tag = get_permalink( $post->ID );
308 308 
 			}
309 309 
 			// blog name.
310 
-			if ( $default_tag == '{blog_name}' ) {
310 
+			if ( $default_tag == '{blog_name}' ) {
311 311 
 				$default_tag = get_bloginfo( 'name' );
312 312 
 			}
313 313 
 			// is user logged in.
314 
-			if ( $default_tag == '{user_logged_in}' ) {
315 
-				if ( is_user_logged_in() ) {
314 
+			if ( $default_tag == '{user_logged_in}' ) {
315 
+				if ( is_user_logged_in() ) {
316 316 
 					$default_tag = 'Registered User';
317 
-				} else {
317 
+				} else {
318 318 
 					$default_tag = 'Guest User';
319 319 
 				}
320 320 
 			}

@@ -328,21 +328,21 @@  discard block
 
 block discarded – undo
328 328 
 		*	When a user clicks 'Clear Log' on the debug settings page, this funciton
329 329 
 		*	is used to clear the data out of our php file.
330 330 
 		*/
331 
-		public function yikes_easy_mailchimp_clear_error_log() {
331 
+		public function yikes_easy_mailchimp_clear_error_log() {
332 332
333 333 
 			// Get our error log class.
334 334 
 			$error_logging = new Yikes_Inc_Easy_Mailchimp_Error_Logging();
335 335
336 336 
 			// file put contents $returned error + other data.
337 
-			if ( file_exists( $error_logging->error_log_file_path ) ) {
337 
+			if ( file_exists( $error_logging->error_log_file_path ) ) {
338 338
339 339 
 				$clear_log = file_put_contents( $error_logging->error_log_file_path, '' );
340 340
341 
-				if ( $clear_log === false ) {
341 
+				if ( $clear_log === false ) {
342 342
343 343 
 					// redirect the user to the manage forms page, display error message.
344 344 
 					wp_redirect( esc_url_raw( admin_url( 'admin.php?page=yikes-inc-easy-mailchimp-settings&section=debug-settings&error-log-cleared=false' ) ) );
345 
-				} else {
345 
+				} else {
346 346
347 347 
 					// redirect the user to the manage forms page, display confirmation.
348 348 
 					wp_redirect( esc_url_raw( admin_url( 'admin.php?page=yikes-inc-easy-mailchimp-settings&section=debug-settings&error-log-cleared=true' ) ) );

@@ -356,13 +356,13 @@  discard block
 
 block discarded – undo
356 356 
 		*	@since 		6.0.0
357 357 
 		*	@return 	CSV export file
358 358 
 		*/
359 
-		public function yikes_easy_mailchimp_export_forms() {
359 
+		public function yikes_easy_mailchimp_export_forms() {
360 360 
 			// grab our nonce.
361 361 
 			$nonce = $_REQUEST['nonce'];
362 362 
 			// grab the forms.
363 363 
 			$forms = isset( $_REQUEST['yikes_export_forms'] ) ? $_REQUEST['yikes_export_forms'] : array();
364 364 
 			// validate nonce.
365 
-			if ( ! wp_verify_nonce( $nonce, 'export-forms' ) ) {
365 
+			if ( ! wp_verify_nonce( $nonce, 'export-forms' ) ) {
366 366 
 				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 ) );
367 367 
 			}
368 368 
 

@@ -380,11 +380,11 @@  discard block
 
 block discarded – undo
380 380 
 		*	@since 		6.0.0
381 381 
 		*	@return 	CSV export file
382 382 
 		*/
383 
-		public function yikes_easy_mailchimp_export_plugin_settings() {
383 
+		public function yikes_easy_mailchimp_export_plugin_settings() {
384 384 
 			// grab our nonce
385 385 
 			$nonce = $_REQUEST['nonce'];
386 386 
 			// validate nonce.
387 
-			if ( ! wp_verify_nonce( $nonce, 'export-settings' ) ) {
387 
+			if ( ! wp_verify_nonce( $nonce, 'export-settings' ) ) {
388 388 
 				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 ) );
389 389 
 			}
390 390 
 

@@ -400,15 +400,15 @@  discard block
 
 block discarded – undo
400 400 
 		*	Custom import function to import all or specific forms
401 401 
 		*	@since 6.0.0
402 402 
 		*/
403 
-		public function yikes_easy_mailchimp_import_forms() {
403 
+		public function yikes_easy_mailchimp_import_forms() {
404 404 
 			// grab our nonce.
405 405 
 			$nonce = $_REQUEST['nonce'];
406 406 
 			// validate nonce.
407 
-			if ( ! wp_verify_nonce( $nonce, 'import-forms' ) ) {
407 
+			if ( ! wp_verify_nonce( $nonce, 'import-forms' ) ) {
408 408 
 				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 409 
 			}
410 410 
 			// include the export class.
411 
-			if ( ! class_exists( 'Yikes_Inc_Easy_Mailchimp_Import_Class' ) ) {
411 
+			if ( ! class_exists( 'Yikes_Inc_Easy_Mailchimp_Import_Class' ) ) {
412 412 
 				include_once( YIKES_MC_PATH . 'includes/import-export/yikes-easy-mailchimp-import.class.php' );
413 413 
 			}
414 414 
 			// run the import function.

@@ -424,9 +424,9 @@  discard block
 
 block discarded – undo
424 424 
 		*	Premium Support Request
425 425 
 		*	@since 6.0.0
426 426 
 		*/
427 
-		public function yikes_easy_mailchimp_premium_support_request() {
427 
+		public function yikes_easy_mailchimp_premium_support_request() {
428 428
429 
-			if ( isset( $_POST['action'] ) && $_POST['action'] != 'yikes-support-request' ) {
429 
+			if ( isset( $_POST['action'] ) && $_POST['action'] != 'yikes-support-request' ) {
430 430 
 				return __( 'We encountered an error. Please contact the YIKES Inc. support team.', 'yikes-inc-easy-mailchimp-extender' );
431 431 
 			}
432 432 
 

@@ -462,7 +462,7 @@  discard block
 
 block discarded – undo
462 462 
 			) );
463 463
464 464 
 			// Catch the error.
465 
-			if ( is_wp_error( $response ) ) {
465 
+			if ( is_wp_error( $response ) ) {
466 466 
 				wp_send_json_error( $response->getMessage() );
467 467 
 			}
468 468 
 

@@ -470,9 +470,9 @@  discard block
 
 block discarded – undo
470 470 
 			$response_body = json_decode( wp_remote_retrieve_body( $response ) );
471 471 
 		}
472 472
473 
-		public function get_premium_license( $plugin_slug ) {
473 
+		public function get_premium_license( $plugin_slug ) {
474 474
475 
-			switch( $plugin_slug ) {
475 
+			switch( $plugin_slug ) {
476 476
477 477 
 				case 'form-customizer':
478 478 
 					return defined( 'YIKES_CUSTOMIZER_EDD_ITEM_ID' ) ? YIKES_CUSTOMIZER_EDD_ITEM_ID : '';

@@ -495,8 +495,8 @@  discard block
 
 block discarded – undo
495 495 
 		 *
496 496 
 		 * @since 6.0.0
497 497 
 		 */
498 
-		public function load_error_logging_class() {
499 
-			if ( get_option( 'yikes-mailchimp-debug-status', '' ) == '1' ) {
498 
+		public function load_error_logging_class() {
499 
+			if ( get_option( 'yikes-mailchimp-debug-status', '' ) == '1' ) {
500 500 
 				// if error logging is enabled we should include our error logging class
501 501 
 				/* Generate oure error logging table */
502 502 
 				require_once YIKES_MC_PATH . '/includes/error_log/class-yikes-inc-easy-mailchimp-error-logging.php';

@@ -511,21 +511,21 @@  discard block
 
 block discarded – undo
511 511 
 		 *
512 512 
 		 * @since v6.0.0
513 513 
 		 */
514 
-		public function yikes_easy_mailchimp_check_installation_date() {
514 
+		public function yikes_easy_mailchimp_check_installation_date() {
515 515
516 516 
 			// add a new option to store the plugin activation date/time.
517 517 
 			// @since v6.0.0.
518 518 
 			// this is used to notify the user that they should review after 2 weeks.
519 
-			if ( !get_option( 'yikes_easy_mailchimp_activation_date' ) ) {
519 
+			if ( !get_option( 'yikes_easy_mailchimp_activation_date' ) ) {
520 520 
 				add_option( 'yikes_easy_mailchimp_activation_date', strtotime( "now" ) );
521 521 
 			}
522 522
523 523 
 			$stop_bugging_me = get_option( 'yikes_easy_mailchimp_review_stop_bugging_me' );
524 524
525 
-			if ( ! $stop_bugging_me ) {
525 
+			if ( ! $stop_bugging_me ) {
526 526 
 				$install_date = get_option( 'yikes_easy_mailchimp_activation_date' );
527 527 
 				$past_date = strtotime( '-14 days' );
528 
-				if ( $past_date >= $install_date && current_user_can( 'install_plugins' ) ) {
528 
+				if ( $past_date >= $install_date && current_user_can( 'install_plugins' ) ) {
529 529 
 					add_action( 'admin_notices', array( $this , 'yikes_easy_mailchimp_display_review_us_notice' ) );
530 530 
 				}
531 531 
 			}

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

@@ -582,8 +582,8 @@  discard block
 
 block discarded – undo
582 582 
 			Remove the Review us notification when user clicks 'Dismiss'
583 583 
 			@since v3.1.1
584 584 
 		*/
585 
-		public function yikes_easy_mailchimp_stop_bugging_me() {
586 
-			if ( isset( $_GET['yikes_easy_mc_icons_nobug'] ) && (int) filter_var( $_GET['yikes_easy_mc_icons_nobug'], FILTER_SANITIZE_NUMBER_INT ) === 1 ) {
585 
+		public function yikes_easy_mailchimp_stop_bugging_me() {
586 
+			if ( isset( $_GET['yikes_easy_mc_icons_nobug'] ) && (int) filter_var( $_GET['yikes_easy_mc_icons_nobug'], FILTER_SANITIZE_NUMBER_INT ) === 1 ) {
587 587 
 				add_option( 'yikes_easy_mailchimp_review_stop_bugging_me', true );
588 588 
 			}
589 589 
 		}

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

@@ -601,10 +601,10 @@  discard block
 
 block discarded – undo
601 601 
 	 * TinyMCE Functions
602 602 
 	 */
603 603 
 	// load our button and pass in the JS form data variable.
604 
-	public function add_tinyMCE_buttons() {
604 
+	public function add_tinyMCE_buttons() {
605 605 
 		global $typenow;
606 606 
 		// only on Post Type: post and page.
607 
-		if ( ! in_array( $typenow, array( 'post', 'page' ) ) ) {
607 
+		if ( ! in_array( $typenow, array( 'post', 'page' ) ) ) {
608 608 
 			return;
609 609 
 		}
610 610 
 		add_filter( 'mce_buttons', array( $this, 'yks_mc_add_tinymce_button' ) );

@@ -612,14 +612,14 @@  discard block
 
 block discarded – undo
612 612 
 	}
613 613
614 614 
 	// Add the button key for address via JS.
615 
-	public function yks_mc_add_tinymce_button( $buttons ) {
615 
+	public function yks_mc_add_tinymce_button( $buttons ) {
616 616 
 		array_push( $buttons, 'yks_mc_tinymce_button_key' );
617 617 
 		// Print all buttons.
618 618 
 		return $buttons;
619 619 
 	}
620 620
621 621 
 	// inlcude the js for tinymce.
622 
-	public function yks_mc_add_tinymce_plugin( $plugin_array ) {
622 
+	public function yks_mc_add_tinymce_plugin( $plugin_array ) {
623 623
624 624 
 		$plugin_array['yks_mc_tinymce_button'] = plugins_url( '/js/min/yikes-inc-easy-mailchimp-tinymce-button.min.js', __FILE__ );
625 625 
 

@@ -631,23 +631,23 @@  discard block
 
 block discarded – undo
631 631 
 		 * Pass our imported list data, to the JS file
632 632 
 		 * to build the drop down list in the modal
633 633 
 		 */
634 
-	public function tinymce_yikes_easy_mc() {
634 
+	public function tinymce_yikes_easy_mc() {
635 635 
 		// check capabilities.
636 
-		if ( ! current_user_can( apply_filters( 'yikes-mailchimp-user-role-access', 'manage_options' ) ) ) {
636 
+		if ( ! current_user_can( apply_filters( 'yikes-mailchimp-user-role-access', 'manage_options' ) ) ) {
637 637 
 			return;
638 638 
 		}
639 639
640 640 
 		$list_data = $this->form_interface->get_all_forms();
641 641 
 		$lists     = array();
642 
-		if ( ! empty( $list_data ) ) {
642 
+		if ( ! empty( $list_data ) ) {
643 643 
 			// build an array to pass to our javascript.
644 
-			foreach ( $list_data as $id => $form ) {
644 
+			foreach ( $list_data as $id => $form ) {
645 645 
 				$lists[] = array(
646 646 
 					'text'  => urlencode( $form['form_name'] ),
647 647 
 					'value' => $id,
648 648 
 				);
649 649 
 			}
650 
-		} else {
650 
+		} else {
651 651 
 			$lists[0] = array(
652 652 
 				'text'  => __( 'Please Import Some Mailchimp Lists', 'yikes-inc-easy-mailchimp-extender' ),
653 653 
 				'value' => '-',

@@ -672,7 +672,7 @@  discard block
 
 block discarded – undo
672 672 
 	/**
673 673 
 	 *  Fix the Mailchimp icon spacing in the admin menu.
674 674 
 	 */
675 
-	public function fix_menu_icon_spacing() {
675 
+	public function fix_menu_icon_spacing() {
676 676 
 		?>
677 677 
 			<style>
678 678 
 			a[href="admin.php?page=yikes-inc-easy-mailchimp"] .wp-menu-image img {

@@ -687,7 +687,7 @@  discard block
 
 block discarded – undo
687 687 
 	 *
688 688 
 	 * @since    6.0.0
689 689 
 	 */
690 
-	public function enqueue_styles() {
690 
+	public function enqueue_styles() {
691 691 
 		/**
692 692 
 		 *	Enqueue our global dashboard styles.
693 693 
 		 */

@@ -696,7 +696,7 @@  discard block
 
 block discarded – undo
696 696 
 		/*
697 697 
 		*	Enqueue Add-ons styles.
698 698 
 		*/
699 
-		if ( get_current_screen()->base == 'easy-forms_page_yikes-inc-easy-mailchimp-addons' ) {
699 
+		if ( get_current_screen()->base == 'easy-forms_page_yikes-inc-easy-mailchimp-addons' ) {
700 700 
 			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' );
701 701 
 		}
702 702 
 	}

@@ -705,7 +705,7 @@  discard block
 
 block discarded – undo
705 705 
 	 *
706 706 
 	 * @since    6.0.0
707 707 
 	 */
708 
-	public function enqueue_scripts() {
708 
+	public function enqueue_scripts() {
709 709 
 		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 );
710 710
711 711 
 		$localized_data = array(

@@ -720,7 +720,7 @@  discard block
 
 block discarded – undo
720 720
721 721 
 		// Enqueue required scripts for the form editor
722 722 
 		$screen = get_current_screen();
723 
-		if ( ! isset( $screen->base ) || 'admin_page_yikes-mailchimp-edit-form' !== $screen->base ) {
723 
+		if ( ! isset( $screen->base ) || 'admin_page_yikes-mailchimp-edit-form' !== $screen->base ) {
724 724 
 			return;
725 725 
 		}
726 726 
 

@@ -768,12 +768,12 @@  discard block
 
 block discarded – undo
768 768 
 	/**
769 769 
 	 * Convert the php date format string to a js date format
770 770 
 	 */
771 
-	public function yikes_jQuery_datepicker_date_format_php_to_js( $sFormat, $type ) {
772 
-		switch ( $type ) {
771 
+	public function yikes_jQuery_datepicker_date_format_php_to_js( $sFormat, $type ) {
772 
+		switch ( $type ) {
773 773 
 			default:
774 774 
 			case 'date':
775 775 
 				// Standard Date Fields
776 
-				switch ( $sFormat ) {
776 
+				switch ( $sFormat ) {
777 777 
 					//Predefined WP date formats
778 778 
 					case 'F j, Y':
779 779 
 					case 'j F Y':

@@ -796,7 +796,7 @@  discard block
 
 block discarded – undo
796 796 
 				break;
797 797 
 			// Birthday Fields
798 798 
 			case 'birthday':
799 
-				switch ( $sFormat ) {
799 
+				switch ( $sFormat ) {
800 800 
 					//Predefined WP date formats
801 801 
 					case 'F j, Y':
802 802 
 					case 'j F Y':

@@ -825,8 +825,8 @@  discard block
 
 block discarded – undo
825 825 
 	/**
826 826 
 	 * Convert the php date format string to a js date format
827 827 
 	 */
828 
-	public function yikes_jQuery_datepicker_date_format( $site_option ) {
829 
-		switch( $site_option ) {
828 
+	public function yikes_jQuery_datepicker_date_format( $site_option ) {
829 
+		switch( $site_option ) {
830 830 
 			//Predefined WP date formats
831 831 
 			default:
832 832 
 			case 'F j, Y':

@@ -846,7 +846,7 @@  discard block
 
 block discarded – undo
846 846 
 	*	Register our admin pages
847 847 
 	*	used to display data back to the user
848 848 
 	**/
849 
-	public function register_admin_pages() {
849 
+	public function register_admin_pages() {
850 850
851 851 
 		/* Top Level Menu 'Easy Mailchimp' */
852 852 
 		add_menu_page(

@@ -959,7 +959,7 @@  discard block
 
 block discarded – undo
959 959 
 	*	when they click 'Go Pro' in the admin menu
960 960 
 	*	to do: populate with sales URL
961 961 
 	*/
962 
-	public function generateAddOnsPage() {
962 
+	public function generateAddOnsPage() {
963 963 
 		require_once YIKES_MC_PATH . 'admin/partials/menu/add-ons.php'; // include our add-ons page
964 964 
 	}
965 965 
 

@@ -968,7 +968,7 @@  discard block
 
 block discarded – undo
968 968 
 	*
969 969 
 	* @since    1.0.0
970 970 
 	*/
971 
-	function generateManageFormsPage() {
971 
+	function generateManageFormsPage() {
972 972 
 		require_once YIKES_MC_PATH . 'admin/partials/menu/manage-forms.php'; // include our manage forms page
973 973 
 	}
974 974 
 

@@ -977,7 +977,7 @@  discard block
 
 block discarded – undo
977 977 
 	*
978 978 
 	* @since    1.0.0
979 979 
 	*/
980 
-	function generateManageListsPage() {
980 
+	function generateManageListsPage() {
981 981 
 		require_once YIKES_MC_PATH . 'admin/partials/menu/manage-lists.php'; // include our lists page
982 982 
 	}
983 983 
 

@@ -986,7 +986,7 @@  discard block
 
 block discarded – undo
986 986 
 	*
987 987 
 	* @since    1.0.0
988 988 
 	*/
989 
-	function generateSupportPage() {
989 
+	function generateSupportPage() {
990 990
991 991 
 		wp_enqueue_script( 'yikes-inc-easy-mailchimp-extender-support-scripts', plugin_dir_url( __FILE__ ) . 'js/support.js', array( 'jquery' ), $this->version, false );
992 992 
 		require_once YIKES_MC_PATH . 'admin/partials/menu/support.php';

@@ -997,7 +997,7 @@  discard block
 
 block discarded – undo
997 997 
 	*
998 998 
 	* @since    1.0.0
999 999 
 	*/
1000 
-	function generateEditFormPage() {
1000 
+	function generateEditFormPage() {
1001 1001 
 		require_once YIKES_MC_PATH . 'admin/partials/edit-form.php'; // include our options page
1002 1002 
 	}
1003 1003 
 

@@ -1006,7 +1006,7 @@  discard block
 
 block discarded – undo
1006 1006 
 	*
1007 1007 
 	* @since    1.0.0
1008 1008 
 	*/
1009 
-	function generateViewListPage() {
1009 
+	function generateViewListPage() {
1010 1010 
 		require_once YIKES_MC_PATH . 'admin/partials/view-list.php'; // include our options page
1011 1011 
 	}
1012 1012 
 

@@ -1015,7 +1015,7 @@  discard block
 
 block discarded – undo
1015 1015 
 	*
1016 1016 
 	* @since    1.0.0
1017 1017 
 	*/
1018 
-	function generateViewUserPage() {
1018 
+	function generateViewUserPage() {
1019 1019 
 		require_once YIKES_MC_PATH . 'admin/partials/view-user.php'; // include our options page
1020 1020 
 	}
1021 1021 
 

@@ -1024,7 +1024,7 @@  discard block
 
 block discarded – undo
1024 1024 
 	*
1025 1025 
 	* @since v.5.4
1026 1026 
 	**/
1027 
-	function yikes_easy_mc_settings_init() {
1027 
+	function yikes_easy_mc_settings_init() {
1028 1028
1029 1029 
 		/* Register General Settings Section */
1030 1030 
 

@@ -1144,27 +1144,27 @@  discard block
 
 block discarded – undo
1144 1144 
 	*	Options Sanitization & Validation
1145 1145 
 	*	@since complete re-write
1146 1146 
 	**/
1147 
-	function yikes_mc_validate_api_key( $input ) {
1148 
-		if ( $input === '' ) {
1147 
+	function yikes_mc_validate_api_key( $input ) {
1148 
+		if ( $input === '' ) {
1149 1149 
 			update_option( 'yikes-mc-api-validation', 'invalid_api_key' );
1150 1150 
 			return '';
1151 1151 
 		}
1152 1152 
 		$api_key = strip_tags ( trim( $input ) );
1153 1153 
 		$dash_position = strpos( trim( $input ), '-' );
1154 
-		if ( $dash_position !== false ) {
1154 
+		if ( $dash_position !== false ) {
1155 1155 
 			$manager = new Yikes_Inc_Easy_Mailchimp_API_Manager( $api_key );
1156 
-		} else {
1156 
+		} else {
1157 1157 
 			update_option( 'yikes-mc-api-invalid-key-response', __( 'Your API key appears to be invalid.', 'yikes-inc-easy-mailchimp-extender' ) );
1158 1158 
 			update_option( 'yikes-mc-api-validation', 'invalid_api_key' );
1159 1159 
 			return $api_key;
1160 1160 
 		}
1161 1161
1162 1162 
 		$response = $manager->get_account_handler()->get_account( false );
1163 
-		if ( ! is_wp_error( $response ) ) {
1163 
+		if ( ! is_wp_error( $response ) ) {
1164 1164 
 			update_option( 'yikes-mc-api-validation', 'valid_api_key' );
1165 1165 
 				// Clear the API key transient data
1166 1166 
 			$this->delete_yikes_mailchimp_transients();
1167 
-		}  else {
1167 
+		} else {
1168 1168 
 			$error_logging = new Yikes_Inc_Easy_Mailchimp_Error_Logging();
1169 1169 
 			$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' ) );
1170 1170 
 			update_option( 'yikes-mc-api-invalid-key-response', $response->get_error_message() );

@@ -1179,7 +1179,7 @@  discard block
 
 block discarded – undo
1179 1179 
 	*
1180 1180 
 	* @since    1.0.0
1181 1181 
 	*/
1182 
-	function generatePageOptions() {
1182 
+	function generatePageOptions() {
1183 1183 
 		require_once YIKES_MC_PATH . 'admin/partials/menu/options.php'; // include our options page
1184 1184 
 	}
1185 1185 
 

@@ -1189,15 +1189,15 @@  discard block
 
 block discarded – undo
1189 1189 
 	*	to form fields. (input, dropdowns, buttons etc.)
1190 1190 
 	* 	@since v5.5 re-write
1191 1191 
 	**/
1192 
-	public function is_user_mc_api_valid_form( $echo = true ) {
1193 
-		if ( $echo == true ) {
1194 
-			if ( get_option( 'yikes-mc-api-validation', 'invalid_api_key' ) == 'invalid_api_key' ) {
1192 
+	public function is_user_mc_api_valid_form( $echo = true ) {
1193 
+		if ( $echo == true ) {
1194 
+			if ( get_option( 'yikes-mc-api-validation', 'invalid_api_key' ) == 'invalid_api_key' ) {
1195 1195 
 				echo 'disabled="disabled"';
1196 1196 
 			}
1197 
-		} else {
1198 
-			if ( get_option( 'yikes-mc-api-validation', 'invalid_api_key' ) == 'invalid_api_key' ) {
1197 
+		} else {
1198 
+			if ( get_option( 'yikes-mc-api-validation', 'invalid_api_key' ) == 'invalid_api_key' ) {
1199 1199 
 				return false;
1200 
-			} else {
1200 
+			} else {
1201 1201 
 				return true;
1202 1202 
 			}
1203 1203 
 		}

@@ -1213,9 +1213,9 @@  discard block
 
 block discarded – undo
1213 1213 
 		*	and return the index ( used to find the list name assigned to a form )
1214 1214 
 		*	- http://stackoverflow.com/questions/6661530/php-multi-dimensional-array-search
1215 1215 
 		*/
1216 
-		function findMCListID($id, $array) {
1217 
-		   foreach ($array as $key => $val) {
1218 
-			   if ($val['id'] === $id) {
1216 
+		function findMCListID($id, $array) {
1217 
+		   foreach ($array as $key => $val) {
1218 
+			   if ($val['id'] === $id) {
1219 1219 
 				   return $key;
1220 1220 
 			   }
1221 1221 
 		   }

@@ -1227,8 +1227,8 @@  discard block
 
 block discarded – undo
1227 1227 
 		*	Render our sidebar menu on all of the setings pages (general, form, checkbox, recaptcha, popup, debug etc. )
1228 1228 
 		*	@since v5.6 - complete re-write
1229 1229 
 		*/
1230 
-		public function generate_options_pages_sidebar_menu() {
1231 
-			if ( isset( $_REQUEST['section'] ) ) {
1230 
+		public function generate_options_pages_sidebar_menu() {
1231 
+			if ( isset( $_REQUEST['section'] ) ) {
1232 1232 
 				$selected = $_REQUEST['section'];
1233 1233 
 			}
1234 1234 
 			$installed_addons = get_option( 'yikes-easy-mc-active-addons', array() );

@@ -1255,13 +1255,13 @@  discard block
 
 block discarded – undo
1255 1255 
 					</ul>
1256 1256 
 					<?php
1257 1257 
 						// create our add-on settings pages
1258 
-						if ( !empty( $installed_addons ) ) {
1258 
+						if ( !empty( $installed_addons ) ) {
1259 1259 
 							?>
1260 1260 
 							<hr class="add-on-settings-divider" />
1261 1261 
 							<strong><?php _e( 'Addon Settings', 'yikes-inc-easy-mailchimp-extender' ); ?></strong>
1262 1262 
 							<ul id="addon-settings-nav">
1263 1263 
 							<?php
1264 
-							foreach( $installed_addons as $addon_name ) {
1264 
+							foreach( $installed_addons as $addon_name ) {
1265 1265 
 								?>
1266 1266 
 									<li>
1267 1267 
 										<?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>

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

@@ -1312,18 +1312,18 @@  discard block
 
 block discarded – undo
1312 1312 
 					<label for="associated-list"><strong><?php _e( 'Associated List', 'yikes-inc-easy-mailchimp-extender' ); ?></strong>
1313 1313 
 						<select name="associated-list" id="associated-list" class=" input-field" <?php $this->is_user_mc_api_valid_form( true ); disabled( true, empty( $lists ) ); ?>>
1314 1314 
 							<?php
1315 
-							if ( ! empty( $lists ) ) {
1316 
-								foreach( $lists as $mailing_list ) {
1315 
+							if ( ! empty( $lists ) ) {
1316 
+								foreach( $lists as $mailing_list ) {
1317 1317 
 									?>
1318 1318 
 									<option value="<?php echo $mailing_list['id']; ?>"><?php echo stripslashes( $mailing_list['name'] ) . ' (' . $mailing_list['stats']['member_count'] . ') '; ?></option>
1319 1319 
 									<?php
1320 1320 
 								}
1321 
-							} else {
1322 
-								if ( get_option( 'yikes-mc-api-validation', 'invalid_api_key' ) == 'invalid_api_key' ) {
1321 
+							} else {
1322 
+								if ( get_option( 'yikes-mc-api-validation', 'invalid_api_key' ) == 'invalid_api_key' ) {
1323 1323 
 									?>
1324 1324 
 									<option><?php echo __( "Please enter a valid API key." , 'yikes-inc-easy-mailchimp-extender' ); ?></option>
1325 1325 
 									<?php
1326 
-								} else {
1326 
+								} else {
1327 1327 
 									?>
1328 1328 
 									<option><?php echo __( "No lists were found on the account." , 'yikes-inc-easy-mailchimp-extender' ); ?></option>
1329 1329 
 									<?php

@@ -1334,8 +1334,8 @@  discard block
 
 block discarded – undo
1334 1334 
 						</select>
1335 1335
1336 1336 
 						<?php
1337 
-						if ( isset( $_GET['transient-cleared'] ) ) {
1338 
-							if ( 'true' === $_GET['transient-cleared'] ) {
1337 
+						if ( isset( $_GET['transient-cleared'] ) ) {
1338 
+							if ( 'true' === $_GET['transient-cleared'] ) {
1339 1339 
 								?>
1340 1340 
 								<div class="yikes-list-refreshed-notice">
1341 1341 
 									<p><?php esc_attr_e( 'Mailchimp list data has been succesfully refreshed.', 'yikes-inc-easy-mailchimp-extender' ); ?></p>

@@ -1344,8 +1344,8 @@  discard block
 
 block discarded – undo
1344 1344 
 							}
1345 1345 
 						}
1346 1346
1347 
-						if ( isset( $lists ) && empty( $lists ) ) {
1348 
-							if ( get_option( 'yikes-mc-api-validation', 'invalid_api_key' ) != 'invalid_api_key' ) {
1347 
+						if ( isset( $lists ) && empty( $lists ) ) {
1348 
+							if ( get_option( 'yikes-mc-api-validation', 'invalid_api_key' ) != 'invalid_api_key' ) {
1349 1349 
 								?>
1350 1350 
 									<p class="description">
1351 1351 
 										<?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' ) ); ?>

@@ -1356,9 +1356,9 @@  discard block
 
 block discarded – undo
1356 1356 
 						?>
1357 1357 
 					</label>
1358 1358 
 					<?php
1359 
-						if ( $this->is_user_mc_api_valid_form( false ) ) {
1359 
+						if ( $this->is_user_mc_api_valid_form( false ) ) {
1360 1360 
 							echo submit_button( __( 'Create', 'yikes-inc-easy-mailchimp-extender' ) , 'primary', '', false , array( 'style' => 'margin:.75em 0 .5em 0;' ) );
1361 
-						} else {
1361 
+						} else {
1362 1362 
 							echo '<p class="description">' . __( "Please enter a valid Mailchimp API key to get started." , 'yikes-inc-easy-mailchimp-extender' ) . '</p>';
1363 1363 
 							?>
1364 1364 
 								<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>

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

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

@@ -1405,10 +1405,10 @@  discard block
 
 block discarded – undo
1405 1405 
 					$excluded_post_types = apply_filters( 'yikes-mailchimp-excluded-redirect-post-types', $excluded_post_types );
1406 1406
1407 1407 
 						// loop over registered post types, and query!
1408 
-						foreach( $post_types as $registered_post_type ) {
1408 
+						foreach( $post_types as $registered_post_type ) {
1409 1409
1410 1410 
 							// exclude a few built in custom post types and any defined by the filter
1411 
-							if ( ! in_array( $registered_post_type, $excluded_post_types ) ) {
1411 
+							if ( ! in_array( $registered_post_type, $excluded_post_types ) ) {
1412 1412
1413 1413 
 								// Grab only the post IDs - in the past we've created timeout issues on some servers with lots of posts
1414 1414 
 								$wp_query_args = array(

@@ -1423,11 +1423,11 @@  discard block
 
 block discarded – undo
1423 1423
1424 1424 
 								$post_ids = ! empty( $wp_query_result->posts ) ? $wp_query_result->posts : array();
1425 1425
1426 
-								if ( ! empty ( $post_ids ) ) {
1426 
+								if ( ! empty ( $post_ids ) ) {
1427 1427 
 									?>
1428 1428 
 										<optgroup label="<?php echo ucwords( str_replace( '_', ' ', $registered_post_type ) ); ?>">
1429 1429 
 									<?php
1430 
-											foreach( $post_ids as $post_id ) {
1430 
+											foreach( $post_ids as $post_id ) {
1431 1431 
 												?><option <?php selected( $redirect_page , $post_id ); ?> value="<?php echo $post_id; ?>"><?php echo get_the_title( $post_id ) ?></option><?php
1432 1432 
 											}
1433 1433 
 									?>

@@ -1458,15 +1458,15 @@  discard block
 
 block discarded – undo
1458 1458 
 		*
1459 1459 
 		* 	Displayed in sidebars
1460 1460 
 		*/
1461 
-		public function generate_show_some_love_container() {
1461 
+		public function generate_show_some_love_container() {
1462 1462 
 			// if no active add-ons are installed,
1463 1463 
 			// lets display our branding and add-on sidebar
1464 1464 
 			$options = get_option( 'yikes-easy-mc-active-addons', array() );
1465 
-			if ( empty( $options ) ) {
1465 
+			if ( empty( $options ) ) {
1466 1466
1467 1467 
 				/* On Edit Forms Page Display Upsell to Customizer */
1468 1468 
 				$screen = get_current_screen();
1469 
-				if ( isset( $screen ) && $screen->base == 'admin_page_yikes-mailchimp-edit-form' ) {
1469 
+				if ( isset( $screen ) && $screen->base == 'admin_page_yikes-mailchimp-edit-form' ) {
1470 1470 
 				?>
1471 1471
1472 1472 
 					<div class="postbox yikes-easy-mc-postbox show-some-love-container">

@@ -1544,18 +1544,18 @@  discard block
 
 block discarded – undo
1544 1544 
 		*	-
1545 1545 
 		* @parameters - $list_id - pass in the list ID to retreive merge variables from
1546 1546 
 		*/
1547 
-		public function generate_form_editor( $form_fields, $list_id, $merge_variables, $interest_groups ) {
1547 
+		public function generate_form_editor( $form_fields, $list_id, $merge_variables, $interest_groups ) {
1548 1548
1549 1549 
 			// if no list id, die!
1550 
-			if ( ! $list_id ) {
1550 
+			if ( ! $list_id ) {
1551 1551 
 				wp_die( __( "We've encountered an error. No list ID was sent." , 'yikes-inc-easy-mailchimp-extender' ) );
1552 1552 
 			}
1553 1553
1554 
-			if ( ! $merge_variables ) {
1554 
+			if ( ! $merge_variables ) {
1555 1555 
 				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' ) );
1556 1556 
 			}
1557 1557
1558 
-			if ( ! empty( $form_fields ) ) {
1558 
+			if ( ! empty( $form_fields ) ) {
1559 1559
1560 1560 
 				// find any fields that are assigned to this form, that don't exist in Mailchimp
1561 1561 
 				// or else were going to run into issues when we submit the form

@@ -1567,18 +1567,18 @@  discard block
 
 block discarded – undo
1567 1567 
 				$mailchimp_merge_field_ids	= array();
1568 1568
1569 1569 
 				// loop over merge variables
1570 
-				if ( ! empty( $merge_variables['merge_fields'] ) ) {
1570 
+				if ( ! empty( $merge_variables['merge_fields'] ) ) {
1571 1571 
 					$available_merge_variables = wp_list_pluck( $merge_variables['merge_fields'], 'tag' );
1572 1572 
 					$mailchimp_merge_field_ids = wp_list_pluck( $merge_variables['merge_fields'], 'merge_id' );
1573 1573
1574 1574 
 					// Array will look like $merge_tag => $merge_id
1575 
-					foreach( $available_merge_variables as $index => $merge_tag ) {
1575 
+					foreach( $available_merge_variables as $index => $merge_tag ) {
1576 1576 
 						$merge_field_ids[$merge_tag] = $mailchimp_merge_field_ids[$index];
1577 1577 
 					}
1578 1578 
 				}
1579 1579
1580 1580 
 				// loop over interest groups
1581 
-				if ( ! empty( $interest_groups ) ) {
1581 
+				if ( ! empty( $interest_groups ) ) {
1582 1582 
 					$available_interest_groups = array_keys( $interest_groups );
1583 1583 
 				}
1584 1584 
 

@@ -1588,9 +1588,9 @@  discard block
 
 block discarded – undo
1588 1588 
 				$excluded_fields = array_diff( $assigned_fields, $merged_fields );
1589 1589
1590 1590 
 				$i = 1;
1591 
-				foreach( $form_fields as $field ) {
1591 
+				foreach( $form_fields as $field ) {
1592 1592
1593 
-					if ( isset( $field['merge'] ) ) {
1593 
+					if ( isset( $field['merge'] ) ) {
1594 1594 
 						// @todo: don't use in_array()
1595 1595 
 						$excluded_field = in_array( $field['merge'], $excluded_fields, true );
1596 1596 
 						?>

@@ -1624,7 +1624,7 @@  discard block
 
 block discarded – undo
1624 1624 
 									<input type="hidden" class="yikes-mc-merge-field-id" name="field[<?php echo $field['merge']; ?>][id]" value="<?php echo $merge_field_ids[ $field['merge'] ] ?>" />
1625 1625 
 								<?php } ?>
1626 1626
1627 
-								<?php if ( $field['type'] == 'radio' || $field['type'] == 'dropdown' || $field['type'] == 'select' ) {
1627 
+								<?php if ( $field['type'] == 'radio' || $field['type'] == 'dropdown' || $field['type'] == 'select' ) {
1628 1628 
 									$choices = json_decode( $field['choices'], true );
1629 1629 
 								?>
1630 1630 
 									<input type="hidden" name="field[<?php echo $field['merge']; ?>][choices]" value='<?php echo esc_attr( json_encode( $choices ) ); ?>' />

@@ -1648,7 +1648,7 @@  discard block
 
 block discarded – undo
1648 1648 
 										</tr>
1649 1649
1650 1650 
 										<!-- Placeholder Value -->
1651 
-										<?php switch( $field['type'] ) {
1651 
+										<?php switch( $field['type'] ) {
1652 1652
1653 1653 
 											case 'text':
1654 1654 
 											case 'email':

@@ -1695,7 +1695,7 @@  discard block
 
 block discarded – undo
1695 1695 
 										?>
1696 1696
1697 1697 
 										<!-- Default Value -->
1698 
-										<?php switch( $field['type'] ) {
1698 
+										<?php switch( $field['type'] ) {
1699 1699 
 											default:
1700 1700 
 											case 'text':
1701 1701 
 											case 'number':

@@ -1711,7 +1711,7 @@  discard block
 
 block discarded – undo
1711 1711 
 													<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 } ?> />
1712 1712 
 													<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>
1713 1713 
 													<?php
1714 
-													switch( $field['type'] ) {
1714 
+													switch( $field['type'] ) {
1715 1715 
 														case 'text':
1716 1716 
 															?>
1717 1717 
 																<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>

@@ -1868,7 +1868,7 @@  discard block
 
 block discarded – undo
1868 1868 
 										<!-- Display Phone/Date Formats back to the user -->
1869 1869 
 										<!-- Phone Format Initial Load -->
1870 1870 
 										<?php
1871 
-											switch( $field['type'] ) {
1871 
+											switch( $field['type'] ) {
1872 1872 
 												/* Store the phone format, for properly regex pattern */
1873 1873 
 												case 'phone':
1874 1874 
 												case 'birthday':

@@ -1878,7 +1878,7 @@  discard block
 
 block discarded – undo
1878 1878 
 															<td scope="row">
1879 1879 
 																<label for="placeholder">
1880 1880 
 																	<?php
1881 
-																		switch( $field['type'] ) {
1881 
+																		switch( $field['type'] ) {
1882 1882 
 																			default:
1883 1883 
 																			case 'birthday':
1884 1884 
 																				$type = __( 'Date Format', 'yikes-inc-easy-mailchimp-extender' );

@@ -1939,7 +1939,7 @@  discard block
 
 block discarded – undo
1939 1939
1940 1940
1941 1941
1942 
-					} else {
1942 
+					} else {
1943 1943
1944 1944 
 						/**** Interest Group ****/
1945 1945 
 

@@ -1972,7 +1972,7 @@  discard block
 
 block discarded – undo
1972 1972
1973 1973 
 									<table class="form-table form-field-container">
1974 1974 
 										<!-- Default Value -->
1975 
-										<?php switch( $field['type'] ) {
1975 
+										<?php switch( $field['type'] ) {
1976 1976 
 											default:
1977 1977 
 											case 'radio':
1978 1978 
 											case 'checkboxes':

@@ -1989,7 +1989,7 @@  discard block
 
 block discarded – undo
1989 1989
1990 1990 
 														$default_shown = false;
1991 1991
1992 
-														foreach ( json_decode( $field['groups'], true ) as $id => $group ) {
1992 
+														foreach ( json_decode( $field['groups'], true ) as $id => $group ) {
1993 1993 
 															$field_id   = "{$field['group_id']}-{$id}";
1994 1994 
 															$field_type = 'hidden' == $field['type'] ? 'checkbox' : $field['type'];
1995 1995 
 															$field_type = 'checkboxes' == $field_type ? 'checkbox' : $field_type;

@@ -1998,7 +1998,7 @@  discard block
 
 block discarded – undo
1998 1998
1999 1999 
 															// Determine if the current group is checked.
2000 2000 
 															$checked = '';
2001 
-															switch ( $field_type ) {
2001 
+															switch ( $field_type ) {
2002 2002 
 																case 'radio':
2003 2003 
 																default:
2004 2004 
 																	$default = is_array( $field['default_choice'] ) ? current( $field['default_choice'] ) : $field['default_choice'];

@@ -2007,14 +2007,14 @@  discard block
 
 block discarded – undo
2007 2007
2008 2008 
 																case 'checkbox':
2009 2009 
 																case 'hidden':
2010 
-																	if ( is_array( $field['default_choice'] ) && in_array( $id, $field['default_choice'] ) ) {
2010 
+																	if ( is_array( $field['default_choice'] ) && in_array( $id, $field['default_choice'] ) ) {
2011 2011 
 																		$checked = checked( true, true, false );
2012 2012 
 																	}
2013 2013 
 																break;
2014 2014 
 															}
2015 2015
2016 2016 
 															// Allow users to not set a default choice for radio buttons.
2017 
-															if ( $field_type === 'radio' && $default_shown === false ) {
2017 
+															if ( $field_type === 'radio' && $default_shown === false ) {
2018 2018 
 																$default_shown = true;
2019 2019 
 																?>
2020 2020 
 																<label for="<?php echo $field_id . 'no-default'; ?>">

@@ -2167,7 +2167,7 @@  discard block
 
 block discarded – undo
2167 2167 
 						<?php
2168 2168 
 					}
2169 2169 
 				}
2170 
-			} else {
2170 
+			} else {
2171 2171 
 				?>
2172 2172 
 					<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>
2173 2173 
 				<?php

@@ -2254,18 +2254,18 @@  discard block
 
 block discarded – undo
2254 2254 
 		 *	-
2255 2255 
 		 * @parameters - $list_id - pass in the list ID to retreive merge variables from
2256 2256 
 		 */
2257 
-		public function build_available_merge_vars( $form_fields, $available_merge_variables ) {
2257 
+		public function build_available_merge_vars( $form_fields, $available_merge_variables ) {
2258 2258 
 			$fields_assigned_to_form = array();
2259 
-			foreach ( $form_fields as $field ) {
2260 
-				if ( isset( $field['merge'] ) ) {
2259 
+			foreach ( $form_fields as $field ) {
2260 
+				if ( isset( $field['merge'] ) ) {
2261 2261 
 					$fields_assigned_to_form[ $field['merge'] ] = true;
2262 2262 
 				}
2263 2263 
 			}
2264 2264
2265 
-			if ( ! empty( $available_merge_variables['merge_fields'] ) ) {
2265 
+			if ( ! empty( $available_merge_variables['merge_fields'] ) ) {
2266 2266 
 				?>
2267 2267 
 				<ul id="available-fields"><?php
2268 
-				foreach ( $available_merge_variables['merge_fields'] as $merge_var ) {
2268 
+				foreach ( $available_merge_variables['merge_fields'] as $merge_var ) {
2269 2269 
 					$not_available = isset( $fields_assigned_to_form[ $merge_var['tag'] ] );
2270 2270 
 					?>
2271 2271 
 					<li class="available-field <?php echo $not_available ? 'not-available' : ''; ?>"

@@ -2278,7 +2278,7 @@  discard block
 
 block discarded – undo
2278 2278 
 					>
2279 2279 
 						<?php
2280 2280 
 							echo esc_html( stripslashes( $merge_var['name'] ) );
2281 
-							if ( $merge_var['required'] ) {
2281 
+							if ( $merge_var['required'] ) {
2282 2282 
 								echo ' <span class="field-required" title="' . __( 'required field', 'yikes-inc-easy-mailchimp-extender' ) . '">*</span>';
2283 2283 
 							}
2284 2284 
 						?>

@@ -2303,21 +2303,21 @@  discard block
 
 block discarded – undo
2303 2303 
 		 *	-
2304 2304 
 		 * @parameters - $list_id - pass in the list ID to retreive merge variables from
2305 2305 
 		 */
2306 
-		public function build_available_interest_groups( $form_fields, $available_interest_groups, $list_id ) {
2306 
+		public function build_available_interest_groups( $form_fields, $available_interest_groups, $list_id ) {
2307 2307 
 			$fields_assigned_to_form = array();
2308 
-			if ( ! empty( $form_fields ) ) {
2309 
-				foreach ( $form_fields as $field ) {
2310 
-					if ( isset( $field['group_id'] ) ) {
2308 
+			if ( ! empty( $form_fields ) ) {
2309 
+				foreach ( $form_fields as $field ) {
2310 
+					if ( isset( $field['group_id'] ) ) {
2311 2311 
 						$fields_assigned_to_form[ $field['group_id'] ] = true;
2312 2312 
 					}
2313 2313 
 				}
2314 2314 
 			}
2315 2315
2316 
-			if ( ! empty( $available_interest_groups ) ) {
2316 
+			if ( ! empty( $available_interest_groups ) ) {
2317 2317 
 			?>
2318 2318 
 				<ul id="available-interest-groups">
2319 2319 
 				<?php
2320 
-					foreach ( $available_interest_groups as $interest_group ) {
2320 
+					foreach ( $available_interest_groups as $interest_group ) {
2321 2321 
 						$not_available = isset( $fields_assigned_to_form[ $interest_group['id'] ] );
2322 2322 
 						?>
2323 2323 
 						<li class="available-field <?php echo $not_available ? 'not-available' : ''; ?>" 

@@ -2348,11 +2348,11 @@  discard block
 
 block discarded – undo
2348 2348 
 		/**
2349 2349 
 		 * Smt.
2350 2350 
 		 */
2351 
-		public function build_available_tags( $form_tags, $tags, $list_id ) {
2351 
+		public function build_available_tags( $form_tags, $tags, $list_id ) {
2352 2352 
 			?>
2353 2353 
 			<ul id="available-tags">
2354 2354 
 			<?php
2355 
-			foreach ( $tags as $tag_id => $tag ) {
2355 
+			foreach ( $tags as $tag_id => $tag ) {
2356 2356 
 				$not_available = isset( $form_tags[ $tag_id ] );
2357 2357 
 				?>
2358 2358 
 				<li class="available-field <?php echo $not_available ? 'not-available' : ''; ?>"

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

@@ -2395,13 +2395,13 @@  discard block
 
 block discarded – undo
2395 2395 
 			) );
2396 2396
2397 2397 
 			// if an error occurs during the form creation process
2398 
-			if ( false == $result ) {
2398 
+			if ( false == $result ) {
2399 2399 
 				// write it to the error log
2400 2400 
 				// if the form was not created successfully
2401 2401 
 				$error_logging = new Yikes_Inc_Easy_Mailchimp_Error_Logging();
2402 2402 
 				$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' ) );
2403 2403 
 				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' ) ) ) ) );
2404 
-			} else {
2404 
+			} else {
2405 2405 
 				// redirect the user to the new form edit page
2406 2406 
 				wp_redirect( esc_url_raw( admin_url( 'admin.php?page=yikes-mailchimp-edit-form&id=' . $result) ) );
2407 2407 
 			}

@@ -2414,12 +2414,12 @@  discard block
 
 block discarded – undo
2414 2414 
 		*	and include it here for easy maintenance
2415 2415 
 		*	- must clean up db tables , ensure what data is going in and what is needed...
2416 2416 
 		*/
2417 
-		public function yikes_easy_mailchimp_delete_form() {
2417 
+		public function yikes_easy_mailchimp_delete_form() {
2418 2418 
 			// grab & store our variables ( associated list & form name )
2419 2419 
 			$nonce = $_REQUEST['nonce'];
2420 2420 
 			$post_id_to_delete = $_REQUEST['mailchimp-form'];
2421 2421 
 			// verify our nonce
2422 
-			if ( ! wp_verify_nonce( $nonce, 'delete-mailchimp-form-'.$post_id_to_delete ) ) {
2422 
+			if ( ! wp_verify_nonce( $nonce, 'delete-mailchimp-form-'.$post_id_to_delete ) ) {
2423 2423 
 				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 ) );
2424 2424 
 			}
2425 2425 
 

@@ -2434,12 +2434,12 @@  discard block
 
 block discarded – undo
2434 2434 
 		*	Duplicate an entire form !
2435 2435 
 		*	Probably Move these to its own file,
2436 2436 
 		*/
2437 
-		public function yikes_easy_mailchimp_duplicate_form() {
2437 
+		public function yikes_easy_mailchimp_duplicate_form() {
2438 2438 
 			// grab & store our variables ( associated list & form name )
2439 2439 
 			$nonce = $_REQUEST['nonce'];
2440 2440 
 			$post_id_to_clone = $_REQUEST['mailchimp-form'];
2441 2441 
 			// verify our nonce
2442 
-			if ( ! wp_verify_nonce( $nonce, 'duplicate-mailchimp-form-'.$post_id_to_clone ) ) {
2442 
+			if ( ! wp_verify_nonce( $nonce, 'duplicate-mailchimp-form-'.$post_id_to_clone ) ) {
2443 2443 
 				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 ) );
2444 2444 
 			}
2445 2445 
 

@@ -2463,10 +2463,10 @@  discard block
 
 block discarded – undo
2463 2463 
 			*/
2464 2464 
 			do_action( 'yikes-mailchimp-after-duplicating-form', $post_id_to_clone, $result, $form_data );
2465 2465
2466 
-			if ( false === $result ) {
2466 
+			if ( false === $result ) {
2467 2467 
 				// redirect the user to the manage forms page, display error
2468 2468 
 				wp_redirect( esc_url_raw( admin_url( 'admin.php?page=yikes-inc-easy-mailchimp&duplicated-form=false' ) ) );
2469 
-			} else {
2469 
+			} else {
2470 2470 
 				// redirect the user to the manage forms page, display confirmation
2471 2471 
 				wp_redirect( esc_url_raw( admin_url( 'admin.php?page=yikes-inc-easy-mailchimp&duplicated-form=true' ) ) );
2472 2472 
 			}

@@ -2477,12 +2477,12 @@  discard block
 
 block discarded – undo
2477 2477 
 		/*
2478 2478 
 		*	Reset a forms impression stats
2479 2479 
 		*/
2480 
-		public function yikes_easy_mailchimp_reset_impression_stats() {
2480 
+		public function yikes_easy_mailchimp_reset_impression_stats() {
2481 2481 
 			// grab & store our variables ( associated list & form name )
2482 2482 
 			$nonce = $_REQUEST['nonce'];
2483 2483 
 			$form_id_to_reset = $_REQUEST['mailchimp-form'];
2484 2484 
 			// verify our nonce
2485 
-			if ( ! wp_verify_nonce( $nonce, 'reset-stats-mailchimp-form-'.$form_id_to_reset ) ) {
2485 
+			if ( ! wp_verify_nonce( $nonce, 'reset-stats-mailchimp-form-'.$form_id_to_reset ) ) {
2486 2486 
 				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 ) );
2487 2487 
 			}
2488 2488 
 

@@ -2494,10 +2494,10 @@  discard block
 
 block discarded – undo
2494 2494 
 				)
2495 2495 
 			);
2496 2496
2497 
-			if ( false === $result ) {
2497 
+			if ( false === $result ) {
2498 2498 
 				// redirect the user to the manage forms page, display error
2499 2499 
 				wp_redirect( esc_url_raw( admin_url( 'admin.php?page=yikes-inc-easy-mailchimp&reset-stats=false' ) ) );
2500 
-			} else {
2500 
+			} else {
2501 2501 
 				// redirect the user to the manage forms page, display confirmation
2502 2502 
 				wp_redirect( esc_url_raw( admin_url( 'admin.php?page=yikes-inc-easy-mailchimp&reset-stats=true' ) ) );
2503 2503 
 			}

@@ -2509,13 +2509,13 @@  discard block
 
 block discarded – undo
2509 2509 
 		*	Update an entire form !
2510 2510 
 		*	Probably Move these to its own file,
2511 2511 
 		*/
2512 
-		public function yikes_easy_mailchimp_update_form() {
2512 
+		public function yikes_easy_mailchimp_update_form() {
2513 2513
2514 2514 
 			$nonce   = $_REQUEST['nonce'];
2515 2515 
 			$form_id = $_REQUEST['id'];
2516 2516
2517 2517 
 			// verify our nonce
2518 
-			if ( ! wp_verify_nonce( $nonce, 'update-mailchimp-form-' . $form_id ) ) {
2518 
+			if ( ! wp_verify_nonce( $nonce, 'update-mailchimp-form-' . $form_id ) ) {
2519 2519 
 				wp_die(
2520 2520 
 					__( "We've run into an error. The security check didn't pass. Please try again.", 'yikes-inc-easy-mailchimp-extender' ),
2521 2521 
 					__( "Failed nonce validation", 'yikes-inc-easy-mailchimp-extender' ),

@@ -2588,11 +2588,11 @@  discard block
 
 block discarded – undo
2588 2588
2589 2589 
 			// additional custom fields (extensions / user defined fields)
2590 2590 
 			$custom_fields = array();
2591 
-			if ( isset( $_POST['custom-field'] ) ) {
2592 
-				foreach ( $_POST['custom-field'] as $custom_field => $custom_value ) {
2593 
-					if ( is_array( $custom_value ) ) {
2591 
+			if ( isset( $_POST['custom-field'] ) ) {
2592 
+				foreach ( $_POST['custom-field'] as $custom_field => $custom_value ) {
2593 
+					if ( is_array( $custom_value ) ) {
2594 2594 
 						$custom_fields[ $custom_field ] = array_filter( stripslashes_deep( $custom_value ) ); // array_filters to remove empty items (don't save them!)
2595 
-					} else {
2595 
+					} else {
2596 2596 
 						$custom_fields[ $custom_field ] = stripslashes( $custom_value );
2597 2597 
 					}
2598 2598 
 				}

@@ -2628,7 +2628,7 @@  discard block
 
 block discarded – undo
2628 2628 
 			exit();
2629 2629 
 		}
2630 2630
2631 
-		public static function generate_default_email_body() {
2631 
+		public static function generate_default_email_body() {
2632 2632 
 			$email_body  = '<p>' . __( 'Greetings,', 'yikes-inc-easy-mailchimp-extender' ) . '</p>';
2633 2633
2634 2634 
 			$email_body .= '<p>';

@@ -2651,18 +2651,18 @@  discard block
 
 block discarded – undo
2651 2651 
 		}
2652 2652
2653 2653 
 		/* Unsubscribe a given user from our list */
2654 
-		public function yikes_easy_mailchimp_unsubscribe_user() {
2654 
+		public function yikes_easy_mailchimp_unsubscribe_user() {
2655 2655 
 			$nonce    = $_REQUEST['nonce'];
2656 2656 
 			$list_id  = $_REQUEST['mailchimp-list'];
2657 2657 
 			$email_id = $_REQUEST['email_id'];
2658 2658
2659 2659 
 			// verify our nonce
2660 
-			if ( ! wp_verify_nonce( $nonce, 'unsubscribe-user-' . $email_id ) ) {
2660 
+			if ( ! wp_verify_nonce( $nonce, 'unsubscribe-user-' . $email_id ) ) {
2661 2661 
 				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 ) );
2662 2662 
 			}
2663 2663
2664 2664 
 			$response = yikes_get_mc_api_manager()->get_list_handler()->member_unsubscribe( $list_id, $email_id );
2665 
-			if ( is_wp_error( $response ) ) {
2665 
+			if ( is_wp_error( $response ) ) {
2666 2666 
 				$error_logging = new Yikes_Inc_Easy_Mailchimp_Error_Logging();
2667 2667 
 				$error_logging->maybe_write_to_log(
2668 2668 
 					$response->get_error_code(),

@@ -2675,22 +2675,22 @@  discard block
 
 block discarded – undo
2675 2675 
 			exit;
2676 2676 
 		}
2677 2677
2678 
-		public function yikes_easy_mailchimp_create_missing_error_log() {
2678 
+		public function yikes_easy_mailchimp_create_missing_error_log() {
2679 2679 
 			// grab our nonnce
2680 2680 
 			$nonce = $_REQUEST['nonce'];
2681 2681 
 			// validate nonce
2682 
-			if ( !wp_verify_nonce( $nonce, 'create_error_log' ) ) {
2682 
+			if ( !wp_verify_nonce( $nonce, 'create_error_log' ) ) {
2683 2683 
 				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 ) );
2684 2684 
 			}
2685 2685 
 			// setup the path to the error log
2686 2686 
 			$error_log = fopen( plugin_dir_path( __FILE__ ) . '../includes/error_log/yikes-easy-mailchimp-error-log.php', 'w' );
2687 
-			try {
2687 
+			try {
2688 2688 
 				// create the file
2689 2689 
 				fwrite( $error_log , '' );
2690 2690 
 				// close out
2691 2691 
 				fclose( $error_log );
2692 2692 
 				wp_redirect( esc_url_raw( admin_url( 'admin.php?page=yikes-inc-easy-mailchimp-settings&section=debug-settings&error_log_created=true' ) ) );
2693 
-			} catch ( Exception $e ) {
2693 
+			} catch ( Exception $e ) {
2694 2694 
 				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() ) ) ) );
2695 2695 
 			}
2696 2696 
 		}

@@ -2699,11 +2699,11 @@  discard block
 
 block discarded – undo
2699 2699 
 		*	Clear Transient Data !
2700 2700 
 		*	Probably Move these to its own file,
2701 2701 
 		*/
2702 
-		public function yikes_easy_mailchimp_clear_transient_data() {
2702 
+		public function yikes_easy_mailchimp_clear_transient_data() {
2703 2703
2704 2704 
 			// verify our nonce
2705 2705 
 			$nonce = $_REQUEST['nonce'];
2706 
-			if ( ! wp_verify_nonce( $nonce, 'clear-mc-transient-data' ) ) {
2706 
+			if ( ! wp_verify_nonce( $nonce, 'clear-mc-transient-data' ) ) {
2707 2707 
 				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 ) );
2708 2708 
 			}
2709 2709 
 

@@ -2711,14 +2711,14 @@  discard block
 
 block discarded – undo
2711 2711
2712 2712 
 			// if the request came from the settings page, redirect to the settings page.
2713 2713 
 			$referer = wp_get_referer();
2714 
-			if ( $referer && ( strpos( $referer, 'yikes-inc-easy-mailchimp-settings' ) > 0 ) ) {
2714 
+			if ( $referer && ( strpos( $referer, 'yikes-inc-easy-mailchimp-settings' ) > 0 ) ) {
2715 2715 
 				wp_redirect( esc_url_raw( admin_url( 'admin.php?page=yikes-inc-easy-mailchimp-settings&section=api-cache-settings&transient-cleared=true' ) ) );
2716 
-			} elseif ( isset( $_REQUEST['page'] ) && $_REQUEST['page'] === 'yikes-mailchimp-edit-form' && isset( $_REQUEST['id'] ) && ! empty( $_REQUEST['id'] ) ) {
2716 
+			} elseif ( isset( $_REQUEST['page'] ) && $_REQUEST['page'] === 'yikes-mailchimp-edit-form' && isset( $_REQUEST['id'] ) && ! empty( $_REQUEST['id'] ) ) {
2717 2717
2718 2718 
 				// else check if we were editing a form.
2719 2719 
 				$id = filter_var( $_REQUEST['id'], FILTER_SANITIZE_NUMBER_INT );
2720 2720 
 				wp_redirect( esc_url_raw( admin_url( 'admin.php?page=yikes-mailchimp-edit-form&id=' . $id ) ) );
2721 
-			} else {
2721 
+			} else {
2722 2722 
 				// else redirect to the manage forms page.
2723 2723 
 				wp_redirect( esc_url_raw( admin_url( 'admin.php?page=yikes-inc-easy-mailchimp&transient-cleared=true' ) ) );
2724 2724 
 			}

@@ -2734,17 +2734,17 @@  discard block
 
 block discarded – undo
2734 2734 
 		 * @since 6.0.2
2735 2735 
 		 * @return $list_id_array - array of list id's to loop over
2736 2736 
 		 */
2737 
-		public function get_mailchimp_list_ids_on_account() {
2737 
+		public function get_mailchimp_list_ids_on_account() {
2738 2738 
 			$api_key = yikes_get_mc_api_key();
2739 
-			if ( ! $api_key ) {
2739 
+			if ( ! $api_key ) {
2740 2740 
 				// if no api key is set/site is not connected, return an empty array.
2741 2741 
 				return array();
2742 2742 
 			}
2743 2743
2744 2744 
 			$lists = get_transient( 'yikesinc_eme_list_ids' );
2745 
-			if ( false === $lists ) {
2745 
+			if ( false === $lists ) {
2746 2746 
 				$lists = yikes_get_mc_api_manager()->get_list_handler()->get_list_ids();
2747 
-				if ( is_wp_error( $lists ) ) {
2747 
+				if ( is_wp_error( $lists ) ) {
2748 2748 
 					return array();
2749 2749 
 				}
2750 2750 
 				set_transient( 'yikesinc_eme_list_ids', $lists, HOUR_IN_SECONDS );

@@ -2758,9 +2758,9 @@  discard block
 
 block discarded – undo
2758 2758 
 		 *
2759 2759 
 		 *	@since 6.0
2760 2760 
 		 */
2761 
-		public function yikes_mailchimp_load_helper_class() {
2761 
+		public function yikes_mailchimp_load_helper_class() {
2762 2762 
 			// check to see if it's already loaded up.
2763 
-			if ( !class_exists( 'Yikes_Inc_Easy_Mailchimp_Forms_Helper' ) ) {
2763 
+			if ( !class_exists( 'Yikes_Inc_Easy_Mailchimp_Forms_Helper' ) ) {
2764 2764 
 				// Include our main helper class file
2765 2765 
 				include_once( YIKES_MC_PATH . 'admin/partials/helpers/init.php' );
2766 2766 
 			}

@@ -2773,11 +2773,11 @@  discard block
 
 block discarded – undo
2773 2773 
 		 * @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)
2774 2774 
 		 * @return print out custom styles to the admin header to alter the default blue color
2775 2775 
 		 */
2776 
-		public function alter_yikes_easy_mc_color_scheme() {
2776 
+		public function alter_yikes_easy_mc_color_scheme() {
2777 2777 
 			// get the current set color scheme for the logged in user
2778 2778 
 			$current_color_scheme = get_user_option( 'admin_color' );
2779 2779 
 			// switch over each color scheme, and set our variable
2780 
-			switch ( $current_color_scheme ) {
2780 
+			switch ( $current_color_scheme ) {
2781 2781 
 				default:
2782 2782 
 				case 'fresh': // default blue (defined by this plugin)
2783 2783 
 					$main_color = '#00a0d2';

@@ -2825,16 +2825,16 @@  discard block
 
 block discarded – undo
2825 2825 
 		/**
2826 2826 
 		 *	Display premium support page if any add-ons are installed, otherwise display free support page
2827 2827 
 		 */
2828 
-		public function display_support_page_content() {
2828 
+		public function display_support_page_content() {
2829 2829
2830 2830 
 			$addons = get_option( 'yikes-easy-mc-active-addons', array() );
2831 2831
2832 2832 
 			// If we have premium add-ons...
2833 
-			if ( ! empty( $addons ) ) {
2833 
+			if ( ! empty( $addons ) ) {
2834 2834
2835 2835 
 				// Add our premium support partial.
2836 2836 
 				include_once( YIKES_MC_PATH . 'admin/partials/helpers/premium-support.php' );
2837 
-			} else {
2837 
+			} else {
2838 2838
2839 2839 
 				// Otherwise add our free support partial.
2840 2840 
 				include_once( YIKES_MC_PATH . 'admin/partials/helpers/free-support.php' );

@@ -2846,8 +2846,8 @@  discard block
 
 block discarded – undo
2846 2846 
 		 *
2847 2847 
 		 * @since 6.0.4
2848 2848 
 		 */
2849 
-		public function check_yikes_mc_table_version() {
2850 
-			if ( get_option( 'yikes_mc_database_version', '0.00' ) < '1.0' ) {
2849 
+		public function check_yikes_mc_table_version() {
2850 
+			if ( get_option( 'yikes_mc_database_version', '0.00' ) < '1.0' ) {
2851 2851 
 				require_once YIKES_MC_PATH . 'includes/class-yikes-inc-easy-mailchimp-extender-activator.php';
2852 2852 
 				global $wpdb;
2853 2853 
 				Yikes_Inc_Easy_Mailchimp_Extender_Activator::_activate_yikes_easy_mailchimp( $wpdb );

@@ -2861,7 +2861,7 @@  discard block
 
 block discarded – undo
2861 2861 
 		 *
2862 2862 
 		 * @since 6.0.4.4
2863 2863 
 		 */
2864 
-		public function process_subscriber_count_shortcode_in_form_descriptions( $form_description, $form_id ) {
2864 
+		public function process_subscriber_count_shortcode_in_form_descriptions( $form_description, $form_id ) {
2865 2865 
 			$form_description = str_replace( '[yikes-mailchimp-subscriber-count]', do_shortcode( '[yikes-mailchimp-subscriber-count form="' . $form_id . '"]' ), $form_description );
2866 2866 
 			return $form_description;
2867 2867 
 		}

@@ -2871,9 +2871,9 @@  discard block
 
 block discarded – undo
2871 2871 
 		 *
2872 2872 
 		 * @since 6.0.3
2873 2873 
 		 */
2874 
-		public function generate_edit_forms_upsell_ad() {
2874 
+		public function generate_edit_forms_upsell_ad() {
2875 2875 
 		$upsell_ads = glob( YIKES_MC_PATH . 'includes/upsells/*.php' );
2876 
-		if ( $upsell_ads && ! empty( $upsell_ads ) ) {
2876 
+		if ( $upsell_ads && ! empty( $upsell_ads ) ) {
2877 2877 
 			$ad_count = absint( count( $upsell_ads ) - 1 );
2878 2878 
 			$ad       = $upsell_ads[ mt_rand( 0, $ad_count ) ];
2879 2879 
 			ob_start();

@@ -2890,11 +2890,11 @@  discard block
 
 block discarded – undo
2890 2890 
 		 * Mainly used when the API key is altered, changed or removed.
2891 2891 
 		 * @since 6.1.3
2892 2892 
 		 */
2893 
-		public function delete_yikes_mailchimp_transients() {
2893 
+		public function delete_yikes_mailchimp_transients() {
2894 2894
2895 2895 
 		// delete all of the list_id transients.
2896 2896 
 		$list_ids = $this->get_mailchimp_list_ids_on_account();
2897 
-		foreach ( $list_ids as $id ) {
2897 
+		foreach ( $list_ids as $id ) {
2898 2898 
 			delete_transient( "yikes_eme_list_{$id}" );
2899 2899 
 			delete_transient( "yikes_eme_merge_variables_{$id}" );
2900 2900 
 			delete_transient( "yikes_eme_interest_categories_{$id}" );

@@ -2916,7 +2916,7 @@  discard block
 
 block discarded – undo
2916 2916 
 	 *
2917 2917 
 	 * @author Jeremy Pry
2918 2918 
 	 */
2919 
-	public function register_optin_widget() {
2919 
+	public function register_optin_widget() {
2920 2920 
 		register_widget( 'Yikes_Inc_Easy_Mailchimp_Extender_Widget' );
2921 2921 
 	}
2922 2922 
 }
Please login to merge, or discard this patch.