yikesinc / yikes-inc-easy-mailchimp-extender

admin/class-yikes-inc-easy-mailchimp-extender-admin.php

Spacing +335 added lines, -335 removed lines

@@ -92,7 +92,7 @@ 
 		/***********************/

 		/** Create A Form **/

 		/**********************/

-		if ( isset( $_REQUEST['action'] ) && $_REQUEST['action'] == 'yikes-easy-mc-create-form' ) {

+		if ( isset( $_REQUEST[ 'action' ] ) && $_REQUEST[ 'action' ] == 'yikes-easy-mc-create-form' ) {

 

 			add_action( 'init', array( $this, 'yikes_easy_mailchimp_create_form' ) );

 

@@ -101,7 +101,7 @@ 
 		/***********************/

 		/** Delete A Form **/

 		/**********************/

-		if ( isset( $_REQUEST['action'] ) && $_REQUEST['action'] == 'yikes-easy-mc-delete-form' ) {

+		if ( isset( $_REQUEST[ 'action' ] ) && $_REQUEST[ 'action' ] == 'yikes-easy-mc-delete-form' ) {

 

 			add_action( 'init', array( $this, 'yikes_easy_mailchimp_delete_form' ) );

 

@@ -110,7 +110,7 @@ 
 		/**********************************/

 		/** Duplicate/Clone A Form    **/

 		/********************************/

-		if ( isset( $_REQUEST['action'] ) && $_REQUEST['action'] == 'yikes-easy-mc-duplicate-form' ) {

+		if ( isset( $_REQUEST[ 'action' ] ) && $_REQUEST[ 'action' ] == 'yikes-easy-mc-duplicate-form' ) {

 

 			add_action( 'init', array( $this, 'yikes_easy_mailchimp_duplicate_form' ) );

 

@@ -119,7 +119,7 @@ 
 		/*************************************/

 		/**  Reset Form Impression Stats **/

 		/***********************************/

-		if ( isset( $_REQUEST['action'] ) && $_REQUEST['action'] == 'yikes-easy-mc-reset-stats' ) {

+		if ( isset( $_REQUEST[ 'action' ] ) && $_REQUEST[ 'action' ] == 'yikes-easy-mc-reset-stats' ) {

 

 			add_action( 'init', array( $this, 'yikes_easy_mailchimp_reset_impression_stats' ) );

 

@@ -128,7 +128,7 @@ 
 		/**********************************/

 		/**         Update A Form        **/

 		/********************************/

-		if ( isset( $_REQUEST['action'] ) && $_REQUEST['action'] == 'yikes-easy-mc-update-form' ) {

+		if ( isset( $_REQUEST[ 'action' ] ) && $_REQUEST[ 'action' ] == 'yikes-easy-mc-update-form' ) {

 

 			add_action( 'init', array( $this, 'yikes_easy_mailchimp_update_form' ) );

 

@@ -137,7 +137,7 @@ 
 		/**************************************************/

 		/**     Clear Store Mailchimp Transient Data   **/

 		/*************************************************/

-		if ( isset( $_REQUEST['action'] ) && $_REQUEST['action'] == 'yikes-easy-mc-clear-transient-data' ) {

+		if ( isset( $_REQUEST[ 'action' ] ) && $_REQUEST[ 'action' ] == 'yikes-easy-mc-clear-transient-data' ) {

 

 			add_action( 'init', array( $this, 'yikes_easy_mailchimp_clear_transient_data' ) );

 

@@ -146,7 +146,7 @@ 
 		/*******************************************/

 		/** Remove a user from a mailing list     **/

 		/*****************************************/

-		if ( isset( $_REQUEST['action'] ) && $_REQUEST['action'] == 'yikes-easy-mc-unsubscribe-user' ) {

+		if ( isset( $_REQUEST[ 'action' ] ) && $_REQUEST[ 'action' ] == 'yikes-easy-mc-unsubscribe-user' ) {

 

 			add_action( 'init', array( $this, 'yikes_easy_mailchimp_unsubscribe_user' ) );

 

@@ -155,7 +155,7 @@ 
 		/*******************************************/

 		/**    Create misisng error log file  **/

 		/*****************************************/

-		if ( isset( $_REQUEST['action'] ) && $_REQUEST['action'] == 'yikes-easy-mc-create-error-log' ) {

+		if ( isset( $_REQUEST[ 'action' ] ) && $_REQUEST[ 'action' ] == 'yikes-easy-mc-create-error-log' ) {

 

 			add_action( 'init', array( $this, 'yikes_easy_mailchimp_create_missing_error_log' ) );

 

@@ -187,7 +187,7 @@ 
 		/**************************************************/

 		/**        Clear Mailchimp Error Log Data        **/

 		/*************************************************/

-		if ( isset( $_REQUEST['action'] ) && $_REQUEST['action'] == 'yikes-easy-mc-clear-error-log' ) {

+		if ( isset( $_REQUEST[ 'action' ] ) && $_REQUEST[ 'action' ] == 'yikes-easy-mc-clear-error-log' ) {

 

 			add_action( 'init', array( $this, 'yikes_easy_mailchimp_clear_error_log' ) );

 

@@ -196,7 +196,7 @@ 
 		/*********************************************/

 		/**        Export Mailchimp Opt-in Forms   **/

 		/*******************************************/

-		if ( isset( $_REQUEST['action'] ) && $_REQUEST['action'] == 'yikes-easy-mc-export-forms' ) {

+		if ( isset( $_REQUEST[ 'action' ] ) && $_REQUEST[ 'action' ] == 'yikes-easy-mc-export-forms' ) {

 

 			add_action( 'init', array( $this, 'yikes_easy_mailchimp_export_forms' ) );

 

@@ -205,7 +205,7 @@ 
 		/*********************************************/

 		/**                Export Plugin Settings           **/

 		/*******************************************/

-		if ( isset( $_REQUEST['action'] ) && $_REQUEST['action'] == 'yikes-easy-mc-export-settings' ) {

+		if ( isset( $_REQUEST[ 'action' ] ) && $_REQUEST[ 'action' ] == 'yikes-easy-mc-export-settings' ) {

 

 			add_action( 'init', array( $this, 'yikes_easy_mailchimp_export_plugin_settings' ) );

 

@@ -214,7 +214,7 @@ 
 		/*******************************************/

 		/**        Import Class Inclusion       **/

 		/*****************************************/

-		if ( isset( $_REQUEST['action'] ) && $_REQUEST['action'] == 'yikes-easy-mc-import-forms' ) {

+		if ( isset( $_REQUEST[ 'action' ] ) && $_REQUEST[ 'action' ] == 'yikes-easy-mc-import-forms' ) {

 

 			add_action( 'init', array( $this, 'yikes_easy_mailchimp_import_forms' ) );

 

@@ -223,7 +223,7 @@ 
 		/*******************************************/

 		/**    Premium Support Request     **/

 		/*****************************************/

-		if ( isset( $_POST['submit-premium-support-request'] ) ) {

+		if ( isset( $_POST[ 'submit-premium-support-request' ] ) ) {

 

 			add_action( 'init', array( $this, 'yikes_easy_mailchimp_premium_support_request' ) );

 

@@ -256,8 +256,8 @@ 
 		 * @ return array  $links  New array of plugin actions

 		 */

 		public function easy_forms_plugin_action_links( $links ) {

-			$links[] = '<a href="'. esc_url( get_admin_url(null, 'admin.php?page=yikes-inc-easy-mailchimp-settings') ) .'">' . __( 'Settings', 'yikes-inc-easy-mailchimp-extender' ) . '</a>';

-			$links[] = '<a href="' . esc_url( 'http://www.yikesplugins.com?utm_source=plugins-page&utm_medium=plugin-row&utm_campaign=admin' ) . '" target="_blank">' . __( 'More plugins by YIKES, Inc.', 'yikes-inc-easy-mailchimp-extender' ) . '</a>';

+			$links[ ] = '<a href="' . esc_url( get_admin_url( null, 'admin.php?page=yikes-inc-easy-mailchimp-settings' ) ) . '">' . __( 'Settings', 'yikes-inc-easy-mailchimp-extender' ) . '</a>';

+			$links[ ] = '<a href="' . esc_url( 'http://www.yikesplugins.com?utm_source=plugins-page&utm_medium=plugin-row&utm_campaign=admin' ) . '" target="_blank">' . __( 'More plugins by YIKES, Inc.', 'yikes-inc-easy-mailchimp-extender' ) . '</a>';

 			return $links;

 		}

 

@@ -358,17 +358,17 @@ 
 		*/

 		public function yikes_easy_mailchimp_export_forms() {

 			// grab our nonce.

-			$nonce = $_REQUEST['nonce'];

+			$nonce = $_REQUEST[ 'nonce' ];

 			// grab the forms.

-			$forms = isset( $_REQUEST['yikes_export_forms'] ) ? $_REQUEST['yikes_export_forms'] : array();

+			$forms = isset( $_REQUEST[ 'yikes_export_forms' ] ) ? $_REQUEST[ 'yikes_export_forms' ] : array();

 			// validate nonce.

 			if ( ! wp_verify_nonce( $nonce, 'export-forms' ) ) {

-				wp_die( __( "We've run into an error. The security check didn't pass. Please try again." , 'yikes-inc-easy-mailchimp-extender' ) , __( "Failed nonce validation" , 'yikes-inc-easy-mailchimp-extender' ) , array( 'response' => 500 , 'back_link' => true ) );

+				wp_die( __( "We've run into an error. The security check didn't pass. Please try again.", 'yikes-inc-easy-mailchimp-extender' ), __( "Failed nonce validation", 'yikes-inc-easy-mailchimp-extender' ), array( 'response' => 500, 'back_link' => true ) );

 			}

 

 			// run the export function.

 			// parameters: ( $table_name, $form_ids, $file_name ).

-			Yikes_Inc_Easy_Mailchimp_Export_Class::yikes_mailchimp_form_export('Yikes-Inc-Easy-Mailchimp-Forms-Export', $forms );

+			Yikes_Inc_Easy_Mailchimp_Export_Class::yikes_mailchimp_form_export( 'Yikes-Inc-Easy-Mailchimp-Forms-Export', $forms );

 			// re-direct the user back to the page.

 			wp_redirect( esc_url_raw( admin_url( 'admin.php?page=yikes-inc-easy-mailchimp-settings&section=import-export-forms' ) ) );

 			die();

@@ -382,10 +382,10 @@ 
 		*/

 		public function yikes_easy_mailchimp_export_plugin_settings() {

 			// grab our nonce

-			$nonce = $_REQUEST['nonce'];

+			$nonce = $_REQUEST[ 'nonce' ];

 			// validate nonce.

 			if ( ! wp_verify_nonce( $nonce, 'export-settings' ) ) {

-				wp_die( __( "We've run into an error. The security check didn't pass. Please try again." , 'yikes-inc-easy-mailchimp-extender' ) , __( "Failed nonce validation" , 'yikes-inc-easy-mailchimp-extender' ) , array( 'response' => 500 , 'back_link' => true ) );

+				wp_die( __( "We've run into an error. The security check didn't pass. Please try again.", 'yikes-inc-easy-mailchimp-extender' ), __( "Failed nonce validation", 'yikes-inc-easy-mailchimp-extender' ), array( 'response' => 500, 'back_link' => true ) );

 			}

 

 			// run the export function.

@@ -402,10 +402,10 @@ 
 		*/

 		public function yikes_easy_mailchimp_import_forms() {

 			// grab our nonce.

-			$nonce = $_REQUEST['nonce'];

+			$nonce = $_REQUEST[ 'nonce' ];

 			// validate nonce.

 			if ( ! wp_verify_nonce( $nonce, 'import-forms' ) ) {

-				wp_die( __( "We've run into an error. The security check didn't pass. Please try again." , 'yikes-inc-easy-mailchimp-extender' ) , __( "Failed nonce validation" , 'yikes-inc-easy-mailchimp-extender' ) , array( 'response' => 500 , 'back_link' => true ) );

+				wp_die( __( "We've run into an error. The security check didn't pass. Please try again.", 'yikes-inc-easy-mailchimp-extender' ), __( "Failed nonce validation", 'yikes-inc-easy-mailchimp-extender' ), array( 'response' => 500, 'back_link' => true ) );

 			}

 			// include the export class.

 			if ( ! class_exists( 'Yikes_Inc_Easy_Mailchimp_Import_Class' ) ) {

@@ -426,18 +426,18 @@ 
 		*/

 		public function yikes_easy_mailchimp_premium_support_request() {

 

-			if ( isset( $_POST['action'] ) && $_POST['action'] != 'yikes-support-request' ) {

+			if ( isset( $_POST[ 'action' ] ) && $_POST[ 'action' ] != 'yikes-support-request' ) {

 				return __( 'We encountered an error. Please contact the YIKES Inc. support team.', 'yikes-inc-easy-mailchimp-extender' );

 			}

 

-			$email       = isset( $_POST['user-email'] ) ? $_POST['user-email'] : '';

-			$topic       = isset( $_POST['support-topic'] ) ? $_POST['support-topic'] : '';

-			$issue       = isset( $_POST['support-content'] ) ? $_POST['support-content'] : '';

-			$priority    = isset( $_POST['support-priority'] ) ? $_POST['support-priority'] : 1;

-			$license     = isset( $_POST['license_key'] ) ? $_POST['license_key'] : '';

-			$plugin_name = isset( $_POST['plugin-name'] ) ? $_POST['plugin-name'] : '';

-			$plugin_slug = isset( $_POST['plugin-slug'] ) ? $_POST['plugin-slug'] : '';

-			$name        = isset( $_POST['user-name'] ) ? $_POST['user-name'] : 'Mailchimp Support';

+			$email       = isset( $_POST[ 'user-email' ] ) ? $_POST[ 'user-email' ] : '';

+			$topic       = isset( $_POST[ 'support-topic' ] ) ? $_POST[ 'support-topic' ] : '';

+			$issue       = isset( $_POST[ 'support-content' ] ) ? $_POST[ 'support-content' ] : '';

+			$priority    = isset( $_POST[ 'support-priority' ] ) ? $_POST[ 'support-priority' ] : 1;

+			$license     = isset( $_POST[ 'license_key' ] ) ? $_POST[ 'license_key' ] : '';

+			$plugin_name = isset( $_POST[ 'plugin-name' ] ) ? $_POST[ 'plugin-name' ] : '';

+			$plugin_slug = isset( $_POST[ 'plugin-slug' ] ) ? $_POST[ 'plugin-slug' ] : '';

+			$name        = isset( $_POST[ 'user-name' ] ) ? $_POST[ 'user-name' ] : 'Mailchimp Support';

 

 			$edd_item_id = $this->get_premium_license( $plugin_slug );

 

@@ -472,7 +472,7 @@ 
 

 		public function get_premium_license( $plugin_slug ) {

 

-			switch( $plugin_slug ) {

+			switch ( $plugin_slug ) {

 

 				case 'form-customizer':

 					return defined( 'YIKES_CUSTOMIZER_EDD_ITEM_ID' ) ? YIKES_CUSTOMIZER_EDD_ITEM_ID : '';

@@ -516,7 +516,7 @@ 
 			// add a new option to store the plugin activation date/time.

 			// @since v6.0.0.

 			// this is used to notify the user that they should review after 2 weeks.

-			if ( !get_option( 'yikes_easy_mailchimp_activation_date' ) ) {

+			if ( ! get_option( 'yikes_easy_mailchimp_activation_date' ) ) {

 				add_option( 'yikes_easy_mailchimp_activation_date', strtotime( "now" ) );

 			}

 

@@ -526,7 +526,7 @@ 
 				$install_date = get_option( 'yikes_easy_mailchimp_activation_date' );

 				$past_date = strtotime( '-14 days' );

 				if ( $past_date >= $install_date && current_user_can( 'install_plugins' ) ) {

-					add_action( 'admin_notices', array( $this , 'yikes_easy_mailchimp_display_review_us_notice' ) );

+					add_action( 'admin_notices', array( $this, 'yikes_easy_mailchimp_display_review_us_notice' ) );

 				}

 			}

 

@@ -539,13 +539,13 @@ 
 		*/

 		public function yikes_easy_mailchimp_display_review_us_notice() {

 			/* Lets only display our admin notice on YT4WP pages to not annoy the hell out of people :) */

-			if ( in_array( get_current_screen()->base , array( 'dashboard', 'post', 'edit' ) ) || strpos( get_current_screen()->base ,'yikes-inc-easy-mailchimp') !== false ) {

+			if ( in_array( get_current_screen()->base, array( 'dashboard', 'post', 'edit' ) ) || strpos( get_current_screen()->base, 'yikes-inc-easy-mailchimp' ) !== false ) {

 

 				// The URL of the page the user is currently on 

-				$current_uri  	  = isset( $_SERVER['REQUEST_URI'] ) && ! empty( $_SERVER['REQUEST_URI'] ) ? $_SERVER['REQUEST_URI'] : false;

-				$current_host	  = isset( $_SERVER['HTTP_HOST'] ) && ! empty( $_SERVER['HTTP_HOST'] ) ? $_SERVER['HTTP_HOST'] : false;

+				$current_uri = isset( $_SERVER[ 'REQUEST_URI' ] ) && ! empty( $_SERVER[ 'REQUEST_URI' ] ) ? $_SERVER[ 'REQUEST_URI' ] : false;

+				$current_host = isset( $_SERVER[ 'HTTP_HOST' ] ) && ! empty( $_SERVER[ 'HTTP_HOST' ] ) ? $_SERVER[ 'HTTP_HOST' ] : false;

 				$current_protocol = is_ssl() === true ? 'https://' : 'http://';

-				$current_url	  = ( $current_uri !== false && $current_host !== false ) ? $current_protocol . $current_host . $current_uri : admin_url();

+				$current_url = ( $current_uri !== false && $current_host !== false ) ? $current_protocol . $current_host . $current_uri : admin_url();

 

 				$plugin_name = '<strong>Easy Forms for Mailchimp</strong>';

 				// Review URL - Change to the URL of your plugin on WordPress.org.

@@ -556,17 +556,17 @@ 
 				// Make sure all of our variables have values.

 				$reviewurl  = ( ! empty( $reviewurl ) ) ? $reviewurl : '';

 				$addons_url = ( ! empty( $addons_url ) ) ? $addons_url : '';

-				$nobugurl	= ( ! empty( $nobugurl ) ) ? $nobugurl : '';

+				$nobugurl = ( ! empty( $nobugurl ) ) ? $nobugurl : '';

 

 				$review_message = '<div id="yikes-mailchimp-logo"></div>';

 				$review_message .= sprintf( 

 					__( 'It looks like you\'ve been using %1$s for 2 weeks now. We hope you\'re enjoying the features included with the free version. If so, please consider leaving us a review. Reviews only help to catch other users attention as well as provide us with feedback to grow and improve upon. If you\'re really enjoying the plugin, consider buying an add-on or developer license for some really awesome features and premium support.', 'yikes-inc-easy-mailchimp-extender' ) 

 					. '<span class="button-container"> <a href="%2$s" target="_blank" class="button-secondary"><span class="dashicons dashicons-star-filled"></span>'

-						. __( "Leave A Review" , 'yikes-inc-easy-mailchimp-extender' ) 

+						. __( "Leave A Review", 'yikes-inc-easy-mailchimp-extender' ) 

 					. '</a> <a href="%3$s" class="button-secondary"><span class="dashicons dashicons-upload"></span>'

-						. __( "View Addons" , 'yikes-inc-easy-mailchimp-extender' ) 

+						. __( "View Addons", 'yikes-inc-easy-mailchimp-extender' ) 

 					. '</a> <a href="%4$s" class="button-secondary"><span class="dashicons dashicons-no-alt"></span>'

-						. __( "Dismiss" , 'yikes-inc-easy-mailchimp-extender' ) 

+						. __( "Dismiss", 'yikes-inc-easy-mailchimp-extender' ) 

 					. "</a> </span>", 

 				$plugin_name, $reviewurl, $addons_url, $nobugurl );

 				?>

@@ -583,7 +583,7 @@ 
 			@since v3.1.1

 		*/

 		public function yikes_easy_mailchimp_stop_bugging_me() {

-			if ( isset( $_GET['yikes_easy_mc_icons_nobug'] ) && (int) filter_var( $_GET['yikes_easy_mc_icons_nobug'], FILTER_SANITIZE_NUMBER_INT ) === 1 ) {

+			if ( isset( $_GET[ 'yikes_easy_mc_icons_nobug' ] ) && (int) filter_var( $_GET[ 'yikes_easy_mc_icons_nobug' ], FILTER_SANITIZE_NUMBER_INT ) === 1 ) {

 				add_option( 'yikes_easy_mailchimp_review_stop_bugging_me', true );

 			}

 		}

@@ -621,7 +621,7 @@ 
 	// inlcude the js for tinymce.

 	public function yks_mc_add_tinymce_plugin( $plugin_array ) {

 

-		$plugin_array['yks_mc_tinymce_button'] = plugins_url( '/js/min/yikes-inc-easy-mailchimp-tinymce-button.min.js', __FILE__ );

+		$plugin_array[ 'yks_mc_tinymce_button' ] = plugins_url( '/js/min/yikes-inc-easy-mailchimp-tinymce-button.min.js', __FILE__ );

 

 		return $plugin_array;

 	}

@@ -642,13 +642,13 @@ 
 		if ( ! empty( $list_data ) ) {

 			// build an array to pass to our javascript.

 			foreach ( $list_data as $id => $form ) {

-				$lists[] = array(

-					'text'  => urlencode( $form['form_name'] ),

+				$lists[ ] = array(

+					'text'  => urlencode( $form[ 'form_name' ] ),

 					'value' => $id,

 				);

 			}

 		} else {

-			$lists[0] = array(

+			$lists[ 0 ] = array(

 				'text'  => __( 'Please Import Some Mailchimp Lists', 'yikes-inc-easy-mailchimp-extender' ),

 				'value' => '-',

 			);

@@ -729,8 +729,8 @@ 
 

 		wp_enqueue_style( 'wp-color-picker' );

 		wp_enqueue_script( 'wp-color-picker' );

-		wp_enqueue_script( 'jquery.timepicker.js',YIKES_MC_URL . 'admin/js/jquery.timepicker.min.js', array( 'jquery' ) , $this->version, false );

-		wp_enqueue_script( 'edit-form-js', YIKES_MC_URL . 'admin/js/min/yikes-inc-easy-mailchimp-extender-edit-form.min.js', array( 'jquery.timepicker.js', 'jquery-ui-datepicker' ) , $this->version, false );

+		wp_enqueue_script( 'jquery.timepicker.js', YIKES_MC_URL . 'admin/js/jquery.timepicker.min.js', array( 'jquery' ), $this->version, false );

+		wp_enqueue_script( 'edit-form-js', YIKES_MC_URL . 'admin/js/min/yikes-inc-easy-mailchimp-extender-edit-form.min.js', array( 'jquery.timepicker.js', 'jquery-ui-datepicker' ), $this->version, false );

 

 		$localized_data = array(

 			'add_tag_nonce'                     => wp_create_nonce( 'add-tag' ),

@@ -826,7 +826,7 @@ 
 	 * Convert the php date format string to a js date format

 	 */

 	public function yikes_jQuery_datepicker_date_format( $site_option ) {

-		switch( $site_option ) {

+		switch ( $site_option ) {

 			//Predefined WP date formats

 			default:

 			case 'F j, Y':

@@ -1028,7 +1028,7 @@ 
 

 		/* Register General Settings Section */

 

-		register_setting( 'yikes_inc_easy_mc_general_settings_page', 'yikes-mc-api-key', array( $this , 'yikes_mc_validate_api_key' ) );

+		register_setting( 'yikes_inc_easy_mc_general_settings_page', 'yikes-mc-api-key', array( $this, 'yikes_mc_validate_api_key' ) );

 

 		register_setting( 'yikes_inc_easy_mc_general_settings_page', 'yikes-mailchimp-use-nonce' );

 

@@ -1073,7 +1073,7 @@ 
 		add_settings_field(

 			'optin-checkbox-init',

 			__( 'Select Checkboxes to Generate', 'yikes-inc-easy-mailchimp-extender' ),

-			'',  // callback + validation inside of admin/partials/menu/options.php

+			'', // callback + validation inside of admin/partials/menu/options.php

 			'yikes_inc_easy_mc_checkbox_settings'

 		);

 		/* End Checkbox Settings */

@@ -1095,21 +1095,21 @@ 
 			add_settings_field(

 				'yikes-mc-recaptcha-site-key',

 				__( 'Enter reCAPTCHA Site Key', 'yikes-inc-easy-mailchimp-extender' ),

-				'',  // callback + validation inside of admin/partials/menu/options.php

+				'', // callback + validation inside of admin/partials/menu/options.php

 				'yikes_easy_mc_settings_recpatcha_section'

 			);

 

 			add_settings_field(

 				'yikes-mc-recaptcha-secret-key',

 				__( 'Enter reCAPTCHA Secret Key', 'yikes-inc-easy-mailchimp-extender' ),

-				'',  // callback + validation inside of admin/partials/menu/options.php

+				'', // callback + validation inside of admin/partials/menu/options.php

 				'yikes_easy_mc_settings_recpatcha_section'

 			);

 

 			add_settings_field(

 				'yikes-mc-recaptcha-status',

 				__( 'Enable ReCaptcha', 'yikes-inc-easy-mailchimp-extender' ),

-				'',  // callback + validation inside of admin/partials/menu/options.php

+				'', // callback + validation inside of admin/partials/menu/options.php

 				'yikes_easy_mc_settings_recpatcha_section'

 			);

 

@@ -1129,7 +1129,7 @@ 
 			add_settings_field(

 				'yikes-mailchimp-debug-status',

 				__( 'Enable Debugging', 'yikes-inc-easy-mailchimp-extender' ),

-				'',  // callback + validation inside of admin/partials/menu/options.php

+				'', // callback + validation inside of admin/partials/menu/options.php

 				'yikes_easy_mc_settings_debug_section'

 			);

 

@@ -1149,7 +1149,7 @@ 
 			update_option( 'yikes-mc-api-validation', 'invalid_api_key' );

 			return '';

 		}

-		$api_key = strip_tags ( trim( $input ) );

+		$api_key = strip_tags( trim( $input ) );

 		$dash_position = strpos( trim( $input ), '-' );

 		if ( $dash_position !== false ) {

 			$manager = new Yikes_Inc_Easy_Mailchimp_API_Manager( $api_key );

@@ -1164,9 +1164,9 @@ 
 			update_option( 'yikes-mc-api-validation', 'valid_api_key' );

 				// Clear the API key transient data

 			$this->delete_yikes_mailchimp_transients();

-		}  else {

+		} else {

 			$error_logging = new Yikes_Inc_Easy_Mailchimp_Error_Logging();

-			$error_logging->yikes_easy_mailchimp_write_to_error_log( $response->get_error_message() , __( "Connecting to Mailchimp" , 'yikes-inc-easy-mailchimp-extender' ) , __( "Settings Page/General Settings" , 'yikes-inc-easy-mailchimp-extender' ) );

+			$error_logging->yikes_easy_mailchimp_write_to_error_log( $response->get_error_message(), __( "Connecting to Mailchimp", 'yikes-inc-easy-mailchimp-extender' ), __( "Settings Page/General Settings", 'yikes-inc-easy-mailchimp-extender' ) );

 			update_option( 'yikes-mc-api-invalid-key-response', $response->get_error_message() );

 			update_option( 'yikes-mc-api-validation', 'invalid_api_key' );

 		}

@@ -1213,9 +1213,9 @@ 
 		*	and return the index ( used to find the list name assigned to a form )

 		*	- http://stackoverflow.com/questions/6661530/php-multi-dimensional-array-search

 		*/

-		function findMCListID($id, $array) {

-		   foreach ($array as $key => $val) {

-			   if ($val['id'] === $id) {

+		function findMCListID( $id, $array ) {

+		   foreach ( $array as $key => $val ) {

+			   if ( $val[ 'id' ] === $id ) {

 				   return $key;

 			   }

 		   }

@@ -1228,8 +1228,8 @@ 
 		*	@since v5.6 - complete re-write

 		*/

 		public function generate_options_pages_sidebar_menu() {

-			if ( isset( $_REQUEST['section'] ) ) {

-				$selected = $_REQUEST['section'];

+			if ( isset( $_REQUEST[ 'section' ] ) ) {

+				$selected = $_REQUEST[ 'section' ];

 			}

 			$installed_addons = get_option( 'yikes-easy-mc-active-addons', array() );

 

@@ -1246,25 +1246,25 @@ 
 				<h3><span><?php _e( 'Additional Settings', 'yikes-inc-easy-mailchimp-extender' ); ?></span></h3>

 				<div class="inside">

 					<ul id="settings-nav">

-						<li><?php if ( isset( $_REQUEST['section'] ) && $_REQUEST['section'] == 'general-settings' || !isset( $_REQUEST['section'] ) ) { ?><div class="option-menu-selected-arrow"></div><?php } ?><a href="<?php echo esc_url_raw( add_query_arg( array( 'section' => 'general-settings' ) , admin_url( 'admin.php?page=yikes-inc-easy-mailchimp-settings&section=general-settings' ) ) ); ?>"><?php _e( 'General Settings', 'yikes-inc-easy-mailchimp-extender' ); ?></a></li>

-						<li><?php if ( isset( $_REQUEST['section'] ) && $_REQUEST['section'] == 'integration-settings' ) { ?><div class="option-menu-selected-arrow"></div><?php } ?><a href="<?php echo esc_url_raw( add_query_arg( array( 'section' => 'integration-settings' ) , admin_url( 'admin.php?page=yikes-inc-easy-mailchimp-settings&section=integration-settings' ) ) ); ?>"><?php _e( 'Integration Settings', 'yikes-inc-easy-mailchimp-extender' ); ?></a></li>

-						<li><?php if ( isset( $_REQUEST['section'] ) && $_REQUEST['section'] == 'recaptcha-settings' ) { ?><div class="option-menu-selected-arrow"></div><?php } ?><a href="<?php echo esc_url_raw( add_query_arg( array( 'section' => 'recaptcha-settings' ) , admin_url( 'admin.php?page=yikes-inc-easy-mailchimp-settings&section=recaptcha-settings' ) ) ); ?>"><?php _e( 'ReCaptcha Settings', 'yikes-inc-easy-mailchimp-extender' ); ?></a></li>

-						<li><?php if ( isset( $_REQUEST['section'] ) && $_REQUEST['section'] == 'api-cache-settings' ) { ?><div class="option-menu-selected-arrow"></div><?php } ?><a href="<?php echo esc_url_raw( add_query_arg( array( 'section' => 'api-cache-settings' ) , admin_url( 'admin.php?page=yikes-inc-easy-mailchimp-settings&section=api-cache-settings' ) ) ); ?>"><?php _e( 'API Cache Settings', 'yikes-inc-easy-mailchimp-extender' ); ?></a></li>

-						<li><?php if ( isset( $_REQUEST['section'] ) && $_REQUEST['section'] ==  'debug-settings' ) { ?><div class="option-menu-selected-arrow"></div><?php } ?><a href="<?php echo esc_url_raw( add_query_arg( array( 'section' => 'debug-settings' ) , admin_url( 'admin.php?page=yikes-inc-easy-mailchimp-settings&section=debug-settings' ) ) ); ?>"><?php _e( 'Debug Settings', 'yikes-inc-easy-mailchimp-extender' ); ?></a></li>

-						<li><?php if ( isset( $_REQUEST['section'] ) && $_REQUEST['section'] ==  'import-export-forms' ) { ?><div class="option-menu-selected-arrow"></div><?php } ?><a href="<?php echo esc_url_raw( add_query_arg( array( 'section' => 'import-export-forms' ) , admin_url( 'admin.php?page=yikes-inc-easy-mailchimp-settings&section=import-export-forms' ) ) ); ?>"><?php _e( 'Import/Export', 'yikes-inc-easy-mailchimp-extender' ); ?></a></li>

+						<li><?php if ( isset( $_REQUEST[ 'section' ] ) && $_REQUEST[ 'section' ] == 'general-settings' || ! isset( $_REQUEST[ 'section' ] ) ) { ?><div class="option-menu-selected-arrow"></div><?php } ?><a href="<?php echo esc_url_raw( add_query_arg( array( 'section' => 'general-settings' ), admin_url( 'admin.php?page=yikes-inc-easy-mailchimp-settings&section=general-settings' ) ) ); ?>"><?php _e( 'General Settings', 'yikes-inc-easy-mailchimp-extender' ); ?></a></li>

+						<li><?php if ( isset( $_REQUEST[ 'section' ] ) && $_REQUEST[ 'section' ] == 'integration-settings' ) { ?><div class="option-menu-selected-arrow"></div><?php } ?><a href="<?php echo esc_url_raw( add_query_arg( array( 'section' => 'integration-settings' ), admin_url( 'admin.php?page=yikes-inc-easy-mailchimp-settings&section=integration-settings' ) ) ); ?>"><?php _e( 'Integration Settings', 'yikes-inc-easy-mailchimp-extender' ); ?></a></li>

+						<li><?php if ( isset( $_REQUEST[ 'section' ] ) && $_REQUEST[ 'section' ] == 'recaptcha-settings' ) { ?><div class="option-menu-selected-arrow"></div><?php } ?><a href="<?php echo esc_url_raw( add_query_arg( array( 'section' => 'recaptcha-settings' ), admin_url( 'admin.php?page=yikes-inc-easy-mailchimp-settings&section=recaptcha-settings' ) ) ); ?>"><?php _e( 'ReCaptcha Settings', 'yikes-inc-easy-mailchimp-extender' ); ?></a></li>

+						<li><?php if ( isset( $_REQUEST[ 'section' ] ) && $_REQUEST[ 'section' ] == 'api-cache-settings' ) { ?><div class="option-menu-selected-arrow"></div><?php } ?><a href="<?php echo esc_url_raw( add_query_arg( array( 'section' => 'api-cache-settings' ), admin_url( 'admin.php?page=yikes-inc-easy-mailchimp-settings&section=api-cache-settings' ) ) ); ?>"><?php _e( 'API Cache Settings', 'yikes-inc-easy-mailchimp-extender' ); ?></a></li>

+						<li><?php if ( isset( $_REQUEST[ 'section' ] ) && $_REQUEST[ 'section' ] == 'debug-settings' ) { ?><div class="option-menu-selected-arrow"></div><?php } ?><a href="<?php echo esc_url_raw( add_query_arg( array( 'section' => 'debug-settings' ), admin_url( 'admin.php?page=yikes-inc-easy-mailchimp-settings&section=debug-settings' ) ) ); ?>"><?php _e( 'Debug Settings', 'yikes-inc-easy-mailchimp-extender' ); ?></a></li>

+						<li><?php if ( isset( $_REQUEST[ 'section' ] ) && $_REQUEST[ 'section' ] == 'import-export-forms' ) { ?><div class="option-menu-selected-arrow"></div><?php } ?><a href="<?php echo esc_url_raw( add_query_arg( array( 'section' => 'import-export-forms' ), admin_url( 'admin.php?page=yikes-inc-easy-mailchimp-settings&section=import-export-forms' ) ) ); ?>"><?php _e( 'Import/Export', 'yikes-inc-easy-mailchimp-extender' ); ?></a></li>

 					</ul>

 					<?php

 						// create our add-on settings pages

-						if ( !empty( $installed_addons ) ) {

+						if ( ! empty( $installed_addons ) ) {

 							?>

 							<hr class="add-on-settings-divider" />

 							<strong><?php _e( 'Addon Settings', 'yikes-inc-easy-mailchimp-extender' ); ?></strong>

 							<ul id="addon-settings-nav">

 							<?php

-							foreach( $installed_addons as $addon_name ) {

+							foreach ( $installed_addons as $addon_name ) {

 								?>

 									<li>

-										<?php if ( isset( $_REQUEST['section'] ) && $_REQUEST['section'] ==  $addon_name ) { ?><div class="option-menu-selected-arrow"></div><?php } ?><a href="<?php echo esc_url_raw( add_query_arg( array( 'section' => $addon_name, 'addon' => 'true' ) , admin_url( 'admin.php?page=yikes-inc-easy-mailchimp-settings&section='.$addon_name ) ) ); ?>"><?php echo ucwords( str_replace( '-', ' ', $addon_name ) ); ?></a></li>

+										<?php if ( isset( $_REQUEST[ 'section' ] ) && $_REQUEST[ 'section' ] == $addon_name ) { ?><div class="option-menu-selected-arrow"></div><?php } ?><a href="<?php echo esc_url_raw( add_query_arg( array( 'section' => $addon_name, 'addon' => 'true' ), admin_url( 'admin.php?page=yikes-inc-easy-mailchimp-settings&section=' . $addon_name ) ) ); ?>"><?php echo ucwords( str_replace( '-', ' ', $addon_name ) ); ?></a></li>

 								<?php

 							}

 							?>

@@ -1313,19 +1313,19 @@ 
 						<select name="associated-list" id="associated-list" class=" input-field" <?php $this->is_user_mc_api_valid_form( true ); disabled( true, empty( $lists ) ); ?>>

 							<?php

 							if ( ! empty( $lists ) ) {

-								foreach( $lists as $mailing_list ) {

+								foreach ( $lists as $mailing_list ) {

 									?>

-									<option value="<?php echo $mailing_list['id']; ?>"><?php echo stripslashes( $mailing_list['name'] ) . ' (' . $mailing_list['stats']['member_count'] . ') '; ?></option>

+									<option value="<?php echo $mailing_list[ 'id' ]; ?>"><?php echo stripslashes( $mailing_list[ 'name' ] ) . ' (' . $mailing_list[ 'stats' ][ 'member_count' ] . ') '; ?></option>

 									<?php

 								}

 							} else {

 								if ( get_option( 'yikes-mc-api-validation', 'invalid_api_key' ) == 'invalid_api_key' ) {

 									?>

-									<option><?php echo __( "Please enter a valid API key." , 'yikes-inc-easy-mailchimp-extender' ); ?></option>

+									<option><?php echo __( "Please enter a valid API key.", 'yikes-inc-easy-mailchimp-extender' ); ?></option>

 									<?php

 								} else {

 									?>

-									<option><?php echo __( "No lists were found on the account." , 'yikes-inc-easy-mailchimp-extender' ); ?></option>

+									<option><?php echo __( "No lists were found on the account.", 'yikes-inc-easy-mailchimp-extender' ); ?></option>

 									<?php

 

 								}

@@ -1334,8 +1334,8 @@ 
 						</select>

 

 						<?php

-						if ( isset( $_GET['transient-cleared'] ) ) {

-							if ( 'true' === $_GET['transient-cleared'] ) {

+						if ( isset( $_GET[ 'transient-cleared' ] ) ) {

+							if ( 'true' === $_GET[ 'transient-cleared' ] ) {

 								?>

 								<div class="yikes-list-refreshed-notice">

 									<p><?php esc_attr_e( 'Mailchimp list data has been succesfully refreshed.', 'yikes-inc-easy-mailchimp-extender' ); ?></p>

@@ -1348,7 +1348,7 @@ 
 							if ( get_option( 'yikes-mc-api-validation', 'invalid_api_key' ) != 'invalid_api_key' ) {

 								?>

 									<p class="description">

-										<?php printf( __( 'Head over to <a href="http://www.Mailchimp.com" title="%s">Mailchimp</a> to create a new list.', 'yikes-inc-easy-mailchimp-extender' ) , __( 'Create a list', 'yikes-inc-easy-mailchimp-extender' ) ); ?>

+										<?php printf( __( 'Head over to <a href="http://www.Mailchimp.com" title="%s">Mailchimp</a> to create a new list.', 'yikes-inc-easy-mailchimp-extender' ), __( 'Create a list', 'yikes-inc-easy-mailchimp-extender' ) ); ?>

 									</p>

 								<?php

 							}

@@ -1357,9 +1357,9 @@ 
 					</label>

 					<?php

 						if ( $this->is_user_mc_api_valid_form( false ) ) {

-							echo submit_button( __( 'Create', 'yikes-inc-easy-mailchimp-extender' ) , 'primary', '', false , array( 'style' => 'margin:.75em 0 .5em 0;' ) );

+							echo submit_button( __( 'Create', 'yikes-inc-easy-mailchimp-extender' ), 'primary', '', false, array( 'style' => 'margin:.75em 0 .5em 0;' ) );

 						} else {

-							echo '<p class="description">' . __( "Please enter a valid Mailchimp API key to get started." , 'yikes-inc-easy-mailchimp-extender' ) . '</p>';

+							echo '<p class="description">' . __( "Please enter a valid Mailchimp API key to get started.", 'yikes-inc-easy-mailchimp-extender' ) . '</p>';

 							?>

 								<a href="<?php echo esc_url_raw( admin_url( 'admin.php?page=yikes-inc-easy-mailchimp-settings&settings-updated=true' ) ); ?>"><?php _e( 'general settings', 'yikes-inc-easy-mailchimp-extender' ); ?></a>

 							<?php

@@ -1389,7 +1389,7 @@ 
 				$post_types = get_post_types();

 				?>

 				<label id="redirect-user-to-selection-label" for="redirect-user-to-selection" class="<?php if ( $redirect == '0' ) { echo 'yikes-easy-mc-hidden'; } ?>">

-					<?php _e( "Select A Page or Post" , 'yikes-inc-easy-mailchimp-extender' ); ?>

+					<?php _e( "Select A Page or Post", 'yikes-inc-easy-mailchimp-extender' ); ?>

 					<select id="redirect-user-to-selection" name="redirect-user-to-selection" onchange="shouldWeDisplayCustomURL( this );return;">

 				<?php

 

@@ -1405,7 +1405,7 @@ 
 					$excluded_post_types = apply_filters( 'yikes-mailchimp-excluded-redirect-post-types', $excluded_post_types );

 

 						// loop over registered post types, and query!

-						foreach( $post_types as $registered_post_type ) {

+						foreach ( $post_types as $registered_post_type ) {

 

 							// exclude a few built in custom post types and any defined by the filter

 							if ( ! in_array( $registered_post_type, $excluded_post_types ) ) {

@@ -1427,8 +1427,8 @@ 
 									?>

 										<optgroup label="<?php echo ucwords( str_replace( '_', ' ', $registered_post_type ) ); ?>">

 									<?php

-											foreach( $post_ids as $post_id ) {

-												?><option <?php selected( $redirect_page , $post_id ); ?> value="<?php echo $post_id; ?>"><?php echo get_the_title( $post_id ) ?></option><?php

+											foreach ( $post_ids as $post_id ) {

+												?><option <?php selected( $redirect_page, $post_id ); ?> value="<?php echo $post_id; ?>"><?php echo get_the_title( $post_id ) ?></option><?php

 											}

 									?>

 										</optgroup>

@@ -1444,7 +1444,7 @@ 
 					</select>

 

 					<label name="custom-redirect-url" class="custom_redirect_url_label" <?php if ( ! isset( $redirect_page ) || $redirect_page != 'custom_url' ) { echo 'style="display:none;"'; } ?>>

-						<?php _e( "Enter Custom URL" , 'yikes-inc-easy-mailchimp-extender' ); ?>

+						<?php _e( "Enter Custom URL", 'yikes-inc-easy-mailchimp-extender' ); ?>

 						<input type="text" class="widefat custom-redirect-url" name="custom-redirect-url" value="<?php echo $custom_redirect_url; ?>" />

 					</label>

 

@@ -1503,7 +1503,7 @@ 
 							</p>

 						</div>

 

-						<p class="description sidebar-footer-text"><?php printf( __( "This plugin made with %s by %s" , 'yikes-inc-easy-mailchimp-extender' ), '<span class="dashicons dashicons-heart yikes-love"></span>', '<a href="http://www.yikesinc.com" target="_blank" title="YIKES Inc.">YIKES Inc.</a>' ); ?> </p>

+						<p class="description sidebar-footer-text"><?php printf( __( "This plugin made with %s by %s", 'yikes-inc-easy-mailchimp-extender' ), '<span class="dashicons dashicons-heart yikes-love"></span>', '<a href="http://www.yikesinc.com" target="_blank" title="YIKES Inc.">YIKES Inc.</a>' ); ?> </p>

 

 						<section id="about-yikes-inc" class="inside">

 							<a href="https://www.yikesinc.com" target="_blank" title="YIKES Inc.">

@@ -1521,7 +1521,7 @@ 
 						<!-- review us container -->

 						<h3><?php _e( 'Easy Forms for Mailchimp Add-Ons', 'yikes-inc-easy-mailchimp-extender' ); ?></h3>

 						<div id="review-yikes-easy-mc" class="inside">

-							<p><?php _e( "Check out available add-ons for some seriously enhanced features." , 'yikes-inc-easy-mailchimp-extender' ); ?></p>

+							<p><?php _e( "Check out available add-ons for some seriously enhanced features.", 'yikes-inc-easy-mailchimp-extender' ); ?></p>

 							<p><a class="button-secondary" href="<?php echo esc_url_raw( admin_url( 'admin.php?page=yikes-inc-easy-mailchimp-addons' ) ); ?>" title="<?php _e( 'View Add-Ons', 'yikes-inc-easy-mailchimp-extender' ); ?>"><?php _e( 'View Add-Ons', 'yikes-inc-easy-mailchimp-extender' ); ?></a></p>

 						</div>

 

@@ -1548,11 +1548,11 @@ 
 

 			// if no list id, die!

 			if ( ! $list_id ) {

-				wp_die( __( "We've encountered an error. No list ID was sent." , 'yikes-inc-easy-mailchimp-extender' ) );

+				wp_die( __( "We've encountered an error. No list ID was sent.", 'yikes-inc-easy-mailchimp-extender' ) );

 			}

 

 			if ( ! $merge_variables ) {

-				wp_die( __( "We've encountered an error. Reload the page and try again. If the error persists, please reach out to support." , 'yikes-inc-easy-mailchimp-extender' ) );

+				wp_die( __( "We've encountered an error. Reload the page and try again. If the error persists, please reach out to support.", 'yikes-inc-easy-mailchimp-extender' ) );

 			}

 

 			if ( ! empty( $form_fields ) ) {

@@ -1563,17 +1563,17 @@ 
 				$available_interest_groups	= array();

 

 				// Default variables as arrays - these are used for holding the Mailchimp merge field ID

-				$merge_field_ids			= array();

-				$mailchimp_merge_field_ids	= array();

+				$merge_field_ids = array();

+				$mailchimp_merge_field_ids = array();

 

 				// loop over merge variables

-				if ( ! empty( $merge_variables['merge_fields'] ) ) {

-					$available_merge_variables = wp_list_pluck( $merge_variables['merge_fields'], 'tag' );

-					$mailchimp_merge_field_ids = wp_list_pluck( $merge_variables['merge_fields'], 'merge_id' );

+				if ( ! empty( $merge_variables[ 'merge_fields' ] ) ) {

+					$available_merge_variables = wp_list_pluck( $merge_variables[ 'merge_fields' ], 'tag' );

+					$mailchimp_merge_field_ids = wp_list_pluck( $merge_variables[ 'merge_fields' ], 'merge_id' );

 					

 					// Array will look like $merge_tag => $merge_id

-					foreach( $available_merge_variables as $index => $merge_tag ) { 

-						$merge_field_ids[$merge_tag] = $mailchimp_merge_field_ids[$index];

+					foreach ( $available_merge_variables as $index => $merge_tag ) { 

+						$merge_field_ids[ $merge_tag ] = $mailchimp_merge_field_ids[ $index ];

 					}

 				}

 

@@ -1588,46 +1588,46 @@ 
 				$excluded_fields = array_diff( $assigned_fields, $merged_fields );

 

 				$i = 1;

-				foreach( $form_fields as $field ) {

+				foreach ( $form_fields as $field ) {

 

-					if ( isset( $field['merge'] ) ) {

+					if ( isset( $field[ 'merge' ] ) ) {

 						// @todo: don't use in_array()

-						$excluded_field = in_array( $field['merge'], $excluded_fields, true );

+						$excluded_field = in_array( $field[ 'merge' ], $excluded_fields, true );

 						?>

-						<section class="draggable" id="<?php echo $field['merge']; ?>">

+						<section class="draggable" id="<?php echo $field[ 'merge' ]; ?>">

 							<!-- top -->

 							<a class="expansion-section-title settings-sidebar">

 								<span class="dashicons dashicons-plus yikes-mc-expansion-toggle"></span>

-								<span class="yikes-mc-expansion-section-field-label"> <?php echo stripslashes( $field['label'] ); ?> </span>

+								<span class="yikes-mc-expansion-section-field-label"> <?php echo stripslashes( $field[ 'label' ] ); ?> </span>

 								<?php if ( $excluded_field ) { ?>

 									<img src="<?php echo YIKES_MC_URL . 'includes/images/warning.svg'; ?>" class="field-doesnt-exist-notice" title="<?php _e( 'Field no longer exists.', 'yikes-inc-easy-mailchimp-extender' ); ?>" alt="<?php _e( 'Field no longer exists.', 'yikes-inc-easy-mailchimp-extender' ); ?>">

 								<?php } ?>

-								<input maxlength="50" type="text" class="yikes-mc-edit-field-label-input" value="<?php echo stripslashes( $field['label'] ); ?>" />

+								<input maxlength="50" type="text" class="yikes-mc-edit-field-label-input" value="<?php echo stripslashes( $field[ 'label' ] ); ?>" />

 								<span class="dashicons dashicons-yes yikes-mc-save-field-label-edits-icon" title="<?php _e( 'Click to save changes.', 'yikes-inc-easy-mailchimp-extender' ); ?>"></span>

 								<span class="dashicons dashicons-edit yikes-mc-edit-field-label-icon" title="<?php _e( 'Click to edit the label', 'yikes-inc-easy-mailchimp-extender' ); ?>"></span>

 								<span class="yikes-mc-edit-field-label-message"></span>

-								<span class="field-type-text"><small><?php echo __( 'type', 'yikes-inc-easy-mailchimp-extender' ) . ' : ' . $field['type']; ?></small></span>

+								<span class="field-type-text"><small><?php echo __( 'type', 'yikes-inc-easy-mailchimp-extender' ) . ' : ' . $field[ 'type' ]; ?></small></span>

 							</a>

 							<!-- expansion section -->

 							<div class="yikes-mc-settings-expansion-section">

 

 								<?php if ( $excluded_field ) { ?>

-									<p class="yikes-mc-warning-message"><?php _e( "This field no longer exists in this list. Delete this field from the form to prevent issues on your website." , 'yikes-inc-easy-mailchimp-extender' ); ?></p>

+									<p class="yikes-mc-warning-message"><?php _e( "This field no longer exists in this list. Delete this field from the form to prevent issues on your website.", 'yikes-inc-easy-mailchimp-extender' ); ?></p>

 								<?php } ?>

 

 								<!-- store field data -->

-								<input type="hidden" class="yikes-mc-merge-field-label" name="field[<?php echo $field['merge']; ?>][label]" value="<?php echo htmlspecialchars( $field['label'] ); ?>" />

-								<input type="hidden" class="yikes-mc-merge-field-type" name="field[<?php echo $field['merge']; ?>][type]" value="<?php echo $field['type']; ?>" />

-								<input type="hidden" class="yikes-mc-merge-field-tag" name="field[<?php echo $field['merge']; ?>][merge]" value="<?php echo $field['merge']; ?>" />

-								<input type="hidden" class="field-<?php echo $field['merge']; ?>-position position-input" name="field[<?php echo $field['merge']; ?>][position]" value="<?php echo $i++; ?>" />

-								<?php if ( isset( $merge_field_ids[ $field['merge'] ] ) && is_int( $merge_field_ids[ $field['merge'] ] ) ) { ?> 

-									<input type="hidden" class="yikes-mc-merge-field-id" name="field[<?php echo $field['merge']; ?>][id]" value="<?php echo $merge_field_ids[ $field['merge'] ] ?>" />  

+								<input type="hidden" class="yikes-mc-merge-field-label" name="field[<?php echo $field[ 'merge' ]; ?>][label]" value="<?php echo htmlspecialchars( $field[ 'label' ] ); ?>" />

+								<input type="hidden" class="yikes-mc-merge-field-type" name="field[<?php echo $field[ 'merge' ]; ?>][type]" value="<?php echo $field[ 'type' ]; ?>" />

+								<input type="hidden" class="yikes-mc-merge-field-tag" name="field[<?php echo $field[ 'merge' ]; ?>][merge]" value="<?php echo $field[ 'merge' ]; ?>" />

+								<input type="hidden" class="field-<?php echo $field[ 'merge' ]; ?>-position position-input" name="field[<?php echo $field[ 'merge' ]; ?>][position]" value="<?php echo $i++; ?>" />

+								<?php if ( isset( $merge_field_ids[ $field[ 'merge' ] ] ) && is_int( $merge_field_ids[ $field[ 'merge' ] ] ) ) { ?> 

+									<input type="hidden" class="yikes-mc-merge-field-id" name="field[<?php echo $field[ 'merge' ]; ?>][id]" value="<?php echo $merge_field_ids[ $field[ 'merge' ] ] ?>" />  

 								<?php } ?>

 

-								<?php if ( $field['type'] == 'radio' || $field['type'] == 'dropdown' || $field['type'] == 'select' ) {

-									$choices = json_decode( $field['choices'], true );

+								<?php if ( $field[ 'type' ] == 'radio' || $field[ 'type' ] == 'dropdown' || $field[ 'type' ] == 'select' ) {

+									$choices = json_decode( $field[ 'choices' ], true );

 								?>

-									<input type="hidden" name="field[<?php echo $field['merge']; ?>][choices]" value='<?php echo esc_attr( json_encode( $choices ) ); ?>' />

+									<input type="hidden" name="field[<?php echo $field[ 'merge' ]; ?>][choices]" value='<?php echo esc_attr( json_encode( $choices ) ); ?>' />

 								<?php } ?>

 

 								<!-- Single or Double Opt-in -->

@@ -1643,12 +1643,12 @@ 
 												</label>

 											</td>

 											<td>

-												<input class="widefat merge-tag-text" type="text" readonly value="<?php echo $field['merge']; ?>">

+												<input class="widefat merge-tag-text" type="text" readonly value="<?php echo $field[ 'merge' ]; ?>">

 											</td>

 										</tr>

 

 										<!-- Placeholder Value -->

-										<?php switch( $field['type'] ) {

+										<?php switch ( $field[ 'type' ] ) {

 

 											case 'text':

 											case 'email':

@@ -1662,13 +1662,13 @@ 
 										<!-- Placeholder -->

 										<tr valign="top">

 											<td scope="row">

-												<label for="placeholder_<?php echo esc_attr( $field['merge'] ); ?>">

+												<label for="placeholder_<?php echo esc_attr( $field[ 'merge' ] ); ?>">

 													<?php _e( 'Placeholder', 'yikes-inc-easy-mailchimp-extender' ); ?>

 												</label>

 											</td>

 											<td>

-												<input type="text" id="placeholder_<?php echo esc_attr( $field['merge'] ); ?>" class="widefat" name="field[<?php echo $field['merge']; ?>][placeholder]" value="<?php echo isset( $field['placeholder'] ) ? $field['placeholder'] : '' ; ?>" />

-												<p class="description"><small><?php _e( "Assign a placeholder value to this field.", 'yikes-inc-easy-mailchimp-extender' );?></small></p>

+												<input type="text" id="placeholder_<?php echo esc_attr( $field[ 'merge' ] ); ?>" class="widefat" name="field[<?php echo $field[ 'merge' ]; ?>][placeholder]" value="<?php echo isset( $field[ 'placeholder' ] ) ? $field[ 'placeholder' ] : ''; ?>" />

+												<p class="description"><small><?php _e( "Assign a placeholder value to this field.", 'yikes-inc-easy-mailchimp-extender' ); ?></small></p>

 											</td>

 										</tr>

 										<?php

@@ -1679,13 +1679,13 @@ 
 											?>

 												<tr valign="top">

 													<td scope="row">

-														<label for="placeholder_<?php echo esc_attr( $field['merge'] ); ?>">

+														<label for="placeholder_<?php echo esc_attr( $field[ 'merge' ] ); ?>">

 															<?php _e( 'Placeholder', 'yikes-inc-easy-mailchimp-extender' ); ?>

 														</label>

 													</td>

 													<td>

-														<input type="checkbox" id="placeholder_<?php echo esc_attr( $field['merge'] ); ?>" class="widefat" name="field[<?php echo $field['merge']; ?>][placeholder]" value="1" <?php echo isset( $field['placeholder'] ) && ! empty( $field['placeholder'] ) ? 'checked="checked"' : '' ; ?> />

-														<span class="description"><small><?php _e( "Use placeholders for this field (these will be automatically filled in with field names).", 'yikes-inc-easy-mailchimp-extender' );?></small></span>

+														<input type="checkbox" id="placeholder_<?php echo esc_attr( $field[ 'merge' ] ); ?>" class="widefat" name="field[<?php echo $field[ 'merge' ]; ?>][placeholder]" value="1" <?php echo isset( $field[ 'placeholder' ] ) && ! empty( $field[ 'placeholder' ] ) ? 'checked="checked"' : ''; ?> />

+														<span class="description"><small><?php _e( "Use placeholders for this field (these will be automatically filled in with field names).", 'yikes-inc-easy-mailchimp-extender' ); ?></small></span>

 													</td>

 												</tr>

 											<?php

@@ -1695,7 +1695,7 @@ 
 										?>

 

 										<!-- Default Value -->

-										<?php switch( $field['type'] ) {

+										<?php switch ( $field[ 'type' ] ) {

 											default:

 											case 'text':

 											case 'number':

@@ -1703,15 +1703,15 @@ 
 										?>

 											<tr valign="top">

 												<td scope="row">

-													<label for="default_value_<?php echo esc_attr( $field['merge'] ); ?>">

+													<label for="default_value_<?php echo esc_attr( $field[ 'merge' ] ); ?>">

 														<?php _e( 'Default Value', 'yikes-inc-easy-mailchimp-extender' ); ?>

 													</label>

 												</td>

 												<td>

-													<input id="default_value_<?php echo esc_attr( $field['merge'] ); ?>" <?php if ( $field['type'] != 'number' ) { ?> type="text" <?php } else { ?> type="number" <?php } ?> class="widefat" name="field[<?php echo $field['merge']; ?>][default]" <?php if ( $field['type'] != 'url' ) { ?> value="<?php echo isset( $field['default'] ) ? stripslashes( wp_strip_all_tags( $field['default'] ) ) : ''; ?>" <?php } else { ?> value="<?php echo isset( $field['default'] ) ? stripslashes( wp_strip_all_tags( esc_url_raw( $field['default'] ) ) ) : ''; ?>" <?php } ?> />

-													<p class="description"><small><?php _e( "Assign a default value to populate this field with on initial page load.", 'yikes-inc-easy-mailchimp-extender' );?></small></p>

+													<input id="default_value_<?php echo esc_attr( $field[ 'merge' ] ); ?>" <?php if ( $field[ 'type' ] != 'number' ) { ?> type="text" <?php } else { ?> type="number" <?php } ?> class="widefat" name="field[<?php echo $field[ 'merge' ]; ?>][default]" <?php if ( $field[ 'type' ] != 'url' ) { ?> value="<?php echo isset( $field[ 'default' ] ) ? stripslashes( wp_strip_all_tags( $field[ 'default' ] ) ) : ''; ?>" <?php } else { ?> value="<?php echo isset( $field[ 'default' ] ) ? stripslashes( wp_strip_all_tags( esc_url_raw( $field[ 'default' ] ) ) ) : ''; ?>" <?php } ?> />

+													<p class="description"><small><?php _e( "Assign a default value to populate this field with on initial page load.", 'yikes-inc-easy-mailchimp-extender' ); ?></small></p>

 													<?php

-													switch( $field['type'] ) {

+													switch ( $field[ 'type' ] ) {

 														case 'text':

 															?>

 																<p><small class="pre-defined-tag-link"><a href="#TB_inline?width=600&height=550&inlineId=pre-defined-tag-container" onclick="storeGlobalClicked( jQuery( this ) );" class="thickbox"><?php _e( 'View Pre-Defined Tags', 'yikes-inc-easy-mailchimp-extender' ); ?></a></small></p>

@@ -1733,28 +1733,28 @@ 
 													</td>

 													<td>

 														<?php

-															$field['default_choice'] = ! isset( $field['default_choice'] ) ? 'no-default' : $field['default_choice'];

+															$field[ 'default_choice' ] = ! isset( $field[ 'default_choice' ] ) ? 'no-default' : $field[ 'default_choice' ];

 															$x = 0;

 														?>

-														<label for="<?php echo $field['merge'] . '-no-default'; ?>">

-															<input id="<?php echo $field['merge'] . '-no-default'; ?>"

+														<label for="<?php echo $field[ 'merge' ] . '-no-default'; ?>">

+															<input id="<?php echo $field[ 'merge' ] . '-no-default'; ?>"

 															       type="radio"

-															       name="field[<?php echo $field['merge']; ?>][default_choice]"

-															       value="no-default" <?php checked( $field['default_choice'], 'no-default' ); ?>

+															       name="field[<?php echo $field[ 'merge' ]; ?>][default_choice]"

+															       value="no-default" <?php checked( $field[ 'default_choice' ], 'no-default' ); ?>

 															>

 															No Default&nbsp;

 														</label>

 														<?php

 														foreach ( $choices as $choice => $value ) { ?>

-															<label for="<?php echo $field['merge'].'-'.$x; ?>">

-																<input id="<?php echo $field['merge'].'-'.$x; ?>"

+															<label for="<?php echo $field[ 'merge' ] . '-' . $x; ?>">

+																<input id="<?php echo $field[ 'merge' ] . '-' . $x; ?>"

 																       type="radio"

-																       name="field[<?php echo $field['merge']; ?>][default_choice]"

-																       value="<?php echo $x; ?>" <?php checked( $field['default_choice'], $x ); ?>>

+																       name="field[<?php echo $field[ 'merge' ]; ?>][default_choice]"

+																       value="<?php echo $x; ?>" <?php checked( $field[ 'default_choice' ], $x ); ?>>

 																<?php echo $value; ?>&nbsp;

 															</label>

 														<?php $x++; } ?>

-														<p class="description"><small><?php _e( "Select the option that should be selected by default.", 'yikes-inc-easy-mailchimp-extender' );?></small></p>

+														<p class="description"><small><?php _e( "Select the option that should be selected by default.", 'yikes-inc-easy-mailchimp-extender' ); ?></small></p>

 													</td>

 												</tr>

 

@@ -1770,13 +1770,13 @@ 
 														</label>

 													</td>

 													<td>

-														<select type="default" name="field[<?php echo $field['merge']; ?>][default_choice]">

-															<option value="no-default" <?php selected( $field['default_choice'] , 'no-default' ); ?>>No Default</option>

-															<?php foreach( json_decode( $field['choices'], true ) as $choice => $value ) { ?>

-																<option value="<?php echo $choice; ?>" <?php selected( $field['default_choice'] , $choice ); ?>><?php echo $value; ?></option>

+														<select type="default" name="field[<?php echo $field[ 'merge' ]; ?>][default_choice]">

+															<option value="no-default" <?php selected( $field[ 'default_choice' ], 'no-default' ); ?>>No Default</option>

+															<?php foreach ( json_decode( $field[ 'choices' ], true ) as $choice => $value ) { ?>

+																<option value="<?php echo $choice; ?>" <?php selected( $field[ 'default_choice' ], $choice ); ?>><?php echo $value; ?></option>

 															<?php } ?>

 														</select>

-														<p class="description"><small><?php _e( "Which option should be selected by default?", 'yikes-inc-easy-mailchimp-extender' );?></small></p>

+														<p class="description"><small><?php _e( "Which option should be selected by default?", 'yikes-inc-easy-mailchimp-extender' ); ?></small></p>

 													</td>

 												</tr>

 

@@ -1793,82 +1793,82 @@ 
 										<!-- Field Description -->

 										<tr valign="top">

 											<td scope="row">

-												<label for="description_<?php echo esc_attr( $field['merge'] ); ?>">

+												<label for="description_<?php echo esc_attr( $field[ 'merge' ] ); ?>">

 													<?php _e( 'Description', 'yikes-inc-easy-mailchimp-extender' ); ?>

 												</label>

 											</td>

 											<td>

-												<textarea class="widefat field-description-input" id="description_<?php echo esc_attr( $field['merge'] ); ?>" name="field[<?php echo $field['merge']; ?>][description]"><?php echo isset( $field['description'] ) ? stripslashes( esc_html( $field['description'] ) ) : '' ; ?></textarea>

-												<p class="description"><small><?php _e( "Enter the description for the form field. This will be displayed to the user and will provide some direction on how the field should be filled out or selected.", 'yikes-inc-easy-mailchimp-extender' );?></small></p>

+												<textarea class="widefat field-description-input" id="description_<?php echo esc_attr( $field[ 'merge' ] ); ?>" name="field[<?php echo $field[ 'merge' ]; ?>][description]"><?php echo isset( $field[ 'description' ] ) ? stripslashes( esc_html( $field[ 'description' ] ) ) : ''; ?></textarea>

+												<p class="description"><small><?php _e( "Enter the description for the form field. This will be displayed to the user and will provide some direction on how the field should be filled out or selected.", 'yikes-inc-easy-mailchimp-extender' ); ?></small></p>

 											</td>

 										</tr>

 										<!-- Description Above Field -->

 										<tr valign="top" class="yikes-checkbox-container">

 											<td scope="row">

-												<label for="description_above_<?php echo esc_attr( $field['merge'] ); ?>">

+												<label for="description_above_<?php echo esc_attr( $field[ 'merge' ] ); ?>">

 													<?php _e( 'Description Above Field', 'yikes-inc-easy-mailchimp-extender' ); ?>

 												</label>

 											</td>

 											<td>

-												<input type="checkbox" id="description_above_<?php echo esc_attr( $field['merge'] ); ?>" class="widefat field-description-input" name="field[<?php echo $field['merge']; ?>][description_above]" value="1" <?php echo isset( $field['description_above'] ) && $field['description_above'] === '1' ? 'checked="checked"' : ''; ?> />

-												<p class="description"><small><?php _e( "By default the description will appear undearneath the field. Check this box if you'd like the description to appear above the field.", 'yikes-inc-easy-mailchimp-extender' );?></small></p>

+												<input type="checkbox" id="description_above_<?php echo esc_attr( $field[ 'merge' ] ); ?>" class="widefat field-description-input" name="field[<?php echo $field[ 'merge' ]; ?>][description_above]" value="1" <?php echo isset( $field[ 'description_above' ] ) && $field[ 'description_above' ] === '1' ? 'checked="checked"' : ''; ?> />

+												<p class="description"><small><?php _e( "By default the description will appear undearneath the field. Check this box if you'd like the description to appear above the field.", 'yikes-inc-easy-mailchimp-extender' ); ?></small></p>

 											</td>

 										</tr>

 										<!-- Additional Classes -->

 										<tr valign="top">

 											<td scope="row">

-												<label for="classes_<?php echo esc_attr( $field['merge'] ); ?>">

+												<label for="classes_<?php echo esc_attr( $field[ 'merge' ] ); ?>">

 													<?php _e( 'Additional Classes', 'yikes-inc-easy-mailchimp-extender' ); ?>

 												</label>

 											</td>

 											<td>

-												<input type="text" id="classes_<?php echo esc_attr( $field['merge'] ); ?>" class="widefat" name="field[<?php echo $field['merge']; ?>][additional-classes]" value="<?php echo isset( $field['additional-classes'] ) ? stripslashes( wp_strip_all_tags( $field['additional-classes'] ) ) : '' ; ?>" />

-												<p class="description"><small><?php printf( __( "Assign additional classes to this field. %s.", 'yikes-inc-easy-mailchimp-extender' ), '<a target="_blank" href="' . esc_url( 'https://yikesplugins.com/support/knowledge-base/bundled-css-classes/' ) . '">' . __( 'View bundled classes', 'yikes-inc-easy-mailchimp-extender' ) . '</a>' );?></small></p>

+												<input type="text" id="classes_<?php echo esc_attr( $field[ 'merge' ] ); ?>" class="widefat" name="field[<?php echo $field[ 'merge' ]; ?>][additional-classes]" value="<?php echo isset( $field[ 'additional-classes' ] ) ? stripslashes( wp_strip_all_tags( $field[ 'additional-classes' ] ) ) : ''; ?>" />

+												<p class="description"><small><?php printf( __( "Assign additional classes to this field. %s.", 'yikes-inc-easy-mailchimp-extender' ), '<a target="_blank" href="' . esc_url( 'https://yikesplugins.com/support/knowledge-base/bundled-css-classes/' ) . '">' . __( 'View bundled classes', 'yikes-inc-easy-mailchimp-extender' ) . '</a>' ); ?></small></p>

 											</td>

 										</tr>

 										<!-- Required Toggle -->

 										<tr valign="top" class="yikes-checkbox-container yikes-checkbox-container-first">

 											<td scope="row">

-												<label for="field-required-<?php echo esc_attr( $field['merge'] ); ?>">

+												<label for="field-required-<?php echo esc_attr( $field[ 'merge' ] ); ?>">

 													<?php _e( 'Field Required?', 'yikes-inc-easy-mailchimp-extender' ); ?>

 												</label>

 											</td>

 											<td>

-												<?php $checked = isset( $field['require'] ) ? $field['require'] : '0'; ?>

-												<input id="field-required-<?php echo esc_attr( $field['merge'] ); ?>" type="checkbox" class="widefat" value="1" name="field[<?php echo $field['merge']; ?>][require]" <?php checked( $checked , 1 ); ?> <?php if ( $field['merge'] == 'EMAIL' ) {  ?> disabled="disabled" checked="checked" title="<?php echo __( 'Email is a required field.', 'yikes-inc-easy-mailchimp-extender' ); } ?>">

-												<p class="description"><small><?php _e( "Require this field to be filled in before the form can be submitted.", 'yikes-inc-easy-mailchimp-extender' );?></small></p>

+												<?php $checked = isset( $field[ 'require' ] ) ? $field[ 'require' ] : '0'; ?>

+												<input id="field-required-<?php echo esc_attr( $field[ 'merge' ] ); ?>" type="checkbox" class="widefat" value="1" name="field[<?php echo $field[ 'merge' ]; ?>][require]" <?php checked( $checked, 1 ); ?> <?php if ( $field[ 'merge' ] == 'EMAIL' ) {  ?> disabled="disabled" checked="checked" title="<?php echo __( 'Email is a required field.', 'yikes-inc-easy-mailchimp-extender' ); } ?>">

+												<p class="description"><small><?php _e( "Require this field to be filled in before the form can be submitted.", 'yikes-inc-easy-mailchimp-extender' ); ?></small></p>

 											</td>

 										</tr>

 										<!-- Visible Toggle -->

 										<tr valign="top" class="yikes-checkbox-container">

 											<td scope="row">

-												<label for="hide-field-<?php echo esc_attr( $field['merge'] ); ?>">

+												<label for="hide-field-<?php echo esc_attr( $field[ 'merge' ] ); ?>">

 													<?php _e( 'Hide Field', 'yikes-inc-easy-mailchimp-extender' ); ?>

 												</label>

 											</td>

 											<td>

-												<?php $hide = isset( $field['hide'] ) ? $field['hide'] : '0'; ?>

-												<input id="hide-field-<?php echo esc_attr( $field['merge'] ); ?>" type="checkbox" class="widefat" value="1" name="field[<?php echo $field['merge']; ?>][hide]" <?php checked( $hide , 1 ); ?> <?php if ( $field['merge'] == 'EMAIL' ) {  ?> disabled="disabled" title="<?php echo __( 'Cannot toggle email field visibility.', 'yikes-inc-easy-mailchimp-extender' ); } ?>">

-												<p class="description"><small><?php _e( "Hide this field from being displayed on the front end.", 'yikes-inc-easy-mailchimp-extender' );?></small></p>

+												<?php $hide = isset( $field[ 'hide' ] ) ? $field[ 'hide' ] : '0'; ?>

+												<input id="hide-field-<?php echo esc_attr( $field[ 'merge' ] ); ?>" type="checkbox" class="widefat" value="1" name="field[<?php echo $field[ 'merge' ]; ?>][hide]" <?php checked( $hide, 1 ); ?> <?php if ( $field[ 'merge' ] == 'EMAIL' ) {  ?> disabled="disabled" title="<?php echo __( 'Cannot toggle email field visibility.', 'yikes-inc-easy-mailchimp-extender' ); } ?>">

+												<p class="description"><small><?php _e( "Hide this field from being displayed on the front end.", 'yikes-inc-easy-mailchimp-extender' ); ?></small></p>

 											</td>

 										</tr>

 										<!-- Toggle Field Label Visibility -->

 										<tr valign="top" class="yikes-checkbox-container">

 											<td scope="row">

-												<label for="hide-label-<?php echo esc_attr( $field['merge'] ); ?>">

+												<label for="hide-label-<?php echo esc_attr( $field[ 'merge' ] ); ?>">

 													<?php _e( 'Hide Label', 'yikes-inc-easy-mailchimp-extender' ); ?>

 												</label>

 											</td>

 											<td>

-												<?php $hide_label = isset( $field['hide-label'] ) ? $field['hide-label'] : '0'; ?>

-												<input id="hide-label-<?php echo esc_attr( $field['merge'] ); ?>" type="checkbox" name="field[<?php echo $field['merge']; ?>][hide-label]" value="1" <?php checked( $hide_label , 1 ); ?>/>

-												<p class="description"><small><?php _e( "Toggle field label visibility.", 'yikes-inc-easy-mailchimp-extender' );?></small></p>

+												<?php $hide_label = isset( $field[ 'hide-label' ] ) ? $field[ 'hide-label' ] : '0'; ?>

+												<input id="hide-label-<?php echo esc_attr( $field[ 'merge' ] ); ?>" type="checkbox" name="field[<?php echo $field[ 'merge' ]; ?>][hide-label]" value="1" <?php checked( $hide_label, 1 ); ?>/>

+												<p class="description"><small><?php _e( "Toggle field label visibility.", 'yikes-inc-easy-mailchimp-extender' ); ?></small></p>

 											</td>

 										</tr>

 										<!-- Display Phone/Date Formats back to the user -->

 										<!-- Phone Format Initial Load -->

 										<?php

-											switch( $field['type'] ) {

+											switch ( $field[ 'type' ] ) {

 												/* Store the phone format, for properly regex pattern */

 												case 'phone':

 												case 'birthday':

@@ -1878,23 +1878,23 @@ 
 															<td scope="row">

 																<label for="placeholder">

 																	<?php

-																		switch( $field['type'] ) {

+																		switch ( $field[ 'type' ] ) {

 																			default:

 																			case 'birthday':

 																				$type = __( 'Date Format', 'yikes-inc-easy-mailchimp-extender' );

-																				$format = ( isset( $field['date_format'] ) ) ? $field['date_format'] : 'MM/DD';

+																				$format = ( isset( $field[ 'date_format' ] ) ) ? $field[ 'date_format' ] : 'MM/DD';

 																				$format_name = 'date_format';

 																				break;

 

 																			case 'date':

 																				$type = __( 'Date Format', 'yikes-inc-easy-mailchimp-extender' );

-																				$format = ( isset( $field['date_format'] ) ) ? $field['date_format'] : 'MM/DD/YYYY';

+																				$format = ( isset( $field[ 'date_format' ] ) ) ? $field[ 'date_format' ] : 'MM/DD/YYYY';

 																				$format_name = 'date_format';

 																				break;

 

 																			case 'phone':

 																				$type = __( 'Phone Format', 'yikes-inc-easy-mailchimp-extender' );

-																				$format = isset( $field['phone_format'] ) && ! empty( $field['phone_format'] ) ? $field['phone_format'] : __( 'International', 'yikes-inc-easy-mailchimp-extender' );

+																				$format = isset( $field[ 'phone_format' ] ) && ! empty( $field[ 'phone_format' ] ) ? $field[ 'phone_format' ] : __( 'International', 'yikes-inc-easy-mailchimp-extender' );

 																				$format_name = 'phone_format';

 																				break;

 																		}

@@ -1904,7 +1904,7 @@ 
 															</td>

 															<td>

 																<strong><?php echo $format; ?></strong>

-																<input type="hidden" name="field[<?php echo $field['merge']; ?>][<?php echo $format_name; ?>]" value="<?php echo $format; ?>" />

+																<input type="hidden" name="field[<?php echo $field[ 'merge' ]; ?>][<?php echo $format_name; ?>]" value="<?php echo $format; ?>" />

 																<p class="description"><small>

 																	<?php printf( __( 'To change the %s please head over to <a href="%s" title="Mailchimp" target="_blank">Mailchimp</a>. If you alter the format, you should re-import this field.', 'yikes-inc-easy-mailchimp-extender' ), strtolower( $type ), esc_url( 'http://www.mailchimp.com' ) ); ?>

 																</small></p>

@@ -1925,8 +1925,8 @@ 
 											</td>

 											<td>

 												<span class="toggle-container">

-													<a href="#" class="close-form-expansion"><?php _e( "Close" , 'yikes-inc-easy-mailchimp-extender' ); ?></a> |

-													<a href="#" class="remove-field" alt="<?php echo $field['merge']; ?>"><?php _e( "Remove Field" , 'yikes-inc-easy-mailchimp-extender' ); ?></a>

+													<a href="#" class="close-form-expansion"><?php _e( "Close", 'yikes-inc-easy-mailchimp-extender' ); ?></a> |

+													<a href="#" class="remove-field" alt="<?php echo $field[ 'merge' ]; ?>"><?php _e( "Remove Field", 'yikes-inc-easy-mailchimp-extender' ); ?></a>

 												</span>

 											</td>

 										</tr>

@@ -1944,35 +1944,35 @@ 
 						/**** Interest Group ****/

 

 						?>

-						<section class="draggable" id="<?php echo $field['group_id']; ?>">

+						<section class="draggable" id="<?php echo $field[ 'group_id' ]; ?>">

 							<!-- top -->

 							<a href="#" class="expansion-section-title settings-sidebar">

-								<span class="dashicons dashicons-plus yikes-mc-expansion-toggle"></span><?php echo stripslashes( $field['label'] ); ?>

-								<?php if ( in_array( $field['group_id'] , $excluded_fields ) ) { ?>

+								<span class="dashicons dashicons-plus yikes-mc-expansion-toggle"></span><?php echo stripslashes( $field[ 'label' ] ); ?>

+								<?php if ( in_array( $field[ 'group_id' ], $excluded_fields ) ) { ?>

 									<img src="<?php echo YIKES_MC_URL . 'includes/images/warning.svg'; ?>" class="field-no-longer-exists-warning" title="<?php _e( 'Field no longer exists.', 'yikes-inc-easy-mailchimp-extender' ); ?>" alt="<?php _e( 'Field no longer exists.', 'yikes-inc-easy-mailchimp-extender' ); ?>">

 								<?php } ?>

-								<span class="field-type-text"><small><?php echo __( 'type', 'yikes-inc-easy-mailchimp-extender' ) . ' : ' . $field['type']; ?></small></span>

+								<span class="field-type-text"><small><?php echo __( 'type', 'yikes-inc-easy-mailchimp-extender' ) . ' : ' . $field[ 'type' ]; ?></small></span>

 							</a>

 							<!-- expansion section -->

 							<div class="yikes-mc-settings-expansion-section">

 

 								<!-- check if this field exists in the available interest group array -->

-								<?php if ( in_array( $field['group_id'] , $excluded_fields ) ) { ?>

-									<p class="yikes-mc-warning-message"><?php _e( "This field no longer exists in this list. Delete this field from the form to prevent issues on the front end." , 'yikes-inc-easy-mailchimp-extender' ); ?></p>

+								<?php if ( in_array( $field[ 'group_id' ], $excluded_fields ) ) { ?>

+									<p class="yikes-mc-warning-message"><?php _e( "This field no longer exists in this list. Delete this field from the form to prevent issues on the front end.", 'yikes-inc-easy-mailchimp-extender' ); ?></p>

 								<?php } ?>

 

 								<!-- store the label -->

-								<input type="hidden" name="field[<?php echo $field['group_id']; ?>][label]" value="<?php echo htmlspecialchars( $field['label'] ); ?>" />

-								<input type="hidden" name="field[<?php echo $field['group_id']; ?>][type]" value="<?php echo $field['type']; ?>" />

-								<input type="hidden" name="field[<?php echo $field['group_id']; ?>][group_id]" value="<?php echo $field['group_id']; ?>" />

-								<input type="hidden" name="field[<?php echo $field['group_id']; ?>][groups]" value='<?php echo esc_attr( json_encode( json_decode( $field['groups'], true ) ) ); ?>' />

+								<input type="hidden" name="field[<?php echo $field[ 'group_id' ]; ?>][label]" value="<?php echo htmlspecialchars( $field[ 'label' ] ); ?>" />

+								<input type="hidden" name="field[<?php echo $field[ 'group_id' ]; ?>][type]" value="<?php echo $field[ 'type' ]; ?>" />

+								<input type="hidden" name="field[<?php echo $field[ 'group_id' ]; ?>][group_id]" value="<?php echo $field[ 'group_id' ]; ?>" />

+								<input type="hidden" name="field[<?php echo $field[ 'group_id' ]; ?>][groups]" value='<?php echo esc_attr( json_encode( json_decode( $field[ 'groups' ], true ) ) ); ?>' />

 

 								<!-- Single or Double Opt-in -->

 								<p class="type-container"><!-- necessary to prevent skipping on slideToggle(); -->

 

 									<table class="form-table form-field-container">

 										<!-- Default Value -->

-										<?php switch( $field['type'] ) {

+										<?php switch ( $field[ 'type' ] ) {

 											default:

 											case 'radio':

 											case 'checkboxes':

@@ -1985,15 +1985,15 @@ 
 													</td>

 													<td>

 														<?php

-														$field['default_choice'] = isset( $field['default_choice'] ) ? $field['default_choice'] : '';

+														$field[ 'default_choice' ] = isset( $field[ 'default_choice' ] ) ? $field[ 'default_choice' ] : '';

 

 														$default_shown = false;

 

-														foreach ( json_decode( $field['groups'], true ) as $id => $group ) {

-															$field_id   = "{$field['group_id']}-{$id}";

-															$field_type = 'hidden' == $field['type'] ? 'checkbox' : $field['type'];

+														foreach ( json_decode( $field[ 'groups' ], true ) as $id => $group ) {

+															$field_id   = "{$field[ 'group_id' ]}-{$id}";

+															$field_type = 'hidden' == $field[ 'type' ] ? 'checkbox' : $field[ 'type' ];

 															$field_type = 'checkboxes' == $field_type ? 'checkbox' : $field_type;

-															$field_name = "field[{$field['group_id']}][default_choice]";

+															$field_name = "field[{$field[ 'group_id' ]}][default_choice]";

 															$field_name = 'checkbox' == $field_type ? $field_name . '[]' : $field_name;

 

 															// Determine if the current group is checked.

@@ -2001,13 +2001,13 @@ 
 															switch ( $field_type ) {

 																case 'radio':

 																default:

-																	$default = is_array( $field['default_choice'] ) ? current( $field['default_choice'] ) : $field['default_choice'];

-																	$checked = is_array( $field['default_choice'] ) ? checked( current( $field['default_choice'] ), $id, false ) : checked( $field['default_choice'], $id, false );

+																	$default = is_array( $field[ 'default_choice' ] ) ? current( $field[ 'default_choice' ] ) : $field[ 'default_choice' ];

+																	$checked = is_array( $field[ 'default_choice' ] ) ? checked( current( $field[ 'default_choice' ] ), $id, false ) : checked( $field[ 'default_choice' ], $id, false );

 																break;

 

 																case 'checkbox':

 																case 'hidden':

-																	if ( is_array( $field['default_choice'] ) && in_array( $id, $field['default_choice'] ) ) {

+																	if ( is_array( $field[ 'default_choice' ] ) && in_array( $id, $field[ 'default_choice' ] ) ) {

 																		$checked = checked( true, true, false );

 																	}

 																break;

@@ -2022,7 +2022,7 @@ 
 																	    type="<?php echo $field_type; ?>"

 																	    name="<?php echo $field_name; ?>"

 																	    value="no-default" 

-																	    <?php is_array( $field['default_choice'] ) ? checked( current( $field['default_choice'] ), 'no-default' ) : checked( $field['default_choice'], 'no-default' ); ?>>

+																	    <?php is_array( $field[ 'default_choice' ] ) ? checked( current( $field[ 'default_choice' ] ), 'no-default' ) : checked( $field[ 'default_choice' ], 'no-default' ); ?>>

 																	No Default&nbsp;

 																</label>

 																<?php

@@ -2038,7 +2038,7 @@ 
 															</label>

 															<?php

 														} ?>

-														<p class="description"><small><?php _e( "Select the option that should be selected by default.", 'yikes-inc-easy-mailchimp-extender' );?></small></p>

+														<p class="description"><small><?php _e( "Select the option that should be selected by default.", 'yikes-inc-easy-mailchimp-extender' ); ?></small></p>

 													</td>

 												</tr>

 

@@ -2054,13 +2054,13 @@ 
 														</label>

 													</td>

 													<td>

-														<select type="default" name="field[<?php echo $field['group_id']; ?>][default_choice]">

+														<select type="default" name="field[<?php echo $field[ 'group_id' ]; ?>][default_choice]">

 															<option value="no-default">No Default</option>

-															<?php foreach( json_decode( stripslashes_deep( $field['groups'] ) , true ) as $id => $group ) { ?>

-																<option value="<?php echo $id; ?>" <?php selected( $field['default_choice'] , $id ); ?>><?php echo stripslashes( $group ); ?></option>

+															<?php foreach ( json_decode( stripslashes_deep( $field[ 'groups' ] ), true ) as $id => $group ) { ?>

+																<option value="<?php echo $id; ?>" <?php selected( $field[ 'default_choice' ], $id ); ?>><?php echo stripslashes( $group ); ?></option>

 															<?php } ?>

 														</select>

-														<p class="description"><small><?php _e( "Which option should be selected by default?", 'yikes-inc-easy-mailchimp-extender' );?></small></p>

+														<p class="description"><small><?php _e( "Which option should be selected by default?", 'yikes-inc-easy-mailchimp-extender' ); ?></small></p>

 													</td>

 												</tr>

 

@@ -2073,78 +2073,78 @@ 
 										<!-- Field Description -->

 										<tr valign="top">

 											<td scope="row">

-												<label for="description_<?php echo esc_attr( $field['group_id'] ); ?>">

+												<label for="description_<?php echo esc_attr( $field[ 'group_id' ] ); ?>">

 													<?php _e( 'Description', 'yikes-inc-easy-mailchimp-extender' ); ?>

 												</label>

 											</td>

 											<td>

-												<textarea id="description_<?php echo esc_attr( $field['group_id'] ); ?>" class="widefat field-description-input" name="field[<?php echo $field['group_id']; ?>][description]"><?php echo isset( $field['description'] ) ? stripslashes( esc_html( $field['description'] ) ) : '' ; ?></textarea>

-												<p class="description"><small><?php _e( "Enter the description for the form field. This will be displayed to the user and provide some direction on how the field should be filled out or selected.", 'yikes-inc-easy-mailchimp-extender' );?></small></p>

+												<textarea id="description_<?php echo esc_attr( $field[ 'group_id' ] ); ?>" class="widefat field-description-input" name="field[<?php echo $field[ 'group_id' ]; ?>][description]"><?php echo isset( $field[ 'description' ] ) ? stripslashes( esc_html( $field[ 'description' ] ) ) : ''; ?></textarea>

+												<p class="description"><small><?php _e( "Enter the description for the form field. This will be displayed to the user and provide some direction on how the field should be filled out or selected.", 'yikes-inc-easy-mailchimp-extender' ); ?></small></p>

 											</td>

 										</tr>

 

 										<!-- Description Above Field -->

 										<tr valign="top" class="yikes-checkbox-container">

 											<td scope="row">

-												<label for="description_above_<?php echo $field['group_id']; ?>">

+												<label for="description_above_<?php echo $field[ 'group_id' ]; ?>">

 													<?php _e( 'Description Above Field', 'yikes-inc-easy-mailchimp-extender' ); ?>

 												</label>

 											</td>

 											<td>

-												<input type="checkbox" id="description_above_<?php echo $field['group_id']; ?>" class="widefat field-description-input" name="field[<?php echo $field['group_id']; ?>][description_above]" value="1" <?php echo isset( $field['description_above'] ) && $field['description_above'] === '1' ? 'checked="checked"' : ''; ?> />

-												<p class="description"><small><?php _e( "By default the description will appear undearneath the field. Check this box if you'd like the description to appear above the field.", 'yikes-inc-easy-mailchimp-extender' );?></small></p>

+												<input type="checkbox" id="description_above_<?php echo $field[ 'group_id' ]; ?>" class="widefat field-description-input" name="field[<?php echo $field[ 'group_id' ]; ?>][description_above]" value="1" <?php echo isset( $field[ 'description_above' ] ) && $field[ 'description_above' ] === '1' ? 'checked="checked"' : ''; ?> />

+												<p class="description"><small><?php _e( "By default the description will appear undearneath the field. Check this box if you'd like the description to appear above the field.", 'yikes-inc-easy-mailchimp-extender' ); ?></small></p>

 											</td>

 										</tr>

 

 										<!-- Additional Classes -->

 										<tr valign="top">

 											<td scope="row">

-												<label for="classes_<?php echo esc_attr( $field['group_id'] ); ?>">

+												<label for="classes_<?php echo esc_attr( $field[ 'group_id' ] ); ?>">

 													<?php _e( 'Additional Classes', 'yikes-inc-easy-mailchimp-extender' ); ?>

 												</label>

 											</td>

 											<td>

-												<input type="text" id="classes_<?php echo esc_attr( $field['group_id'] ); ?>" class="widefat" name="field[<?php echo $field['group_id']; ?>][additional-classes]" value="<?php echo isset( $field['additional-classes'] ) ? stripslashes( wp_strip_all_tags( $field['additional-classes'] ) ) : '' ; ?>" />

-												<p class="description"><small><?php printf( __( "Assign additional classes to this field. %s.", 'yikes-inc-easy-mailchimp-extender' ), '<a target="_blank" href="' . esc_url( 'https://yikesplugins.com/support/knowledge-base/bundled-css-classes/' ) . '">' . __( 'View bundled classes', 'yikes-inc-easy-mailchimp-extender' ) . '</a>' );?></small></p>

+												<input type="text" id="classes_<?php echo esc_attr( $field[ 'group_id' ] ); ?>" class="widefat" name="field[<?php echo $field[ 'group_id' ]; ?>][additional-classes]" value="<?php echo isset( $field[ 'additional-classes' ] ) ? stripslashes( wp_strip_all_tags( $field[ 'additional-classes' ] ) ) : ''; ?>" />

+												<p class="description"><small><?php printf( __( "Assign additional classes to this field. %s.", 'yikes-inc-easy-mailchimp-extender' ), '<a target="_blank" href="' . esc_url( 'https://yikesplugins.com/support/knowledge-base/bundled-css-classes/' ) . '">' . __( 'View bundled classes', 'yikes-inc-easy-mailchimp-extender' ) . '</a>' ); ?></small></p>

 											</td>

 										</tr>

 										<!-- Required Toggle -->

 										<tr valign="top" class="yikes-checkbox-container">

 											<td scope="row">

-												<label for="field-required-<?php echo esc_attr( $field['group_id'] ); ?>">

+												<label for="field-required-<?php echo esc_attr( $field[ 'group_id' ] ); ?>">

 													<?php _e( 'Field Required?', 'yikes-inc-easy-mailchimp-extender' ); ?>

 												</label>

 											</td>

 											<td>

-												<?php $checked = isset( $field['require'] ) ? $field['require'] : '0'; ?>

-												<input type="checkbox" id="field-required-<?php echo esc_attr( $field['group_id'] ); ?>" class="widefat" value="1" name="field[<?php echo $field['group_id']; ?>][require]" <?php checked( $checked , 1 ); ?>>

-												<p class="description"><small><?php _e( "Require this field to be filled in before the form can be submitted.", 'yikes-inc-easy-mailchimp-extender' );?></small></p>

+												<?php $checked = isset( $field[ 'require' ] ) ? $field[ 'require' ] : '0'; ?>

+												<input type="checkbox" id="field-required-<?php echo esc_attr( $field[ 'group_id' ] ); ?>" class="widefat" value="1" name="field[<?php echo $field[ 'group_id' ]; ?>][require]" <?php checked( $checked, 1 ); ?>>

+												<p class="description"><small><?php _e( "Require this field to be filled in before the form can be submitted.", 'yikes-inc-easy-mailchimp-extender' ); ?></small></p>

 											</td>

 										</tr>

 										<!-- Visible Toggle -->

 										<tr valign="top" class="yikes-checkbox-container">

 											<td scope="row">

-												<label for="hide-field-<?php echo esc_attr( $field['group_id'] ); ?>">

+												<label for="hide-field-<?php echo esc_attr( $field[ 'group_id' ] ); ?>">

 													<?php _e( 'Hide Field', 'yikes-inc-easy-mailchimp-extender' ); ?>

 												</label>

 											</td>

 											<td>

-												<?php $hide = isset( $field['hide'] ) ? $field['hide'] : '0'; ?>

-												<input type="checkbox" id="hide-field-<?php echo esc_attr( $field['group_id'] ); ?>" class="widefat" value="1" name="field[<?php echo $field['group_id']; ?>][hide]" <?php checked( $hide , 1 ); ?>>

-												<p class="description"><small><?php _e( "Hide this field from being displayed on the front end.", 'yikes-inc-easy-mailchimp-extender' );?></small></p>

+												<?php $hide = isset( $field[ 'hide' ] ) ? $field[ 'hide' ] : '0'; ?>

+												<input type="checkbox" id="hide-field-<?php echo esc_attr( $field[ 'group_id' ] ); ?>" class="widefat" value="1" name="field[<?php echo $field[ 'group_id' ]; ?>][hide]" <?php checked( $hide, 1 ); ?>>

+												<p class="description"><small><?php _e( "Hide this field from being displayed on the front end.", 'yikes-inc-easy-mailchimp-extender' ); ?></small></p>

 											</td>

 										</tr>

 										<!-- Toggle Field Label Visibility -->

 										<tr valign="top" class="yikes-checkbox-container">

 											<td scope="row">

-												<label for="hide-label-<?php echo esc_attr( $field['group_id'] ); ?>">

+												<label for="hide-label-<?php echo esc_attr( $field[ 'group_id' ] ); ?>">

 													<?php _e( 'Hide Label', 'yikes-inc-easy-mailchimp-extender' ); ?>

 												</label>

 											</td>

 											<td>

-												<?php $hide = isset( $field['hide-label'] ) ? $field['hide-label'] : '0'; ?>

-												<input type="checkbox" id="hide-label-<?php echo esc_attr( $field['group_id'] ); ?>" name="field[<?php echo $field['group_id']; ?>][hide-label]" value="1" <?php checked( $hide , 1 ); ?>/>

-												<p class="description"><small><?php _e( "Toggle field label visibility.", 'yikes-inc-easy-mailchimp-extender' );?></small></p>

+												<?php $hide = isset( $field[ 'hide-label' ] ) ? $field[ 'hide-label' ] : '0'; ?>

+												<input type="checkbox" id="hide-label-<?php echo esc_attr( $field[ 'group_id' ] ); ?>" name="field[<?php echo $field[ 'group_id' ]; ?>][hide-label]" value="1" <?php checked( $hide, 1 ); ?>/>

+												<p class="description"><small><?php _e( "Toggle field label visibility.", 'yikes-inc-easy-mailchimp-extender' ); ?></small></p>

 											</td>

 										</tr>

 										<!-- Toggle Buttons -->

@@ -2154,8 +2154,8 @@ 
 											</td>

 											<td>

 												<span class="toggle-container">

-													<a href="#" class="close-form-expansion"><?php _e( "Close" , 'yikes-inc-easy-mailchimp-extender' ); ?></a> |

-													<a href="#" class="remove-field" alt="<?php echo $field['group_id']; ?>"><?php _e( "Remove Field" , 'yikes-inc-easy-mailchimp-extender' ); ?></a>

+													<a href="#" class="close-form-expansion"><?php _e( "Close", 'yikes-inc-easy-mailchimp-extender' ); ?></a> |

+													<a href="#" class="remove-field" alt="<?php echo $field[ 'group_id' ]; ?>"><?php _e( "Remove Field", 'yikes-inc-easy-mailchimp-extender' ); ?></a>

 												</span>

 											</td>

 										</tr>

@@ -2176,7 +2176,7 @@ 
 				add_thickbox();

 				// enqueue jquery qtip for our tooltip

 				wp_enqueue_script( 'jquery-qtip-tooltip', YIKES_MC_URL . 'admin/js/min/jquery.qtip.min.js', array( 'jquery' ) );

-				wp_enqueue_style( 'jquery-qtip-style',  YIKES_MC_URL . 'admin/css/jquery.qtip.min.css' );

+				wp_enqueue_style( 'jquery-qtip-style', YIKES_MC_URL . 'admin/css/jquery.qtip.min.css' );

 					$available_tags = array(

 						array(

 							'tag' => '{page_title}',

@@ -2231,14 +2231,14 @@ 
 						<h3><?php _e( 'Pre Defined Tags', 'yikes-inc-easy-mailchimp-extender' ); ?></h3>

 						<p class="description"><?php _e( 'You can use any of the following tags to populate a Mailchimp text field with dynamic content. This can be used to determine which page the user signed up on, if the user was logged in and more.', 'yikes-inc-easy-mailchimp-extender' ); ?></p>

 						<ul>

-							<?php foreach( apply_filters( 'yikes-mailchimp-custom-default-value-tags', $available_tags ) as $tag ) { ?>

+							<?php foreach ( apply_filters( 'yikes-mailchimp-custom-default-value-tags', $available_tags ) as $tag ) { ?>

 								<li class="tooltop-tag">

 									<!-- link/tag -->

-									<a href="#" onclick="populateDefaultValue( '<?php echo $tag['tag']; ?>' );return false;" data-attr-tag="<?php echo $tag['tag']; ?>" title="<?php echo $tag['title']; ?>"><?php echo $tag['title']; ?></a>

+									<a href="#" onclick="populateDefaultValue( '<?php echo $tag[ 'tag' ]; ?>' );return false;" data-attr-tag="<?php echo $tag[ 'tag' ]; ?>" title="<?php echo $tag[ 'title' ]; ?>"><?php echo $tag[ 'title' ]; ?></a>

 									<!-- help icon -->

 									<span class="dashicons dashicons-editor-help"></span>

 									<!-- tooltip -->

-									<div class="tooltiptext qtip-bootstrap yikes-easy-mc-hidden"><?php echo $tag['description']; ?></div>

+									<div class="tooltiptext qtip-bootstrap yikes-easy-mc-hidden"><?php echo $tag[ 'description' ]; ?></div>

 								</li>

 							<?php } ?>

 						</ul>

@@ -2257,32 +2257,32 @@ 
 		public function build_available_merge_vars( $form_fields, $available_merge_variables ) {

 			$fields_assigned_to_form = array();

 			foreach ( $form_fields as $field ) {

-				if ( isset( $field['merge'] ) ) {

-					$fields_assigned_to_form[ $field['merge'] ] = true;

+				if ( isset( $field[ 'merge' ] ) ) {

+					$fields_assigned_to_form[ $field[ 'merge' ] ] = true;

 				}

 			}

 

-			if ( ! empty( $available_merge_variables['merge_fields'] ) ) {

+			if ( ! empty( $available_merge_variables[ 'merge_fields' ] ) ) {

 				?>

 				<ul id="available-fields"><?php

-				foreach ( $available_merge_variables['merge_fields'] as $merge_var ) {

-					$not_available = isset( $fields_assigned_to_form[ $merge_var['tag'] ] );

+				foreach ( $available_merge_variables[ 'merge_fields' ] as $merge_var ) {

+					$not_available = isset( $fields_assigned_to_form[ $merge_var[ 'tag' ] ] );

 					?>

 					<li class="available-field <?php echo $not_available ? 'not-available' : ''; ?>"

-						alt="<?php echo esc_attr( $merge_var['tag'] ); ?>"

-						data-attr-field-type="<?php echo esc_attr( $merge_var['type'] ); ?>"

-						data-attr-field-name="<?php echo esc_attr( $merge_var['name'] ); ?>"

-						data-attr-form-id="<?php echo esc_attr( $available_merge_variables['list_id'] ); ?>"

+						alt="<?php echo esc_attr( $merge_var[ 'tag' ] ); ?>"

+						data-attr-field-type="<?php echo esc_attr( $merge_var[ 'type' ] ); ?>"

+						data-attr-field-name="<?php echo esc_attr( $merge_var[ 'name' ] ); ?>"

+						data-attr-form-id="<?php echo esc_attr( $available_merge_variables[ 'list_id' ] ); ?>"

 						title="<?php echo $not_available ? esc_attr__( 'Already assigned to your form', 'yikes-inc-easy-mailchimp-extender' ) : ''; ?>"

 						<?php echo $not_available ? 'disabled="disabled"' : ''; ?>

 					>

 						<?php

-							echo esc_html( stripslashes( $merge_var['name'] ) );

-							if ( $merge_var['required'] ) {

+							echo esc_html( stripslashes( $merge_var[ 'name' ] ) );

+							if ( $merge_var[ 'required' ] ) {

 								echo ' <span class="field-required" title="' . __( 'required field', 'yikes-inc-easy-mailchimp-extender' ) . '">*</span>';

 							}

 						?>

-						<small class="field-type-text"><?php echo esc_html( $merge_var['type'] ); ?></small>

+						<small class="field-type-text"><?php echo esc_html( $merge_var[ 'type' ] ); ?></small>

 					</li>

 					<?php

 				}

@@ -2307,8 +2307,8 @@ 
 			$fields_assigned_to_form = array();

 			if ( ! empty( $form_fields ) ) {

 				foreach ( $form_fields as $field ) {

-					if ( isset( $field['group_id'] ) ) {

-						$fields_assigned_to_form[ $field['group_id'] ] = true;

+					if ( isset( $field[ 'group_id' ] ) ) {

+						$fields_assigned_to_form[ $field[ 'group_id' ] ] = true;

 					}

 				}

 			}

@@ -2318,19 +2318,19 @@ 
 				<ul id="available-interest-groups">

 				<?php

 					foreach ( $available_interest_groups as $interest_group ) {

-						$not_available = isset( $fields_assigned_to_form[ $interest_group['id'] ] );

+						$not_available = isset( $fields_assigned_to_form[ $interest_group[ 'id' ] ] );

 						?>

 						<li class="available-field <?php echo $not_available ? 'not-available' : ''; ?>" 

-							alt="<?php echo esc_attr( $interest_group['id'] ); ?>" 

-							data-group-id="<?php echo esc_attr( $interest_group['id'] ); ?>" 

-							data-attr-field-name="<?php echo esc_attr( htmlspecialchars( $interest_group['title'] ) ); ?>" 

-							data-attr-field-type="<?php echo esc_attr( $interest_group['type'] ); ?>" 

+							alt="<?php echo esc_attr( $interest_group[ 'id' ] ); ?>" 

+							data-group-id="<?php echo esc_attr( $interest_group[ 'id' ] ); ?>" 

+							data-attr-field-name="<?php echo esc_attr( htmlspecialchars( $interest_group[ 'title' ] ) ); ?>" 

+							data-attr-field-type="<?php echo esc_attr( $interest_group[ 'type' ] ); ?>" 

 							data-attr-form-id="<?php echo esc_attr( $list_id ); ?>"

 							title="<?php echo $not_available ? __( 'Already assigned to your form', 'yikes-inc-easy-mailchimp-extender' ) : ''; ?>"

 							<?php echo $not_available ? 'disabled="disabled"' : ''; ?>

 						>

-							<?php echo esc_html( stripslashes( $interest_group['title'] ) ); ?>

-							<small class="field-type-text"><?php echo esc_html( $interest_group['type'] ); ?></small>

+							<?php echo esc_html( stripslashes( $interest_group[ 'title' ] ) ); ?>

+							<small class="field-type-text"><?php echo esc_html( $interest_group[ 'type' ] ); ?></small>

 						</li>

 						<?php

 					}

@@ -2356,13 +2356,13 @@ 
 				$not_available = isset( $form_tags[ $tag_id ] );

 				?>

 				<li class="available-field <?php echo $not_available ? 'not-available' : ''; ?>"

-					id="tag-<?php echo esc_attr( $tag['id'] ); ?>"

-					data-tag-id="<?php echo esc_attr( $tag['id'] ); ?>"

-					data-tag-name="<?php echo esc_attr( $tag['name'] ); ?>"

-					title="<?php echo $not_available ? __( 'Already assigned to your form', 'yikes-inc-easy-mailchimp-extender' ) : esc_attr( $tag['name'] ); ?>"

+					id="tag-<?php echo esc_attr( $tag[ 'id' ] ); ?>"

+					data-tag-id="<?php echo esc_attr( $tag[ 'id' ] ); ?>"

+					data-tag-name="<?php echo esc_attr( $tag[ 'name' ] ); ?>"

+					title="<?php echo $not_available ? __( 'Already assigned to your form', 'yikes-inc-easy-mailchimp-extender' ) : esc_attr( $tag[ 'name' ] ); ?>"

 					<?php echo $not_available ? 'disabled="disabled"' : ''; ?>

 				>

-					<?php echo esc_html( $tag['name'] ); ?>

+					<?php echo esc_html( $tag[ 'name' ] ); ?>

 				</li>

 				<?php

 			}

@@ -2383,15 +2383,15 @@ 
 		*	- must clean up db tables , ensure what data is going in and what is needed...

 		*/

 		public function yikes_easy_mailchimp_create_form() {

-			$nonce = $_REQUEST['nonce'];

+			$nonce = $_REQUEST[ 'nonce' ];

 			if ( ! wp_verify_nonce( $nonce, 'create_mailchimp_form' ) ) {

-				wp_die( __( "We've run into an error. The security check didn't pass. Please try again." , 'yikes-inc-easy-mailchimp-extender' ) );

+				wp_die( __( "We've run into an error. The security check didn't pass. Please try again.", 'yikes-inc-easy-mailchimp-extender' ) );

 			}

 

 			$result = $this->form_interface->create_form( array(

-				'list_id'          => sanitize_key( $_POST['associated-list'] ),

-				'form_name'        => stripslashes( $_POST['form-name'] ),

-				'form_description' => stripslashes( $_POST['form-description'] ),

+				'list_id'          => sanitize_key( $_POST[ 'associated-list' ] ),

+				'form_name'        => stripslashes( $_POST[ 'form-name' ] ),

+				'form_description' => stripslashes( $_POST[ 'form-description' ] ),

 			) );

 

 			// if an error occurs during the form creation process

@@ -2399,11 +2399,11 @@ 
 				// write it to the error log

 				// if the form was not created successfully

 				$error_logging = new Yikes_Inc_Easy_Mailchimp_Error_Logging();

-				$error_logging->maybe_write_to_log( __( 'Error creating a new form', 'yikes-inc-easy-mailchimp-extender') , __( "Creating a new form" , 'yikes-inc-easy-mailchimp-extender' ) , __( "Forms" , 'yikes-inc-easy-mailchimp-extender' ) );

+				$error_logging->maybe_write_to_log( __( 'Error creating a new form', 'yikes-inc-easy-mailchimp-extender' ), __( "Creating a new form", 'yikes-inc-easy-mailchimp-extender' ), __( "Forms", 'yikes-inc-easy-mailchimp-extender' ) );

 				wp_redirect( esc_url_raw( admin_url( 'admin.php?page=yikes-mailchimp-edit-form&sql_error=' . urlencode( __( 'Error creating a new form', 'yikes-inc-easy-mailchimp-extender' ) ) ) ) );

 			} else {

 				// redirect the user to the new form edit page

-				wp_redirect( esc_url_raw( admin_url( 'admin.php?page=yikes-mailchimp-edit-form&id=' . $result) ) );

+				wp_redirect( esc_url_raw( admin_url( 'admin.php?page=yikes-mailchimp-edit-form&id=' . $result ) ) );

 			}

 			exit();

 		}

@@ -2416,11 +2416,11 @@ 
 		*/

 		public function yikes_easy_mailchimp_delete_form() {

 			// grab & store our variables ( associated list & form name )

-			$nonce = $_REQUEST['nonce'];

-			$post_id_to_delete = $_REQUEST['mailchimp-form'];

+			$nonce = $_REQUEST[ 'nonce' ];

+			$post_id_to_delete = $_REQUEST[ 'mailchimp-form' ];

 			// verify our nonce

-			if ( ! wp_verify_nonce( $nonce, 'delete-mailchimp-form-'.$post_id_to_delete ) ) {

-				wp_die( __( "We've run into an error. The security check didn't pass. Please try again." , 'yikes-inc-easy-mailchimp-extender' ) , __( "Failed nonce validation" , 'yikes-inc-easy-mailchimp-extender' ) , array( 'response' => 500 , 'back_link' => true ) );

+			if ( ! wp_verify_nonce( $nonce, 'delete-mailchimp-form-' . $post_id_to_delete ) ) {

+				wp_die( __( "We've run into an error. The security check didn't pass. Please try again.", 'yikes-inc-easy-mailchimp-extender' ), __( "Failed nonce validation", 'yikes-inc-easy-mailchimp-extender' ), array( 'response' => 500, 'back_link' => true ) );

 			}

 

 			$this->form_interface->delete_form( $post_id_to_delete );

@@ -2436,19 +2436,19 @@ 
 		*/

 		public function yikes_easy_mailchimp_duplicate_form() {

 			// grab & store our variables ( associated list & form name )

-			$nonce = $_REQUEST['nonce'];

-			$post_id_to_clone = $_REQUEST['mailchimp-form'];

+			$nonce = $_REQUEST[ 'nonce' ];

+			$post_id_to_clone = $_REQUEST[ 'mailchimp-form' ];

 			// verify our nonce

-			if ( ! wp_verify_nonce( $nonce, 'duplicate-mailchimp-form-'.$post_id_to_clone ) ) {

-				wp_die( __( "We've run into an error. The security check didn't pass. Please try again." , 'yikes-inc-easy-mailchimp-extender' ) , __( "Failed nonce validation" , 'yikes-inc-easy-mailchimp-extender' ) , array( 'response' => 500 , 'back_link' => true ) );

+			if ( ! wp_verify_nonce( $nonce, 'duplicate-mailchimp-form-' . $post_id_to_clone ) ) {

+				wp_die( __( "We've run into an error. The security check didn't pass. Please try again.", 'yikes-inc-easy-mailchimp-extender' ), __( "Failed nonce validation", 'yikes-inc-easy-mailchimp-extender' ), array( 'response' => 500, 'back_link' => true ) );

 			}

 

 			// Get the current form data.

 			$form_data = $this->form_interface->get_form( $post_id_to_clone );

 

 			// Update some of the data before duplication

-			$form_data['form_name'] .= ' - Copy';

-			$form_data['impressions'] = $form_data['submissions'] = 0;

+			$form_data[ 'form_name' ] .= ' - Copy';

+			$form_data[ 'impressions' ] = $form_data[ 'submissions' ] = 0;

 

 			// Create the new form, and handle the result.

 			$result = $this->form_interface->create_form( $form_data );

@@ -2479,11 +2479,11 @@ 
 		*/

 		public function yikes_easy_mailchimp_reset_impression_stats() {

 			// grab & store our variables ( associated list & form name )

-			$nonce = $_REQUEST['nonce'];

-			$form_id_to_reset = $_REQUEST['mailchimp-form'];

+			$nonce = $_REQUEST[ 'nonce' ];

+			$form_id_to_reset = $_REQUEST[ 'mailchimp-form' ];

 			// verify our nonce

-			if ( ! wp_verify_nonce( $nonce, 'reset-stats-mailchimp-form-'.$form_id_to_reset ) ) {

-				wp_die( __( "We've run into an error. The security check didn't pass. Please try again." , 'yikes-inc-easy-mailchimp-extender' ) , __( "Failed nonce validation" , 'yikes-inc-easy-mailchimp-extender' ) , array( 'response' => 500 , 'back_link' => true ) );

+			if ( ! wp_verify_nonce( $nonce, 'reset-stats-mailchimp-form-' . $form_id_to_reset ) ) {

+				wp_die( __( "We've run into an error. The security check didn't pass. Please try again.", 'yikes-inc-easy-mailchimp-extender' ), __( "Failed nonce validation", 'yikes-inc-easy-mailchimp-extender' ), array( 'response' => 500, 'back_link' => true ) );

 			}

 

 			$result = $this->form_interface->update_form(

@@ -2511,8 +2511,8 @@ 
 		*/

 		public function yikes_easy_mailchimp_update_form() {

 

-			$nonce   = $_REQUEST['nonce'];

-			$form_id = $_REQUEST['id'];

+			$nonce   = $_REQUEST[ 'nonce' ];

+			$form_id = $_REQUEST[ 'id' ];

 

 			// verify our nonce

 			if ( ! wp_verify_nonce( $nonce, 'update-mailchimp-form-' . $form_id ) ) {

@@ -2526,70 +2526,70 @@ 
 			}

 

 			// Store our values!

-			$list_id                 = $_POST['associated-list'];

-			$form_name               = stripslashes( $_POST['form-name'] );

-			$form_description        = sanitize_text_field( stripslashes( $_POST['form-description'] ) );

-			$redirect_user_on_submit = $_POST['redirect-user-on-submission'];

-			$redirect_page           = $_POST['redirect-user-to-selection'];

+			$list_id                 = $_POST[ 'associated-list' ];

+			$form_name               = stripslashes( $_POST[ 'form-name' ] );

+			$form_description        = sanitize_text_field( stripslashes( $_POST[ 'form-description' ] ) );

+			$redirect_user_on_submit = $_POST[ 'redirect-user-on-submission' ];

+			$redirect_page           = $_POST[ 'redirect-user-to-selection' ];

 

 			// stripslashes_deep on save, to prevent foreign languages from added excessive backslashes

-			$assigned_fields = isset( $_POST['field'] ) ? stripslashes_deep( $_POST['field'] ): array();

+			$assigned_fields = isset( $_POST[ 'field' ] ) ? stripslashes_deep( $_POST[ 'field' ] ) : array();

 

 			// setup our submission settings serialized array

 			$submission_settings = array(

-				'ajax'                   => $_POST['form-ajax-submission'],

-				'redirect_on_submission' => $_POST['redirect-user-on-submission'],

-				'redirect_page'          => $_POST['redirect-user-to-selection'],

-				'custom_redirect_url'    => esc_url( $_POST['custom-redirect-url'] ),

-				'redirect_new_window'	 => $_POST['redirect_new_window'],

-				'hide_form_post_signup'  => $_POST['hide-form-post-signup'],

-				'replace_interests'      => $_POST['replace-interest-groups'],

+				'ajax'                   => $_POST[ 'form-ajax-submission' ],

+				'redirect_on_submission' => $_POST[ 'redirect-user-on-submission' ],

+				'redirect_page'          => $_POST[ 'redirect-user-to-selection' ],

+				'custom_redirect_url'    => esc_url( $_POST[ 'custom-redirect-url' ] ),

+				'redirect_new_window'	 => $_POST[ 'redirect_new_window' ],

+				'hide_form_post_signup'  => $_POST[ 'hide-form-post-signup' ],

+				'replace_interests'      => $_POST[ 'replace-interest-groups' ],

 			);

 

 			// setup our opt-in settings serialized array

 			$optin_settings = array(

-				'optin'                => $_POST['single-double-optin'],

-				'update_existing_user' => $_POST['update-existing-user'],

-				'send_update_email'    => $_POST['update-existing-email'],

+				'optin'                => $_POST[ 'single-double-optin' ],

+				'update_existing_user' => $_POST[ 'update-existing-user' ],

+				'send_update_email'    => $_POST[ 'update-existing-email' ],

 			);

 

 			// Setup our error settings serialized array

 			$error_settings = array(

-				'success'				=> trim( $_POST['yikes-easy-mc-success-message'] ) ? trim( stripslashes( $_POST['yikes-easy-mc-success-message'] ) ) : '',

-				'success-single-optin'	=> trim( $_POST['yikes-easy-mc-success-single-optin-message'] ) ? trim( stripslashes( $_POST['yikes-easy-mc-success-single-optin-message'] ) ) : '',

-				'success-resubscribed'	=> trim( $_POST['yikes-easy-mc-user-resubscribed-success-message'] ) ? trim( stripslashes( $_POST['yikes-easy-mc-user-resubscribed-success-message'] ) ) : '',

-				'general-error'			=> trim( $_POST['yikes-easy-mc-general-error-message'] ) ? trim( stripslashes( $_POST['yikes-easy-mc-general-error-message'] ) ) : '',

-				'already-subscribed'	=> trim( $_POST['yikes-easy-mc-user-subscribed-message'] ) ? trim( stripslashes( $_POST['yikes-easy-mc-user-subscribed-message'] ) ) : '',

-				'update-link'			=> trim( $_POST['yikes-easy-mc-user-update-link'] ) ? trim( stripslashes( $_POST['yikes-easy-mc-user-update-link'] ) ) : '',

-				'email-subject'			=> trim( $_POST['yikes-easy-mc-user-email-subject'] ) ? trim( stripslashes( $_POST['yikes-easy-mc-user-email-subject'] ) ) : '',

-				'email-body'			=> trim( $_POST['yikes-easy-mc-user-email-body'] ) ? trim( stripslashes( $_POST['yikes-easy-mc-user-email-body'] ) ) : '',

-				'update-email-success'  => trim( $_POST['yikes-easy-mc-update-email-successful'] ) ? trim( stripslashes( $_POST['yikes-easy-mc-update-email-successful'] ) ) : '',

-				'update-email-failure'  => trim( $_POST['yikes-easy-mc-update-email-failure'] ) ? trim( stripslashes( $_POST['yikes-easy-mc-update-email-failure'] ) ) : '',

+				'success'				=> trim( $_POST[ 'yikes-easy-mc-success-message' ] ) ? trim( stripslashes( $_POST[ 'yikes-easy-mc-success-message' ] ) ) : '',

+				'success-single-optin'	=> trim( $_POST[ 'yikes-easy-mc-success-single-optin-message' ] ) ? trim( stripslashes( $_POST[ 'yikes-easy-mc-success-single-optin-message' ] ) ) : '',

+				'success-resubscribed'	=> trim( $_POST[ 'yikes-easy-mc-user-resubscribed-success-message' ] ) ? trim( stripslashes( $_POST[ 'yikes-easy-mc-user-resubscribed-success-message' ] ) ) : '',

+				'general-error'			=> trim( $_POST[ 'yikes-easy-mc-general-error-message' ] ) ? trim( stripslashes( $_POST[ 'yikes-easy-mc-general-error-message' ] ) ) : '',

+				'already-subscribed'	=> trim( $_POST[ 'yikes-easy-mc-user-subscribed-message' ] ) ? trim( stripslashes( $_POST[ 'yikes-easy-mc-user-subscribed-message' ] ) ) : '',

+				'update-link'			=> trim( $_POST[ 'yikes-easy-mc-user-update-link' ] ) ? trim( stripslashes( $_POST[ 'yikes-easy-mc-user-update-link' ] ) ) : '',

+				'email-subject'			=> trim( $_POST[ 'yikes-easy-mc-user-email-subject' ] ) ? trim( stripslashes( $_POST[ 'yikes-easy-mc-user-email-subject' ] ) ) : '',

+				'email-body'			=> trim( $_POST[ 'yikes-easy-mc-user-email-body' ] ) ? trim( stripslashes( $_POST[ 'yikes-easy-mc-user-email-body' ] ) ) : '',

+				'update-email-success'  => trim( $_POST[ 'yikes-easy-mc-update-email-successful' ] ) ? trim( stripslashes( $_POST[ 'yikes-easy-mc-update-email-successful' ] ) ) : '',

+				'update-email-failure'  => trim( $_POST[ 'yikes-easy-mc-update-email-failure' ] ) ? trim( stripslashes( $_POST[ 'yikes-easy-mc-update-email-failure' ] ) ) : '',

 			);

 

 			// Setup the new form settings array

 			// @since 6.0.3.8

 			// To Do: Combine date & time so it's a single unix timestamp

 			$form_settings = array(

-				'yikes-easy-mc-form-class-names'                 => trim( $_POST['yikes-easy-mc-form-class-names'] ),

-				'yikes-easy-mc-inline-form'                      => $_POST['yikes-easy-mc-inline-form'][0],

-				'yikes-easy-mc-submit-button-type'               => $_POST['yikes-easy-mc-submit-button-type'][0],

-				'yikes-easy-mc-submit-button-text'               => trim( $_POST['yikes-easy-mc-submit-button-text'] ),

-				'yikes-easy-mc-submit-button-image'              => esc_url( trim( $_POST['yikes-easy-mc-submit-button-image'] ) ),

-				'yikes-easy-mc-submit-button-classes'            => trim( $_POST['yikes-easy-mc-submit-button-classes'] ),

-				'yikes-easy-mc-form-schedule'                    => ( isset( $_POST['yikes-easy-mc-form-schedule'] ) ) ? '1' : '0',

-				'yikes-easy-mc-form-restriction-start'           => strtotime( $_POST['yikes-easy-mc-form-restriction-start-date'] . ' ' . $_POST['yikes-easy-mc-form-restriction-start-time'] ),

-				'yikes-easy-mc-form-restriction-end'             => strtotime( $_POST['yikes-easy-mc-form-restriction-end-date'] . ' ' . $_POST['yikes-easy-mc-form-restriction-end-time'] ),

-				'yikes-easy-mc-form-restriction-pending-message' => trim( $_POST['yikes-easy-mc-form-restriction-pending-message'] ),

-				'yikes-easy-mc-form-restriction-expired-message' => trim( $_POST['yikes-easy-mc-form-restriction-expired-message'] ),

-				'yikes-easy-mc-form-login-required'              => ( isset( $_POST['yikes-easy-mc-form-login-required'] ) ) ? '1' : '0',

-				'yikes-easy-mc-form-restriction-login-message'   => trim( $_POST['yikes-easy-mc-form-restriction-login-message'] ),

+				'yikes-easy-mc-form-class-names'                 => trim( $_POST[ 'yikes-easy-mc-form-class-names' ] ),

+				'yikes-easy-mc-inline-form'                      => $_POST[ 'yikes-easy-mc-inline-form' ][ 0 ],

+				'yikes-easy-mc-submit-button-type'               => $_POST[ 'yikes-easy-mc-submit-button-type' ][ 0 ],

+				'yikes-easy-mc-submit-button-text'               => trim( $_POST[ 'yikes-easy-mc-submit-button-text' ] ),

+				'yikes-easy-mc-submit-button-image'              => esc_url( trim( $_POST[ 'yikes-easy-mc-submit-button-image' ] ) ),

+				'yikes-easy-mc-submit-button-classes'            => trim( $_POST[ 'yikes-easy-mc-submit-button-classes' ] ),

+				'yikes-easy-mc-form-schedule'                    => ( isset( $_POST[ 'yikes-easy-mc-form-schedule' ] ) ) ? '1' : '0',

+				'yikes-easy-mc-form-restriction-start'           => strtotime( $_POST[ 'yikes-easy-mc-form-restriction-start-date' ] . ' ' . $_POST[ 'yikes-easy-mc-form-restriction-start-time' ] ),

+				'yikes-easy-mc-form-restriction-end'             => strtotime( $_POST[ 'yikes-easy-mc-form-restriction-end-date' ] . ' ' . $_POST[ 'yikes-easy-mc-form-restriction-end-time' ] ),

+				'yikes-easy-mc-form-restriction-pending-message' => trim( $_POST[ 'yikes-easy-mc-form-restriction-pending-message' ] ),

+				'yikes-easy-mc-form-restriction-expired-message' => trim( $_POST[ 'yikes-easy-mc-form-restriction-expired-message' ] ),

+				'yikes-easy-mc-form-login-required'              => ( isset( $_POST[ 'yikes-easy-mc-form-login-required' ] ) ) ? '1' : '0',

+				'yikes-easy-mc-form-restriction-login-message'   => trim( $_POST[ 'yikes-easy-mc-form-restriction-login-message' ] ),

 			);

 

 			// additional custom fields (extensions / user defined fields)

 			$custom_fields = array();

-			if ( isset( $_POST['custom-field'] ) ) {

-				foreach ( $_POST['custom-field'] as $custom_field => $custom_value ) {

+			if ( isset( $_POST[ 'custom-field' ] ) ) {

+				foreach ( $_POST[ 'custom-field' ] as $custom_field => $custom_value ) {

 					if ( is_array( $custom_value ) ) {

 						$custom_fields[ $custom_field ] = array_filter( stripslashes_deep( $custom_value ) ); // array_filters to remove empty items (don't save them!)

 					} else {

@@ -2621,7 +2621,7 @@ 
 			$this->form_interface->update_form( $form_id, $form_updates );

 

 			/* Custom action hook which allows users to update specific options when a form is updated - used in add ons */

-			do_action( 'yikes-mailchimp-save-form', $form_id,  $custom_fields );

+			do_action( 'yikes-mailchimp-save-form', $form_id, $custom_fields );

 

 			// redirect the user to the manage forms page, display confirmation

 			wp_redirect( esc_url_raw( admin_url( 'admin.php?page=yikes-mailchimp-edit-form&id=' . $form_id . '&updated-form=true' ) ) );

@@ -2632,11 +2632,11 @@ 
 			$email_body  = '<p>' . __( 'Greetings,', 'yikes-inc-easy-mailchimp-extender' ) . '</p>'; 

 

 			$email_body .= '<p>';

-			$email_body .= 	__( 'A request has been made to update your Mailchimp account profile information.', 'yikes-inc-easy-mailchimp-extender' );

-			$email_body .=	__( ' To do so please use the following link: ', 'yikes-inc-easy-mailchimp-extender' );

-			$email_body .=	'[link]';

-			$email_body .=		__( 'Update Mailchimp Profile Info', 'yikes-inc-easy-mailchimp-extender' );

-			$email_body .= 	'[/link]';

+			$email_body .= __( 'A request has been made to update your Mailchimp account profile information.', 'yikes-inc-easy-mailchimp-extender' );

+			$email_body .= __( ' To do so please use the following link: ', 'yikes-inc-easy-mailchimp-extender' );

+			$email_body .= '[link]';

+			$email_body .= __( 'Update Mailchimp Profile Info', 'yikes-inc-easy-mailchimp-extender' );

+			$email_body .= '[/link]';

 			$email_body .= '</p>';

 

 			$email_body .= '<p>' . __( 'If you did not request this update, please disregard this email.', 'yikes-inc-easy-mailchimp-extender' ) . '</p>';

@@ -2652,13 +2652,13 @@ 
 

 		/* Unsubscribe a given user from our list */

 		public function yikes_easy_mailchimp_unsubscribe_user() {

-			$nonce    = $_REQUEST['nonce'];

-			$list_id  = $_REQUEST['mailchimp-list'];

-			$email_id = $_REQUEST['email_id'];

+			$nonce    = $_REQUEST[ 'nonce' ];

+			$list_id  = $_REQUEST[ 'mailchimp-list' ];

+			$email_id = $_REQUEST[ 'email_id' ];

 

 			// verify our nonce

 			if ( ! wp_verify_nonce( $nonce, 'unsubscribe-user-' . $email_id ) ) {

-				wp_die( __( "We've run into an error. The security check didn't pass. Please try again." , 'yikes-inc-easy-mailchimp-extender' ) , __( "Failed nonce validation" , 'yikes-inc-easy-mailchimp-extender' ) , array( 'response' => 500 , 'back_link' => true ) );

+				wp_die( __( "We've run into an error. The security check didn't pass. Please try again.", 'yikes-inc-easy-mailchimp-extender' ), __( "Failed nonce validation", 'yikes-inc-easy-mailchimp-extender' ), array( 'response' => 500, 'back_link' => true ) );

 			}

 

 			$response = yikes_get_mc_api_manager()->get_list_handler()->member_unsubscribe( $list_id, $email_id );

@@ -2677,21 +2677,21 @@ 
 

 		public function yikes_easy_mailchimp_create_missing_error_log() {

 			// grab our nonnce

-			$nonce = $_REQUEST['nonce'];

+			$nonce = $_REQUEST[ 'nonce' ];

 			// validate nonce

-			if ( !wp_verify_nonce( $nonce, 'create_error_log' ) ) {

-				wp_die( __( "We've run into an error. The security check didn't pass. Please try again." , 'yikes-inc-easy-mailchimp-extender' ) , __( "Failed nonce validation" , 'yikes-inc-easy-mailchimp-extender' ) , array( 'response' => 500 , 'back_link' => true ) );

+			if ( ! wp_verify_nonce( $nonce, 'create_error_log' ) ) {

+				wp_die( __( "We've run into an error. The security check didn't pass. Please try again.", 'yikes-inc-easy-mailchimp-extender' ), __( "Failed nonce validation", 'yikes-inc-easy-mailchimp-extender' ), array( 'response' => 500, 'back_link' => true ) );

 			}

 			// setup the path to the error log

 			$error_log = fopen( plugin_dir_path( __FILE__ ) . '../includes/error_log/yikes-easy-mailchimp-error-log.php', 'w' );

 			try {

 				// create the file

-				fwrite( $error_log , '' );

+				fwrite( $error_log, '' );

 				// close out

 				fclose( $error_log );

 				wp_redirect( esc_url_raw( admin_url( 'admin.php?page=yikes-inc-easy-mailchimp-settings&section=debug-settings&error_log_created=true' ) ) );

 			} catch ( Exception $e ) {

-				wp_redirect( esc_url_raw( admin_url( 'admin.php?page=yikes-inc-easy-mailchimp-settings&section=debug-settings&error_log_created=false&error_message='.urlencode( $e->getMessage() ) ) ) );

+				wp_redirect( esc_url_raw( admin_url( 'admin.php?page=yikes-inc-easy-mailchimp-settings&section=debug-settings&error_log_created=false&error_message=' . urlencode( $e->getMessage() ) ) ) );

 			}

 		}

 

@@ -2702,9 +2702,9 @@ 
 		public function yikes_easy_mailchimp_clear_transient_data() {

 

 			// verify our nonce

-			$nonce = $_REQUEST['nonce'];

+			$nonce = $_REQUEST[ 'nonce' ];

 			if ( ! wp_verify_nonce( $nonce, 'clear-mc-transient-data' ) ) {

-				wp_die( __( "We've run into an error. The security check didn't pass. Please try again." , 'yikes-inc-easy-mailchimp-extender' ) , __( "Failed nonce validation" , 'yikes-inc-easy-mailchimp-extender' ) , array( 'response' => 500 , 'back_link' => true ) );

+				wp_die( __( "We've run into an error. The security check didn't pass. Please try again.", 'yikes-inc-easy-mailchimp-extender' ), __( "Failed nonce validation", 'yikes-inc-easy-mailchimp-extender' ), array( 'response' => 500, 'back_link' => true ) );

 			}

 

 			$this->delete_yikes_mailchimp_transients();

@@ -2713,10 +2713,10 @@ 
 			$referer = wp_get_referer();

 			if ( $referer && ( strpos( $referer, 'yikes-inc-easy-mailchimp-settings' ) > 0 ) ) {

 				wp_redirect( esc_url_raw( admin_url( 'admin.php?page=yikes-inc-easy-mailchimp-settings&section=api-cache-settings&transient-cleared=true' ) ) );

-			} elseif ( isset( $_REQUEST['page'] ) && $_REQUEST['page'] === 'yikes-mailchimp-edit-form' && isset( $_REQUEST['id'] ) && ! empty( $_REQUEST['id'] ) ) {

+			} elseif ( isset( $_REQUEST[ 'page' ] ) && $_REQUEST[ 'page' ] === 'yikes-mailchimp-edit-form' && isset( $_REQUEST[ 'id' ] ) && ! empty( $_REQUEST[ 'id' ] ) ) {

 

 				// else check if we were editing a form.

-				$id = filter_var( $_REQUEST['id'], FILTER_SANITIZE_NUMBER_INT );

+				$id = filter_var( $_REQUEST[ 'id' ], FILTER_SANITIZE_NUMBER_INT );

 				wp_redirect( esc_url_raw( admin_url( 'admin.php?page=yikes-mailchimp-edit-form&id=' . $id ) ) );

 			} else {

 				// else redirect to the manage forms page.

@@ -2760,7 +2760,7 @@ 
 		 */

 		public function yikes_mailchimp_load_helper_class() {

 			// check to see if it's already loaded up.

-			if ( !class_exists( 'Yikes_Inc_Easy_Mailchimp_Forms_Helper' ) ) {

+			if ( ! class_exists( 'Yikes_Inc_Easy_Mailchimp_Forms_Helper' ) ) {

 				// Include our main helper class file

 				include_once( YIKES_MC_PATH . 'admin/partials/helpers/init.php' );

 			}