yikesinc / yikes-inc-easy-mailchimp-extender

admin/partials/menu/options-sections/debug-settings.php

Spacing +5 added lines, -5 removed lines

@@ -4,7 +4,7 @@ 
 	- php version, wp version, plugin version and debug log
 -->
 
-<h3><span><?php _e( 'Debug Settings' , 'yikes-inc-easy-mailchimp-extender' ); ?></span></h3>
+<h3><span><?php _e( 'Debug Settings', 'yikes-inc-easy-mailchimp-extender' ); ?></span></h3>
 
 <div class="inside">
 	
@@ -13,10 +13,10 @@ 
 	
 		<?php settings_fields( 'yikes_inc_easy_mc_debug_settings_page' ); ?>
 	
-		<label for="yikes-mailchimp-debug-status"><strong><?php _e( 'Enable Debugging' , 'yikes-inc-easy-mailchimp-extender' ); ?></strong>
-			<input type="checkbox" name="yikes-mailchimp-debug-status" id="yikes-mailchimp-debug-status" value="1" <?php checked( get_option( 'yikes-mailchimp-debug-status' , '' ) , '1' ); ?>>
+		<label for="yikes-mailchimp-debug-status"><strong><?php _e( 'Enable Debugging', 'yikes-inc-easy-mailchimp-extender' ); ?></strong>
+			<input type="checkbox" name="yikes-mailchimp-debug-status" id="yikes-mailchimp-debug-status" value="1" <?php checked( get_option( 'yikes-mailchimp-debug-status', '' ), '1' ); ?>>
 		</label>
-		<p class="description"><?php _e( "If you encounter an issue with Easy Forms for MailChimp you can toggle on debugging to display advanced error messages and start logging errors." , 'yikes-inc-easy-mailchimp-extender' ); ?></p>
+		<p class="description"><?php _e( "If you encounter an issue with Easy Forms for MailChimp you can toggle on debugging to display advanced error messages and start logging errors.", 'yikes-inc-easy-mailchimp-extender' ); ?></p>
 		
 		<?php submit_button(); ?>
 									
@@ -35,7 +35,7 @@ 
 				)
 			);
 		?>
-		<h2><?php _e( "Debug Log" , 'yikes-inc-easy-mailchimp-extender' ); ?> &nbsp; <a href="<?php echo $url; ?>" class="button-secondary"><?php _e( 'Clear Log', 'yikes-inc-easy-mailchimp-extender' ); ?></a></h2>
+		<h2><?php _e( "Debug Log", 'yikes-inc-easy-mailchimp-extender' ); ?> &nbsp; <a href="<?php echo $url; ?>" class="button-secondary"><?php _e( 'Clear Log', 'yikes-inc-easy-mailchimp-extender' ); ?></a></h2>
 		
 		<table class="widefat" id="yikes-mailchimp-error-log">
 			<!-- table header -->

admin/partials/menu/options-sections/recaptcha-settings.php

Spacing +11 added lines, -11 removed lines

@@ -12,16 +12,16 @@ 
 
 ?>
 
-<h3><span><?php _e( 'reCAPTCHA Settings' , 'yikes-inc-easy-mailchimp-extender' ); ?></span></h3>
+<h3><span><?php _e( 'reCAPTCHA Settings', 'yikes-inc-easy-mailchimp-extender' ); ?></span></h3>
 
 <div class="inside">
 	
 	<p>
-		<?php _e( 'reCAPTCHA is a free CAPTCHA service, from Google, that helps protect your site against spam, malicious registrations and other forms of attacks where computers try to disguise themselves as a human. reCAPTCHA will help prevent spammers and bots from submitting data through your MailChimp forms.' , 'yikes-inc-easy-mailchimp-extender' ); ?>
+		<?php _e( 'reCAPTCHA is a free CAPTCHA service, from Google, that helps protect your site against spam, malicious registrations and other forms of attacks where computers try to disguise themselves as a human. reCAPTCHA will help prevent spammers and bots from submitting data through your MailChimp forms.', 'yikes-inc-easy-mailchimp-extender' ); ?>
 	</p>
 	
 	<p>
-		<?php echo '<a href="https://www.google.com/recaptcha/admin" target="_blank" title="' . __( 'Get your reCAPTCHA API Key' , 'yikes-inc-easy-mailchimp-extender' ) . '">' . __( 'Get Your reCAPTCHA API Key' , 'yikes-inc-easy-mailchimp-extender' ) . '</a>'; ?>
+		<?php echo '<a href="https://www.google.com/recaptcha/admin" target="_blank" title="' . __( 'Get your reCAPTCHA API Key', 'yikes-inc-easy-mailchimp-extender' ) . '">' . __( 'Get Your reCAPTCHA API Key', 'yikes-inc-easy-mailchimp-extender' ) . '</a>'; ?>
 	</p>
 	
 	<!-- Settings Form -->
@@ -29,21 +29,21 @@ 
 		
 		<?php settings_fields( 'yikes_inc_easy_mc_recaptcha_settings_page' ); ?>
 		
-			<label for="yikes-mc-recaptcha-setting"><strong><?php _e( 'Enable reCAPTCHA Protection' , 'yikes-inc-easy-mailchimp-extender' ); ?></strong>
-				<input type="checkbox" name="yikes-mc-recaptcha-status" class="recaptcha-setting-checkbox" value="1" <?php checked( get_option( 'yikes-mc-recaptcha-status' , '' ) , '1' ); ?>>
+			<label for="yikes-mc-recaptcha-setting"><strong><?php _e( 'Enable reCAPTCHA Protection', 'yikes-inc-easy-mailchimp-extender' ); ?></strong>
+				<input type="checkbox" name="yikes-mc-recaptcha-status" class="recaptcha-setting-checkbox" value="1" <?php checked( get_option( 'yikes-mc-recaptcha-status', '' ), '1' ); ?>>
 			</label>
 			
-			<label for="yikes-mc-recaptcha-api-key"><strong><?php _e( 'reCAPTCHA Site Key' , 'yikes-inc-easy-mailchimp-extender' ); ?></strong>
-				<input type="text" class="widefat recaptcha-setting-checkbox" name="yikes-mc-recaptcha-site-key" value="<?php echo esc_attr( get_option( 'yikes-mc-recaptcha-site-key' , '' ) ); ?>">
+			<label for="yikes-mc-recaptcha-api-key"><strong><?php _e( 'reCAPTCHA Site Key', 'yikes-inc-easy-mailchimp-extender' ); ?></strong>
+				<input type="text" class="widefat recaptcha-setting-checkbox" name="yikes-mc-recaptcha-site-key" value="<?php echo esc_attr( get_option( 'yikes-mc-recaptcha-site-key', '' ) ); ?>">
 			</label>
 			
-			<label for="yikes-mc-recaptcha-private-api-key"><strong><?php _e( 'reCAPTCHA Secret Key' , 'yikes-inc-easy-mailchimp-extender' ); ?></strong>
-				<input type="text" class="widefat recaptcha-setting-checkbox" name="yikes-mc-recaptcha-secret-key" id="" value="<?php echo esc_attr( get_option( 'yikes-mc-recaptcha-secret-key' , '' ) ); ?>">
+			<label for="yikes-mc-recaptcha-private-api-key"><strong><?php _e( 'reCAPTCHA Secret Key', 'yikes-inc-easy-mailchimp-extender' ); ?></strong>
+				<input type="text" class="widefat recaptcha-setting-checkbox" name="yikes-mc-recaptcha-secret-key" id="" value="<?php echo esc_attr( get_option( 'yikes-mc-recaptcha-secret-key', '' ) ); ?>">
 			</label>
 			
-			<a href="#" onclick="jQuery(this).next().slideToggle();return false;" class="recaptcha-preview-link"><?php _e( 'View reCAPTCHA Preview' , 'yikes-inc-easy-mailchimp-extender' ); ?></a>
+			<a href="#" onclick="jQuery(this).next().slideToggle();return false;" class="recaptcha-preview-link"><?php _e( 'View reCAPTCHA Preview', 'yikes-inc-easy-mailchimp-extender' ); ?></a>
 				<span class="recaptcha-preview-container">
-					<img src="<?php echo YIKES_MC_URL . 'includes/images/recaptcha/recaptcha-demo.gif'; ?>" alt="<?php _e( 'reCAPTCHA Preview' , 'yikes-inc-easy-mailchimp-extender' ); ?>" class="recaptcha-demo-gif">
+					<img src="<?php echo YIKES_MC_URL . 'includes/images/recaptcha/recaptcha-demo.gif'; ?>" alt="<?php _e( 'reCAPTCHA Preview', 'yikes-inc-easy-mailchimp-extender' ); ?>" class="recaptcha-demo-gif">
 				</span>
 			
 			

admin/partials/menu/support.php

Spacing +12 added lines, -12 removed lines

@@ -10,17 +10,17 @@ 
 
 	<div id="yikes-mailchimp-logo" class="support-page"></div>
 	
-	<h1><?php _e( 'Support' , 'yikes-inc-easy-mailchimp-extender' ); ?></h1>
-	<strong><?php _e( "You've got questions? We have answers!" , 'yikes-inc-easy-mailchimp-extender' ); ?></strong>
-	<?php if( get_option( 'yikes-easy-mc-active-addons' , array() ) == array() ) { ?>
-		<p><?php _e( 'Users of the free version of YIKES Inc. Easy Forms for MailChimp are limited to two methods of support. We respond to support requests for the free version of the plugin once a week.' , 'yikes-inc-easy-mailchimp-extender' ); ?></p>
-		<p><?php printf( __( 'Purchasers of our paid add-ons qualify for premium support, <a href="%s" target="_blank" title="' . __( 'check them out', 'yikes-inc-easy-mailchimp-extender' ) . '">' . __( 'check them out', 'yikes-inc-easy-mailchimp-extender' ) . '</a>!' , 'yikes-inc-easy-mailchimp-extender' ), esc_url( 'https://yikesplugins.com/' ) ); ?></p>
+	<h1><?php _e( 'Support', 'yikes-inc-easy-mailchimp-extender' ); ?></h1>
+	<strong><?php _e( "You've got questions? We have answers!", 'yikes-inc-easy-mailchimp-extender' ); ?></strong>
+	<?php if ( get_option( 'yikes-easy-mc-active-addons', array() ) == array() ) { ?>
+		<p><?php _e( 'Users of the free version of YIKES Inc. Easy Forms for MailChimp are limited to two methods of support. We respond to support requests for the free version of the plugin once a week.', 'yikes-inc-easy-mailchimp-extender' ); ?></p>
+		<p><?php printf( __( 'Purchasers of our paid add-ons qualify for premium support, <a href="%s" target="_blank" title="' . __( 'check them out', 'yikes-inc-easy-mailchimp-extender' ) . '">' . __( 'check them out', 'yikes-inc-easy-mailchimp-extender' ) . '</a>!', 'yikes-inc-easy-mailchimp-extender' ), esc_url( 'https://yikesplugins.com/' ) ); ?></p>
 	<?php } else { ?>
-		<p><?php _e( "It looks like you are one of our premium users! Fill out the form below to submit a priority support request." , 'yikes-inc-easy-mailchimp-extender' ); ?></p>
-		<p><?php _e( "If you have any problems with the form, send an email to <a href='mailto:support@yikesinc.com'>support@yikesinc.com</a> and a ticket will be created." , 'yikes-inc-easy-mailchimp-extender' ); ?></p>
+		<p><?php _e( "It looks like you are one of our premium users! Fill out the form below to submit a priority support request.", 'yikes-inc-easy-mailchimp-extender' ); ?></p>
+		<p><?php _e( "If you have any problems with the form, send an email to <a href='mailto:support@yikesinc.com'>support@yikesinc.com</a> and a ticket will be created.", 'yikes-inc-easy-mailchimp-extender' ); ?></p>
 	<?php } ?>
 
-		<p><?php printf( __( 'Before submitting a support request, visit our %s.' , 'yikes-inc-easy-mailchimp-extender' ), '<a target="_blank" href="' . esc_url( 'https://yikesplugins.com/support/knowledge-base/product/easy-forms-for-mailchimp/' ) . '" title="' . __( 'Knowledge Base', 'yikes-inc-easy-mailchimp-extender' ) . '">' . __( 'knowledge base', 'yikes-inc-easy-mailchimp-extender' ) . '</a> where we have step-by-step guides and troubleshooting help.' ); ?></p>
+		<p><?php printf( __( 'Before submitting a support request, visit our %s.', 'yikes-inc-easy-mailchimp-extender' ), '<a target="_blank" href="' . esc_url( 'https://yikesplugins.com/support/knowledge-base/product/easy-forms-for-mailchimp/' ) . '" title="' . __( 'Knowledge Base', 'yikes-inc-easy-mailchimp-extender' ) . '">' . __( 'knowledge base', 'yikes-inc-easy-mailchimp-extender' ) . '</a> where we have step-by-step guides and troubleshooting help.' ); ?></p>
 
 	<hr />
 	
@@ -29,10 +29,10 @@ 
 		<div id="col-right">
 
 			<div class="col-wrap">
-				<h1><span class="github-octocat"></span><?php _e( 'Github Issue Tracker' , 'yikes-inc-easy-mailchimp-extender' ); ?></h1>
+				<h1><span class="github-octocat"></span><?php _e( 'Github Issue Tracker', 'yikes-inc-easy-mailchimp-extender' ); ?></h1>
 				<div class="inside">
 					<p><?php _e( 'The fastest way to receive free support is to submit a new issue to our GitHub issue tracker. ', 'yikes-inc-easy-mailchimp-extender' ); ?></p>
-					<img class="support-page-logo" src="<?php echo YIKES_MC_URL; ?>includes/images/Support_Page/github-issue-screenshot.png" title="<?php esc_attr_e( 'Github Issue Tracker Screenshot' , 'yikes-inc-easy-mailchimp-extender' ); ?>" >
+					<img class="support-page-logo" src="<?php echo YIKES_MC_URL; ?>includes/images/Support_Page/github-issue-screenshot.png" title="<?php esc_attr_e( 'Github Issue Tracker Screenshot', 'yikes-inc-easy-mailchimp-extender' ); ?>" >
 					<a href="https://github.com/yikesinc/yikes-inc-easy-mailchimp-extender/issues" target="_blank" class="button-secondary support-page-button"><?php _e( 'Submit New github.org Issue', 'yikes-inc-easy-mailchimp-extender' ); ?></a>
 				</div>
 			</div>
@@ -44,10 +44,10 @@ 
 		<div id="col-left">
 
 			<div class="col-wrap">
-				<h1><span class="dashicons dashicons-wordpress-alt support-page-wordpress-font"></span>&nbsp;<?php _e( 'WordPress.org Plugin Directory' , 'yikes-inc-easy-mailchimp-extender' ); ?></h1>
+				<h1><span class="dashicons dashicons-wordpress-alt support-page-wordpress-font"></span>&nbsp;<?php _e( 'WordPress.org Plugin Directory', 'yikes-inc-easy-mailchimp-extender' ); ?></h1>
 				<div class="inside">
 					<p><?php _e( 'Use your WordPress.org username to submit support requests on the WordPress Directory support forum.', 'yikes-inc-easy-mailchimp-extender' ); ?></p>
-					<img class="support-page-logo" src="<?php echo YIKES_MC_URL; ?>includes/images/Support_Page/wordpress-issue-screenshot.png" title="<?php esc_attr_e( 'WordPress.org Issue Tracker Screenshot' , 'yikes-inc-easy-mailchimp-extender' ); ?>" >
+					<img class="support-page-logo" src="<?php echo YIKES_MC_URL; ?>includes/images/Support_Page/wordpress-issue-screenshot.png" title="<?php esc_attr_e( 'WordPress.org Issue Tracker Screenshot', 'yikes-inc-easy-mailchimp-extender' ); ?>" >
 					<a href="https://wordpress.org/support/plugin/yikes-inc-easy-mailchimp-extender" target="_blank" class="button-secondary support-page-button"><?php _e( 'Submit New WordPress.org Support Request', 'yikes-inc-easy-mailchimp-extender' ); ?></a>
 				</div>
 			</div>

admin/partials/helpers/init.php

Indentation +23 added lines, -23 removed lines

@@ -7,13 +7,13 @@ 
 	class Yikes_Inc_Easy_Mailchimp_Extender_Helper {
 	
 			/**
-			*	Helper functions to help out with extensions (still fleshing out)
-			*	@since 6.0
-			*	@ Parameters (array of data)
-			*		-	Section ID - id of the section, should be a slug style text ie: 'custom-section'
-			*		-	Link Text - Visible text for this link ie: 'Custom Section'
-			*		-	Dashicon - class of the icon you would like to use for this link
-			**/
+			 *	Helper functions to help out with extensions (still fleshing out)
+			 *	@since 6.0
+			 *	@ Parameters (array of data)
+			 *		-	Section ID - id of the section, should be a slug style text ie: 'custom-section'
+			 *		-	Link Text - Visible text for this link ie: 'Custom Section'
+			 *		-	Dashicon - class of the icon you would like to use for this link
+			 **/
 			public static function add_edit_form_section_link( $link_array=array() ) {
 				if( !empty( $link_array ) ) {
 					$link_data = wp_parse_args( array() , $link_array );
@@ -36,17 +36,17 @@ 
 			}
 			
 			/**
-			*	Helper functions to help out with extensions (still fleshing out)
-			*	@since 6.0
-			*	@ Parameters:
-			*		-	Section ID - id of the section, should be a slug style text ie: 'custom-section'
-			*		-	Class - class file to call function from?
-			*		-	Main Callback - call back for main section
-			*		-	Main Section Title - main section title
-			*		-	Sidebar Callback - callback for the sidebar section
-			*		-	Sidebar Title - title of the sidebar section
-			*		-	Class - class to reference funtions out of (optiona, if left blank functions should be defined in functions.php (or outside of a class))
-			**/
+			 *	Helper functions to help out with extensions (still fleshing out)
+			 *	@since 6.0
+			 *	@ Parameters:
+			 *		-	Section ID - id of the section, should be a slug style text ie: 'custom-section'
+			 *		-	Class - class file to call function from?
+			 *		-	Main Callback - call back for main section
+			 *		-	Main Section Title - main section title
+			 *		-	Sidebar Callback - callback for the sidebar section
+			 *		-	Sidebar Title - title of the sidebar section
+			 *		-	Class - class to reference funtions out of (optiona, if left blank functions should be defined in functions.php (or outside of a class))
+			 **/
 			public static function add_edit_form_section( $section_array=array() ) {
 				if( !empty( $section_array ) ) {
 					$section_data = wp_parse_args( array() , $section_array );
@@ -59,11 +59,11 @@ 
 			}
 			
 			/**
-			*	Check if the custom section is single or two columns (with sidebar)
-			*	@since 6.0
-			*	@Parameters:
-			*		-	Section Data - the array of data associated with the custom field you've set up
-			*/
+			 *	Check if the custom section is single or two columns (with sidebar)
+			 *	@since 6.0
+			 *	@Parameters:
+			 *		-	Section Data - the array of data associated with the custom field you've set up
+			 */
 			public static function is_custom_section_two_column( $custom_section_data ) {
 				// print_r( $custom_section_data );
 				$value = ( isset( $custom_section_data['sidebar_title'] ) && isset( $custom_section_data['sidebar_fields'] ) && !empty( $custom_section_data['sidebar_fields'] ) ) ?  true : false;

Spacing +13 added lines, -13 removed lines

@@ -14,21 +14,21 @@ 
 			*		-	Link Text - Visible text for this link ie: 'Custom Section'
 			*		-	Dashicon - class of the icon you would like to use for this link
 			**/
-			public static function add_edit_form_section_link( $link_array=array() ) {
-				if( !empty( $link_array ) ) {
-					$link_data = wp_parse_args( array() , $link_array );
-					if( !empty( $link_data['text'] ) && !empty( $link_data['id'] ) ) {
-						if( !empty( $link_data['icon'] ) ) {
-							if( !isset( $link_data['icon_family'] ) || $link_data['icon_family'] == 'dashicons' || $link_data['icon_family'] == 'dashicon' ) {
-								$icon =  '<span class="dashicons dashicons-' . esc_attr__( $link_data['icon'] ) . ' yikes-easy-mailchimp-custom-content-icon"></span>';
+			public static function add_edit_form_section_link( $link_array = array() ) {
+				if ( ! empty( $link_array ) ) {
+					$link_data = wp_parse_args( array(), $link_array );
+					if ( ! empty( $link_data[ 'text' ] ) && ! empty( $link_data[ 'id' ] ) ) {
+						if ( ! empty( $link_data[ 'icon' ] ) ) {
+							if ( ! isset( $link_data[ 'icon_family' ] ) || $link_data[ 'icon_family' ] == 'dashicons' || $link_data[ 'icon_family' ] == 'dashicon' ) {
+								$icon = '<span class="dashicons dashicons-' . esc_attr__( $link_data[ 'icon' ] ) . ' yikes-easy-mailchimp-custom-content-icon"></span>';
 							} else {
-								$icon =  '<span class="' . esc_attr__( $link_data['icon'] ) . ' yikes-easy-mailchimp-custom-content-icon"></span>';
+								$icon = '<span class="' . esc_attr__( $link_data[ 'icon' ] ) . ' yikes-easy-mailchimp-custom-content-icon"></span>';
 							}
 						} else {
 							$icon = '';
 						}
 						$link = '<li class="hidden_setting_list">';
-							$link .= '<a class="hidden_setting ' . esc_attr__( $link_data['id'] ) . '" data-attr-container="' . esc_attr__( $link_data['id'] ) . '" onclick="return false;" title="' . esc_attr__( $link_data['text'] ) . '" href="#">' . $icon . esc_attr__( $link_data['text'] ) . '</a>';
+							$link .= '<a class="hidden_setting ' . esc_attr__( $link_data[ 'id' ] ) . '" data-attr-container="' . esc_attr__( $link_data[ 'id' ] ) . '" onclick="return false;" title="' . esc_attr__( $link_data[ 'text' ] ) . '" href="#">' . $icon . esc_attr__( $link_data[ 'text' ] ) . '</a>';
 						$link .= '</li>';
 						echo $link;
 					}
@@ -47,9 +47,9 @@ 
 			*		-	Sidebar Title - title of the sidebar section
 			*		-	Class - class to reference funtions out of (optiona, if left blank functions should be defined in functions.php (or outside of a class))
 			**/
-			public static function add_edit_form_section( $section_array=array() ) {
-				if( !empty( $section_array ) ) {
-					$section_data = wp_parse_args( array() , $section_array );
+			public static function add_edit_form_section( $section_array = array() ) {
+				if ( ! empty( $section_array ) ) {
+					$section_data = wp_parse_args( array(), $section_array );
 					ob_start();
 					include ( YIKES_MC_PATH . 'admin/partials/helpers/edit-form-hidden-section-template.php' );
 					$section = ob_get_contents();
@@ -66,7 +66,7 @@ 
 			*/
 			public static function is_custom_section_two_column( $custom_section_data ) {
 				// print_r( $custom_section_data );
-				$value = ( isset( $custom_section_data['sidebar_title'] ) && isset( $custom_section_data['sidebar_fields'] ) && !empty( $custom_section_data['sidebar_fields'] ) ) ?  true : false;
+				$value = ( isset( $custom_section_data[ 'sidebar_title' ] ) && isset( $custom_section_data[ 'sidebar_fields' ] ) && ! empty( $custom_section_data[ 'sidebar_fields' ] ) ) ? true : false;
 				return $value;
 			}
 			

admin/partials/helpers/edit-form-hidden-section-template.php

Spacing +21 added lines, -21 removed lines

@@ -8,28 +8,28 @@ 
 		// grab our global form_data;
 		global $form_data;
 	?>
-	<label class="hidden-setting-label yikes-easy-mc-hidden" for="form" id=<?php esc_attr_e( $section_data['id'] ); ?>>
+	<label class="hidden-setting-label yikes-easy-mc-hidden" for="form" id=<?php esc_attr_e( $section_data[ 'id' ] ); ?>>
 		<div id="poststuff">
-			<div id="post-body" class="metabox-holder <?php if( self::is_custom_section_two_column( $section_data ) ) { ?> columns-2 <?php } else { ?> columns-1 <?php } ?>">
+			<div id="post-body" class="metabox-holder <?php if ( self::is_custom_section_two_column( $section_data ) ) { ?> columns-2 <?php } else { ?> columns-1 <?php } ?>">
 				<div id="post-body-content">
 					<div class="meta-box-sortables ui-sortable">
 						<div class="postbox yikes-easy-mc-postbox">
-							<h3 class="edit-form-title"><span><?php echo $section_data['main_title']; ?></span></h3>
-								<div class="inside <?php esc_attr_e( $section_data['id'] ); ?>-container">
+							<h3 class="edit-form-title"><span><?php echo $section_data[ 'main_title' ]; ?></span></h3>
+								<div class="inside <?php esc_attr_e( $section_data[ 'id' ] ); ?>-container">
 									<?php 
-										if( isset( $section_data['main_description'] ) && $section_data['main_description'] != '' ) {
+										if ( isset( $section_data[ 'main_description' ] ) && $section_data[ 'main_description' ] != '' ) {
 											?>
-												<p><?php echo $section_data['main_description']; ?></p>
+												<p><?php echo $section_data[ 'main_description' ]; ?></p>
 											<?php
 										}
-										$main_field_data = $section_data['main_fields'];
-										foreach( $main_field_data as $field ) { 
-											if( $field['type'] == 'custom' ) {
+										$main_field_data = $section_data[ 'main_fields' ];
+										foreach ( $main_field_data as $field ) { 
+											if ( $field[ 'type' ] == 'custom' ) {
 												// execute the custom callback
-												$field['callback']();
+												$field[ 'callback' ]();
 											} else {
 												// include our field files
-												include( YIKES_MC_PATH . 'admin/partials/helpers/fields/yikes-mailchimp-' . $field['type'] . '-field.php' );
+												include( YIKES_MC_PATH . 'admin/partials/helpers/fields/yikes-mailchimp-' . $field[ 'type' ] . '-field.php' );
 											}
 										}
 									?>
@@ -39,27 +39,27 @@ 
 					</div>
 					
 					<!-- check for single/double box -->
-					<?php if( self::is_custom_section_two_column( $section_data ) ) { ?>
+					<?php if ( self::is_custom_section_two_column( $section_data ) ) { ?>
 						<!-- begin sidebar -->
 						<div id="postbox-container-1" class="postbox-container">
 							<div class="meta-box-sortables">
 								<div class="postbox yikes-easy-mc-postbox">
-									<h3 class="edit-form-title"><span><?php echo $section_data['sidebar_title']; ?></span></h3>
-									<div class="inside <?php esc_attr_e( $section_data['id'] ); ?>-sidebar-container"> 
+									<h3 class="edit-form-title"><span><?php echo $section_data[ 'sidebar_title' ]; ?></span></h3>
+									<div class="inside <?php esc_attr_e( $section_data[ 'id' ] ); ?>-sidebar-container"> 
 										<?php
-											if( isset( $section_data['sidebar_description'] ) && $section_data['sidebar_description'] != '' ) {
+											if ( isset( $section_data[ 'sidebar_description' ] ) && $section_data[ 'sidebar_description' ] != '' ) {
 												?>
-													<p><?php echo $section_data['sidebar_description']; ?></p>
+													<p><?php echo $section_data[ 'sidebar_description' ]; ?></p>
 												<?php
 											}
-											$sidebar_field_data = $section_data['sidebar_fields'];
-											foreach( $sidebar_field_data as $field ) { 
-												if( $field['type'] == 'custom' ) {
+											$sidebar_field_data = $section_data[ 'sidebar_fields' ];
+											foreach ( $sidebar_field_data as $field ) { 
+												if ( $field[ 'type' ] == 'custom' ) {
 													// execute the custom callback
-													$field['callback']();
+													$field[ 'callback' ]();
 												} else {
 													// include our field files
-													include( YIKES_MC_PATH . 'admin/partials/helpers/fields/yikes-mailchimp-' . $field['type'] . '-field.php' );
+													include( YIKES_MC_PATH . 'admin/partials/helpers/fields/yikes-mailchimp-' . $field[ 'type' ] . '-field.php' );
 												}
 											}
 										?>

Braces +2 added lines, -2 removed lines

@@ -23,7 +23,7 @@ 
 											<?php
 										}
 										$main_field_data = $section_data['main_fields'];
-										foreach( $main_field_data as $field ) { 
+										foreach( $main_field_data as $field ) {
 											if( $field['type'] == 'custom' ) {
 												// execute the custom callback
 												$field['callback']();
@@ -53,7 +53,7 @@ 
 												<?php
 											}
 											$sidebar_field_data = $section_data['sidebar_fields'];
-											foreach( $sidebar_field_data as $field ) { 
+											foreach( $sidebar_field_data as $field ) {
 												if( $field['type'] == 'custom' ) {
 													// execute the custom callback
 													$field['callback']();

admin/partials/upgrade-helpers/upgrade-migrate-options.php

Spacing +53 added lines, -53 removed lines

@@ -9,30 +9,30 @@ 
 	*/
 		
 	// enqueue the styles for our migration page..
-	wp_enqueue_style( 'yikes_mc_migrate_option_styles' , YIKES_MC_URL . 'admin/css/yikes-inc-easy-mailchimp-migrate-option-styles.css' );
-	wp_enqueue_style( 'animate-css' , YIKES_MC_URL . 'admin/css/animate.min.css' );
+	wp_enqueue_style( 'yikes_mc_migrate_option_styles', YIKES_MC_URL . 'admin/css/yikes-inc-easy-mailchimp-migrate-option-styles.css' );
+	wp_enqueue_style( 'animate-css', YIKES_MC_URL . 'admin/css/animate.min.css' );
 	
 	// store our old options
 	$old_plugin_options = get_option( 'ykseme_storage' );
 	
 	$global_error_messages = array(
-		'success' => __( $old_plugin_options['single-optin-message'] , 'yikes-inc-easy-mailchimp-extender' ),
-		'general-error' => __( "Whoops! It looks like something went wrong. Please try again." , 'yikes-inc-easy-mailchimp-extender' ),
-		'invalid-email' => __( "Please provide a valid email address." , 'yikes-inc-easy-mailchimp-extender' ),
-		'email-exists-error' => __( "The provided email is already subscribed to this list." , 'yikes-inc-easy-mailchimp-extender' )
+		'success' => __( $old_plugin_options[ 'single-optin-message' ], 'yikes-inc-easy-mailchimp-extender' ),
+		'general-error' => __( "Whoops! It looks like something went wrong. Please try again.", 'yikes-inc-easy-mailchimp-extender' ),
+		'invalid-email' => __( "Please provide a valid email address.", 'yikes-inc-easy-mailchimp-extender' ),
+		'email-exists-error' => __( "The provided email is already subscribed to this list.", 'yikes-inc-easy-mailchimp-extender' )
 	);
 	
 	// if old options are defined...
-	if( $old_plugin_options ) {
+	if ( $old_plugin_options ) {
 		
 		// Verify the NONCE is valid
-		check_admin_referer( 'yikes-mc-migrate-options' , 'migrate_options_nonce' );
+		check_admin_referer( 'yikes-mc-migrate-options', 'migrate_options_nonce' );
 		
 		?>
 			
 		<div class="wrap" style="text-align:center;">
-			<h3><?php _e( 'Migrating old plugin options' , 'yikes-inc-easy-mailchimp-extender' ); ?><span class="upgrading-ellipse-one">.</span><span class="upgrading-ellipse-two">.</span><span class="upgrading-ellipse-three">.</h3>
-			<p><?php _e( 'please be patient while your options are updated and the process has completed' , 'yikes-inc-easy-mailchimp-extender' ); ?></p>
+			<h3><?php _e( 'Migrating old plugin options', 'yikes-inc-easy-mailchimp-extender' ); ?><span class="upgrading-ellipse-one">.</span><span class="upgrading-ellipse-two">.</span><span class="upgrading-ellipse-three">.</h3>
+			<p><?php _e( 'please be patient while your options are updated and the process has completed', 'yikes-inc-easy-mailchimp-extender' ); ?></p>
 			<!-- empty list, populate when options  get updated -->
 			<ul id="options-updated" class="yikes-easy-mc-hidden">
 				<hr />
@@ -46,82 +46,82 @@ 
 				
 					// loop over our old options, and store them in a new option value
 					$do_not_migrate_options = array(
-						'ssl_verify_peer', 'api_validation' , 'widget_yikes_mc_widget' , 'flavor' , 'single-optin-message' , 'double-optin-message' ,
-						'mailchimp-optIn-default-list' , 'version' , 'yks-mailchimp-jquery-datepicker' , 'ssl_verify_peer' , 'optIn-checkbox' , 'yks-mailchimp-optin-checkbox-text',
-						'yks-mailchimp-required-text' , 'optin'
+						'ssl_verify_peer', 'api_validation', 'widget_yikes_mc_widget', 'flavor', 'single-optin-message', 'double-optin-message',
+						'mailchimp-optIn-default-list', 'version', 'yks-mailchimp-jquery-datepicker', 'ssl_verify_peer', 'optIn-checkbox', 'yks-mailchimp-optin-checkbox-text',
+						'yks-mailchimp-required-text', 'optin'
 					);
 							
-					foreach( $old_plugin_options as $option_name => $option_value ) {
+					foreach ( $old_plugin_options as $option_name => $option_value ) {
 												
-						if( ! in_array( $option_name , $do_not_migrate_options ) ) {
+						if ( ! in_array( $option_name, $do_not_migrate_options ) ) {
 							// ajax request to update our options one by one..
 							// if its an array, we need to json encode it
-							if( is_array( $option_value ) ) {
+							if ( is_array( $option_value ) ) {
 								
-								if( $option_name == 'lists' ) {
+								if ( $option_name == 'lists' ) {
 																	
-									if( ! empty( $option_value ) ) {
+									if ( ! empty( $option_value ) ) {
 										$settings = 1;
 										$form_length = count( $option_value );
-										foreach( $option_value as $mailchimp_form ) {
+										foreach ( $option_value as $mailchimp_form ) {
 											// update and pass our placeholder value
 											reset( $mailchimp_form );
-											$form_id = $mailchimp_form['id'];
+											$form_id = $mailchimp_form[ 'id' ];
 											
-											$fields = $mailchimp_form['fields'];	
+											$fields = $mailchimp_form[ 'fields' ];	
 											reset( $fields );
 											$first_field_key = key( $fields );
 											$array_keys = array_keys( $fields );
 											
 											$x = 1;								
 					
-											foreach( $array_keys as $parent_key ) {
+											foreach ( $array_keys as $parent_key ) {
 												
 												// alter the field keys so they show up after an import
 												$split_parent_key = explode( '-', $parent_key );
 
-												$new_parent_key = ( isset( $split_parent_key[1] ) ) ? strtoupper( $split_parent_key[1] ) : $parent_key;
+												$new_parent_key = ( isset( $split_parent_key[ 1 ] ) ) ? strtoupper( $split_parent_key[ 1 ] ) : $parent_key;
 
-												$mailchimp_form['fields'][$new_parent_key] = $mailchimp_form['fields'][$parent_key];
+												$mailchimp_form[ 'fields' ][ $new_parent_key ] = $mailchimp_form[ 'fields' ][ $parent_key ];
 
-												unset( $mailchimp_form['fields'][$parent_key] );			
+												unset( $mailchimp_form[ 'fields' ][ $parent_key ] );			
 										
 												// update our placeholder key to be 'placeholder'
-												$mailchimp_form['fields'][$new_parent_key]['placeholder'] = isset( $mailchimp_form['fields'][$new_parent_key]['placeholder-'.$form_id.'-'.$x] ) ? $mailchimp_form['fields'][$new_parent_key]['placeholder-'.$form_id.'-'.$x] : '';
+												$mailchimp_form[ 'fields' ][ $new_parent_key ][ 'placeholder' ] = isset( $mailchimp_form[ 'fields' ][ $new_parent_key ][ 'placeholder-' . $form_id . '-' . $x ] ) ? $mailchimp_form[ 'fields' ][ $new_parent_key ][ 'placeholder-' . $form_id . '-' . $x ] : '';
 												// update field classes
-												$mailchimp_form['fields'][$new_parent_key]['additional-classes'] = isset( $mailchimp_form['fields'][$new_parent_key]['custom-field-class-'.$form_id.'-'.$x] ) ? $mailchimp_form['fields'][$new_parent_key]['custom-field-class-'.$form_id.'-'.$x] : '';
+												$mailchimp_form[ 'fields' ][ $new_parent_key ][ 'additional-classes' ] = isset( $mailchimp_form[ 'fields' ][ $new_parent_key ][ 'custom-field-class-' . $form_id . '-' . $x ] ) ? $mailchimp_form[ 'fields' ][ $new_parent_key ][ 'custom-field-class-' . $form_id . '-' . $x ] : '';
 												// update help field - populate description
-												$mailchimp_form['fields'][$new_parent_key]['description'] = isset( $mailchimp_form['fields'][$new_parent_key]['help'] ) ? $mailchimp_form['fields'][$new_parent_key]['help'] : ''; 
+												$mailchimp_form[ 'fields' ][ $new_parent_key ][ 'description' ] = isset( $mailchimp_form[ 'fields' ][ $new_parent_key ][ 'help' ] ) ? $mailchimp_form[ 'fields' ][ $new_parent_key ][ 'help' ] : ''; 
 												// remove the old placeholder structure
-												unset( $mailchimp_form['fields'][$new_parent_key]['placeholder-'.$form_id.'-'.$x] );
+												unset( $mailchimp_form[ 'fields' ][ $new_parent_key ][ 'placeholder-' . $form_id . '-' . $x ] );
 												// remove old custom class structure
-												unset( $mailchimp_form['fields'][$new_parent_key]['custom-field-class-'.$form_id.'-'.$x] );
+												unset( $mailchimp_form[ 'fields' ][ $new_parent_key ][ 'custom-field-class-' . $form_id . '-' . $x ] );
 												// remove old help/description 
-												unset( $mailchimp_form['fields'][$new_parent_key]['help'] );
+												unset( $mailchimp_form[ 'fields' ][ $new_parent_key ][ 'help' ] );
 																							
 												// check if choices is set, and encode them
-												if( isset( $mailchimp_form['fields'][$new_parent_key]['choices'] ) && ! empty( $mailchimp_form['fields'][$new_parent_key]['choices'] ) ) {
-													$mailchimp_form['fields'][$new_parent_key]['choices'] = addslashes( addslashes( json_encode( $mailchimp_form['fields'][$new_parent_key]['choices'] ) ) );
+												if ( isset( $mailchimp_form[ 'fields' ][ $new_parent_key ][ 'choices' ] ) && ! empty( $mailchimp_form[ 'fields' ][ $new_parent_key ][ 'choices' ] ) ) {
+													$mailchimp_form[ 'fields' ][ $new_parent_key ][ 'choices' ] = addslashes( addslashes( json_encode( $mailchimp_form[ 'fields' ][ $new_parent_key ][ 'choices' ] ) ) );
 												}	
 
 												// update 'default' to 'default-choice' for radio/dropdown
-												if( isset( $mailchimp_form['fields'][$new_parent_key]['type'] ) && in_array( $mailchimp_form['fields'][$new_parent_key]['type'], array( 'radio', 'dropdown' ) ) ) {
-													$mailchimp_form['fields'][$new_parent_key]['default_choice'] = $mailchimp_form['fields'][$new_parent_key]['default'];
-													unset( $mailchimp_form['fields'][$new_parent_key]['default'] );
+												if ( isset( $mailchimp_form[ 'fields' ][ $new_parent_key ][ 'type' ] ) && in_array( $mailchimp_form[ 'fields' ][ $new_parent_key ][ 'type' ], array( 'radio', 'dropdown' ) ) ) {
+													$mailchimp_form[ 'fields' ][ $new_parent_key ][ 'default_choice' ] = $mailchimp_form[ 'fields' ][ $new_parent_key ][ 'default' ];
+													unset( $mailchimp_form[ 'fields' ][ $new_parent_key ][ 'default' ] );
 												}
 												
 												// update 'date_format' on 'birthday' and 'date' fields
-												if( isset( $mailchimp_form['fields'][$new_parent_key]['type'] ) && in_array( $mailchimp_form['fields'][$new_parent_key]['type'], array( 'date', 'birthday' ) ) ) {
-													if( $mailchimp_form['fields'][$new_parent_key]['type'] == 'date' ) { // date
-														$mailchimp_form['fields'][$new_parent_key]['date_format'] = 'MM/DD'; // mailchimp default (can be altered)
+												if ( isset( $mailchimp_form[ 'fields' ][ $new_parent_key ][ 'type' ] ) && in_array( $mailchimp_form[ 'fields' ][ $new_parent_key ][ 'type' ], array( 'date', 'birthday' ) ) ) {
+													if ( $mailchimp_form[ 'fields' ][ $new_parent_key ][ 'type' ] == 'date' ) { // date
+														$mailchimp_form[ 'fields' ][ $new_parent_key ][ 'date_format' ] = 'MM/DD'; // mailchimp default (can be altered)
 													} else { // birthday 
-														$mailchimp_form['fields'][$new_parent_key]['date_format'] = 'MM/DD/YYYY'; // mailchimp default (can be altered)
+														$mailchimp_form[ 'fields' ][ $new_parent_key ][ 'date_format' ] = 'MM/DD/YYYY'; // mailchimp default (can be altered)
 													}
 												}
 												
 												// update 'phone_format' on 'phone'
-												if( isset( $mailchimp_form['fields'][$new_parent_key]['type'] ) && in_array( $mailchimp_form['fields'][$new_parent_key]['type'], array( 'phone' ) ) ) {
-													$mailchimp_form['fields'][$new_parent_key]['phone_format'] = 'phone_format '; // phone format
+												if ( isset( $mailchimp_form[ 'fields' ][ $new_parent_key ][ 'type' ] ) && in_array( $mailchimp_form[ 'fields' ][ $new_parent_key ][ 'type' ], array( 'phone' ) ) ) {
+													$mailchimp_form[ 'fields' ][ $new_parent_key ][ 'phone_format' ] = 'phone_format '; // phone format
 												}
 												
 												$x++;
@@ -138,7 +138,7 @@ 
 																								
 												$.post( ajaxurl, mc_data, function(response) {
 													jQuery( '#options-updated' ).show();
-													jQuery( '#options-updated' ).append( '<li class="animated fadeInDown"><?php echo '<strong>'; ?>' + response.form_name + '<?php echo '</strong> ' . __( "successfully imported." , 'yikes-inc-easy-mailchimp-extender' ); ?></li>' );	
+													jQuery( '#options-updated' ).append( '<li class="animated fadeInDown"><?php echo '<strong>'; ?>' + response.form_name + '<?php echo '</strong> ' . __( "successfully imported.", 'yikes-inc-easy-mailchimp-extender' ); ?></li>' );	
 													if( response.completed_import ) {
 														setTimeout( function() {
 															// finished with the loop...lets let the user know....and then redirect them....
@@ -147,13 +147,13 @@ 
 															jQuery( '.upgrading-ellipse-two' ).remove();
 															jQuery( '.upgrading-ellipse-three' ).remove();
 															jQuery( '.wrap' ).find( 'h3' ).next().fadeOut();
-															jQuery( '#options-updated' ).append( '<li class="animated fadeInDown migration-complete-notification"><em><?php _e( "Migration Complete. Please wait..." , 'yikes-inc-easy-mailchimp-extender' ); ?> </em> <img src="<?php echo esc_url_raw( admin_url( "images/wpspin_light.gif" ) ); ?>" /></li>' );
+															jQuery( '#options-updated' ).append( '<li class="animated fadeInDown migration-complete-notification"><em><?php _e( "Migration Complete. Please wait...", 'yikes-inc-easy-mailchimp-extender' ); ?> </em> <img src="<?php echo esc_url_raw( admin_url( "images/wpspin_light.gif" ) ); ?>" /></li>' );
 															// redirect our user to the main plugin page...
 															setTimeout( function() {
 																<?php 
 																	// migrate options that didnt make it (they were never stored in the 'ykseme_storage' options array)
-																	add_option( 'yikes-mc-api-validation' , get_option( 'api_validation' , 'invalid_api_key' ) );
-																	add_option( 'yikes-mc-error-messages' , $global_error_messages );
+																	add_option( 'yikes-mc-api-validation', get_option( 'api_validation', 'invalid_api_key' ) );
+																	add_option( 'yikes-mc-error-messages', $global_error_messages );
 																	// delete our old options after a successful migration (and some new ones that are no longer needed)
 																	delete_option( 'widget_yikes_mc_widget' );
 																	delete_option( 'api_validation' );
@@ -174,26 +174,26 @@ 
 							}
 							/* Rename our ReCaptcha Options */
 								/* Public Site Key */
-								if( $option_name == 'recaptcha-api-key' ) {
+								if ( $option_name == 'recaptcha-api-key' ) {
 									$option_name = 'recaptcha-site-key';
 								}
 								/* Private Key */
-								if( $option_name == 'recaptcha-private-api-key'  ) {
+								if ( $option_name == 'recaptcha-private-api-key' ) {
 									$option_name = 'recaptcha-secret-key';
 								}
 								/* Change 'recaptcha-setting' to 'recaptcha-status' */
 								/* Status */
-								if( $option_name == 'recaptcha-setting' ) {
+								if ( $option_name == 'recaptcha-setting' ) {
 									$option_name = 'recaptcha-status';
 								}
 							/* End  re-name ReCaptcha options */
 							
 
-							if( is_array( $option_value ) ) {
+							if ( is_array( $option_value ) ) {
 								$option_value = json_encode( $option_value );
 							}
 							// do noit migrate the lists option, it's not useful to us
-							if( $option_name != 'lists' ) {
+							if ( $option_name != 'lists' ) {
 								?>
 									var data = {
 										'action': 'migrate_old_plugin_settings',
@@ -203,7 +203,7 @@ 
 													
 									$.post( ajaxurl, data, function(response) {
 										jQuery( '#options-updated' ).show();
-										jQuery( '#options-updated' ).append( '<li class="animated fadeInDown"><?php echo '<strong>' . ucwords( str_replace( '_' , ' ' , str_replace( '-' , ' ' , $option_name ) ) ) . '</strong> ' . __( "successfully imported." , 'yikes-inc-easy-mailchimp-extender' ); ?></li>' );	
+										jQuery( '#options-updated' ).append( '<li class="animated fadeInDown"><?php echo '<strong>' . ucwords( str_replace( '_', ' ', str_replace( '-', ' ', $option_name ) ) ) . '</strong> ' . __( "successfully imported.", 'yikes-inc-easy-mailchimp-extender' ); ?></li>' );	
 									});
 								<?php
 								
@@ -227,7 +227,7 @@ 
 					}, 2000 );
 			</script>
 		<?php
-			wp_die( '<strong>' . __( 'Old plugin options do not exist. Redirecting you...' , 'yikes-inc-easy-mailchimp-extender' ) . '</strong>' , 500 );
+			wp_die( '<strong>' . __( 'Old plugin options do not exist. Redirecting you...', 'yikes-inc-easy-mailchimp-extender' ) . '</strong>', 500 );
 		?>
 		</div>
 		<?php

Braces +4 added lines, -2 removed lines

@@ -112,9 +112,11 @@
 												
 												// update 'date_format' on 'birthday' and 'date' fields
 												if( isset( $mailchimp_form['fields'][$new_parent_key]['type'] ) && in_array( $mailchimp_form['fields'][$new_parent_key]['type'], array( 'date', 'birthday' ) ) ) {
-													if( $mailchimp_form['fields'][$new_parent_key]['type'] == 'date' ) { // date
+													if( $mailchimp_form['fields'][$new_parent_key]['type'] == 'date' ) {
+// date
 														$mailchimp_form['fields'][$new_parent_key]['date_format'] = 'MM/DD'; // mailchimp default (can be altered)
-													} else { // birthday 
+													} else {
+// birthday 
 														$mailchimp_form['fields'][$new_parent_key]['date_format'] = 'MM/DD/YYYY'; // mailchimp default (can be altered)
 													}
 												}

public/partials/shortcodes/process_form_shortcode.php

Indentation +8 added lines, -8 removed lines

@@ -162,9 +162,9 @@ 
 	}
 
 	/**
-	*	If login is required, abort
-	*	@since 6.0.3.8
-	*/
+	 *	If login is required, abort
+	 *	@since 6.0.3.8
+	 */
 	if( $form_login_required ) {
 		if( apply_filters( 'yikes-mailchimp-required-login-requirement', ! is_user_logged_in() ) ) {
 			ob_start();
@@ -179,9 +179,9 @@ 
 	}
 
 	/**
-	*	Check if schedule is set for this form
-	*	@since 6.0.3.8
-	*/
+	 *	Check if schedule is set for this form
+	 *	@since 6.0.3.8
+	 */
 	if( $form_schedule_state ) {
 		// store current date
 		$current_date = strtotime( current_time( 'm/d/Y g:iA' ) );
@@ -234,8 +234,8 @@ 
 	}
 
 	/**
-	*	Check for form inline parameter
-	*/
+	 *	Check for form inline parameter
+	 */
 	$form_inline = ( isset( $atts['inline'] ) && ( $atts['inline'] == 1 || $atts['inline'] == 'true' ) ) ? true : false;
 	// recheck from our form options
 	if( ! $form_inline ) {

Braces +3 added lines, -2 removed lines

@@ -720,7 +720,7 @@ 
 														} else {
 															$zip_value_to_echo = $_POST[$field['merge']]; 
 														}
-													} else { 
+													} else {
 														$zip_value_to_echo = esc_attr( $default_value ); 
 													}
 												?>
@@ -994,7 +994,8 @@ 
 
 						}
 
-					} else { // loop over interest groups
+					} else {
+// loop over interest groups
 
 
 						// store default choice

Spacing +300 added lines, -300 removed lines

@@ -30,54 +30,54 @@ 
 	$form_submitted = isset( $form_submitted ) ? $form_submitted : 0;
 
 	/* If the user hasn't authenticated yet, lets kill off */
-	if( get_option( 'yikes-mc-api-validation' , 'invalid_api_key' ) != 'valid_api_key' ) {
-		return '<div class="invalid-api-key-error"><p>' . __( "Whoops, you're not connected to MailChimp. You need to enter a valid MailChimp API key." , 'yikes-inc-easy-mailchimp-extender' ) . '</p></div>';
+	if ( get_option( 'yikes-mc-api-validation', 'invalid_api_key' ) != 'valid_api_key' ) {
+		return '<div class="invalid-api-key-error"><p>' . __( "Whoops, you're not connected to MailChimp. You need to enter a valid MailChimp API key.", 'yikes-inc-easy-mailchimp-extender' ) . '</p></div>';
 	}
 
 	// if the user forgot to specify a form ID, lets kill of and warn them.
-	if( ! $atts['form'] ) {
+	if ( ! $atts[ 'form' ] ) {
 		return __( 'Whoops, it looks like you forgot to specify a form to display.', 'yikes-inc-easy-mailchimp-extender' );
 	}
 
 	// store our variables
-	$form_id = (int) $atts['form']; // form id (the id of the form in the database)
+	$form_id = (int) $atts[ 'form' ]; // form id (the id of the form in the database)
 	$interface = yikes_easy_mailchimp_extender_get_form_interface();
 	$form_data = $interface->get_form( $form_id );
 
 	// confirm we have some results, or return an error
 	if ( empty( $form_data ) ) {
-		return __( "Oh no...This form doesn't exist. Head back to the manage forms page and select a different form." , 'yikes-inc-easy-mailchimp-extender' );
+		return __( "Oh no...This form doesn't exist. Head back to the manage forms page and select a different form.", 'yikes-inc-easy-mailchimp-extender' );
 	}
 
 	/*
 	*	Check if the user wants to use reCAPTCHA Spam Prevention
 	*/
-	if ( get_option( 'yikes-mc-recaptcha-status' , '' ) == '1' ) {
+	if ( get_option( 'yikes-mc-recaptcha-status', '' ) == '1' ) {
 		// allow users to manually set recaptcha (instead of globally - recaptcha="1"/recaptcha="0" - but still needs to be globally enabled on the settings page)
-		if ( $atts['recaptcha'] != '0' ) {
+		if ( $atts[ 'recaptcha' ] != '0' ) {
 			// if either of the Private the Secret key is left blank, we should display an error back to the user
-			if( get_option( 'yikes-mc-recaptcha-site-key' , '' ) == '' ) {
-				return __( "Whoops! It looks like you enabled reCAPTCHA but forgot to enter the reCAPTCHA site key!" , 'yikes-inc-easy-mailchimp-extender' ) . '<span class="edit-link yikes-easy-mc-edit-link"><a class="post-edit-link" href="' . esc_url( admin_url( 'admin.php?page=yikes-inc-easy-mailchimp-settings&section=recaptcha-settings' ) ) . '" title="' . __( 'ReCaptcha Settings' , 'yikes-inc-easy-mailchimp-extender' ) . '">' . __( 'Edit ReCaptcha Settings' , 'yikes-inc-easy-mailchimp-extender' ) . '</a></span>';
+			if ( get_option( 'yikes-mc-recaptcha-site-key', '' ) == '' ) {
+				return __( "Whoops! It looks like you enabled reCAPTCHA but forgot to enter the reCAPTCHA site key!", 'yikes-inc-easy-mailchimp-extender' ) . '<span class="edit-link yikes-easy-mc-edit-link"><a class="post-edit-link" href="' . esc_url( admin_url( 'admin.php?page=yikes-inc-easy-mailchimp-settings&section=recaptcha-settings' ) ) . '" title="' . __( 'ReCaptcha Settings', 'yikes-inc-easy-mailchimp-extender' ) . '">' . __( 'Edit ReCaptcha Settings', 'yikes-inc-easy-mailchimp-extender' ) . '</a></span>';
 			}
-			if( get_option( 'yikes-mc-recaptcha-secret-key' , '' ) == '' ) {
-				return __( "Whoops! It looks like you enabled reCAPTCHA but forgot to enter the reCAPTCHA secret key!" , 'yikes-inc-easy-mailchimp-extender' ) . '<span class="edit-link yikes-easy-mc-edit-link"><a class="post-edit-link" href="' . esc_url( admin_url( 'admin.php?page=yikes-inc-easy-mailchimp-settings&section=recaptcha-settings' ) ) . '" title="' . __( 'ReCaptcha Settings' , 'yikes-inc-easy-mailchimp-extender' ) . '">' . __( 'Edit ReCaptcha Settings' , 'yikes-inc-easy-mailchimp-extender' ) . '</a></span>';
+			if ( get_option( 'yikes-mc-recaptcha-secret-key', '' ) == '' ) {
+				return __( "Whoops! It looks like you enabled reCAPTCHA but forgot to enter the reCAPTCHA secret key!", 'yikes-inc-easy-mailchimp-extender' ) . '<span class="edit-link yikes-easy-mc-edit-link"><a class="post-edit-link" href="' . esc_url( admin_url( 'admin.php?page=yikes-inc-easy-mailchimp-settings&section=recaptcha-settings' ) ) . '" title="' . __( 'ReCaptcha Settings', 'yikes-inc-easy-mailchimp-extender' ) . '">' . __( 'Edit ReCaptcha Settings', 'yikes-inc-easy-mailchimp-extender' ) . '</a></span>';
 			}
 
-			if( ! empty( $atts['recaptcha_type'] ) ) {
-				echo $atts['recaptcha_type'];
+			if ( ! empty( $atts[ 'recaptcha_type' ] ) ) {
+				echo $atts[ 'recaptcha_type' ];
 			}
 
 			// Store the site language (to load recaptcha in a specific language)
 			$locale = get_locale();
 			$locale_split = explode( '_', $locale );
 			// Setup reCAPTCHA parameters
-			$lang = ( ! empty( $locale_split ) ? $locale_split[0] : $locale );
-			$lang = ( ! empty( $atts['recaptcha_lang'] ) ) ? $atts['recaptcha_lang'] : $lang;
-			$type = ( ! empty( $atts['recaptcha_type'] ) ) ? strtolower( $atts['recaptcha_type'] ) : 'image'; // setup recaptcha type
-			$theme= ( ! empty( $atts['recaptcha_theme'] ) ) ? strtolower( $atts['recaptcha_theme'] ) : 'light'; // setup recaptcha theme
-			$size = ( ! empty( $atts['recaptcha_size'] ) ) ? strtolower( $atts['recaptcha_size'] ) : 'normal'; // setup recaptcha size
-			$data_callback = ( ! empty( $atts['recaptcha_data_callback'] ) ) ? $atts['recaptcha_data_callback'] : false; // setup recaptcha size
-			$expired_callback = ( ! empty( $atts['recaptcha_expired_callback'] ) ) ? $atts['recaptcha_expired_callback'] : false; // setup recaptcha size
+			$lang = ( ! empty( $locale_split ) ? $locale_split[ 0 ] : $locale );
+			$lang = ( ! empty( $atts[ 'recaptcha_lang' ] ) ) ? $atts[ 'recaptcha_lang' ] : $lang;
+			$type = ( ! empty( $atts[ 'recaptcha_type' ] ) ) ? strtolower( $atts[ 'recaptcha_type' ] ) : 'image'; // setup recaptcha type
+			$theme = ( ! empty( $atts[ 'recaptcha_theme' ] ) ) ? strtolower( $atts[ 'recaptcha_theme' ] ) : 'light'; // setup recaptcha theme
+			$size = ( ! empty( $atts[ 'recaptcha_size' ] ) ) ? strtolower( $atts[ 'recaptcha_size' ] ) : 'normal'; // setup recaptcha size
+			$data_callback = ( ! empty( $atts[ 'recaptcha_data_callback' ] ) ) ? $atts[ 'recaptcha_data_callback' ] : false; // setup recaptcha size
+			$expired_callback = ( ! empty( $atts[ 'recaptcha_expired_callback' ] ) ) ? $atts[ 'recaptcha_expired_callback' ] : false; // setup recaptcha size
 			// Pass the shortcode parameters through a filter
 			$recaptcha_shortcode_params = apply_filters( 'yikes-mailchimp-recaptcha-parameters', array(
 				'language' => $lang,
@@ -86,12 +86,12 @@ 
 				'size' => $size,
 				'success_callback' => $data_callback,
 				'expired_callback' => $expired_callback,
-			), $atts['form'] );
+			), $atts[ 'form' ] );
 			// enqueue Google recaptcha JS
-			wp_register_script( 'google-recaptcha-js' , 'https://www.google.com/recaptcha/api.js?hl=' . $recaptcha_shortcode_params['language'] . '&onload=renderReCaptchaCallback&render=explicit', array( 'jquery' ) , 'all' );
+			wp_register_script( 'google-recaptcha-js', 'https://www.google.com/recaptcha/api.js?hl=' . $recaptcha_shortcode_params[ 'language' ] . '&onload=renderReCaptchaCallback&render=explicit', array( 'jquery' ), 'all' );
 			wp_enqueue_script( 'google-recaptcha-js' );
-			$recaptcha_site_key = get_option( 'yikes-mc-recaptcha-site-key' , '' );
-			$recaptcha_box = '<div name="g-recaptcha" class="g-recaptcha" data-sitekey="' . $recaptcha_site_key . '" data-theme="' . $recaptcha_shortcode_params['theme'] . '" data-type="' . $recaptcha_shortcode_params['type'] . '" data-size="' . $recaptcha_shortcode_params['size'] . '" data-callback="' . $recaptcha_shortcode_params['success_callback'] . '" data-expired-callback="' . $recaptcha_shortcode_params['expired_callback'] . '"></div>';
+			$recaptcha_site_key = get_option( 'yikes-mc-recaptcha-site-key', '' );
+			$recaptcha_box = '<div name="g-recaptcha" class="g-recaptcha" data-sitekey="' . $recaptcha_site_key . '" data-theme="' . $recaptcha_shortcode_params[ 'theme' ] . '" data-type="' . $recaptcha_shortcode_params[ 'type' ] . '" data-size="' . $recaptcha_shortcode_params[ 'size' ] . '" data-callback="' . $recaptcha_shortcode_params[ 'success_callback' ] . '" data-expired-callback="' . $recaptcha_shortcode_params[ 'expired_callback' ] . '"></div>';
 			?>
 			<script type="text/javascript">
 				/* Script Callback to init. multiple recaptchas on a single page */
@@ -118,36 +118,36 @@ 
 	}
 
 	// place our results into a seperate variable for easy looping
-	$additional_form_settings = ( isset( $form_data['form_settings'] ) ) ? $form_data['form_settings'] : false;
+	$additional_form_settings = ( isset( $form_data[ 'form_settings' ] ) ) ? $form_data[ 'form_settings' ] : false;
 	// store our options from the additional form settings array
-	$form_classes = ( $additional_form_settings ) ? $additional_form_settings['yikes-easy-mc-form-class-names'] : '';
-	$inline_form = ( $additional_form_settings ) ? $additional_form_settings['yikes-easy-mc-inline-form'] : '';
-	$submit_button_type = ( $additional_form_settings ) ? $additional_form_settings['yikes-easy-mc-submit-button-type'] : 'text';
-	$submit_button_text = ( $additional_form_settings && $additional_form_settings['yikes-easy-mc-submit-button-text'] != '' ) ? esc_attr( $additional_form_settings['yikes-easy-mc-submit-button-text'] ) : __( 'Submit', 'yikes-inc-easy-mailchimp-extender' );
-	$submit_button_image = ( $additional_form_settings ) ? esc_url( $additional_form_settings['yikes-easy-mc-submit-button-image'] ) : '';
-	$submit_button_classes = ( $additional_form_settings ) ? ' ' . esc_attr( $additional_form_settings['yikes-easy-mc-submit-button-classes'] ) : '';
+	$form_classes = ( $additional_form_settings ) ? $additional_form_settings[ 'yikes-easy-mc-form-class-names' ] : '';
+	$inline_form = ( $additional_form_settings ) ? $additional_form_settings[ 'yikes-easy-mc-inline-form' ] : '';
+	$submit_button_type = ( $additional_form_settings ) ? $additional_form_settings[ 'yikes-easy-mc-submit-button-type' ] : 'text';
+	$submit_button_text = ( $additional_form_settings && $additional_form_settings[ 'yikes-easy-mc-submit-button-text' ] != '' ) ? esc_attr( $additional_form_settings[ 'yikes-easy-mc-submit-button-text' ] ) : __( 'Submit', 'yikes-inc-easy-mailchimp-extender' );
+	$submit_button_image = ( $additional_form_settings ) ? esc_url( $additional_form_settings[ 'yikes-easy-mc-submit-button-image' ] ) : '';
+	$submit_button_classes = ( $additional_form_settings ) ? ' ' . esc_attr( $additional_form_settings[ 'yikes-easy-mc-submit-button-classes' ] ) : '';
 
 	// scheuldes
-	$form_schedule_state = ( $additional_form_settings ) ? $additional_form_settings['yikes-easy-mc-form-schedule'] : false;
-	$form_schedule_start = ( $additional_form_settings ) ? $additional_form_settings['yikes-easy-mc-form-restriction-start'] : '';;
-	$form_schedule_end = ( $additional_form_settings ) ? $additional_form_settings['yikes-easy-mc-form-restriction-end'] : '';
-	$form_pending_message = ( $additional_form_settings ) ? $additional_form_settings['yikes-easy-mc-form-restriction-pending-message'] : '';
-	$form_expired_message = ( $additional_form_settings ) ? $additional_form_settings['yikes-easy-mc-form-restriction-expired-message'] : '';
+	$form_schedule_state = ( $additional_form_settings ) ? $additional_form_settings[ 'yikes-easy-mc-form-schedule' ] : false;
+	$form_schedule_start = ( $additional_form_settings ) ? $additional_form_settings[ 'yikes-easy-mc-form-restriction-start' ] : ''; ;
+	$form_schedule_end = ( $additional_form_settings ) ? $additional_form_settings[ 'yikes-easy-mc-form-restriction-end' ] : '';
+	$form_pending_message = ( $additional_form_settings ) ? $additional_form_settings[ 'yikes-easy-mc-form-restriction-pending-message' ] : '';
+	$form_expired_message = ( $additional_form_settings ) ? $additional_form_settings[ 'yikes-easy-mc-form-restriction-expired-message' ] : '';
 
 	// register required
-	$form_login_required = ( $additional_form_settings ) ? $additional_form_settings['yikes-easy-mc-form-login-required'] : false;
-	$form_login_message = ( $additional_form_settings ) ? $additional_form_settings['yikes-easy-mc-form-restriction-login-message'] : '';
+	$form_login_required = ( $additional_form_settings ) ? $additional_form_settings[ 'yikes-easy-mc-form-login-required' ] : false;
+	$form_login_message = ( $additional_form_settings ) ? $additional_form_settings[ 'yikes-easy-mc-form-restriction-login-message' ] : '';
 
 	// store number of fields
-	$field_count = (int) count( $form_data['fields'] );
+	$field_count = (int) count( $form_data[ 'fields' ] );
 
 	// confirm we actually have fields, before looping
-	if ( isset( $form_data['fields'] ) && ! empty( $form_data['fields'] ) ) {
+	if ( isset( $form_data[ 'fields' ] ) && ! empty( $form_data[ 'fields' ] ) ) {
 		// loop over each field, if it's set to hidden -- subtract it from the field count
 		// this throws off the layout for inline forms setup below
-		foreach ( $form_data['fields'] as $form_field ) {
+		foreach ( $form_data[ 'fields' ] as $form_field ) {
 			if ( isset( $form_field->hide ) && $form_field->hide == 1 ) {
-				$field_count --;
+				$field_count--;
 			}
 		}
 	}
@@ -156,8 +156,8 @@ 
 	*	If login is required, abort
 	*	@since 6.0.3.8
 	*/
-	if( $form_login_required ) {
-		if( apply_filters( 'yikes-mailchimp-required-login-requirement', ! is_user_logged_in() ) ) {
+	if ( $form_login_required ) {
+		if ( apply_filters( 'yikes-mailchimp-required-login-requirement', ! is_user_logged_in() ) ) {
 			ob_start();
 				?>
 					<div class="yikes-mailchimp-login-required yikes-mailchimp-form-<?php echo $form_id; ?>-login-required">
@@ -173,19 +173,19 @@ 
 	*	Check if schedule is set for this form
 	*	@since 6.0.3.8
 	*/
-	if( $form_schedule_state ) {
+	if ( $form_schedule_state ) {
 		// store current date
 		$current_date = strtotime( current_time( 'm/d/Y g:iA' ) );
 
 		// the the current date is less than the form scheduled start date
-		if( $current_date < $form_schedule_start ) {
+		if ( $current_date < $form_schedule_start ) {
 			echo apply_filters( 'yikes-mailchimp-frontend-content', $form_pending_message );
 			return;
 			// abort
 		}
 
 		// The current date is past or equal to the end date, aka form has now expired
-		if( $current_date >= $form_schedule_end ) {
+		if ( $current_date >= $form_schedule_end ) {
 			echo apply_filters( 'yikes-mailchimp-frontend-content', $form_expired_message );
 			return;
 			// abort
@@ -194,14 +194,14 @@ 
 
 	// setup the submit button text
 	// shortcode parameter takes precedence over option
-	$submit = ( ! empty( $atts['submit'] ) ) ? $atts['submit'] : $submit_button_text;
+	$submit = ( ! empty( $atts[ 'submit' ] ) ) ? $atts[ 'submit' ] : $submit_button_text;
 
 	// used in yikes-mailchimp-redirect-url filter
 	global $post;
 	$page_data = $post;
 
 	// Remove the post_password from this for security
-	if( isset( $page_data->post_password ) ) {
+	if ( isset( $page_data->post_password ) ) {
 		unset( $page_data->post_password );
 	}
 
@@ -219,7 +219,7 @@ 
 	*	to exclude styles from loading, add `define( 'YIKES_MAILCHIMP_EXCLUDE_STYLES', true );` to functions.php
 	*	@since 6.0.3.8
 	*/
-	if( ! defined( 'YIKES_MAILCHIMP_EXCLUDE_STYLES' ) ) {
+	if ( ! defined( 'YIKES_MAILCHIMP_EXCLUDE_STYLES' ) ) {
 		// enqueue the form styles
 		wp_enqueue_style( 'yikes-inc-easy-mailchimp-public-styles', YIKES_MC_URL . 'public/css/yikes-inc-easy-mailchimp-extender-public.min.css', array( $last_key ) );
 	}
@@ -227,19 +227,19 @@ 
 	/**
 	*	Check for form inline parameter
 	*/
-	$form_inline = ( $atts['inline'] == 1 || $atts['inline'] == 'true' );
+	$form_inline = ( $atts[ 'inline' ] == 1 || $atts[ 'inline' ] == 'true' );
 	// recheck from our form options
 	if ( ! $form_inline ) {
-		$form_inline = (bool) $additional_form_settings['yikes-easy-mc-inline-form'];
+		$form_inline = (bool) $additional_form_settings[ 'yikes-easy-mc-inline-form' ];
 	}
 
 	/* If the current user is logged in, and an admin...lets display our 'Edit Form' link */
-	if( is_user_logged_in() ) {
-		if( current_user_can( apply_filters( 'yikes-mailchimp-user-role-access' , 'manage_options' ) ) ) {
+	if ( is_user_logged_in() ) {
+		if ( current_user_can( apply_filters( 'yikes-mailchimp-user-role-access', 'manage_options' ) ) ) {
 			$edit_form_link = '<span class="edit-link">';
-			$edit_form_link .= '<a class="post-edit-link" href="' . esc_url( admin_url( 'admin.php?page=yikes-mailchimp-edit-form&id=' . $atts['form'] ) ) . '" title="' . __( 'Edit' , 'yikes-inc-easy-mailchimp-extender' ) . ' ' . ucwords( $form_data['form_name'] ) . '">' . __( 'Edit Form' , 'yikes-inc-easy-mailchimp-extender' ) . '</a>';
+			$edit_form_link .= '<a class="post-edit-link" href="' . esc_url( admin_url( 'admin.php?page=yikes-mailchimp-edit-form&id=' . $atts[ 'form' ] ) ) . '" title="' . __( 'Edit', 'yikes-inc-easy-mailchimp-extender' ) . ' ' . ucwords( $form_data[ 'form_name' ] ) . '">' . __( 'Edit Form', 'yikes-inc-easy-mailchimp-extender' ) . '</a>';
 			$edit_form_link .= '</span>';
-			$edit_form_link = apply_filters( 'yikes-mailchimp-front-end-form-action-links', $edit_form_link, $atts['form'], ucwords( $form_data['form_name'] ) );
+			$edit_form_link = apply_filters( 'yikes-mailchimp-front-end-form-action-links', $edit_form_link, $atts[ 'form' ], ucwords( $form_data[ 'form_name' ] ) );
 		} else {
 			$edit_form_link = '';
 		}
@@ -249,16 +249,16 @@ 
 	// or else MailChimp throws errors at you
 	// extract our array keys
 	// @todo Remove array_keys() and in_array() usage here.
-	if( isset( $form_data['fields'] ) && ! empty( $form_data['fields'] ) ) {
-		$array_keys = array_keys( $form_data['fields'] );
+	if ( isset( $form_data[ 'fields' ] ) && ! empty( $form_data[ 'fields' ] ) ) {
+		$array_keys = array_keys( $form_data[ 'fields' ] );
 		// check for EMAIL in that array
-		if( !in_array( 'EMAIL', $array_keys ) && !in_array( 'email', $array_keys ) ) {
-			return '<p>' . __( "An email field is required for all MailChimp forms. Please add an email field to this form." , 'yikes-inc-easy-mailchimp-extender' ) . '</p><p>' . $edit_form_link . '</p>';
+		if ( ! in_array( 'EMAIL', $array_keys ) && ! in_array( 'email', $array_keys ) ) {
+			return '<p>' . __( "An email field is required for all MailChimp forms. Please add an email field to this form.", 'yikes-inc-easy-mailchimp-extender' ) . '</p><p>' . $edit_form_link . '</p>';
 		}
 	} else {
-		$error = '<p>' . __( "Whoops, it looks like you forgot to assign fields to this form." , 'yikes-inc-easy-mailchimp-extender' ) . '</p>';
-		if( is_user_logged_in() ) {
-			if( current_user_can( apply_filters( 'yikes-mailchimp-user-role-access' , 'manage_options' ) ) ) {
+		$error = '<p>' . __( "Whoops, it looks like you forgot to assign fields to this form.", 'yikes-inc-easy-mailchimp-extender' ) . '</p>';
+		if ( is_user_logged_in() ) {
+			if ( current_user_can( apply_filters( 'yikes-mailchimp-user-role-access', 'manage_options' ) ) ) {
 				return $error . $edit_form_link;
 			}
 		} else {
@@ -266,7 +266,7 @@ 
 		}
 	}
 
-	if( $form_inline ) {
+	if ( $form_inline ) {
 		$field_width = (float) ( 100 / $field_count );
 		$submit_button_width = (float) ( 20 / $field_count );
 		/*
@@ -303,17 +303,17 @@ 
 		*	Set a custom title using custom_title="lorem ipsum" parameter in the shortcode
 		*	- This takes precedence over the title set
 		*/
-		if ( $atts['title'] ) {
-			if ( ! empty( $atts['custom_title'] ) ) {
+		if ( $atts[ 'title' ] ) {
+			if ( ! empty( $atts[ 'custom_title' ] ) ) {
 				/**
 				 * Filter the title that is displayed through the shortcode.
 				 *
 				 * @param string $title   The title to display.
 				 * @param int    $form_id The form ID.
 				 */
-				$title = apply_filters( 'yikes-mailchimp-form-title', apply_filters( 'the_title', $atts['custom_title'] ), $form_id );
+				$title = apply_filters( 'yikes-mailchimp-form-title', apply_filters( 'the_title', $atts[ 'custom_title' ] ), $form_id );
 			} else {
-				$title = apply_filters( 'yikes-mailchimp-form-title', apply_filters( 'the_title', $form_data['form_name'] ), $form_id );
+				$title = apply_filters( 'yikes-mailchimp-form-title', apply_filters( 'the_title', $form_data[ 'form_name' ] ), $form_id );
 			}
 
 			echo sprintf( '<h3 class="yikes-mailchimp-form-title yikes-mailchimp-form-title-%1$s">%2$s</h3>', $form_id, $title );
@@ -323,26 +323,26 @@ 
 		*	Allow users to specify a custom description for this form, no html support
 		*	@since 6.0.3.8
 		*/
-		if ( $atts['description'] ) {
-			if ( ! empty( $atts['custom_description'] ) ) {
+		if ( $atts[ 'description' ] ) {
+			if ( ! empty( $atts[ 'custom_description' ] ) ) {
 				/**
 				 * Filter the description that is displayed through the shortcode.
 				 *
 				 * @param string $title   The title to display.
 				 * @param int    $form_id The form ID.
 				 */
-				$description = apply_filters( 'yikes-mailchimp-form-description', $atts['custom_description'], $form_id );
+				$description = apply_filters( 'yikes-mailchimp-form-description', $atts[ 'custom_description' ], $form_id );
 			} else {
-				$description = apply_filters( 'yikes-mailchimp-form-description', $form_data['form_description'], $form_id );
+				$description = apply_filters( 'yikes-mailchimp-form-description', $form_data[ 'form_description' ], $form_id );
 			}
 
 			echo sprintf( '<section class="yikes-mailchimp-form-description yikes-mailchimp-form-description-%1$s">%2$s</section>', $form_id, $description );
 		}
 
 		// Check for AJAX
-		if( ( ! empty( $atts['ajax'] ) && $atts['ajax'] == 1 ) || $form_data['submission_settings']['ajax'] == 1 ) {
+		if ( ( ! empty( $atts[ 'ajax' ] ) && $atts[ 'ajax' ] == 1 ) || $form_data[ 'submission_settings' ][ 'ajax' ] == 1 ) {
 			// enqueue our ajax script
-			wp_enqueue_script( 'yikes-easy-mc-ajax' , YIKES_MC_URL . 'public/js/yikes-mc-ajax-forms.min.js' , array( 'jquery' ) , YIKES_MC_VERSION, false );
+			wp_enqueue_script( 'yikes-easy-mc-ajax', YIKES_MC_URL . 'public/js/yikes-mc-ajax-forms.min.js', array( 'jquery' ), YIKES_MC_VERSION, false );
 			wp_localize_script( 'yikes-easy-mc-ajax', 'yikes_mailchimp_ajax', array(
 				'ajax_url'                      => esc_url( admin_url( 'admin-ajax.php' ) ),
 				'page_data'                     => $page_data,
@@ -361,67 +361,67 @@ 
 
 		// render the form!
 		?>
-			<form id="<?php echo sanitize_title( $form_data['form_name'] ); ?>-<?php echo $form_id; ?>" class="yikes-easy-mc-form yikes-easy-mc-form-<?php echo $form_id . ' '; if ( $form_inline )  { echo 'yikes-mailchimp-form-inline '; } echo ' ' . apply_filters( 'yikes-mailchimp-form-class', $form_classes, $form_id ); if( !empty( $_POST ) && $form_submitted == 1 && $form_data['submission_settings']['hide_form_post_signup'] == 1 ) { echo ' yikes-easy-mc-display-none'; } ?>" action="" method="POST" data-attr-form-id="<?php echo $form_id; ?>">
+			<form id="<?php echo sanitize_title( $form_data[ 'form_name' ] ); ?>-<?php echo $form_id; ?>" class="yikes-easy-mc-form yikes-easy-mc-form-<?php echo $form_id . ' '; if ( $form_inline ) { echo 'yikes-mailchimp-form-inline '; } echo ' ' . apply_filters( 'yikes-mailchimp-form-class', $form_classes, $form_id ); if ( ! empty( $_POST ) && $form_submitted == 1 && $form_data[ 'submission_settings' ][ 'hide_form_post_signup' ] == 1 ) { echo ' yikes-easy-mc-display-none'; } ?>" action="" method="POST" data-attr-form-id="<?php echo $form_id; ?>">
 
 				<?php
 				// Set a default constant for hidden fields
 				$hidden_label_count = 0;
 
 				// Loop over our form fields
-				foreach( $form_data['fields'] as $field ) {
+				foreach ( $form_data[ 'fields' ] as $field ) {
 						// input array
 						$field_array = array();
 						// label array
 						$label_array = array();
 						// label classes array
 						$label_class_array = array();
-						if( $field['additional-classes'] != '' ) {
+						if ( $field[ 'additional-classes' ] != '' ) {
 							// split custom classes at spaces
-							$custom_classes = explode( ' ' , $field['additional-classes'] );
+							$custom_classes = explode( ' ', $field[ 'additional-classes' ] );
 							// check our custom class array for field-left/field-right
 							// if it's set we need to assign it to our label and remove it from the field classes
 							 // input half left
-							if( in_array( 'field-left-half' , $custom_classes ) ) {
+							if ( in_array( 'field-left-half', $custom_classes ) ) {
 								// $label_array['class'] = 'class="field-left-half"';
-								$label_class_array[] = 'field-left-half';
-								$key = array_search( 'field-left-half' , $custom_classes );
-								unset( $custom_classes[$key] );
+								$label_class_array[ ] = 'field-left-half';
+								$key = array_search( 'field-left-half', $custom_classes );
+								unset( $custom_classes[ $key ] );
 							} // input half right
-							if( in_array( 'field-right-half' , $custom_classes ) ) {
+							if ( in_array( 'field-right-half', $custom_classes ) ) {
 								// $label_array['class'] = 'class="field-right-half"';
-								$label_class_array[] = 'field-right-half';
-								$key = array_search( 'field-right-half' , $custom_classes );
-								unset( $custom_classes[$key] );
+								$label_class_array[ ] = 'field-right-half';
+								$key = array_search( 'field-right-half', $custom_classes );
+								unset( $custom_classes[ $key ] );
 							} // input thirds (1/3 width, floated left)
-							if( in_array( 'field-third' , $custom_classes ) ) {
+							if ( in_array( 'field-third', $custom_classes ) ) {
 								// $label_array['class'] = 'class="field-third"';
-								$label_class_array[] = 'field-third';
-								$key = array_search( 'field-third' , $custom_classes );
-								unset( $custom_classes[$key] );
+								$label_class_array[ ] = 'field-third';
+								$key = array_search( 'field-third', $custom_classes );
+								unset( $custom_classes[ $key ] );
 							} // 2 column radio
-							if( in_array( 'option-2-col' , $custom_classes ) ) {
+							if ( in_array( 'option-2-col', $custom_classes ) ) {
 								// $label_array['class'] = 'class="option-2-col"';
-								$label_class_array[] = 'option-2-col';
-								$key = array_search( 'option-2-col' , $custom_classes );
-								unset( $custom_classes[$key] );
+								$label_class_array[ ] = 'option-2-col';
+								$key = array_search( 'option-2-col', $custom_classes );
+								unset( $custom_classes[ $key ] );
 							} // 3 column radio
-							if( in_array( 'option-3-col' , $custom_classes ) ) {
+							if ( in_array( 'option-3-col', $custom_classes ) ) {
 								// $label_array['class'] = 'class="option-3-col"';
-								$label_class_array[] = 'option-3-col';
-								$key = array_search( 'option-3-col' , $custom_classes );
-								unset( $custom_classes[$key] );
+								$label_class_array[ ] = 'option-3-col';
+								$key = array_search( 'option-3-col', $custom_classes );
+								unset( $custom_classes[ $key ] );
 							} // 4 column radio
-							if( in_array( 'option-4-col' , $custom_classes ) ) {
+							if ( in_array( 'option-4-col', $custom_classes ) ) {
 								// $label_array['class'] = 'class="option-4-col"';
-								$label_class_array[] = 'option-4-col';
-								$key = array_search( 'option-4-col' , $custom_classes );
-								unset( $custom_classes[$key] );
+								$label_class_array[ ] = 'option-4-col';
+								$key = array_search( 'option-4-col', $custom_classes );
+								unset( $custom_classes[ $key ] );
 							} // inline radio & checkboxes etc
-							if( in_array( 'option-inline' , $custom_classes ) ) {
+							if ( in_array( 'option-inline', $custom_classes ) ) {
 								// $label_array['class'] = 'class="option-inline"';
-								$label_class_array[] = 'option-inline';
-								$key = array_search( 'option-inline' , $custom_classes );
-								unset( $custom_classes[$key] );
+								$label_class_array[ ] = 'option-inline';
+								$key = array_search( 'option-inline', $custom_classes );
+								unset( $custom_classes[ $key ] );
 							}
 						} else {
 							$custom_classes = array();
@@ -429,19 +429,19 @@ 
 
 						// if the form is set to inline, add the inline class to our labels
 						// since @6.0.3.8
-						if( $form_inline ) {
-							$label_class_array[] = 'label-inline';
+						if ( $form_inline ) {
+							$label_class_array[ ] = 'label-inline';
 						}
 
-						if( isset( $field['hide-label'] ) ) {
-							if( absint( $field['hide-label'] ) === 1 ) {
+						if ( isset( $field[ 'hide-label' ] ) ) {
+							if ( absint( $field[ 'hide-label' ] ) === 1 ) {
 								$hidden_label_count++;
-								$custom_classes[] = 'field-no-label';
+								$custom_classes[ ] = 'field-no-label';
 							}
 						}
 
 					/* Store tag variable based on field type */
-					if( isset( $field['merge'] ) ) {
+					if ( isset( $field[ 'merge' ] ) ) {
 						$group = '';
 						$tag = 'merge';
 					} else {
@@ -450,49 +450,49 @@ 
 					}
 
 					// build up our array
-					$field_array['id'] = 'id="yikes-easy-mc-form-' . $form_id . '-' . esc_attr( $field[$tag] ) . '" ';
-					$field_array['name'] = 'name="' . $group . esc_attr( $field[ $tag ] ) . '" ';
-					$field_array['placeholder'] = isset( $field['placeholder'] ) ? 'placeholder="' . esc_attr( stripslashes( $field['placeholder'] ) ) . '" ' : '';
-					$field_array['classes'] = 'class="yikes-easy-mc-'.$field['type'] . ' ' .  esc_attr( trim( implode( ' ' , $custom_classes ) ) ) . '" ';
+					$field_array[ 'id' ] = 'id="yikes-easy-mc-form-' . $form_id . '-' . esc_attr( $field[ $tag ] ) . '" ';
+					$field_array[ 'name' ] = 'name="' . $group . esc_attr( $field[ $tag ] ) . '" ';
+					$field_array[ 'placeholder' ] = isset( $field[ 'placeholder' ] ) ? 'placeholder="' . esc_attr( stripslashes( $field[ 'placeholder' ] ) ) . '" ' : '';
+					$field_array[ 'classes' ] = 'class="yikes-easy-mc-' . $field[ 'type' ] . ' ' . esc_attr( trim( implode( ' ', $custom_classes ) ) ) . '" ';
 
 					// email must always be required and visible
-					if( $field['type'] == 'email' ) {
-						$field_array['required'] = 'required="required"';
-						$label_array['visible'] = '';
+					if ( $field[ 'type' ] == 'email' ) {
+						$field_array[ 'required' ] = 'required="required"';
+						$label_array[ 'visible' ] = '';
 						// $label_array['required'] = 'class="' . $field['merge'] . '-label yikes-mailchimp-field-required"';
-						$label_class_array[] = $field['merge'] . '-label';
-						$label_class_array[] = 'yikes-mailchimp-field-required';
+						$label_class_array[ ] = $field[ 'merge' ] . '-label';
+						$label_class_array[ ] = 'yikes-mailchimp-field-required';
 					} else {
-						if( $tag == 'merge' ) {
-							$field_array['required'] = isset( $field['require'] ) ? 'required="required"' : '';
-							$label_array['visible'] = isset( $field['hide'] ) ? 'style="display:none;"' : '';
+						if ( $tag == 'merge' ) {
+							$field_array[ 'required' ] = isset( $field[ 'require' ] ) ? 'required="required"' : '';
+							$label_array[ 'visible' ] = isset( $field[ 'hide' ] ) ? 'style="display:none;"' : '';
 							// $label_array['required'] = isset( $field['require'] ) ? 'class="' . $field['merge'] . '-label yikes-mailchimp-field-required"' : 'class="' . $field['merge'] . '-label"';
-							$label_class_array[] = isset( $field['require'] ) ? $field['merge'] . '-label yikes-mailchimp-field-required' : $field['merge'] . '-label';
+							$label_class_array[ ] = isset( $field[ 'require' ] ) ? $field[ 'merge' ] . '-label yikes-mailchimp-field-required' : $field[ 'merge' ] . '-label';
 						} else {
-							$field_array['required'] = isset( $field['require'] ) ? 'required="required"' : '';
-							$label_array['visible'] = isset( $field['hide'] ) ? 'style="display:none;"' : '';
+							$field_array[ 'required' ] = isset( $field[ 'require' ] ) ? 'required="required"' : '';
+							$label_array[ 'visible' ] = isset( $field[ 'hide' ] ) ? 'style="display:none;"' : '';
 							// $label_array['required'] = isset( $field['require'] ) ? 'class="' . $field['group_id'] . '-label yikes-mailchimp-field-required"' : 'class="' . $field['group_id'] . '-label"';
-							$label_class_array[] = isset( $field['require'] ) ? $field['group_id'] . '-label yikes-mailchimp-field-required' : $field['group_id'] . '-label';
+							$label_class_array[ ] = isset( $field[ 'require' ] ) ? $field[ 'group_id' ] . '-label yikes-mailchimp-field-required' : $field[ 'group_id' ] . '-label';
 						}
 					}
 
 					// if both hide label and hide field are checked, we gotta hide the field!
-					if( isset( $field['hide' ] ) && $field['hide'] == 1 ) {
-						if( isset( $field['hide-label' ] ) && $field['hide-label'] == 1 ) {
-							$field_array['visible'] = 'style="display:none;"';
+					if ( isset( $field[ 'hide' ] ) && $field[ 'hide' ] == 1 ) {
+						if ( isset( $field[ 'hide-label' ] ) && $field[ 'hide-label' ] == 1 ) {
+							$field_array[ 'visible' ] = 'style="display:none;"';
 						}
 					}
 
-					$label_array['classes'] = 'class="' . implode( ' ', $label_class_array ) . '"';
+					$label_array[ 'classes' ] = 'class="' . implode( ' ', $label_class_array ) . '"';
 
 					// filter the field array data
 					$field_array = apply_filters( 'yikes-mailchimp-field-data', $field_array, $field, $form_id );
 
 					/* Loop Over Standard Fields (aka merge variables) */
-					if( isset( $field['merge'] ) ) {
+					if ( isset( $field[ 'merge' ] ) ) {
 
 						// loop over our fields by Type
-						switch ( $field['type'] ) {
+						switch ( $field[ 'type' ] ) {
 
 							default:
 							case 'email':
@@ -500,25 +500,25 @@ 
 							case 'number':
 
 								// pass our default value through our filter to parse dynamic data by tag (used solely for 'text' type)
-								$default_value = ( isset( $field['default'] ) ? esc_attr( $field['default'] ) : '' );
+								$default_value = ( isset( $field[ 'default' ] ) ? esc_attr( $field[ 'default' ] ) : '' );
 								$default_value = apply_filters( 'yikes-mailchimp-process-default-tag', $default_value );
 									?>
-									<label for="<?php echo $field['merge']; ?>" <?php echo implode( ' ' , $label_array ); ?>>
+									<label for="<?php echo $field[ 'merge' ]; ?>" <?php echo implode( ' ', $label_array ); ?>>
 
 										<!-- dictate label visibility -->
-										<?php if( !isset( $field['hide-label'] ) ) { ?>
-											<span class="<?php echo esc_attr( $field['merge'] ) . '-label'; ?>">
-												<?php if( ! isset( $field['hide-label'] ) ) { echo apply_filters( 'yikes-mailchimp-'.$field['merge'].'-label' , esc_attr( stripslashes( $field['label'] ) ), $form_id ); } ?>
+										<?php if ( ! isset( $field[ 'hide-label' ] ) ) { ?>
+											<span class="<?php echo esc_attr( $field[ 'merge' ] ) . '-label'; ?>">
+												<?php if ( ! isset( $field[ 'hide-label' ] ) ) { echo apply_filters( 'yikes-mailchimp-' . $field[ 'merge' ] . '-label', esc_attr( stripslashes( $field[ 'label' ] ) ), $form_id ); } ?>
 											</span>
 										<?php } ?>
 
-										<input <?php echo implode( ' ' , $field_array ); if( $field['type'] != 'email' && $field['type'] != 'number' ) { ?> type="text" <?php } else if( $field['type'] == 'email' ) { ?> type="email" <?php } else { ?> type="number" <?php } ?> value="<?php if( isset( $_POST[$field['merge']] ) && $form_submitted != 1 ) { echo $_POST[$field['merge']]; } else { echo esc_attr( $default_value ); } ?>">
+										<input <?php echo implode( ' ', $field_array ); if ( $field[ 'type' ] != 'email' && $field[ 'type' ] != 'number' ) { ?> type="text" <?php } else if ( $field[ 'type' ] == 'email' ) { ?> type="email" <?php } else { ?> type="number" <?php } ?> value="<?php if ( isset( $_POST[ $field[ 'merge' ] ] ) && $form_submitted != 1 ) { echo $_POST[ $field[ 'merge' ] ]; } else { echo esc_attr( $default_value ); } ?>">
 
 										<!-- description -->
-										<?php if( isset( $field['description'] ) && trim( $field['description'] ) != '' ) { ?>
+										<?php if ( isset( $field[ 'description' ] ) && trim( $field[ 'description' ] ) != '' ) { ?>
 											<p class="form-field-description">
 												<small>
-													<?php echo apply_filters( 'yikes-mailchimp-' . $field['merge'] . '-description', esc_attr( stripslashes( $field['description'] ) ), $form_id ); ?>
+													<?php echo apply_filters( 'yikes-mailchimp-' . $field[ 'merge' ] . '-description', esc_attr( stripslashes( $field[ 'description' ] ) ), $form_id ); ?>
 												</small>
 											</p>
 										<?php } ?>
@@ -530,7 +530,7 @@ 
 
 							case 'url':
 							case 'imageurl':
-								$default_value = ( isset( $field['default'] ) ) ? $field['default'] : '';
+								$default_value = ( isset( $field[ 'default' ] ) ) ? $field[ 'default' ] : '';
 									?>
 
 									<script type="text/javascript">
@@ -545,22 +545,22 @@ 
 										}
 									</script>
 
-									<label for="<?php echo $field['merge']; ?>" <?php echo implode( ' ' , $label_array ); ?>>
+									<label for="<?php echo $field[ 'merge' ]; ?>" <?php echo implode( ' ', $label_array ); ?>>
 
 										<!-- dictate label visibility -->
-										<?php if( !isset( $field['hide-label'] ) ) { ?>
-											<span class="<?php echo esc_attr( $field['merge'] ) . '-label'; ?>">
-												<?php echo apply_filters( 'yikes-mailchimp-'.$field['merge'].'-label' , esc_attr( stripslashes( $field['label'] ) ) ); ?>
+										<?php if ( ! isset( $field[ 'hide-label' ] ) ) { ?>
+											<span class="<?php echo esc_attr( $field[ 'merge' ] ) . '-label'; ?>">
+												<?php echo apply_filters( 'yikes-mailchimp-' . $field[ 'merge' ] . '-label', esc_attr( stripslashes( $field[ 'label' ] ) ) ); ?>
 											</span>
 										<?php } ?>
 
-										<input <?php echo implode( ' ' , $field_array ); ?> type="url" <?php if( $field['type'] == 'url' ) { ?> title="<?php _e( 'Please enter a valid URL to the website.' , 'yikes-inc-easy-mailchimp-extender' ); ?>" <?php } else { ?> title="<?php _e( 'Please enter a valid URL to the image.' , 'yikes-inc-easy-mailchimp-extender' ); ?>" <?php } ?> value="<?php if( isset( $_POST[$field['merge']] ) && $form_submitted != 1 ) { echo $_POST[$field['merge']]; } else { echo esc_attr( $default_value ); } ?>" onblur="properlyFormatURLField(this);return false;">
+										<input <?php echo implode( ' ', $field_array ); ?> type="url" <?php if ( $field[ 'type' ] == 'url' ) { ?> title="<?php _e( 'Please enter a valid URL to the website.', 'yikes-inc-easy-mailchimp-extender' ); ?>" <?php } else { ?> title="<?php _e( 'Please enter a valid URL to the image.', 'yikes-inc-easy-mailchimp-extender' ); ?>" <?php } ?> value="<?php if ( isset( $_POST[ $field[ 'merge' ] ] ) && $form_submitted != 1 ) { echo $_POST[ $field[ 'merge' ] ]; } else { echo esc_attr( $default_value ); } ?>" onblur="properlyFormatURLField(this);return false;">
 
 										<!-- description -->
-										<?php if( isset( $field['description'] ) && trim( $field['description'] ) != '' ) { ?>
+										<?php if ( isset( $field[ 'description' ] ) && trim( $field[ 'description' ] ) != '' ) { ?>
 											<p class="form-field-description">
 												<small>
-													<?php echo apply_filters( 'yikes-mailchimp-' . $field['merge'] . '-description', esc_attr( stripslashes( $field['description'] ) ), $form_id ); ?>
+													<?php echo apply_filters( 'yikes-mailchimp-' . $field[ 'merge' ] . '-description', esc_attr( stripslashes( $field[ 'description' ] ) ), $form_id ); ?>
 												</small>
 											</p>
 										<?php } ?>
@@ -571,8 +571,8 @@ 
 							break;
 
 							case 'phone':
-								$default_value = ( isset( $field['default'] ) ? esc_attr( $field['default'] ) : '' );
-								$phone_format = $field['phone_format'];
+								$default_value = ( isset( $field[ 'default' ] ) ? esc_attr( $field[ 'default' ] ) : '' );
+								$phone_format = $field[ 'phone_format' ];
 								?>
 									<script type="text/javascript">
 										/* Replace incorrect values and format it correctly for MailChimp API */
@@ -585,22 +585,22 @@ 
 										}
 									</script>
 
-									<label for="<?php echo $field['merge']; ?>" <?php echo implode( ' ' , $label_array ); ?>>
+									<label for="<?php echo $field[ 'merge' ]; ?>" <?php echo implode( ' ', $label_array ); ?>>
 
 										<!-- dictate label visibility -->
-										<?php if( !isset( $field['hide-label'] ) ) { ?>
-											<span class="<?php echo esc_attr( $field['merge'] ) . '-label'; ?>">
-												<?php echo apply_filters( 'yikes-mailchimp-'.$field['merge'].'-label' , esc_attr( stripslashes( $field['label'] ) ) ); ?>
+										<?php if ( ! isset( $field[ 'hide-label' ] ) ) { ?>
+											<span class="<?php echo esc_attr( $field[ 'merge' ] ) . '-label'; ?>">
+												<?php echo apply_filters( 'yikes-mailchimp-' . $field[ 'merge' ] . '-label', esc_attr( stripslashes( $field[ 'label' ] ) ) ); ?>
 											</span>
 										<?php } ?>
 
-										<input <?php echo implode( ' ' , $field_array ); ?> type="text" <?php if( $phone_format != 'US' ) { ?>  title="<?php _e( 'International Phone Number' , 'yikes-inc-easy-mailchimp-extender' ); ?>" pattern="<?php echo apply_filters( 'yikes-mailchimp-international-phone-pattern' , '[0-9,-]{1,}' ); ?>" <?php } else { ?> title="<?php _e( 'US Phone Number (###) ### - ####' , 'yikes-inc-easy-mailchimp-extender' ); ?>" pattern="<?php echo apply_filters( 'yikes-mailchimp-us-phone-pattern' , '^(\([0-9]{3}\)|[0-9]{3}-)[0-9]{3}-[0-9]{4}$' ); ?>" onblur="formatUSPhoneNumber(this);"<?php } ?> value="<?php if( isset( $_POST[$field['merge']] ) && $form_submitted != 1 ) { echo $_POST[$field['merge']]; } else { echo esc_attr( $default_value ); } ?>">
+										<input <?php echo implode( ' ', $field_array ); ?> type="text" <?php if ( $phone_format != 'US' ) { ?>  title="<?php _e( 'International Phone Number', 'yikes-inc-easy-mailchimp-extender' ); ?>" pattern="<?php echo apply_filters( 'yikes-mailchimp-international-phone-pattern', '[0-9,-]{1,}' ); ?>" <?php } else { ?> title="<?php _e( 'US Phone Number (###) ### - ####', 'yikes-inc-easy-mailchimp-extender' ); ?>" pattern="<?php echo apply_filters( 'yikes-mailchimp-us-phone-pattern', '^(\([0-9]{3}\)|[0-9]{3}-)[0-9]{3}-[0-9]{4}$' ); ?>" onblur="formatUSPhoneNumber(this);"<?php } ?> value="<?php if ( isset( $_POST[ $field[ 'merge' ] ] ) && $form_submitted != 1 ) { echo $_POST[ $field[ 'merge' ] ]; } else { echo esc_attr( $default_value ); } ?>">
 
 										<!-- description -->
-										<?php if( isset( $field['description'] ) && trim( $field['description'] ) != '' ) { ?>
+										<?php if ( isset( $field[ 'description' ] ) && trim( $field[ 'description' ] ) != '' ) { ?>
 											<p class="form-field-description">
 												<small>
-													<?php echo apply_filters( 'yikes-mailchimp-' . esc_attr( $field['merge'] ) . '-description', stripslashes( $field['description'] ), $form_id ); ?>
+													<?php echo apply_filters( 'yikes-mailchimp-' . esc_attr( $field[ 'merge' ] ) . '-description', stripslashes( $field[ 'description' ] ), $form_id ); ?>
 												</small>
 											</p>
 										<?php } ?>
@@ -610,25 +610,25 @@ 
 							break;
 
 							case 'zip':
-								$default_value = ( isset( $field['default'] ) ? esc_attr( $field['default'] ) : '' );
+								$default_value = ( isset( $field[ 'default' ] ) ? esc_attr( $field[ 'default' ] ) : '' );
 
 									?>
-									<label for="<?php echo $field['merge']; ?>" <?php echo implode( ' ' , $label_array ); ?>>
+									<label for="<?php echo $field[ 'merge' ]; ?>" <?php echo implode( ' ', $label_array ); ?>>
 
 									<!-- dictate label visibility -->
-									<?php if( ! isset( $field['hide-label'] ) ) { ?>
-										<span class="<?php echo esc_attr( $field['merge'] ) . '-label'; ?>">
-											<?php echo apply_filters( 'yikes-mailchimp-'.$field['merge'].'-label' , esc_attr( stripslashes( $field['label'] ) ) ); ?>
+									<?php if ( ! isset( $field[ 'hide-label' ] ) ) { ?>
+										<span class="<?php echo esc_attr( $field[ 'merge' ] ) . '-label'; ?>">
+											<?php echo apply_filters( 'yikes-mailchimp-' . $field[ 'merge' ] . '-label', esc_attr( stripslashes( $field[ 'label' ] ) ) ); ?>
 										</span>
 									<?php } ?>
 
-									<input <?php echo implode( ' ' , $field_array ); ?> type="text" pattern="\d{5,5}(-\d{4,4})?" title="<?php _e( '5 digit zip code, numbers only' , 'yikes-inc-easy-mailchimp-extender' ); ?>" value="<?php if( isset( $_POST[$field['merge']] ) && $form_submitted != 1 ) { echo $_POST[$field['merge']]; } else { echo esc_attr( $default_value ); } ?>">
+									<input <?php echo implode( ' ', $field_array ); ?> type="text" pattern="\d{5,5}(-\d{4,4})?" title="<?php _e( '5 digit zip code, numbers only', 'yikes-inc-easy-mailchimp-extender' ); ?>" value="<?php if ( isset( $_POST[ $field[ 'merge' ] ] ) && $form_submitted != 1 ) { echo $_POST[ $field[ 'merge' ] ]; } else { echo esc_attr( $default_value ); } ?>">
 
 									<!-- description -->
-									<?php if( isset( $field['description'] ) ) { ?>
+									<?php if ( isset( $field[ 'description' ] ) ) { ?>
 										<p class="form-field-description">
 											<small>
-												<?php echo apply_filters( 'yikes-mailchimp-' . $field['merge'] . '-description', esc_attr( stripslashes( $field['description'] ) ), $form_id ); ?>
+												<?php echo apply_filters( 'yikes-mailchimp-' . $field[ 'merge' ] . '-description', esc_attr( stripslashes( $field[ 'description' ] ) ), $form_id ); ?>
 											</small>
 										</p>
 									<?php } ?>
@@ -640,28 +640,28 @@ 
 
 							case 'address':
 								// required fields
-								$required_fields = array( 'addr1' => 'address' , 'addr2' => 'address 2', 'city' => 'city', 'state' =>'state', 'zip' =>'zip' , 'country' => 'country' );
+								$required_fields = array( 'addr1' => 'address', 'addr2' => 'address 2', 'city' => 'city', 'state' =>'state', 'zip' =>'zip', 'country' => 'country' );
 
 								// setup the default country value
 								$default_country = apply_filters( 'yikes-mailchimp-default-country-value', 'US' );
 
 								// store number for looping
 								$x = 1;
-								foreach( $required_fields as $type => $label ) {
+								foreach ( $required_fields as $type => $label ) {
 
 									// set the field names for the addrress fields
-									$field_array['name'] = 'name="'.$field[$tag].'['.$type.']'.'"';
+									$field_array[ 'name' ] = 'name="' . $field[ $tag ] . '[' . $type . ']' . '"';
 
 									// reset the label classes for left-half/right-half for addresses
-									if( isset( $label_array['class'] ) ) {
+									if ( isset( $label_array[ 'class' ] ) ) {
 										if ( $x % 2 == 0 ) {
-											$label_array['class'] = str_replace( 'field-left-half', 'field-right-half', $label_array['class'] );
+											$label_array[ 'class' ] = str_replace( 'field-left-half', 'field-right-half', $label_array[ 'class' ] );
 										} else {
-											$label_array['class'] = str_replace( 'field-right-half', 'field-left-half', $label_array['class'] );
+											$label_array[ 'class' ] = str_replace( 'field-right-half', 'field-left-half', $label_array[ 'class' ] );
 										}
 									}
 
-									switch( $type ) {
+									switch ( $type ) {
 
 										default:
 										case 'addr1':
@@ -670,17 +670,17 @@ 
 
 
 											?>
-											<label for="<?php echo $field['merge']; ?>" data-attr-name="<?php echo esc_attr( $type ); ?>-field" <?php echo implode( ' ' , $label_array ); ?>>
+											<label for="<?php echo $field[ 'merge' ]; ?>" data-attr-name="<?php echo esc_attr( $type ); ?>-field" <?php echo implode( ' ', $label_array ); ?>>
 
 												<!-- dictate label visibility -->
-												<?php if( ! isset( $field['hide-label'] ) ) { ?>
-													<span class="<?php echo esc_attr( $field['merge'] ) . '-label'; ?>">
-														<?php echo ucwords( apply_filters( 'yikes-mailchimp-address-'.$type.'-label' , esc_attr( $label ) ) ); ?>
+												<?php if ( ! isset( $field[ 'hide-label' ] ) ) { ?>
+													<span class="<?php echo esc_attr( $field[ 'merge' ] ) . '-label'; ?>">
+														<?php echo ucwords( apply_filters( 'yikes-mailchimp-address-' . $type . '-label', esc_attr( $label ) ) ); ?>
 													</span>
 												<?php } ?>
 
 
-												<input <?php echo implode( ' ' , $field_array ); ?> type="text"  value="<?php if( isset( $_POST[$field['merge']] ) && $form_submitted != 1 ) { echo $_POST[$field['merge']]; } ?>">
+												<input <?php echo implode( ' ', $field_array ); ?> type="text"  value="<?php if ( isset( $_POST[ $field[ 'merge' ] ] ) && $form_submitted != 1 ) { echo $_POST[ $field[ 'merge' ] ]; } ?>">
 
 											</label>
 											<?php
@@ -690,16 +690,16 @@ 
 										case 'state':
 
 											?>
-											<label for="<?php echo $field['merge']; ?>" <?php echo implode( ' ' , $label_array ); ?> data-attr-name="state-dropdown"<?php if( ! in_array( $default_country, array( 'US' ) ) ) { ?> style="display: none;"<?php } ?>>
+											<label for="<?php echo $field[ 'merge' ]; ?>" <?php echo implode( ' ', $label_array ); ?> data-attr-name="state-dropdown"<?php if ( ! in_array( $default_country, array( 'US' ) ) ) { ?> style="display: none;"<?php } ?>>
 
 												<!-- dictate label visibility -->
-												<?php if( ! isset( $field['hide-label'] ) ) { ?>
-													<span class="<?php echo esc_attr( $field['merge'] ) . '-label'; ?>">
-														<?php echo ucwords( apply_filters( 'yikes-mailchimp-address-'.$type.'-label' , esc_attr( $label ) ) ); ?>
+												<?php if ( ! isset( $field[ 'hide-label' ] ) ) { ?>
+													<span class="<?php echo esc_attr( $field[ 'merge' ] ) . '-label'; ?>">
+														<?php echo ucwords( apply_filters( 'yikes-mailchimp-address-' . $type . '-label', esc_attr( $label ) ) ); ?>
 													</span>
 												<?php } ?>
 
-												<select <?php echo implode( ' ' , $field_array ); ?>>
+												<select <?php echo implode( ' ', $field_array ); ?>>
 													<?php include( YIKES_MC_PATH . 'public/partials/shortcodes/templates/state-dropdown.php' ); ?>
 												</select>
 
@@ -712,29 +712,29 @@ 
 										case 'zip':
 
 											?>
-											<label for="<?php echo $field['merge']; ?>" <?php echo implode( ' ' , $label_array ); ?> data-attr-name="zip-input"<?php if( ! in_array( $default_country, array( 'US', 'GB' ) ) ) { ?> style="display: none;"<?php } ?>>
+											<label for="<?php echo $field[ 'merge' ]; ?>" <?php echo implode( ' ', $label_array ); ?> data-attr-name="zip-input"<?php if ( ! in_array( $default_country, array( 'US', 'GB' ) ) ) { ?> style="display: none;"<?php } ?>>
 
-												<?php if( ! isset( $field['hide-label'] ) ) { ?>
-													<span class="<?php echo esc_attr( $field['merge'] ) . '-label'; ?>">
-														<?php echo ucwords( apply_filters( 'yikes-mailchimp-address-'.$type.'-label' , esc_attr( $label ) ) ); ?>
+												<?php if ( ! isset( $field[ 'hide-label' ] ) ) { ?>
+													<span class="<?php echo esc_attr( $field[ 'merge' ] ) . '-label'; ?>">
+														<?php echo ucwords( apply_filters( 'yikes-mailchimp-address-' . $type . '-label', esc_attr( $label ) ) ); ?>
 													</span>
 												<?php } ?>
 
 												<?php 
 													// If zip lookup plugin is installed, the ZIP field comes back as an array and we need to handle it differently...
 													$zip_value_to_echo = '';
-													if( isset( $_POST[$field['merge']] ) && $form_submitted != 1 ) {
-														if ( is_array( $_POST[$field['merge']] ) && isset( $_POST[$field['merge']]['zip'] ) ) {
-															$zip_value_to_echo = $_POST[$field['merge']]['zip'];
+													if ( isset( $_POST[ $field[ 'merge' ] ] ) && $form_submitted != 1 ) {
+														if ( is_array( $_POST[ $field[ 'merge' ] ] ) && isset( $_POST[ $field[ 'merge' ] ][ 'zip' ] ) ) {
+															$zip_value_to_echo = $_POST[ $field[ 'merge' ] ][ 'zip' ];
 														} else {
-															$zip_value_to_echo = $_POST[$field['merge']]; 
+															$zip_value_to_echo = $_POST[ $field[ 'merge' ] ]; 
 														}
 													} else { 
 														$zip_value_to_echo = esc_attr( $default_value ); 
 													}
 												?>
 
-												<input <?php echo implode( ' ' , $field_array ); ?> type="text" pattern="<?php echo apply_filters( 'yikes-mailchimp-zip-pattern', '\d{5,5}(-\d{4,4})?' ); ?>" title="<?php _e( '5 digit zip code, numbers only' , 'yikes-inc-easy-mailchimp-extender' ); ?>" value="<?php echo $zip_value_to_echo ?>">
+												<input <?php echo implode( ' ', $field_array ); ?> type="text" pattern="<?php echo apply_filters( 'yikes-mailchimp-zip-pattern', '\d{5,5}(-\d{4,4})?' ); ?>" title="<?php _e( '5 digit zip code, numbers only', 'yikes-inc-easy-mailchimp-extender' ); ?>" value="<?php echo $zip_value_to_echo ?>">
 
 											</label>
 											<?php
@@ -772,16 +772,16 @@ 
 												$default_country = apply_filters( 'yikes-mailchimp-default-country-value', 'US' );
 											?>
 
-											<label for="<?php echo $field['merge']; ?>" data-attr-name="<?php echo esc_attr( $type ); ?>-field" <?php echo implode( ' ' , $label_array ); ?>>
+											<label for="<?php echo $field[ 'merge' ]; ?>" data-attr-name="<?php echo esc_attr( $type ); ?>-field" <?php echo implode( ' ', $label_array ); ?>>
 
 												<!-- dictate label visibility -->
-												<?php if( !isset( $field['hide-label'] ) ) { ?>
-													<span class="<?php echo esc_attr( $field['merge'] ) . '-label'; ?>">
-														<?php echo ucwords( apply_filters( 'yikes-mailchimp-address-'.$type.'-label' , esc_attr( $label ) ) ); ?>
+												<?php if ( ! isset( $field[ 'hide-label' ] ) ) { ?>
+													<span class="<?php echo esc_attr( $field[ 'merge' ] ) . '-label'; ?>">
+														<?php echo ucwords( apply_filters( 'yikes-mailchimp-address-' . $type . '-label', esc_attr( $label ) ) ); ?>
 													</span>
 												<?php } ?>
 
-												<select <?php echo implode( ' ' , $field_array ); ?> onchange="checkCountry(this);return false;">
+												<select <?php echo implode( ' ', $field_array ); ?> onchange="checkCountry(this);return false;">
 													<?php include( YIKES_MC_PATH . 'public/partials/shortcodes/templates/country-dropdown.php' ); ?>
 												</select>
 											</label>
@@ -792,10 +792,10 @@ 
 								}
 
 								// description
-								if( isset( $field['description'] ) && trim( $field['description'] ) != '' ) { ?>
+								if ( isset( $field[ 'description' ] ) && trim( $field[ 'description' ] ) != '' ) { ?>
 									<p class="form-field-description">
 										<small>
-											<?php echo apply_filters( 'yikes-mailchimp-' . $field['merge'] . '-description', esc_attr( trim( stripslashes( $field['description'] ) ) ), $form_id ); ?>
+											<?php echo apply_filters( 'yikes-mailchimp-' . $field[ 'merge' ] . '-description', esc_attr( trim( stripslashes( $field[ 'description' ] ) ) ), $form_id ); ?>
 										</small>
 									</p>
 									<?php }
@@ -805,19 +805,19 @@ 
 							case 'birthday':
 
 								// bootstrap datepicker requirements
-								wp_enqueue_script( 'bootstrap-hover-dropdown' , YIKES_MC_URL . 'public/js/bootstrap-hover-dropdown.min.js' , array( 'jquery' ) );
-								wp_enqueue_script( 'bootstrap-datepicker-script' , YIKES_MC_URL . 'public/js/bootstrap-datepicker.min.js' , array( 'jquery' , 'bootstrap-hover-dropdown' ) );
-								wp_enqueue_style( 'bootstrap-datepicker-styles' , YIKES_MC_URL . 'public/css/bootstrap-datepicker3.standalone.min.css' );
-								wp_enqueue_style( 'override-datepicker-styles' , YIKES_MC_URL . 'public/css/yikes-inc-easy-mailchimp-datepicker-styles.css' , array( 'bootstrap-datepicker-styles' ) );
+								wp_enqueue_script( 'bootstrap-hover-dropdown', YIKES_MC_URL . 'public/js/bootstrap-hover-dropdown.min.js', array( 'jquery' ) );
+								wp_enqueue_script( 'bootstrap-datepicker-script', YIKES_MC_URL . 'public/js/bootstrap-datepicker.min.js', array( 'jquery', 'bootstrap-hover-dropdown' ) );
+								wp_enqueue_style( 'bootstrap-datepicker-styles', YIKES_MC_URL . 'public/css/bootstrap-datepicker3.standalone.min.css' );
+								wp_enqueue_style( 'override-datepicker-styles', YIKES_MC_URL . 'public/css/yikes-inc-easy-mailchimp-datepicker-styles.css', array( 'bootstrap-datepicker-styles' ) );
 
-								switch ( $field['type'] ) {
+								switch ( $field[ 'type' ] ) {
 									default:
 									case 'date':
-										$date_format = ( isset( $field['date_format'] ) ) ? $field['date_format'] : 'mm/dd';
+										$date_format = ( isset( $field[ 'date_format' ] ) ) ? $field[ 'date_format' ] : 'mm/dd';
 										break;
 
 									case 'birthday':
-										$date_format = ( isset( $field['date_format'] ) ) ? strtolower( $field['date_format'] ) : 'mm/dd';
+										$date_format = ( isset( $field[ 'date_format' ] ) ) ? strtolower( $field[ 'date_format' ] ) : 'mm/dd';
 										break;
 								}
 								// initialize the datepicker
@@ -828,7 +828,7 @@ 
 											padding: .85em .5em !important;
 										}
 										<?php
-											if( wp_is_mobile() ) {
+											if ( wp_is_mobile() ) {
 												?>
 												.datepicker-dropdown {
 													margin-top: 0px;
@@ -844,7 +844,7 @@ 
 											$day_names = array_values( $wp_locale->weekday );
 											$day_names_short = array_values( $wp_locale->weekday_abbrev );
 											$day_names_min = array_values( $wp_locale->weekday_initial );
-											$date_format = $admin_class->yikes_jQuery_datepicker_date_format_php_to_js( $date_format, $field['type'] );
+											$date_format = $admin_class->yikes_jQuery_datepicker_date_format_php_to_js( $date_format, $field[ 'type' ] );
 											$first_day = get_option( 'start_of_week' );
 											$isRTL = $wp_locale->is_rtl();
 										?>
@@ -865,10 +865,10 @@ 
 												numberOfMonths: 1,
 												today: '<?php _e( 'Today', 'yikes-inc-easy-mailchimp-extender' ); ?>'
 											};
-											jQuery('input[data-attr-type="<?php echo $field['type']; ?>"]').datepicker().on( 'show', function( e ) {
-												var date_picker_height = jQuery('input[data-attr-type="<?php echo $field['type']; ?>"]').css( 'height' );
+											jQuery('input[data-attr-type="<?php echo $field[ 'type' ]; ?>"]').datepicker().on( 'show', function( e ) {
+												var date_picker_height = jQuery('input[data-attr-type="<?php echo $field[ 'type' ]; ?>"]').css( 'height' );
 												date_picker_height = parseInt( date_picker_height.replace( 'px', '' ) ) + parseInt( 15 ) + 'px';
-												var date_picker_width = jQuery('input[data-attr-type="<?php echo $field['type']; ?>"]').css( 'width' ).replace( 'px', '' );
+												var date_picker_width = jQuery('input[data-attr-type="<?php echo $field[ 'type' ]; ?>"]').css( 'width' ).replace( 'px', '' );
 												if( date_picker_width > 500 ) {
 													date_picker_width = 500;
 												}
@@ -878,27 +878,27 @@ 
 									</script>
 								<?php
 
-								$default_value = ( isset( $field['default'] ) ? esc_attr( $field['default'] ) : '' );
+								$default_value = ( isset( $field[ 'default' ] ) ? esc_attr( $field[ 'default' ] ) : '' );
 								// store empty number for looping
 								$x = 0;
 
 								?>
-									<label for="<?php echo esc_attr( $field['merge'] ); ?>" <?php echo implode( ' ' , $label_array ); ?>>
+									<label for="<?php echo esc_attr( $field[ 'merge' ] ); ?>" <?php echo implode( ' ', $label_array ); ?>>
 
 										<!-- dictate label visibility -->
-										<?php if( !isset( $field['hide-label'] ) ) { ?>
-											<span class="<?php echo esc_attr( $field['merge'] ) . '-label'; ?>">
-												<?php echo apply_filters( 'yikes-mailchimp-'.$field['merge'].'-label' , esc_attr( stripslashes( $field['label'] ) ) ); ?>
+										<?php if ( ! isset( $field[ 'hide-label' ] ) ) { ?>
+											<span class="<?php echo esc_attr( $field[ 'merge' ] ) . '-label'; ?>">
+												<?php echo apply_filters( 'yikes-mailchimp-' . $field[ 'merge' ] . '-label', esc_attr( stripslashes( $field[ 'label' ] ) ) ); ?>
 											</span>
 										<?php } ?>
 
-										<input <?php echo implode( ' ' , $field_array ); ?> type="text" <?php if( $field['type'] == 'date' ) { ?> data-attr-type="date" <?php } else { ?> data-attr-type="birthday" <?php } ?> value="<?php if( isset( $_POST[$field['merge']] ) && $form_submitted != 1 ) { echo $_POST[$field['merge']]; } else { echo esc_attr( $default_value ); } ?>">
+										<input <?php echo implode( ' ', $field_array ); ?> type="text" <?php if ( $field[ 'type' ] == 'date' ) { ?> data-attr-type="date" <?php } else { ?> data-attr-type="birthday" <?php } ?> value="<?php if ( isset( $_POST[ $field[ 'merge' ] ] ) && $form_submitted != 1 ) { echo $_POST[ $field[ 'merge' ] ]; } else { echo esc_attr( $default_value ); } ?>">
 
 										<!-- description -->
-										<?php if( isset( $field['description'] ) && trim( $field['description'] ) != '' ) { ?>
+										<?php if ( isset( $field[ 'description' ] ) && trim( $field[ 'description' ] ) != '' ) { ?>
 											<p class="form-field-description">
 												<small>
-													<?php echo apply_filters( 'yikes-mailchimp-' . $field['merge'] . '-description', esc_attr( trim( stripslashes( $field['description'] ) ) ), $form_id ); ?>
+													<?php echo apply_filters( 'yikes-mailchimp-' . $field[ 'merge' ] . '-description', esc_attr( trim( stripslashes( $field[ 'description' ] ) ) ), $form_id ); ?>
 												</small>
 											</p>
 										<?php } ?>
@@ -909,36 +909,36 @@ 
 							break;
 
 							case 'dropdown':
-								$default_value = $field['default_choice'];
+								$default_value = $field[ 'default_choice' ];
 								// store empty number for looping
 								$x = 0;
 								// hidden labels
 
 									?>
-									<label for="<?php echo esc_attr( $field['merge'] ); ?>" <?php echo implode( ' ' , $label_array ); ?>>
+									<label for="<?php echo esc_attr( $field[ 'merge' ] ); ?>" <?php echo implode( ' ', $label_array ); ?>>
 										<!-- dictate label visibility -->
-										<?php if( ! isset( $field['hide-label'] ) ) { ?>
-											<span class="<?php echo esc_attr( $field['merge'] ) . '-label'; ?>">
-												<?php echo apply_filters( 'yikes-mailchimp-'.$field['merge'].'-label' , esc_attr( stripslashes( $field['label'] ) ) ); ?>
+										<?php if ( ! isset( $field[ 'hide-label' ] ) ) { ?>
+											<span class="<?php echo esc_attr( $field[ 'merge' ] ) . '-label'; ?>">
+												<?php echo apply_filters( 'yikes-mailchimp-' . $field[ 'merge' ] . '-label', esc_attr( stripslashes( $field[ 'label' ] ) ) ); ?>
 											</span>
 										<?php } ?>
 
-										<select <?php echo implode( ' ' , $field_array ); ?>>
+										<select <?php echo implode( ' ', $field_array ); ?>>
 											<?php
 												// decode for looping
-												$choices = json_decode( $field['choices'], true );
-												foreach( $choices as $choice ) {
-													?><option value="<?php echo $choice; ?>" <?php selected( $default_value , $x ); ?>><?php echo esc_attr( stripslashes( $choice ) ); ?></option><?php
+												$choices = json_decode( $field[ 'choices' ], true );
+												foreach ( $choices as $choice ) {
+													?><option value="<?php echo $choice; ?>" <?php selected( $default_value, $x ); ?>><?php echo esc_attr( stripslashes( $choice ) ); ?></option><?php
 													$x++;
 												}
 											?>
 										</select>
 
 										<!-- description -->
-										<?php if( isset( $field['description'] ) && trim( $field['description'] ) != '' ) { ?>
+										<?php if ( isset( $field[ 'description' ] ) && trim( $field[ 'description' ] ) != '' ) { ?>
 											<p class="form-field-description">
 												<small>
-													<?php echo apply_filters( 'yikes-mailchimp-' . $field['merge'] . '-description', esc_attr( trim( stripslashes( $field['description'] ) ) ), $form_id ); ?>
+													<?php echo apply_filters( 'yikes-mailchimp-' . $field[ 'merge' ] . '-description', esc_attr( trim( stripslashes( $field[ 'description' ] ) ) ), $form_id ); ?>
 												</small>
 											</p>
 										<?php } ?>
@@ -952,13 +952,13 @@ 
 							case 'radio':
 							case 'checkbox':
 								// remove the ID (as to not assign the same ID to every radio button)
-								unset( $field_array['id'] );
-								$choices = json_decode( $field['choices'], true );
+								unset( $field_array[ 'id' ] );
+								$choices = json_decode( $field[ 'choices' ], true );
 								// assign a default choice
-								$default_value = ( isset( $field['default_choice'] ) && $field['default_choice'] != '' ) ? $field['default_choice'] : $choices[0];
+								$default_value = ( isset( $field[ 'default_choice' ] ) && $field[ 'default_choice' ] != '' ) ? $field[ 'default_choice' ] : $choices[ 0 ];
 								// if the form was submit, but failed, let's reset the post data
-								if( isset( $_POST[$field['merge']] ) && $form_submitted != 1 ) {
-									$default_value = $_POST[$field['merge']];
+								if ( isset( $_POST[ $field[ 'merge' ] ] ) && $form_submitted != 1 ) {
+									$default_value = $_POST[ $field[ 'merge' ] ];
 								}
 								$count = count( $choices );
 								$i = 1;
@@ -967,20 +967,20 @@ 
 								// hidden labels
 
 									?>
-									<label for="<?php echo esc_attr( $field['merge'] ); ?>" <?php echo implode( ' ' , $label_array ); ?>>
+									<label for="<?php echo esc_attr( $field[ 'merge' ] ); ?>" <?php echo implode( ' ', $label_array ); ?>>
 
 										<!-- dictate label visibility -->
-										<?php if( ! isset( $field['hide-label'] ) ) { ?>
-											<span class="<?php echo esc_attr( $field['merge'] ). '-label'; ?> checkbox-parent-label">
-												<?php echo apply_filters( 'yikes-mailchimp-'.$field['merge'].'-label' , esc_attr( stripslashes( $field['label'] ) ) ); ?>
+										<?php if ( ! isset( $field[ 'hide-label' ] ) ) { ?>
+											<span class="<?php echo esc_attr( $field[ 'merge' ] ) . '-label'; ?> checkbox-parent-label">
+												<?php echo apply_filters( 'yikes-mailchimp-' . $field[ 'merge' ] . '-label', esc_attr( stripslashes( $field[ 'label' ] ) ) ); ?>
 											</span>
 										<?php }
 
-										foreach( $choices as $choice ) {
+										foreach ( $choices as $choice ) {
 											?>
-											<label for="<?php echo esc_attr( $field['merge'] ) . '-' . $i; ?>" class="yikes-easy-mc-checkbox-label <?php echo implode( ' ' , $custom_classes ); if( $i === $count ) { ?> last-selection<?php } ?>" <?php if( $i == 1 ) { echo $field_array['required']; } ?>>
-												<input type="<?php echo esc_attr( $field['type'] ); ?>" name="<?php echo $field['merge']; ?>" id="<?php echo $field['merge'] . '-' . $i; ?>" <?php checked( $default_value , $x ); ?> value="<?php echo esc_attr( $choice ); ?>">
-												<span class="<?php echo esc_attr( $field['merge'] ). '-label'; ?>"><?php echo stripslashes( $choice ); ?></span>
+											<label for="<?php echo esc_attr( $field[ 'merge' ] ) . '-' . $i; ?>" class="yikes-easy-mc-checkbox-label <?php echo implode( ' ', $custom_classes ); if ( $i === $count ) { ?> last-selection<?php } ?>" <?php if ( $i == 1 ) { echo $field_array[ 'required' ]; } ?>>
+												<input type="<?php echo esc_attr( $field[ 'type' ] ); ?>" name="<?php echo $field[ 'merge' ]; ?>" id="<?php echo $field[ 'merge' ] . '-' . $i; ?>" <?php checked( $default_value, $x ); ?> value="<?php echo esc_attr( $choice ); ?>">
+												<span class="<?php echo esc_attr( $field[ 'merge' ] ) . '-label'; ?>"><?php echo stripslashes( $choice ); ?></span>
 											</label>
 											<?php
 											$i++;
@@ -988,10 +988,10 @@ 
 										}
 
 										// description
-										if( isset( $field['description'] ) && trim( $field['description'] ) != '' ) { ?>
+										if ( isset( $field[ 'description' ] ) && trim( $field[ 'description' ] ) != '' ) { ?>
 											<p class="form-field-description">
 												<small>
-													<?php echo apply_filters( 'yikes-mailchimp-' . $field['merge'] . '-description', esc_attr( trim( stripslashes( $field['description'] ) ) ), $form_id ); ?>
+													<?php echo apply_filters( 'yikes-mailchimp-' . $field[ 'merge' ] . '-description', esc_attr( trim( stripslashes( $field[ 'description' ] ) ) ), $form_id ); ?>
 												</small>
 											</p>
 										<?php } ?>
@@ -1007,26 +1007,26 @@ 
 
 
 						// store default choice
-						$default_choice = ( isset( $field['default_choice'] ) && ! empty( $field['default_choice'] ) ) ? ( is_array( $field['default_choice'] ) ? $field['default_choice'] : $field['default_choice'] ) : ( isset( $field['default_choice'] ) ? $field['default_choice'] : '' );
+						$default_choice = ( isset( $field[ 'default_choice' ] ) && ! empty( $field[ 'default_choice' ] ) ) ? ( is_array( $field[ 'default_choice' ] ) ? $field[ 'default_choice' ] : $field[ 'default_choice' ] ) : ( isset( $field[ 'default_choice' ] ) ? $field[ 'default_choice' ] : '' );
 
 						// if the form was submit, but failed, let's reset the post data
-						if( isset( $_POST[$field['group_id']] ) && $form_submitted != 1 ) {
-							$default_choice = $_POST[$field['group_id']];
+						if ( isset( $_POST[ $field[ 'group_id' ] ] ) && $form_submitted != 1 ) {
+							$default_choice = $_POST[ $field[ 'group_id' ] ];
 						}
 
 						// get our groups
-						$groups = ( isset( $field['groups'] ) && ! empty( $field['groups'] ) ) ? json_decode( $field['groups'], true ) : array();
+						$groups = ( isset( $field[ 'groups' ] ) && ! empty( $field[ 'groups' ] ) ) ? json_decode( $field[ 'groups' ], true ) : array();
 
 						$count = count( $groups );
 
-						if( $field['type'] == 'checkboxes' ) {
+						if ( $field[ 'type' ] == 'checkboxes' ) {
 							$type = 'checkbox';
-						} else if( $field['type'] == 'radio' ) {
+						} else if ( $field[ 'type' ] == 'radio' ) {
 							$type = 'radio';
 						}
 
 						// loop over the interest group field types
-						switch ( $field['type'] ) {
+						switch ( $field[ 'type' ] ) {
 
 							case 'checkboxes':
 							case 'radio':
@@ -1034,18 +1034,18 @@ 
 								$x = 1; // used to find the last item of our array
 
 									?>
-									<label for="<?php echo esc_attr( $field['group_id'] ); ?>" <?php echo implode( ' ' , $label_array ); ?>>
-										<?php if( ! isset( $field['hide-label'] ) ) { ?>
+									<label for="<?php echo esc_attr( $field[ 'group_id' ] ); ?>" <?php echo implode( ' ', $label_array ); ?>>
+										<?php if ( ! isset( $field[ 'hide-label' ] ) ) { ?>
 											<!-- dictate label visibility -->
-											<span class="<?php echo esc_attr( $field['group_id'] ) . '-label'; ?> checkbox-parent-label">
-												<?php echo apply_filters( 'yikes-mailchimp-'.$field['group_id'].'-label' , esc_attr( $field['label'] ) ); ?>
+											<span class="<?php echo esc_attr( $field[ 'group_id' ] ) . '-label'; ?> checkbox-parent-label">
+												<?php echo apply_filters( 'yikes-mailchimp-' . $field[ 'group_id' ] . '-label', esc_attr( $field[ 'label' ] ) ); ?>
 											</span>
 									<?php
 										}
 
 										// Display Submission Errors
-										if( ! empty( $missing_required_checkbox_interest_groups ) ) {
-											if( in_array( $field['group_id'], $missing_required_checkbox_interest_groups ) ) {
+										if ( ! empty( $missing_required_checkbox_interest_groups ) ) {
+											if ( in_array( $field[ 'group_id' ], $missing_required_checkbox_interest_groups ) ) {
 												?>
 													<p class="yikes-mailchimp-required-interest-group-error">
 														<?php echo apply_filters( 'yikes-mailchimp-interest-group-checkbox-error', __( 'This field is required.', 'yikes-inc-easy-mailchimp-extender' ), $form_id ); ?>
@@ -1056,24 +1056,24 @@ 
 
 										foreach ( $groups as $group_id => $name ) {
 
-											if( $field['type'] == 'checkboxes' ) {
+											if ( $field[ 'type' ] == 'checkboxes' ) {
 
 												/* Setup the defaults for this field - varies if the field was previously submitted */
-												if( isset( $_POST[$field['group_id']] ) && $form_submitted != 1 ) {
+												if ( isset( $_POST[ $field[ 'group_id' ] ] ) && $form_submitted != 1 ) {
 
-													$default_choice = $_POST[$field['group_id']];
+													$default_choice = $_POST[ $field[ 'group_id' ] ];
 
-												} elseif( ( ! isset( $_POST['yikes-mailchimp-honeypot'] ) && $form_submitted != 1 ) || ( isset( $_POST['yikes-mailchimp-honeypot'] ) && $form_submitted == 1 ) ) {
+												} elseif ( ( ! isset( $_POST[ 'yikes-mailchimp-honeypot' ] ) && $form_submitted != 1 ) || ( isset( $_POST[ 'yikes-mailchimp-honeypot' ] ) && $form_submitted == 1 ) ) {
 
-													$default_choice = ( isset( $field['default_choice'] ) && ! empty( $field['default_choice'] ) ) ? ( is_array( $field['default_choice'] ) ? $field['default_choice'] : $field['default_choice'] ) : array();
+													$default_choice = ( isset( $field[ 'default_choice' ] ) && ! empty( $field[ 'default_choice' ] ) ) ? ( is_array( $field[ 'default_choice' ] ) ? $field[ 'default_choice' ] : $field[ 'default_choice' ] ) : array();
 
 												}
 
 											}
 
 											?>
-											<label for="<?php echo $field['group_id'] . '-' . $i; ?>" class="yikes-easy-mc-checkbox-label <?php echo implode( ' ' , $custom_classes ); if( $x === $count ) { ?> last-selection<?php } ?>">
-												<input <?php if( isset( $field['require'] ) && $field['require'] == 1 ) { ?> class="yikes-interest-group-required" <?php } ?> type="<?php echo $type; ?>" name="group-<?php echo $field['group_id']; ?>[]" id="<?php echo $field['group_id'] . '-' . $i; ?>" <?php if( $field['type'] == 'checkboxes' ) { if( ( ( isset( $_POST['yikes-mailchimp-honeypot' ] ) && $form_submitted == 1 && in_array( $i , $default_choice )) || ! isset( $_POST['yikes-mailchimp-honeypot' ] ) && $form_submitted != 1 && in_array( $i , $default_choice ) ) || ( ( $form_submitted != 1 && isset( $_POST[$field['group_id']] ) ) && in_array( esc_attr( $group['name'] ), $default_choice ) ) ) { echo 'checked="checked"'; } } else { checked( ( isset( $default_choice ) && is_array( $default_choice ) ) ? $default_choice[0] : $default_choice , $i ); } ?> value="<?php echo $group_id; ?>">
+											<label for="<?php echo $field[ 'group_id' ] . '-' . $i; ?>" class="yikes-easy-mc-checkbox-label <?php echo implode( ' ', $custom_classes ); if ( $x === $count ) { ?> last-selection<?php } ?>">
+												<input <?php if ( isset( $field[ 'require' ] ) && $field[ 'require' ] == 1 ) { ?> class="yikes-interest-group-required" <?php } ?> type="<?php echo $type; ?>" name="group-<?php echo $field[ 'group_id' ]; ?>[]" id="<?php echo $field[ 'group_id' ] . '-' . $i; ?>" <?php if ( $field[ 'type' ] == 'checkboxes' ) { if ( ( ( isset( $_POST[ 'yikes-mailchimp-honeypot' ] ) && $form_submitted == 1 && in_array( $i, $default_choice ) ) || ! isset( $_POST[ 'yikes-mailchimp-honeypot' ] ) && $form_submitted != 1 && in_array( $i, $default_choice ) ) || ( ( $form_submitted != 1 && isset( $_POST[ $field[ 'group_id' ] ] ) ) && in_array( esc_attr( $group[ 'name' ] ), $default_choice ) ) ) { echo 'checked="checked"'; } } else { checked( ( isset( $default_choice ) && is_array( $default_choice ) ) ? $default_choice[ 0 ] : $default_choice, $i ); } ?> value="<?php echo $group_id; ?>">
 												<?php echo $name; ?>
 											</label>
 											<?php
@@ -1082,10 +1082,10 @@ 
 										}
 
 										// description
-										if( isset( $field['description'] ) && trim( $field['description'] ) != '' ) { ?>
+										if ( isset( $field[ 'description' ] ) && trim( $field[ 'description' ] ) != '' ) { ?>
 											<p class="form-field-description">
 												<small>
-													<?php echo apply_filters( 'yikes-mailchimp-' . $field['group_id'] . '-description', esc_attr( trim( $field['description'] ) ), $form_id ); ?>
+													<?php echo apply_filters( 'yikes-mailchimp-' . $field[ 'group_id' ] . '-description', esc_attr( trim( $field[ 'description' ] ) ), $form_id ); ?>
 												</small>
 											</p>
 										<?php } ?>
@@ -1099,28 +1099,28 @@ 
 
 									?>
 
-									<label for="<?php echo esc_attr( $field['group_id'] ); ?>" <?php echo implode( ' ' , $label_array ); ?>>
+									<label for="<?php echo esc_attr( $field[ 'group_id' ] ); ?>" <?php echo implode( ' ', $label_array ); ?>>
 										<!-- dictate label visibility -->
-										<?php if( ! isset( $field['hide-label'] ) ) { ?>
-											<span class="<?php echo esc_attr( $field['group_id'] ) . '-label'; ?>">
-												<?php echo apply_filters( 'yikes-mailchimp-'.$field['group_id'].'-label' , esc_attr( $field['label'] ) ); ?>
+										<?php if ( ! isset( $field[ 'hide-label' ] ) ) { ?>
+											<span class="<?php echo esc_attr( $field[ 'group_id' ] ) . '-label'; ?>">
+												<?php echo apply_filters( 'yikes-mailchimp-' . $field[ 'group_id' ] . '-label', esc_attr( $field[ 'label' ] ) ); ?>
 											</span>
 										<?php } ?>
 
-										<select <?php echo implode( ' ' , $field_array ); ?>>
+										<select <?php echo implode( ' ', $field_array ); ?>>
 											<?php
 												$i = 0;
-												foreach( $groups as $group_id => $name ) {
-													?><option <?php selected( $i , $default_choice ); ?> value="<?php echo $group_id; ?>"><?php echo esc_attr( $name ); ?></option><?php
+												foreach ( $groups as $group_id => $name ) {
+													?><option <?php selected( $i, $default_choice ); ?> value="<?php echo $group_id; ?>"><?php echo esc_attr( $name ); ?></option><?php
 													$i++;
 												}
 											?>
 										</select>
 
-										<?php if( isset( $field['description'] ) && trim( $field['description'] ) != '' ) { ?>
+										<?php if ( isset( $field[ 'description' ] ) && trim( $field[ 'description' ] ) != '' ) { ?>
 											<p class="form-field-description">
 												<small>
-													<?php echo apply_filters( 'yikes-mailchimp-' . $field['group_id'] . '-description', esc_attr( trim( $field['description'] ) ), $form_id ); ?>
+													<?php echo apply_filters( 'yikes-mailchimp-' . $field[ 'group_id' ] . '-description', esc_attr( trim( $field[ 'description' ] ) ), $form_id ); ?>
 												</small>
 											</p>
 										<?php } ?>
@@ -1137,21 +1137,21 @@ 
 
 									?>
 
-									<label for="<?php echo esc_attr( $field['group_id'] ); ?>" <?php echo implode( ' ' , $label_array ); ?>>
+									<label for="<?php echo esc_attr( $field[ 'group_id' ] ); ?>" <?php echo implode( ' ', $label_array ); ?>>
 
 										<!-- dictate label visibility -->
-										<?php if( ! isset( $field['hide-label'] ) ) { ?>
-											<span class="<?php echo esc_attr( $field['group_id'] ) . '-label'; ?> checkbox-parent-label" style="display:none;">
-												<?php echo apply_filters( 'yikes-mailchimp-'.$field['group_id'].'-label' , esc_attr( stripslashes( $field['label'] ) ) ); ?>
+										<?php if ( ! isset( $field[ 'hide-label' ] ) ) { ?>
+											<span class="<?php echo esc_attr( $field[ 'group_id' ] ) . '-label'; ?> checkbox-parent-label" style="display:none;">
+												<?php echo apply_filters( 'yikes-mailchimp-' . $field[ 'group_id' ] . '-label', esc_attr( stripslashes( $field[ 'label' ] ) ) ); ?>
 											</span>
 										<?php }
 
 
-										foreach( $groups as $group ) {
+										foreach ( $groups as $group ) {
 											?>
-											<label for="<?php echo $field['group_id'] . '-' . $i; ?>" class="yikes-easy-mc-checkbox-label <?php echo implode( ' ' , $custom_classes ); if( $x === $count ) { ?> last-selection<?php } ?>" style="display:none;">
-												<input type="radio" name="<?php echo $field['group_id']; ?>[]" id="<?php echo $field['group_id'] . '-' . $i; ?>" <?php if( $field['type'] == 'checkboxes' ) { if( in_array( $i , $default_choice ) ) { echo 'checked="checked"'; } } else { checked( ( isset( $default_choice ) && is_array( $default_choice ) ) ? $default_choice[0] : $default_choice , $i ); } ?> value="<?php echo esc_attr( $group['name'] ); ?>">
-												<?php echo esc_attr( stripslashes( str_replace( '' , '\'', $group['name'] ) ) ); ?>
+											<label for="<?php echo $field[ 'group_id' ] . '-' . $i; ?>" class="yikes-easy-mc-checkbox-label <?php echo implode( ' ', $custom_classes ); if ( $x === $count ) { ?> last-selection<?php } ?>" style="display:none;">
+												<input type="radio" name="<?php echo $field[ 'group_id' ]; ?>[]" id="<?php echo $field[ 'group_id' ] . '-' . $i; ?>" <?php if ( $field[ 'type' ] == 'checkboxes' ) { if ( in_array( $i, $default_choice ) ) { echo 'checked="checked"'; } } else { checked( ( isset( $default_choice ) && is_array( $default_choice ) ) ? $default_choice[ 0 ] : $default_choice, $i ); } ?> value="<?php echo esc_attr( $group[ 'name' ] ); ?>">
+												<?php echo esc_attr( stripslashes( str_replace( '', '\'', $group[ 'name' ] ) ) ); ?>
 											</label>
 											<?php
 											$i++;
@@ -1159,10 +1159,10 @@ 
 										}
 
 										// description
-										if( isset( $field['description'] ) && trim( $field['description'] ) != '' ) { ?>
+										if ( isset( $field[ 'description' ] ) && trim( $field[ 'description' ] ) != '' ) { ?>
 											<p class="form-field-description">
 												<small>
-													<?php echo apply_filters( 'yikes-mailchimp-' . $field['group_id'] . '-description', esc_attr( trim( stripslashes( $field['description'] ) ) ), $form_id ); ?>
+													<?php echo apply_filters( 'yikes-mailchimp-' . $field[ 'group_id' ] . '-description', esc_attr( trim( stripslashes( $field[ 'description' ] ) ) ), $form_id ); ?>
 												</small>
 											</p>
 										<?php }
@@ -1179,11 +1179,11 @@ 
 				do_action( 'yikes-mailchimp-additional-form-fields', $form_data );
 
 				/* if we've enabled reCAPTCHA protection */
-				if( isset( $recaptcha_box ) ) {
+				if ( isset( $recaptcha_box ) ) {
 					echo $recaptcha_box;
 				}
-				if( is_user_logged_in() ) {
-					$admin_class = ( current_user_can( apply_filters( 'yikes-mailchimp-user-role-access' , 'manage_options' ) ) ) ? ' admin-logged-in' : '';
+				if ( is_user_logged_in() ) {
+					$admin_class = ( current_user_can( apply_filters( 'yikes-mailchimp-user-role-access', 'manage_options' ) ) ) ? ' admin-logged-in' : '';
 				} else {
 					$admin_class = '';
 				}
@@ -1193,29 +1193,29 @@ 
 				<input type="hidden" name="yikes-mailchimp-honeypot" id="yikes-mailchimp-honeypot" value="">
 
 				<!-- List ID -->
-				<input type="hidden" name="yikes-mailchimp-associated-list-id" id="yikes-mailchimp-associated-list-id" value="<?php echo $form_data['list_id']; ?>">
+				<input type="hidden" name="yikes-mailchimp-associated-list-id" id="yikes-mailchimp-associated-list-id" value="<?php echo $form_data[ 'list_id' ]; ?>">
 
 				<!-- Form that is being submitted! Used to display error/success messages above the correct form -->
 				<input type="hidden" name="yikes-mailchimp-submitted-form" id="yikes-mailchimp-submitted-form" value="<?php echo $form_id; ?>">
 
 				<!-- Submit Button -->
 				<?php
-					if( $form_inline ) {
+					if ( $form_inline ) {
 						$submit_button_label_classes = array( 'empty-label' );
 						// If the number of fields, is equal to the hidden label count, add our class
 						// eg: All field labels are set to hidden.
 						if ( absint( $field_count ) === absint( $hidden_label_count ) ) {
-							$submit_button_label_classes[] = 'labels-hidden';
+							$submit_button_label_classes[ ] = 'labels-hidden';
 						}
 						echo '<label class="empty-form-inline-label submit-button-inline-label"><span class="' . implode( ' ', $submit_button_label_classes ) . '">&nbsp;</span>';
 					}
 					// display the image or text based button
-					if( $submit_button_type == 'text' ) {
-						echo apply_filters( 'yikes-mailchimp-form-submit-button', '<button type="submit" class="' . apply_filters( 'yikes-mailchimp-form-submit-button-classes', 'yikes-easy-mc-submit-button yikes-easy-mc-submit-button-' . esc_attr( $form_data['id'] ) . ' btn btn-primary' . $submit_button_classes . $admin_class, $form_data['id'] ) . '">' .  apply_filters( 'yikes-mailchimp-form-submit-button-text', esc_attr( stripslashes( $submit ) ), $form_data['id'] ) . '</button>', $form_data['id'] );
+					if ( $submit_button_type == 'text' ) {
+						echo apply_filters( 'yikes-mailchimp-form-submit-button', '<button type="submit" class="' . apply_filters( 'yikes-mailchimp-form-submit-button-classes', 'yikes-easy-mc-submit-button yikes-easy-mc-submit-button-' . esc_attr( $form_data[ 'id' ] ) . ' btn btn-primary' . $submit_button_classes . $admin_class, $form_data[ 'id' ] ) . '">' . apply_filters( 'yikes-mailchimp-form-submit-button-text', esc_attr( stripslashes( $submit ) ), $form_data[ 'id' ] ) . '</button>', $form_data[ 'id' ] );
 					} else {
-						echo apply_filters( 'yikes-mailchimp-form-submit-button', '<input type="image" alt="' . apply_filters( 'yikes-mailchimp-form-submit-button-text', esc_attr( stripslashes( $submit ) ), $form_data['id'] ) . '" src="' . $submit_button_image . '" class="' . apply_filters( 'yikes-mailchimp-form-submit-button-classes', 'yikes-easy-mc-submit-button yikes-easy-mc-submit-button-image yikes-easy-mc-submit-button-' . esc_attr( $form_data['id'] ) . ' btn btn-primary' . $submit_button_classes . $admin_class, $form_data['id'] ) . '">', $form_data['id'] );
+						echo apply_filters( 'yikes-mailchimp-form-submit-button', '<input type="image" alt="' . apply_filters( 'yikes-mailchimp-form-submit-button-text', esc_attr( stripslashes( $submit ) ), $form_data[ 'id' ] ) . '" src="' . $submit_button_image . '" class="' . apply_filters( 'yikes-mailchimp-form-submit-button-classes', 'yikes-easy-mc-submit-button yikes-easy-mc-submit-button-image yikes-easy-mc-submit-button-' . esc_attr( $form_data[ 'id' ] ) . ' btn btn-primary' . $submit_button_classes . $admin_class, $form_data[ 'id' ] ) . '">', $form_data[ 'id' ] );
 					}
-					if( $form_inline ) {
+					if ( $form_inline ) {
 						echo '</label>';
 					}
 				?>
@@ -1227,8 +1227,8 @@ 
 
 		<?php
 			/* If the current user is logged in, and an admin...lets display our 'Edit Form' link */
-			if( is_user_logged_in() ) {
-				if( current_user_can( apply_filters( 'yikes-mailchimp-user-role-access' , 'manage_options' ) ) ) {
+			if ( is_user_logged_in() ) {
+				if ( current_user_can( apply_filters( 'yikes-mailchimp-user-role-access', 'manage_options' ) ) ) {
 					echo $edit_form_link;
 				}
 			}
@@ -1244,7 +1244,7 @@ 
 		*	for non-admins
 		*/
 		if ( ! current_user_can( 'manage_options' ) ) {
-			$impressions = $form_data['impressions'] + 1;
+			$impressions = $form_data[ 'impressions' ] + 1;
 			$interface->update_form_field( $form_id, 'impressions', $impressions );
 		}
 

public/classes/checkbox-integrations/class.comment_form-checkbox.php

Indentation +3 added lines, -3 removed lines

@@ -24,8 +24,8 @@ 
 			
 		
 		/**
-		* Outputs a checkbox, if user is not already subscribed
-		*/
+		 * Outputs a checkbox, if user is not already subscribed
+		 */
 		public function output_checkbox( $comment_field ) {
 			if( $this->is_user_already_subscribed( $this->type ) == '1' ) {
 				return $comment_field;
@@ -40,7 +40,7 @@ 
 		 *	a new comment is submitted
 		 *
 		 *	@since 6.0.0
-		**/
+		 **/
 		public function subscribe_from_comment( $comment_id , $comment_approved ) {	
 			// was sign-up checkbox checked?
 			if ( $this->was_checkbox_checked( $this->type ) === false ) {

Braces +2 added lines, -2 removed lines

@@ -13,7 +13,7 @@ 
 		// declare our integration type
 		protected $type = 'comment_form';
 	
-		public function __construct() {	
+		public function __construct() {
 			// hooks for outputting the checkbox
 			add_action( 'thesis_hook_after_comment_box', array( $this, 'output_checkbox' ), 10 );
 			add_action( 'comment_form_field_comment', array( $this, 'output_checkbox' ), 10 );
@@ -41,7 +41,7 @@ 
 		 *
 		 *	@since 6.0.0
 		**/
-		public function subscribe_from_comment( $comment_id , $comment_approved ) {	
+		public function subscribe_from_comment( $comment_id , $comment_approved ) {
 			// was sign-up checkbox checked?
 			if ( $this->was_checkbox_checked( $this->type ) === false ) {
 				return false;

Spacing +3 added lines, -3 removed lines

@@ -6,7 +6,7 @@ 
 	*/
 	
 	// Prevent direct access to the file
-	defined('ABSPATH') or die( __( "Whoops, you shouldn't be accessing this file directly. Abort!" , 'yikes-inc-easy-mailchimp-extender' ) );
+	defined( 'ABSPATH' ) or die( __( "Whoops, you shouldn't be accessing this file directly. Abort!", 'yikes-inc-easy-mailchimp-extender' ) );
 	
 	class Yikes_Easy_MC_Comment_Checkbox_Class extends Yikes_Easy_MC_Checkbox_Integration_Class {
 	
@@ -42,7 +42,7 @@ 
 		 *
 		 *	@since 6.0.0
 		**/
-		public function subscribe_from_comment( $comment_id , $comment_approved ) {	
+		public function subscribe_from_comment( $comment_id, $comment_approved ) {	
 			// was sign-up checkbox checked?
 			if ( $this->was_checkbox_checked( $this->type ) === false ) {
 				return false;
@@ -59,7 +59,7 @@ 
 				'OPTIN_IP' => $comment_data->comment_author_IP,
 			);
 			// subscribe the user 
-			$this->subscribe_user_integration( sanitize_email( $comment_data->comment_author_email ) , $this->type , $merge_vars );
+			$this->subscribe_user_integration( sanitize_email( $comment_data->comment_author_email ), $this->type, $merge_vars );
 		}
 		
 	}

public/classes/checkbox-integrations/class.woocommerce_checkout_form-checkbox.php

Indentation +5 added lines, -5 removed lines

@@ -65,17 +65,17 @@
 	}
 	
 	/**
-	* @param int $order_id
-	*/
+	 * @param int $order_id
+	 */
 	public function save_woocommerce_checkout_checkbox_value( $order_id ) {
 		// update the order post meta
 		update_post_meta( $order_id, 'yikes_easy_mailchimp_optin', $this->was_checkbox_checked( $this->type ) );
 	}
 	
 	/**
-	* @param int $order_id
-	* @return boolean
-	*/
+	 * @param int $order_id
+	 * @return boolean
+	 */
 	public function subscribe_from_woocommerce_checkout( $order_id ) {
 		$do_optin = get_post_meta( $order_id, 'yikes_easy_mailchimp_optin', true );
 		if( $do_optin == '1' ) {

Spacing +11 added lines, -11 removed lines

@@ -8,7 +8,7 @@ 
 */
 
 // Prevent direct access to the file
-defined('ABSPATH') or die( __( "Whoops, you shouldn't be accessing this file directly. Abort!" , 'yikes-inc-easy-mailchimp-extender' ) );
+defined( 'ABSPATH' ) or die( __( "Whoops, you shouldn't be accessing this file directly. Abort!", 'yikes-inc-easy-mailchimp-extender' ) );
 
 class Yikes_Easy_MC_WooCommerce_Checkbox_Class extends Yikes_Easy_MC_Checkbox_Integration_Class {
 
@@ -32,7 +32,7 @@ 
 	 */
 	public function get_position() {
 		$opts = $this->get_options();
-		return $opts['woocommerce_position'];
+		return $opts[ 'woocommerce_position' ];
 	}
 	
 	/**
@@ -42,22 +42,22 @@ 
 	 */
 	public function add_checkout_field( $fields ) {
 		// get checkbox data
-		$checkbox_options = get_option( 'optin-checkbox-init' , '' );
+		$checkbox_options = get_option( 'optin-checkbox-init', '' );
 		// only display the field if a list is set
-		if( isset( $checkbox_options ) && $checkbox_options[$this->type]['associated-list'] != '-' ) {
-			if( $this->is_user_already_subscribed( $this->type ) ) {
+		if ( isset( $checkbox_options ) && $checkbox_options[ $this->type ][ 'associated-list' ] != '-' ) {
+			if ( $this->is_user_already_subscribed( $this->type ) ) {
 				return $fields;
 			}
-			if( isset( $checkbox_options[$this->type]['precheck'] ) && $checkbox_options[$this->type]['precheck'] == 'true' ) {
+			if ( isset( $checkbox_options[ $this->type ][ 'precheck' ] ) && $checkbox_options[ $this->type ][ 'precheck' ] == 'true' ) {
 				$precheck = '1';
 			} else {
 				$precheck = '0';
 			}
-			$fields[ 'billing' ]['yikes_mailchimp_checkbox_'.$this->type] = array(
-				'id' => 'yikes_mailchimp_checkbox_'.$this->type,
+			$fields[ 'billing' ][ 'yikes_mailchimp_checkbox_' . $this->type ] = array(
+				'id' => 'yikes_mailchimp_checkbox_' . $this->type,
 				'type'    => 'checkbox',
 				'class' => array(),
-				'label'   => $checkbox_options[$this->type]['label'],
+				'label'   => $checkbox_options[ $this->type ][ 'label' ],
 				'default' => $precheck,
 			);
 		}
@@ -78,7 +78,7 @@ 
 	*/
 	public function subscribe_from_woocommerce_checkout( $order_id ) {
 		$do_optin = get_post_meta( $order_id, 'yikes_easy_mailchimp_optin', true );
-		if( $do_optin == '1' ) {
+		if ( $do_optin == '1' ) {
 			$order = new WC_Order( $order_id );
 			$email = $order->billing_email;
 			$merge_vars = array(
@@ -87,7 +87,7 @@ 
 				'LNAME' => $order->billing_last_name,
 			);
 			// subscribe the user
-			$this->subscribe_user_integration( sanitize_email( $email ) , $this->type , $merge_vars );
+			$this->subscribe_user_integration( sanitize_email( $email ), $this->type, $merge_vars );
 		}
 		return false;
 	}