yikesinc / yikes-inc-easy-mailchimp-extender

admin/partials/dashboard-widgets/templates/account-activity-template.php

Spacing +11 added lines, -11 removed lines

@@ -8,23 +8,23 @@
 	</tr>
 	<?php 
 	$i = 1;
-	foreach( $account_activity as $activity ) {
-		if( $i <= 8 ) {
-		$message = $activity['message'];
-		$split_message = explode( ' - ' , $activity['message'] );
-		$split_list = explode( '"' , $split_message[0] );
-		if( isset( $split_list[1] ) ) {
-			if( isset( $activity['list_id'] ) ) {
-				$message = $split_list[0] . ' <a href="' . esc_url_raw( admin_url( 'admin.php?page=yikes-mailchimp-view-list&list-id=' . $activity['list_id'] ) ) . '"><strong>' . $split_list[1] . '</strong></a>'; 
+	foreach ( $account_activity as $activity ) {
+		if ( $i <= 8 ) {
+		$message = $activity[ 'message' ];
+		$split_message = explode( ' - ', $activity[ 'message' ] );
+		$split_list = explode( '"', $split_message[ 0 ] );
+		if ( isset( $split_list[ 1 ] ) ) {
+			if ( isset( $activity[ 'list_id' ] ) ) {
+				$message = $split_list[ 0 ] . ' <a href="' . esc_url_raw( admin_url( 'admin.php?page=yikes-mailchimp-view-list&list-id=' . $activity[ 'list_id' ] ) ) . '"><strong>' . $split_list[ 1 ] . '</strong></a>'; 
 			} else {
-				$message = $split_list[0] . ' <strong>' . $split_list[1] . '</strong>'; 
+				$message = $split_list[ 0 ] . ' <strong>' . $split_list[ 1 ] . '</strong>'; 
 			}
 		} else {
-			$message = $split_list[0];
+			$message = $split_list[ 0 ];
 		}
 		?>
 			<tr valign="top">
-				<td><label for="tablecell"><?php echo ucwords( str_replace( '-' , ' ' , str_replace( 'lists:' , '' , $activity['type'] ) ) ); ?></label></td>
+				<td><label for="tablecell"><?php echo ucwords( str_replace( '-', ' ', str_replace( 'lists:', '', $activity[ 'type' ] ) ) ); ?></label></td>
 				<td><?php echo $message; ?></td>
 			</tr>
 		<?php 

admin/partials/welcome-page/welcome-sections/whats-new-section.php

Spacing +9 added lines, -9 removed lines

@@ -2,7 +2,7 @@ 
 	
 	<div class="feature-section">
 		
-		<h2><?php _e( 'All New Form Settings' , 'yikes-inc-easy-mailchimp-extender' ); ?></h2>
+		<h2><?php _e( 'All New Form Settings', 'yikes-inc-easy-mailchimp-extender' ); ?></h2>
 		
 		<img src="<?php echo YIKES_MC_URL . 'includes/images/Welcome_Page/form-layout-option.jpg'; ?>" alt="<?php _e( 'New Form Settings', 'yikes-inc-easy-mailchimp-extender' ); ?>" class="yikes-easy-mc-feature-image yikes-easy-mc-whats-new-section-image">
 		
@@ -26,9 +26,9 @@ 
 	
 	<div class="feature-section">
 		
-		<h2><?php _e( 'Translated & Localized' , 'yikes-inc-easy-mailchimp-extender' ); ?></h2>
+		<h2><?php _e( 'Translated & Localized', 'yikes-inc-easy-mailchimp-extender' ); ?></h2>
 		
-		<p style="float:left;width:55%;max-width:55%;"><?php _e( "YIKES Easy Forms for MailChimp was developed with our international users in mind. Not only will you find the plugin to be i18n ready, but you'll also find our datepickers to be localized for mm/dd/yyyy or dd/mm/yyyy formats. Everything is automatic and gets localized based on the language of your site. It's like magic!",  'yikes-inc-easy-mailchimp-extender' ); ?></p>
+		<p style="float:left;width:55%;max-width:55%;"><?php _e( "YIKES Easy Forms for MailChimp was developed with our international users in mind. Not only will you find the plugin to be i18n ready, but you'll also find our datepickers to be localized for mm/dd/yyyy or dd/mm/yyyy formats. Everything is automatic and gets localized based on the language of your site. It's like magic!", 'yikes-inc-easy-mailchimp-extender' ); ?></p>
 		
 		<img style="width:40%;max-width:400px;display:block;" src="<?php echo YIKES_MC_URL . 'includes/images/Welcome_Page/arabic-calendar.png'; ?>" alt="<?php _e( 'Localized Arabic Calendar', 'yikes-inc-easy-mailchimp-extender' ); ?>" class="yikes-easy-mc-feature-image yikes-easy-mc-whats-new-section-image">
 
@@ -38,19 +38,19 @@ 
 	
 	<div class="feature-section">
 		
-		<h2><?php _e( 'Knowledge Base & GlotPress Support' , 'yikes-inc-easy-mailchimp-extender' ); ?></h2>
+		<h2><?php _e( 'Knowledge Base & GlotPress Support', 'yikes-inc-easy-mailchimp-extender' ); ?></h2>
 				
 		<img style="float:left;max-width:300px;margin-right:20px;margin-left:0 !important;" src="<?php echo YIKES_MC_URL . 'includes/images/Welcome_Page/glotpress-translation-percentage.png'; ?>" alt="<?php _e( 'GlotPress Localized Precentage', 'yikes-inc-easy-mailchimp-extender' ); ?>" class="yikes-easy-mc-feature-image yikes-easy-mc-whats-new-section-image">
 
-		<p><?php _e( "Since the initial release of this Easy Forms for MailChimp by YIKES we've been tirelessly working on putting together a collection of help articles ranging from troubleshooting tips to customization options. We've also included a collection of code snippets from some of our most widely asked questions. Now you can access some of our most popular articles right from within the plugin.",  'yikes-inc-easy-mailchimp-extender' ); ?></p>
+		<p><?php _e( "Since the initial release of this Easy Forms for MailChimp by YIKES we've been tirelessly working on putting together a collection of help articles ranging from troubleshooting tips to customization options. We've also included a collection of code snippets from some of our most widely asked questions. Now you can access some of our most popular articles right from within the plugin.", 'yikes-inc-easy-mailchimp-extender' ); ?></p>
 				
-		<p><h4><a href="<?php echo esc_url_raw( admin_url( 'admin.php?page=yikes-inc-easy-mailchimp-support#knowledge-base-articles' ) ); ?>" title="<?php _e( 'Support | Knowledge Base' , 'yikes-inc-easy-mailchimp-extender' ); ?>"><?php _e( 'Support → Knowledge Base Articles', 'yikes-inc-easy-mailchimp-extender' ); ?></a></h4></p>
+		<p><h4><a href="<?php echo esc_url_raw( admin_url( 'admin.php?page=yikes-inc-easy-mailchimp-support#knowledge-base-articles' ) ); ?>" title="<?php _e( 'Support | Knowledge Base', 'yikes-inc-easy-mailchimp-extender' ); ?>"><?php _e( 'Support → Knowledge Base Articles', 'yikes-inc-easy-mailchimp-extender' ); ?></a></h4></p>
 		
 		<p>&nbsp;</p>
 		
 		<p><?php _e( "With a ton of help from the WordPress community, we've been able to support 7 international languages. We're always looking for additional translators, so if you are multi-lingual and can help translate things - hop into glotpress and help contribute to future development of this plugin.", 'yikes-inc-easy-mailchimp-extender' ); ?></p>
 		
-		<p><h4><a href="<?php echo esc_url_raw( 'https://translate.wordpress.org/projects/wp-plugins/yikes-inc-easy-mailchimp-extender' ); ?>" target="_blank"title="<?php _e( 'Easy Forms for MailChimp | GlotPress' , 'yikes-inc-easy-mailchimp-extender' ); ?>"><?php _e( 'GlotPress', 'yikes-inc-easy-mailchimp-extender' ); ?></a></h4></p>
+		<p><h4><a href="<?php echo esc_url_raw( 'https://translate.wordpress.org/projects/wp-plugins/yikes-inc-easy-mailchimp-extender' ); ?>" target="_blank"title="<?php _e( 'Easy Forms for MailChimp | GlotPress', 'yikes-inc-easy-mailchimp-extender' ); ?>"><?php _e( 'GlotPress', 'yikes-inc-easy-mailchimp-extender' ); ?></a></h4></p>
 
 		
 	</div>
@@ -59,11 +59,11 @@ 
 	
 	<div class="feature-section">
 		
-		<h2><?php _e( 'Intuitive Settings Page' , 'yikes-inc-easy-mailchimp-extender' ); ?></h2>
+		<h2><?php _e( 'Intuitive Settings Page', 'yikes-inc-easy-mailchimp-extender' ); ?></h2>
 		
 		<img src="<?php echo YIKES_MC_URL . 'includes/images/Welcome_Page/settings-page.png'; ?>" alt="<?php _e( 'Settings Page', 'yikes-inc-easy-mailchimp-extender' ); ?>" class="yikes-easy-mc-feature-image yikes-easy-mc-whats-new-section-image">
 
-		<p style="float:left; padding-left:15px;margin-top:5px;"><?php _e( "We've re-laid out the settings page to allow for a more intuitive workflow. All of your settings are neatly tucked away in their respective setting tab.",  'yikes-inc-easy-mailchimp-extender' ); ?></p>
+		<p style="float:left; padding-left:15px;margin-top:5px;"><?php _e( "We've re-laid out the settings page to allow for a more intuitive workflow. All of your settings are neatly tucked away in their respective setting tab.", 'yikes-inc-easy-mailchimp-extender' ); ?></p>
 		
 	</div>
 	

admin/partials/welcome-page/welcome-sections/credits-section.php

Spacing +24 added lines, -24 removed lines

@@ -3,8 +3,8 @@ 
 	if ( false === ( $contributors = get_transient( 'yikes-mailchimp-contributor-transient' ) ) ) {
 		// It wasn't there, so regenerate the data and save the transient
 		$contributors = wp_remote_get( 'https://api.github.com/repos/yikesinc/yikes-inc-easy-mailchimp-extender/contributors?per_page=100', array( 'timeout' => 120 ) );
-		$contributors = json_decode( $contributors['body'] , true );
-		set_transient( 'yikes-mailchimp-contributor-transient', $contributors, 60*60*12 );
+		$contributors = json_decode( $contributors[ 'body' ], true );
+		set_transient( 'yikes-mailchimp-contributor-transient', $contributors, 60 * 60 * 12 );
 	}
 	// get the YIKES Inc. MailChimp translators via the Github API
 	if ( false === ( $translators = get_transient( 'yikes-mailchimp-translators-transient' ) ) ) {
@@ -19,20 +19,20 @@ 
 		);	
 		// create an empty array to store with translator data to loop over
 		$translators = array();
-		foreach( $translator_usernames as $username => $language ) {
+		foreach ( $translator_usernames as $username => $language ) {
 			$translator_data = wp_remote_get( 'https://api.github.com/users/' . $username, array( 'timeout' => 120 ) );
 			// if( $translator_data['status'] == 200 ) {
-				$translators_data_decoded = json_decode( $translator_data['body'] , true );
-				$translators[] = array(
-					'login' => $translators_data_decoded['login'],
-					'avatar_url' => $translators_data_decoded['avatar_url'],
-					'html_url' => $translators_data_decoded['html_url'],
-					'name' => $translators_data_decoded['name'],
+				$translators_data_decoded = json_decode( $translator_data[ 'body' ], true );
+				$translators[ ] = array(
+					'login' => $translators_data_decoded[ 'login' ],
+					'avatar_url' => $translators_data_decoded[ 'avatar_url' ],
+					'html_url' => $translators_data_decoded[ 'html_url' ],
+					'name' => $translators_data_decoded[ 'name' ],
 					'translation_language' => $language,
 				);
 			// }
 		}		
-		set_transient( 'yikes-mailchimp-translators-transient', $translators, 60*60*12 );
+		set_transient( 'yikes-mailchimp-translators-transient', $translators, 60 * 60 * 12 );
 	}
 ?>
 <div class="wrap about-wrap">
@@ -46,17 +46,17 @@ 
 		<div id="credit-container">
 			<h2><?php _e( 'Developers', 'yikes-inc-easy-mailchimp-extender' ); ?></h2>
 			<?php
-				if( ! empty( $contributors ) ) {
-					$old_contributors = array( 'seriouslysean' , 'Apfelbiss', 'hiwhatsup', 'mialevesque' );
-						foreach( $contributors as $contributor ) {
+				if ( ! empty( $contributors ) ) {
+					$old_contributors = array( 'seriouslysean', 'Apfelbiss', 'hiwhatsup', 'mialevesque' );
+						foreach ( $contributors as $contributor ) {
 							// skip contributors from our old plugin (this is a new re-write)
-							if( ! in_array( $contributor['login'] , $old_contributors ) ) {
+							if ( ! in_array( $contributor[ 'login' ], $old_contributors ) ) {
 								?>
-								<a href="<?php echo esc_url_raw( $contributor['html_url'] ); ?>" title="<?php echo $contributor['login']; ?>" target="_blank" class="github-avatar-url">
+								<a href="<?php echo esc_url_raw( $contributor[ 'html_url' ] ); ?>" title="<?php echo $contributor[ 'login' ]; ?>" target="_blank" class="github-avatar-url">
 									<div class="team-member">
-										<img src="<?php echo esc_url_raw( $contributor['avatar_url'] ); ?>" class="github-avatar-image">
+										<img src="<?php echo esc_url_raw( $contributor[ 'avatar_url' ] ); ?>" class="github-avatar-image">
 										<p class="member-blurb">
-											<p><strong><?php echo $contributor['login']; ?></strong></p>
+											<p><strong><?php echo $contributor[ 'login' ]; ?></strong></p>
 										</p>
 									</div>
 								</a>
@@ -65,24 +65,24 @@ 
 						}
 				} else {
 					?>
-						<h4><?php _e( 'There was an error retrieving the contributors list. Please try again later.' , 'yikes-inc-easy-mailchimp-extender' ); ?></h4>
+						<h4><?php _e( 'There was an error retrieving the contributors list. Please try again later.', 'yikes-inc-easy-mailchimp-extender' ); ?></h4>
 					<?php
 				}
 			?>
 		</div>
 		
-		<?php if( ! empty( $translators ) ) { ?>
+		<?php if ( ! empty( $translators ) ) { ?>
 			<div id="translators-container">
 				<h2><?php _e( 'Translators', 'yikes-inc-easy-mailchimp-extender' ); ?></h2>
 				<?php
-					foreach( $translators as $translator ) {
+					foreach ( $translators as $translator ) {
 						?>
-							<a href="<?php echo esc_url_raw( $translator['html_url'] ); ?>" title="<?php echo $translator['name']; ?>" target="_blank" class="github-avatar-url">
+							<a href="<?php echo esc_url_raw( $translator[ 'html_url' ] ); ?>" title="<?php echo $translator[ 'name' ]; ?>" target="_blank" class="github-avatar-url">
 								<div class="translator">
-									<img src="<?php echo esc_url_raw( $translator['avatar_url'] ); ?>" class="github-avatar-image">
+									<img src="<?php echo esc_url_raw( $translator[ 'avatar_url' ] ); ?>" class="github-avatar-image">
 									<p class="member-blurb">
-										<p><strong><?php echo $translator['login']; ?></strong></p>
-										<em class="translation-language"><?php echo $translator['translation_language']; ?></em>
+										<p><strong><?php echo $translator[ 'login' ]; ?></strong></p>
+										<em class="translation-language"><?php echo $translator[ 'translation_language' ]; ?></em>
 									</p>
 								</div>
 							</a>

admin/partials/welcome-page/welcome-sections/getting-started-section.php

Spacing +23 added lines, -23 removed lines

@@ -1,24 +1,24 @@ 
-<?php if( get_option( 'yikes-mc-api-validation' , 'invalid_api_key' ) == 'invalid_api_key' ) { ?>
+<?php if ( get_option( 'yikes-mc-api-validation', 'invalid_api_key' ) == 'invalid_api_key' ) { ?>
 	<div class="about-description">
-		<?php printf( __( "Before you can create any opt-in forms, you'll first need to enter your MailChimp API key into the <a href='%s' title='Yikes Easy MailChimp Settings'>settings page</a>" , 'yikes-inc-easy-mailchimp-extender' ), esc_url_raw( admin_url( 'admin.php?page=yikes-inc-easy-mailchimp-settings&section=general-settings' ) ) ); ?>
+		<?php printf( __( "Before you can create any opt-in forms, you'll first need to enter your MailChimp API key into the <a href='%s' title='Yikes Easy MailChimp Settings'>settings page</a>", 'yikes-inc-easy-mailchimp-extender' ), esc_url_raw( admin_url( 'admin.php?page=yikes-inc-easy-mailchimp-settings&section=general-settings' ) ) ); ?>
 	</div>
 <?php } ?>
 
 <div class="changelog">
 		
-	<h3><?php _e( 'Creating Your First Opt-In Form' , 'yikes-inc-easy-mailchimp-extender' ); ?></h3>
+	<h3><?php _e( 'Creating Your First Opt-In Form', 'yikes-inc-easy-mailchimp-extender' ); ?></h3>
 	
 	<div class="feature-section">
 		
 		<img src="<?php echo YIKES_MC_URL . 'includes/images/Welcome_Page/create-first-optin-form.jpg'; ?>" alt="<?php _e( 'Create first optin form screenshot', 'yikes-inc-easy-mailchimp-extender' ); ?>" class="yikes-easy-mc-feature-image">
 					
-		<h4><a href="<?php echo esc_url_raw( admin_url( 'admin.php?page=yikes-inc-easy-mailchimp' ) ); ?>" title="<?php _e( 'Manage Forms' , 'yikes-inc-easy-mailchimp-extender' ); ?>">Easy MailChimp → <?php _e( 'Forms', 'yikes-inc-easy-mailchimp-extender' ); ?></a></h4>
-		<p><?php _e( "Before you can start collecting users email addresses and building your mailing list, you'll need to create your first form. You can create as many forms as you'd like and assign each form to the same or different mailing lists.",  'yikes-inc-easy-mailchimp-extender' ); ?></p>
+		<h4><a href="<?php echo esc_url_raw( admin_url( 'admin.php?page=yikes-inc-easy-mailchimp' ) ); ?>" title="<?php _e( 'Manage Forms', 'yikes-inc-easy-mailchimp-extender' ); ?>">Easy MailChimp → <?php _e( 'Forms', 'yikes-inc-easy-mailchimp-extender' ); ?></a></h4>
+		<p><?php _e( "Before you can start collecting users email addresses and building your mailing list, you'll need to create your first form. You can create as many forms as you'd like and assign each form to the same or different mailing lists.", 'yikes-inc-easy-mailchimp-extender' ); ?></p>
 	
 		<p>&nbsp;</p>
 		
-		<h4><?php _e( 'Additional Options' , 'yikes-inc-easy-mailchimp-extender' ); ?></h4>
-		<p><?php _e( "Once you create a form, you can choose which fields you want to add to it and customize the success and error messages returned by MailChimp.",  'yikes-inc-easy-mailchimp-extender' ); ?></p>
+		<h4><?php _e( 'Additional Options', 'yikes-inc-easy-mailchimp-extender' ); ?></h4>
+		<p><?php _e( "Once you create a form, you can choose which fields you want to add to it and customize the success and error messages returned by MailChimp.", 'yikes-inc-easy-mailchimp-extender' ); ?></p>
 		
 	</div>
 	
@@ -26,41 +26,41 @@ 
 		
 		<img src="<?php echo YIKES_MC_URL . 'includes/images/Welcome_Page/optin-settings.png'; ?>" alt="<?php _e( 'Optin settings screenshot', 'yikes-inc-easy-mailchimp-extender' ); ?>" class="yikes-easy-mc-feature-image yikes-easy-mc-feature-image-left">
 					
-		<h4><?php _e( 'Customize the Form' , 'yikes-inc-easy-mailchimp-extender' ); ?></h4>
-		<p><?php _e( "Once created, you can customize the form. This includes editing the success and error messages displayed to the user, choosing which fields or interest groups are displayed, adding CSS classes to fields, assigning default values amp; placeholders and tons more!",  'yikes-inc-easy-mailchimp-extender' ); ?></p>
+		<h4><?php _e( 'Customize the Form', 'yikes-inc-easy-mailchimp-extender' ); ?></h4>
+		<p><?php _e( "Once created, you can customize the form. This includes editing the success and error messages displayed to the user, choosing which fields or interest groups are displayed, adding CSS classes to fields, assigning default values amp; placeholders and tons more!", 'yikes-inc-easy-mailchimp-extender' ); ?></p>
 		
 		<p>&nbsp;</p>
 		
-		<p><?php _e( "Quickly and easily switch which list the form is associated with, toggle single or double optin, whether the welcome email should be sent, toggle AJAX form submissions and more. Get customizing!",  'yikes-inc-easy-mailchimp-extender' ); ?></p>
+		<p><?php _e( "Quickly and easily switch which list the form is associated with, toggle single or double optin, whether the welcome email should be sent, toggle AJAX form submissions and more. Get customizing!", 'yikes-inc-easy-mailchimp-extender' ); ?></p>
 	</div>
 	<div class="feature-section">
 		
 		<img src="<?php echo YIKES_MC_URL . 'includes/images/Welcome_Page/add-field-to-page.png'; ?>" alt="<?php _e( 'Add field to form screenshot', 'yikes-inc-easy-mailchimp-extender' ); ?>" class="yikes-easy-mc-feature-image">
 					
-		<h4><?php _e( 'Add Form to Page/Post' , 'yikes-inc-easy-mailchimp-extender' ); ?></h4>
-		<p><?php _e( "When you're ready to add your MailChimp opt-in form to a page or post, you can click on the small MailChimp button in the content editor toolbar.",  'yikes-inc-easy-mailchimp-extender' ); ?></p>
+		<h4><?php _e( 'Add Form to Page/Post', 'yikes-inc-easy-mailchimp-extender' ); ?></h4>
+		<p><?php _e( "When you're ready to add your MailChimp opt-in form to a page or post, you can click on the small MailChimp button in the content editor toolbar.", 'yikes-inc-easy-mailchimp-extender' ); ?></p>
 		
 		<p>&nbsp;</p>
 		
-		<h4><?php _e( 'Add Form to Widget' , 'yikes-inc-easy-mailchimp-extender' ); ?></h4>
-		<p><?php _e( "We've created a MailChimp widget to easily add forms to any sidebar or widgetized area on your site. The widget allows you to select from any created forms.",  'yikes-inc-easy-mailchimp-extender' ); ?></p>
+		<h4><?php _e( 'Add Form to Widget', 'yikes-inc-easy-mailchimp-extender' ); ?></h4>
+		<p><?php _e( "We've created a MailChimp widget to easily add forms to any sidebar or widgetized area on your site. The widget allows you to select from any created forms.", 'yikes-inc-easy-mailchimp-extender' ); ?></p>
 	</div>
 	
 	<div class="feature-section">
-		<h3><span class="dashicons dashicons-format-status need-support-icon"></span> <?php _e( "Need Support?" , 'yikes-inc-easy-mailchimp-extender' ); ?></h3>		
+		<h3><span class="dashicons dashicons-format-status need-support-icon"></span> <?php _e( "Need Support?", 'yikes-inc-easy-mailchimp-extender' ); ?></h3>		
 		
-		<h4><?php _e( 'Free Support' , 'yikes-inc-easy-mailchimp-extender' ); ?></h4>
-		<p><?php _e( "If you need help using the free version of the plugin, you can post support inquiries to one of two locations.",  'yikes-inc-easy-mailchimp-extender' ); ?></p>
+		<h4><?php _e( 'Free Support', 'yikes-inc-easy-mailchimp-extender' ); ?></h4>
+		<p><?php _e( "If you need help using the free version of the plugin, you can post support inquiries to one of two locations.", 'yikes-inc-easy-mailchimp-extender' ); ?></p>
 		<ul class="support-option-list">
-			<li class="support-option support-option-first"><a href="https://wordpress.org/plugins/yikes-inc-easy-mailchimp-extender/" title="<?php esc_attr_e( 'WordPress Plugin Directory' , 'yikes-inc-easy-mailchimp-extender' ); ?>"><?php _e( 'WordPress Plugin Directory' , 'yikes-inc-easy-mailchimp-extender' ); ?></a></li>
-			<li class="support-option support-option-second"><a href="https://github.com/yikesinc/yikes-inc-easy-mailchimp-extender/issues" target="_blank" title="<?php esc_attr_e( 'GitHub Issue Tracker' , 'yikes-inc-easy-mailchimp-extender' ); ?>"><?php _e( 'GitHub Issue Tracker' , 'yikes-inc-easy-mailchimp-extender' ); ?></a></li>
+			<li class="support-option support-option-first"><a href="https://wordpress.org/plugins/yikes-inc-easy-mailchimp-extender/" title="<?php esc_attr_e( 'WordPress Plugin Directory', 'yikes-inc-easy-mailchimp-extender' ); ?>"><?php _e( 'WordPress Plugin Directory', 'yikes-inc-easy-mailchimp-extender' ); ?></a></li>
+			<li class="support-option support-option-second"><a href="https://github.com/yikesinc/yikes-inc-easy-mailchimp-extender/issues" target="_blank" title="<?php esc_attr_e( 'GitHub Issue Tracker', 'yikes-inc-easy-mailchimp-extender' ); ?>"><?php _e( 'GitHub Issue Tracker', 'yikes-inc-easy-mailchimp-extender' ); ?></a></li>
 		</ul>
 		
-		<h4><?php _e( 'Priority Support' , 'yikes-inc-easy-mailchimp-extender' ); ?></h4>
-		<p><?php _e( "If you want immediate support, please consider purchasing an add-on or developer License. Not only will you get 1 full year of automatic updates and priority support, you will enjoy the tons of features packed into our add-ons that are not available in the free version." , 'yikes-inc-easy-mailchimp-extender' ); ?></p>
+		<h4><?php _e( 'Priority Support', 'yikes-inc-easy-mailchimp-extender' ); ?></h4>
+		<p><?php _e( "If you want immediate support, please consider purchasing an add-on or developer License. Not only will you get 1 full year of automatic updates and priority support, you will enjoy the tons of features packed into our add-ons that are not available in the free version.", 'yikes-inc-easy-mailchimp-extender' ); ?></p>
 
-		<h4><?php _e( 'Knowledge Base' , 'yikes-inc-easy-mailchimp-extender' ); ?></h4>
-		<p><?php printf( __( 'For plugin documentation, visit our <a href="%s" title="Knowledge Base" target="_blank">knowledge base</a>.' , 'yikes-inc-easy-mailchimp-extender' ), esc_url_raw( 'https://yikesplugins.com/support/knowledge-base/product/easy-forms-for-mailchimp/' ) ); ?>
+		<h4><?php _e( 'Knowledge Base', 'yikes-inc-easy-mailchimp-extender' ); ?></h4>
+		<p><?php printf( __( 'For plugin documentation, visit our <a href="%s" title="Knowledge Base" target="_blank">knowledge base</a>.', 'yikes-inc-easy-mailchimp-extender' ), esc_url_raw( 'https://yikesplugins.com/support/knowledge-base/product/easy-forms-for-mailchimp/' ) ); ?>
 		
 	</div>
 	

admin/partials/welcome-page/welcome.php

Spacing +12 added lines, -12 removed lines

@@ -7,22 +7,22 @@ 
 	 * @return void
 	 */
 	function yikes_easy_mc_welcome_tabs() {
-		$section = isset( $_GET['section'] ) ? $_GET['section'] : 'getting-started';
+		$section = isset( $_GET[ 'section' ] ) ? $_GET[ 'section' ] : 'getting-started';
 		?>
 		<h2 class="nav-tab-wrapper welcome-page-tabs">
-			<a class="nav-tab <?php echo $section == 'getting-started' ? 'nav-tab-active' : ''; ?>" href="<?php echo esc_url_raw( admin_url( add_query_arg( array( 'page' => 'yikes-mailchimp-welcome' , 'section' => 'getting-started' ), 'admin.php' ) ) ); ?>">
+			<a class="nav-tab <?php echo $section == 'getting-started' ? 'nav-tab-active' : ''; ?>" href="<?php echo esc_url_raw( admin_url( add_query_arg( array( 'page' => 'yikes-mailchimp-welcome', 'section' => 'getting-started' ), 'admin.php' ) ) ); ?>">
 				<span class="dashicons dashicons-admin-home"></span> <?php _e( 'Getting Started', 'yikes-inc-easy-mailchimp-extender' ); ?>
 			</a>
-			<a class="nav-tab <?php echo $section == 'whats-new' ? 'nav-tab-active' : ''; ?>" href="<?php echo esc_url_raw( admin_url( add_query_arg( array( 'page' => 'yikes-mailchimp-welcome' , 'section' => 'whats-new' ), 'admin.php' ) ) ); ?>">
+			<a class="nav-tab <?php echo $section == 'whats-new' ? 'nav-tab-active' : ''; ?>" href="<?php echo esc_url_raw( admin_url( add_query_arg( array( 'page' => 'yikes-mailchimp-welcome', 'section' => 'whats-new' ), 'admin.php' ) ) ); ?>">
 				<span class="dashicons dashicons-warning"></span> <?php _e( "What's New", 'yikes-inc-easy-mailchimp-extender' ); ?>
 			</a>
-			<a class="nav-tab <?php echo $section == 'add-ons' ? 'nav-tab-active' : ''; ?>" href="<?php echo esc_url_raw( admin_url( add_query_arg( array( 'page' => 'yikes-mailchimp-welcome' , 'section' => 'add-ons' ), 'admin.php' ) ) ); ?>">
+			<a class="nav-tab <?php echo $section == 'add-ons' ? 'nav-tab-active' : ''; ?>" href="<?php echo esc_url_raw( admin_url( add_query_arg( array( 'page' => 'yikes-mailchimp-welcome', 'section' => 'add-ons' ), 'admin.php' ) ) ); ?>">
 				<span class="dashicons dashicons-admin-plugins"></span> <?php _e( "Add-Ons", 'yikes-inc-easy-mailchimp-extender' ); ?>
 			</a>
-			<a class="nav-tab <?php echo $section == 'knowledge-base' ? 'nav-tab-active' : ''; ?>" href="<?php echo esc_url_raw( admin_url( add_query_arg( array( 'page' => 'yikes-mailchimp-welcome' , 'section' => 'knowledge-base' ), 'admin.php' ) ) ); ?>">
+			<a class="nav-tab <?php echo $section == 'knowledge-base' ? 'nav-tab-active' : ''; ?>" href="<?php echo esc_url_raw( admin_url( add_query_arg( array( 'page' => 'yikes-mailchimp-welcome', 'section' => 'knowledge-base' ), 'admin.php' ) ) ); ?>">
 				<span class="dashicons dashicons-welcome-learn-more"></span> <?php _e( 'Knowledge Base', 'yikes-inc-easy-mailchimp-extender' ); ?>
 			</a>
-			<a class="nav-tab <?php echo $section == 'credits' ? 'nav-tab-active' : ''; ?>" href="<?php echo esc_url_raw( admin_url( add_query_arg( array( 'page' => 'yikes-mailchimp-welcome' , 'section' => 'credits' ), 'admin.php' ) ) ); ?>">
+			<a class="nav-tab <?php echo $section == 'credits' ? 'nav-tab-active' : ''; ?>" href="<?php echo esc_url_raw( admin_url( add_query_arg( array( 'page' => 'yikes-mailchimp-welcome', 'section' => 'credits' ), 'admin.php' ) ) ); ?>">
 				<span class="dashicons dashicons-arrow-left-alt2"></span><?php _e( 'Credits', 'yikes-inc-easy-mailchimp-extender' ); ?><span class="dashicons dashicons-arrow-right-alt2"></span>
 			</a>
 		</h2>
@@ -30,8 +30,8 @@ 
 	}
 	
 	function yikes_easy_mc_welcome_body() {
-		$section = isset( $_GET['section'] ) ? $_GET['section'] : 'getting-started';
-		if( isset( $section ) ) {
+		$section = isset( $_GET[ 'section' ] ) ? $_GET[ 'section' ] : 'getting-started';
+		if ( isset( $section ) ) {
 			include_once( plugin_dir_path( dirname( __FILE__ ) ) . '/welcome-page/welcome-sections/' . $section . '-section.php' );
 		}
 	}
@@ -44,17 +44,17 @@ 
 		<div id="yikes-mailchimp-logo"></div>
 		
 		<h2 class="welcome-title">
-			Easy Forms for MailChimp by YIKES | <?php echo __( 'MailChimp Done Right' , 'yikes-inc-easy-mailchimp-extender' ); ?>
+			Easy Forms for MailChimp by YIKES | <?php echo __( 'MailChimp Done Right', 'yikes-inc-easy-mailchimp-extender' ); ?>
 		</h2>		
 		
 		<p class="about-text">
 			<?php 
 				// check if this is a fresh install
-				if( get_option( 'yikes_easy_mailchimp_activation_date', strtotime( 'now' ) ) == strtotime( 'now' ) ) {
-					echo sprintf( __( 'Welcome to the most powerful MailChimp integration for WordPress. Easy Forms for MailChimp by YIKES v%s is ready to help take your mailing lists to the next level!' , 'yikes-inc-easy-mailchimp-extender' ) , $this->version ); 
+				if ( get_option( 'yikes_easy_mailchimp_activation_date', strtotime( 'now' ) ) == strtotime( 'now' ) ) {
+					echo sprintf( __( 'Welcome to the most powerful MailChimp integration for WordPress. Easy Forms for MailChimp by YIKES v%s is ready to help take your mailing lists to the next level!', 'yikes-inc-easy-mailchimp-extender' ), $this->version ); 
 				} else {
 					// else thank you for updating :)
-					echo sprintf( __( 'Thank you for updating to the latest version! Easy Forms for MailChimp by YIKES v%s is ready to help take your mailing lists to the next level!' , 'yikes-inc-easy-mailchimp-extender' ) , $this->version ); 
+					echo sprintf( __( 'Thank you for updating to the latest version! Easy Forms for MailChimp by YIKES v%s is ready to help take your mailing lists to the next level!', 'yikes-inc-easy-mailchimp-extender' ), $this->version ); 
 				}
 			?>
 		</p>

admin/partials/ajax/class.ajax.php

Indentation +9 added lines, -9 removed lines

@@ -154,17 +154,17 @@
 		public function findMCListIndex( $id, $array, $tag ) {
 			if( $tag == 'tag' ) {
 				foreach( $array as $key => $val ) {
-					   if ( $val['tag'] === $id ) {
-						   return $key;
-					   }
-				   }
-			   return null;
+						if ( $val['tag'] === $id ) {
+							return $key;
+						}
+					}
+				return null;
 			} else {
 				foreach ( $array as $key => $val ) {
-				   if ( $val['id'] == $id ) {
-					   return $key;
-				   }
-			   }
+					if ( $val['id'] == $id ) {
+						return $key;
+					}
+				}
 			return null;
 			}
 	  	} // end

Spacing +38 added lines, -38 removed lines

@@ -12,15 +12,15 @@ 
 
 		public function __construct() {				
 			// ajax send merge variable to form builder
-			add_action( 'wp_ajax_add_field_to_form', array( $this , 'send_field_to_form' ), 10 );
+			add_action( 'wp_ajax_add_field_to_form', array( $this, 'send_field_to_form' ), 10 );
 			// ajax send interest group to form builder
-			add_action( 'wp_ajax_add_interest_group_to_form', array( $this , 'send_interest_group_to_form' ), 10 );
+			add_action( 'wp_ajax_add_interest_group_to_form', array( $this, 'send_interest_group_to_form' ), 10 );
 			// return new list data + activity (for dashboard widget )
-			add_action( 'wp_ajax_get_new_list_data', array( $this , 'get_new_list_data' ), 10 );
+			add_action( 'wp_ajax_get_new_list_data', array( $this, 'get_new_list_data' ), 10 );
 			// return new list data + activity (for dashboard widget )
-			add_action( 'wp_ajax_check_list_for_interest_groups', array( $this , 'check_list_for_interest_groups' ), 10 );
+			add_action( 'wp_ajax_check_list_for_interest_groups', array( $this, 'check_list_for_interest_groups' ), 10 );
 			// Add a new notification to a form
-			add_action( 'wp_ajax_add_notification_to_form', array( $this , 'add_notification_to_form' ), 10 , 1 );
+			add_action( 'wp_ajax_add_notification_to_form', array( $this, 'add_notification_to_form' ), 10, 1 );
 		}
 		
 		/* 
@@ -28,7 +28,7 @@ 
 		*	- return a single container
 		*/
 		public function add_notification_to_form() {
-			if( $_POST['notification_name'] ) {
+			if ( $_POST[ 'notification_name' ] ) {
 				include_once( YIKES_MC_PATH . 'admin/partials/ajax/add_notification_to_form.php' );
 			}
 			exit();
@@ -39,10 +39,10 @@ 
 		// when the user wants to switch which form data
 		// is displayed on the dashboard
 		public function get_new_list_data() {
-			$list_id = $_POST['list_id'];
-			$api_key = trim( get_option( 'yikes-mc-api-key' , '' ) );
+			$list_id = $_POST[ 'list_id' ];
+			$api_key = trim( get_option( 'yikes-mc-api-key', '' ) );
 			$dash_position = strpos( $api_key, '-' );
-			if( $dash_position !== false ) {
+			if ( $dash_position !== false ) {
 				$api_endpoint = 'https://' . substr( $api_key, $dash_position + 1 ) . '.api.mailchimp.com/2.0/lists/list.json';
 			}
 			$list_data = wp_remote_post( $api_endpoint, array( 
@@ -54,14 +54,14 @@ 
 				'sslverify' => apply_filters( 'yikes-mailchimp-sslverify', true )
 			) );
 			$list_data = json_decode( wp_remote_retrieve_body( $list_data ), true );
-			if( isset( $list_data['error'] ) ) {
-				if( WP_DEBUG || get_option( 'yikes-mailchimp-debug-status' , '' ) == '1' ) {
+			if ( isset( $list_data[ 'error' ] ) ) {
+				if ( WP_DEBUG || get_option( 'yikes-mailchimp-debug-status', '' ) == '1' ) {
 					require_once YIKES_MC_PATH . 'includes/error_log/class-yikes-inc-easy-mailchimp-error-logging.php';
 					$error_logging = new Yikes_Inc_Easy_Mailchimp_Error_Logging();
-					$error_logging->yikes_easy_mailchimp_write_to_error_log( $list_data['error'], __( "Get Account Lists" , 'yikes-inc-easy-mailchimp-extender' ) , __( "MailChimp Widget" , 'yikes-inc-easy-mailchimp-extender' ) );
+					$error_logging->yikes_easy_mailchimp_write_to_error_log( $list_data[ 'error' ], __( "Get Account Lists", 'yikes-inc-easy-mailchimp-extender' ), __( "MailChimp Widget", 'yikes-inc-easy-mailchimp-extender' ) );
 				}
 			}
-			if( ! empty( $list_data['data'][0] ) ) {
+			if ( ! empty( $list_data[ 'data' ][ 0 ] ) ) {
 				include_once( YIKES_MC_PATH . 'admin/partials/dashboard-widgets/templates/stats-list-template.php' );
 			}
 			exit();
@@ -73,19 +73,19 @@ 
 		// we want to return the interest groups associated with this list,
 		// to allow users to pre-check anything they want to assign users appropriately
 		/* note: this function is called statically from the integration settings page */
-		public static function check_list_for_interest_groups( $list_id='', $integration_type='', $load=false ) {
-			if( ! $list_id ) { 	
-				$list_id = $_POST['list_id'];
+		public static function check_list_for_interest_groups( $list_id = '', $integration_type = '', $load = false ) {
+			if ( ! $list_id ) { 	
+				$list_id = $_POST[ 'list_id' ];
 			}
-			if( ! $integration_type ) {	
-				$integration_type = $_POST['integration'];
+			if ( ! $integration_type ) {	
+				$integration_type = $_POST[ 'integration' ];
 			}
-			$api_key = trim( get_option( 'yikes-mc-api-key' , '' ) );
+			$api_key = trim( get_option( 'yikes-mc-api-key', '' ) );
 			// setup/check our transients
-			if ( WP_DEBUG ||  false === ( $interest_groupings = get_transient( $list_id . '_interest_group' ) ) ) {
+			if ( WP_DEBUG || false === ( $interest_groupings = get_transient( $list_id . '_interest_group' ) ) ) {
 			  // It wasn't there, so regenerate the data and save the transient		
 				$dash_position = strpos( $api_key, '-' );
-				if( $dash_position !== false ) {
+				if ( $dash_position !== false ) {
 					$api_endpoint = 'https://' . substr( $api_key, $dash_position + 1 ) . '.api.mailchimp.com/2.0/lists/interest-groupings.json';
 				}
 				$interest_groupings = wp_remote_post( $api_endpoint, array( 
@@ -98,22 +98,22 @@ 
 					'sslverify' => apply_filters( 'yikes-mailchimp-sslverify', true )
 				) );
 				$interest_groupings = json_decode( wp_remote_retrieve_body( $interest_groupings ), true );
-				if( isset( $interest_groupings['error'] ) ) {
-					if( get_option( 'yikes-mailchimp-debug-status' , '' ) == '1' ) {
+				if ( isset( $interest_groupings[ 'error' ] ) ) {
+					if ( get_option( 'yikes-mailchimp-debug-status', '' ) == '1' ) {
 						require_once YIKES_MC_PATH . 'includes/error_log/class-yikes-inc-easy-mailchimp-error-logging.php';
 						$error_logging = new Yikes_Inc_Easy_Mailchimp_Error_Logging();
-						$error_logging->yikes_easy_mailchimp_write_to_error_log( $interest_groupings['error'], __( "Get Interest Groups" , 'yikes-inc-easy-mailchimp-extender' ), "class.ajax.php" );
+						$error_logging->yikes_easy_mailchimp_write_to_error_log( $interest_groupings[ 'error' ], __( "Get Interest Groups", 'yikes-inc-easy-mailchimp-extender' ), "class.ajax.php" );
 					}
 				} else {
 					// set the transient for 2 hours
 					set_transient( $list_id . '_interest_group', $interest_groupings, 2 * HOUR_IN_SECONDS );
 				}
 			}
-			if( isset( $interest_groupings ) && ! empty( $interest_groupings ) ) {
+			if ( isset( $interest_groupings ) && ! empty( $interest_groupings ) ) {
 				require( YIKES_MC_PATH . 'admin/partials/menu/options-sections/templates/integration-interest-groups.php' );
 			}
 			// do not kill off execution on load, only on an ajax request
-			if( ! $load ) {
+			if ( ! $load ) {
 				exit();
 				wp_die();
 			}
@@ -123,10 +123,10 @@ 
 		// send a field to our form
 		public function send_field_to_form() {
 			$form_data_array = array(
-				'field_name' => $_POST['field_name'],
-				'merge_tag' => $_POST['merge_tag'],
-				'field_type' => $_POST['field_type'],
-				'list_id' => $_POST['list_id'],
+				'field_name' => $_POST[ 'field_name' ],
+				'merge_tag' => $_POST[ 'merge_tag' ],
+				'field_type' => $_POST[ 'field_type' ],
+				'list_id' => $_POST[ 'list_id' ],
 			);
 			include YIKES_MC_PATH . 'admin/partials/ajax/add_field_to_form.php';
 			exit();
@@ -136,10 +136,10 @@ 
 		// send interest group to our form
 		public function send_interest_group_to_form() {
 			$form_data_array = array(
-				'field_name' => $_POST['field_name'],
-				'group_id' => $_POST['group_id'],
-				'field_type' => $_POST['field_type'],
-				'list_id' => $_POST['list_id'],
+				'field_name' => $_POST[ 'field_name' ],
+				'group_id' => $_POST[ 'group_id' ],
+				'field_type' => $_POST[ 'field_type' ],
+				'list_id' => $_POST[ 'list_id' ],
 			);
 			include YIKES_MC_PATH . 'admin/partials/ajax/add_interest_group_to_form.php';
 			exit();
@@ -152,16 +152,16 @@ 
 		*	- http://stackoverflow.com/questions/6661530/php-multi-dimensional-array-search
 		*/
 		public function findMCListIndex( $id, $array, $tag ) {
-			if( $tag == 'tag' ) {
-				foreach( $array as $key => $val ) {
-					   if ( $val['tag'] === $id ) {
+			if ( $tag == 'tag' ) {
+				foreach ( $array as $key => $val ) {
+					   if ( $val[ 'tag' ] === $id ) {
 						   return $key;
 					   }
 				   }
 			   return null;
 			} else {
 				foreach ( $array as $key => $val ) {
-				   if ( $val['id'] == $id ) {
+				   if ( $val[ 'id' ] == $id ) {
 					   return $key;
 				   }
 			   }

Braces +4 added lines, -5 removed lines

@@ -7,10 +7,9 @@ 
 	*	@since 6.0.0
 	*	Author: Yikes Inc. | https://www.yikesinc.com
 	*/
-	class YIKES_Inc_Easy_MailChimp_Process_Ajax
-	{
+	class YIKES_Inc_Easy_MailChimp_Process_Ajax {
 
-		public function __construct() {				
+		public function __construct() {
 			// ajax send merge variable to form builder
 			add_action( 'wp_ajax_add_field_to_form', array( $this , 'send_field_to_form' ), 10 );
 			// ajax send interest group to form builder
@@ -74,10 +73,10 @@ 
 		// to allow users to pre-check anything they want to assign users appropriately
 		/* note: this function is called statically from the integration settings page */
 		public static function check_list_for_interest_groups( $list_id='', $integration_type='', $load=false ) {
-			if( ! $list_id ) { 	
+			if( ! $list_id ) {
 				$list_id = $_POST['list_id'];
 			}
-			if( ! $integration_type ) {	
+			if( ! $integration_type ) {
 				$integration_type = $_POST['integration'];
 			}
 			$api_key = trim( get_option( 'yikes-mc-api-key' , '' ) );

admin/partials/ajax/add_field_to_form.php

Spacing +74 added lines, -74 removed lines

@@ -1,43 +1,43 @@ 
 <?php
 	// lets run an ajax request to get all of our field data, to either prepopulate
 	// or build our default selection arrays etc.
-	$api_key = trim( get_option( 'yikes-mc-api-key' , '' ) );
+	$api_key = trim( get_option( 'yikes-mc-api-key', '' ) );
 	$dash_position = strpos( $api_key, '-' );
-	if( $dash_position !== false ) {
+	if ( $dash_position !== false ) {
 		$api_endpoint = 'https://' . substr( $api_key, $dash_position + 1 ) . '.api.mailchimp.com/2.0/lists/merge-vars.json';
 	}
 	$available_merge_variables = wp_remote_post( $api_endpoint, array( 
 		'body' => array( 
 			'apikey' => $api_key, 
-			'id' => array( $form_data_array['list_id'] ),
+			'id' => array( $form_data_array[ 'list_id' ] ),
 		),
 		'timeout' => 10,
 		'sslverify' => apply_filters( 'yikes-mailchimp-sslverify', true )
 	) );
 	$body = json_decode( wp_remote_retrieve_body( $available_merge_variables ), true );
-	if( isset( $body['error'] ) ) {
-		if( WP_DEBUG || get_option( 'yikes-mailchimp-debug-status' , '' ) == '1' ) {
+	if ( isset( $body[ 'error' ] ) ) {
+		if ( WP_DEBUG || get_option( 'yikes-mailchimp-debug-status', '' ) == '1' ) {
 			require_once YIKES_MC_PATH . 'includes/error_log/class-yikes-inc-easy-mailchimp-error-logging.php';
 			$error_logging = new Yikes_Inc_Easy_Mailchimp_Error_Logging();
-			$error_logging->yikes_easy_mailchimp_write_to_error_log( $body['error'], __( "Get Merge Variables" , 'yikes-inc-easy-mailchimp-extender' ) , __( "Add Field to Form" , 'yikes-inc-easy-mailchimp-extender' ) );
+			$error_logging->yikes_easy_mailchimp_write_to_error_log( $body[ 'error' ], __( "Get Merge Variables", 'yikes-inc-easy-mailchimp-extender' ), __( "Add Field to Form", 'yikes-inc-easy-mailchimp-extender' ) );
 		}
 		?>
 			<section class="draggable" id="error-container">
-				<p><span class="dashicons dashicons-no-alt"></span> <?php printf( __( 'Error: %s', 'yikes-inc-easy-mailchimp-extender' ), $body['error'] ); ?></p>
+				<p><span class="dashicons dashicons-no-alt"></span> <?php printf( __( 'Error: %s', 'yikes-inc-easy-mailchimp-extender' ), $body[ 'error' ] ); ?></p>
 			</section>
 		<?php 
 		return;
 	}
 	// find and return the location of this merge field in the array
-	$index = $this->findMCListIndex( $form_data_array['merge_tag'] , $body['data'][0]['merge_vars'], 'tag' );
+	$index = $this->findMCListIndex( $form_data_array[ 'merge_tag' ], $body[ 'data' ][ 0 ][ 'merge_vars' ], 'tag' );
 	// store it and use it to pre-populate field data (only on initial add to form)
-	$merge_field_data = $body['data'][0]['merge_vars'][$index];
+	$merge_field_data = $body[ 'data' ][ 0 ][ 'merge_vars' ][ $index ];
 ?>
-<section class="draggable" id="<?php echo $form_data_array['field_name']; ?>">
+<section class="draggable" id="<?php echo $form_data_array[ 'field_name' ]; ?>">
 	<!-- top -->
 	<a href="#" class="expansion-section-title settings-sidebar">
-		<span class="dashicons dashicons-plus" title="<?php _e( 'Expand Field' , 'yikes-inc-easy-mailchimp-extender' ); ?>"></span><?php echo stripslashes( $form_data_array['field_name'] ); ?>
-		<span class="field-type-text"><small><?php echo __( 'type' , 'yikes-inc-easy-mailchimp-extender' ) . ' : ' . $form_data_array['field_type']; ?></small></span>
+		<span class="dashicons dashicons-plus" title="<?php _e( 'Expand Field', 'yikes-inc-easy-mailchimp-extender' ); ?>"></span><?php echo stripslashes( $form_data_array[ 'field_name' ] ); ?>
+		<span class="field-type-text"><small><?php echo __( 'type', 'yikes-inc-easy-mailchimp-extender' ) . ' : ' . $form_data_array[ 'field_type' ]; ?></small></span>
 	</a>
 	<!-- expansion section -->
 	<div class="yikes-mc-settings-expansion-section">
@@ -45,14 +45,14 @@ 
 		<!-- Single or Double Opt-in -->
 		<p class="type-container form-field-container"><!-- necessary to prevent skipping on slideToggle(); -->
 			<!-- store the label -->
-			<input type="hidden" name="field[<?php echo $merge_field_data['tag']; ?>][label]" value="<?php echo $form_data_array['field_name']; ?>" />
-			<input type="hidden" name="field[<?php echo $merge_field_data['tag']; ?>][type]" value="<?php echo $form_data_array['field_type']; ?>" />
-			<input type="hidden" name="field[<?php echo $merge_field_data['tag']; ?>][merge]" value="<?php echo $merge_field_data['tag']; ?>" />
-			<input type="hidden" class="field-<?php echo $merge_field_data['tag']; ?>-position position-input" name="field[<?php echo $merge_field_data['tag']; ?>][position]" value="" />
+			<input type="hidden" name="field[<?php echo $merge_field_data[ 'tag' ]; ?>][label]" value="<?php echo $form_data_array[ 'field_name' ]; ?>" />
+			<input type="hidden" name="field[<?php echo $merge_field_data[ 'tag' ]; ?>][type]" value="<?php echo $form_data_array[ 'field_type' ]; ?>" />
+			<input type="hidden" name="field[<?php echo $merge_field_data[ 'tag' ]; ?>][merge]" value="<?php echo $merge_field_data[ 'tag' ]; ?>" />
+			<input type="hidden" class="field-<?php echo $merge_field_data[ 'tag' ]; ?>-position position-input" name="field[<?php echo $merge_field_data[ 'tag' ]; ?>][position]" value="" />
 			
-			<?php if ( $form_data_array['field_type'] == 'radio' || $form_data_array['field_type'] == 'dropdown' ) { ?>
-				<?php $choices = ( isset( $merge_field_data['choices'] ) ) ? esc_attr( json_encode( $merge_field_data['choices'] ) ) : ''; ?>
-				<input type="hidden" name="field[<?php echo $merge_field_data['tag']; ?>][choices]" value='<?php echo $choices; ?>' />
+			<?php if ( $form_data_array[ 'field_type' ] == 'radio' || $form_data_array[ 'field_type' ] == 'dropdown' ) { ?>
+				<?php $choices = ( isset( $merge_field_data[ 'choices' ] ) ) ? esc_attr( json_encode( $merge_field_data[ 'choices' ] ) ) : ''; ?>
+				<input type="hidden" name="field[<?php echo $merge_field_data[ 'tag' ]; ?>][choices]" value='<?php echo $choices; ?>' />
 			<?php } ?>
 				
 			<table class="form-table form-field-container">
@@ -61,15 +61,15 @@ 
 					<tr valign="top">
 						<td scope="row">
 							<label for="merge-tag">
-								<?php _e( 'Merge Tag' , 'yikes-inc-easy-mailchimp-extender' ); ?>
+								<?php _e( 'Merge Tag', 'yikes-inc-easy-mailchimp-extender' ); ?>
 							</label>
 						</td>
 						<td>
-							<input class="widefat merge-tag-text" type="text" readonly value="<?php echo $merge_field_data['tag']; ?>">
+							<input class="widefat merge-tag-text" type="text" readonly value="<?php echo $merge_field_data[ 'tag' ]; ?>">
 						</td>
 					</tr>
 
-			<?php switch( $form_data_array['field_type'] ) {
+			<?php switch ( $form_data_array[ 'field_type' ] ) {
 					
 					default:
 						break;
@@ -87,12 +87,12 @@ 
 					<tr valign="top">
 						<td scope="row">
 							<label for="placeholder">
-								<?php _e( 'Placeholder' , 'yikes-inc-easy-mailchimp-extender' ); ?> 
+								<?php _e( 'Placeholder', 'yikes-inc-easy-mailchimp-extender' ); ?> 
 							</label>
 						</td>
 						<td>
-						<input type="text" class="widefat" name="field[<?php echo $merge_field_data['tag']; ?>][placeholder]" value="<?php echo isset( $merge_field_data['placeholder'] ) ? stripslashes( wp_strip_all_tags( $merge_field_data['placeholder'] ) ): '' ; ?>" />
-							<p class="description"><small><?php _e( "Assign a placeholder value to this field.", 'yikes-inc-easy-mailchimp-extender' );?></small></p>
+						<input type="text" class="widefat" name="field[<?php echo $merge_field_data[ 'tag' ]; ?>][placeholder]" value="<?php echo isset( $merge_field_data[ 'placeholder' ] ) ? stripslashes( wp_strip_all_tags( $merge_field_data[ 'placeholder' ] ) ) : ''; ?>" />
+							<p class="description"><small><?php _e( "Assign a placeholder value to this field.", 'yikes-inc-easy-mailchimp-extender' ); ?></small></p>
 						</td>
 					</tr>
 			
@@ -101,27 +101,27 @@ 
 					*	Loop over field types and store necessary formats
 					*	( date, birthday - dateformat ; phone - phoneformat )
 					*/
-					switch( $form_data_array['field_type'] ) {
+					switch ( $form_data_array[ 'field_type' ] ) {
 												
 						/* Store the date format, for properly rendering dates on the front end */
 						case 'date':
-							$date_format = ( isset( $merge_field_data['dateformat'] ) ) ? $merge_field_data['dateformat'] : 'MM/DD/YYYY';
+							$date_format = ( isset( $merge_field_data[ 'dateformat' ] ) ) ? $merge_field_data[ 'dateformat' ] : 'MM/DD/YYYY';
 							?>
-								<input type="hidden" name="field[<?php echo $merge_field_data['tag']; ?>][date_format]" value="<?php echo strtolower( $merge_field_data['dateformat'] ); ?>" />
+								<input type="hidden" name="field[<?php echo $merge_field_data[ 'tag' ]; ?>][date_format]" value="<?php echo strtolower( $merge_field_data[ 'dateformat' ] ); ?>" />
 							<?php
 						break;
 						
 						case 'birthday':
-							$date_format = ( isset( $merge_field_data['dateformat'] ) ) ? $merge_field_data['dateformat'] : 'MM/DD';
+							$date_format = ( isset( $merge_field_data[ 'dateformat' ] ) ) ? $merge_field_data[ 'dateformat' ] : 'MM/DD';
 							?>
-								<input type="hidden" name="field[<?php echo $merge_field_data['tag']; ?>][date_format]" value="<?php echo strtolower( $date_format ); ?>" />
+								<input type="hidden" name="field[<?php echo $merge_field_data[ 'tag' ]; ?>][date_format]" value="<?php echo strtolower( $date_format ); ?>" />
 							<?php
 						break;
 						
 						/* Store the phone format, for properly regex pattern */
 						case 'phone':
 							?>
-								<input type="hidden" name="field[<?php echo $merge_field_data['tag']; ?>][phone_format]" value="<?php echo $merge_field_data['phoneformat']; ?>" />
+								<input type="hidden" name="field[<?php echo $merge_field_data[ 'tag' ]; ?>][phone_format]" value="<?php echo $merge_field_data[ 'phoneformat' ]; ?>" />
 							<?php
 						break;
 					}
@@ -132,7 +132,7 @@ 
 			?>
 			
 				<!-- Default Value -->
-				<?php switch( $form_data_array['field_type'] ) { 
+				<?php switch ( $form_data_array[ 'field_type' ] ) { 
 						
 						default:
 						case 'text':
@@ -140,17 +140,17 @@ 
 							<tr valign="top">
 								<td scope="row">
 									<label for="placeholder">
-										<?php _e( 'Default Value' , 'yikes-inc-easy-mailchimp-extender' ); ?>
+										<?php _e( 'Default Value', 'yikes-inc-easy-mailchimp-extender' ); ?>
 									</label>
 								</td>
 							<td>
-								<input type="text" class="widefat" name="field[<?php echo $merge_field_data['tag']; ?>][default]" <?php if( $form_data_array['field_type'] != 'url' ) { ?> value="<?php echo isset( $merge_field_data['default'] ) ? stripslashes( wp_strip_all_tags( $merge_field_data['default'] ) ) : ''; ?>" <?php } else { ?> value="<?php echo isset( $merge_field_data['default'] ) ? stripslashes( wp_strip_all_tags( esc_url_raw( $merge_field_data['default'] ) ) ) : ''; } ?>" />
-								<p class="description"><small><?php _e( "Assign a default value to populate this field with on initial page load.", 'yikes-inc-easy-mailchimp-extender' );?></small></p>
+								<input type="text" class="widefat" name="field[<?php echo $merge_field_data[ 'tag' ]; ?>][default]" <?php if ( $form_data_array[ 'field_type' ] != 'url' ) { ?> value="<?php echo isset( $merge_field_data[ 'default' ] ) ? stripslashes( wp_strip_all_tags( $merge_field_data[ 'default' ] ) ) : ''; ?>" <?php } else { ?> value="<?php echo isset( $merge_field_data[ 'default' ] ) ? stripslashes( wp_strip_all_tags( esc_url_raw( $merge_field_data[ 'default' ] ) ) ) : ''; } ?>" />
+								<p class="description"><small><?php _e( "Assign a default value to populate this field with on initial page load.", 'yikes-inc-easy-mailchimp-extender' ); ?></small></p>
 								<?php 
-								switch( $form_data_array['field_type'] ) { 
+								switch ( $form_data_array[ 'field_type' ] ) { 
 									case 'text':
 										?>
-											<p><small class="pre-defined-tag-link"><a href="#TB_inline?width=600&height=550&inlineId=pre-defined-tag-container" class="thickbox" onclick="storeGlobalClicked( jQuery( this ) );"><?php _e( 'View Pre-Defined Tags' , 'yikes-inc-easy-mailchimp-extender' ); ?></a></small></p>
+											<p><small class="pre-defined-tag-link"><a href="#TB_inline?width=600&height=550&inlineId=pre-defined-tag-container" class="thickbox" onclick="storeGlobalClicked( jQuery( this ) );"><?php _e( 'View Pre-Defined Tags', 'yikes-inc-easy-mailchimp-extender' ); ?></a></small></p>
 										<?php
 									break;
 								} ?>
@@ -164,20 +164,20 @@ 
 							<tr valign="top">
 								<td scope="row">
 									<label for="placeholder">
-										<?php _e( 'Default Selection' , 'yikes-inc-easy-mailchimp-extender' ); ?>
+										<?php _e( 'Default Selection', 'yikes-inc-easy-mailchimp-extender' ); ?>
 									</label>
 								</td>
 								<td>
 									<?php 
 										$x = 0;
-										foreach( $merge_field_data['choices'] as $choice => $value ) { 
-											$pre_selected = !empty( $merge_field_data['default_choice'] ) ? $merge_field_data['default_choice'] : '0';
+										foreach ( $merge_field_data[ 'choices' ] as $choice => $value ) { 
+											$pre_selected = ! empty( $merge_field_data[ 'default_choice' ] ) ? $merge_field_data[ 'default_choice' ] : '0';
 									?>
 										<label>
-											<input type="radio" name="field[<?php echo $merge_field_data['tag']; ?>][default_choice]" value="<?php echo $x; ?>" <?php checked( $pre_selected , $choice ); ?>><?php echo $value; ?>
+											<input type="radio" name="field[<?php echo $merge_field_data[ 'tag' ]; ?>][default_choice]" value="<?php echo $x; ?>" <?php checked( $pre_selected, $choice ); ?>><?php echo $value; ?>
 										</label>
 									<?php $x++; } ?>
-									<p class="description"><small><?php _e( "Select the option that should be selected by default.", 'yikes-inc-easy-mailchimp-extender' );?></small></p>
+									<p class="description"><small><?php _e( "Select the option that should be selected by default.", 'yikes-inc-easy-mailchimp-extender' ); ?></small></p>
 								</td>
 							</tr>
 											
@@ -189,18 +189,18 @@ 
 							<tr valign="top">
 								<td scope="row">
 									<label for="placeholder">
-										<?php _e( 'Default Selection' , 'yikes-inc-easy-mailchimp-extender' ); ?>
+										<?php _e( 'Default Selection', 'yikes-inc-easy-mailchimp-extender' ); ?>
 									</label>
 								</td>
 								<td>
-									<select type="default" name="field[<?php echo $merge_field_data['tag']; ?>][default_choice]">
-										<?php foreach( $merge_field_data['choices'] as $choice => $value ) { 
-												$pre_selected = ! empty( $merge_field_data['default_choice'] ) ? $merge_field_data['default_choice'] : '0';
+									<select type="default" name="field[<?php echo $merge_field_data[ 'tag' ]; ?>][default_choice]">
+										<?php foreach ( $merge_field_data[ 'choices' ] as $choice => $value ) { 
+												$pre_selected = ! empty( $merge_field_data[ 'default_choice' ] ) ? $merge_field_data[ 'default_choice' ] : '0';
 										?>
-											<option value="<?php echo $choice; ?>" <?php selected( $pre_selected , $choice ); ?>><?php echo stripslashes( $value ); ?></option>
+											<option value="<?php echo $choice; ?>" <?php selected( $pre_selected, $choice ); ?>><?php echo stripslashes( $value ); ?></option>
 										<?php } ?>
 									</select>
-									<p class="description"><small><?php _e( "Which option should be selected by default?", 'yikes-inc-easy-mailchimp-extender' );?></small></p>
+									<p class="description"><small><?php _e( "Which option should be selected by default?", 'yikes-inc-easy-mailchimp-extender' ); ?></small></p>
 								</td>
 							</tr>
 									
@@ -214,65 +214,65 @@ 
 				<tr valign="top">
 					<td scope="row">
 						<label for="placeholder">
-							<?php _e( 'Description' , 'yikes-inc-easy-mailchimp-extender' ); ?>
+							<?php _e( 'Description', 'yikes-inc-easy-mailchimp-extender' ); ?>
 						</label>
 					</td>
 					<td>
-						<textarea class="widefat field-description-input" name="field[<?php echo $merge_field_data['tag']; ?>][description]"></textarea>
-						<p class="description"><small><?php _e( "Enter the description for the form field. This will be displayed to the user and provide some direction on how the field should be filled out or selected.", 'yikes-inc-easy-mailchimp-extender' );?></small></p>
+						<textarea class="widefat field-description-input" name="field[<?php echo $merge_field_data[ 'tag' ]; ?>][description]"></textarea>
+						<p class="description"><small><?php _e( "Enter the description for the form field. This will be displayed to the user and provide some direction on how the field should be filled out or selected.", 'yikes-inc-easy-mailchimp-extender' ); ?></small></p>
 					</td>
 				</tr>
 				<!-- Additional Classes -->
 				<tr valign="top">
 					<td scope="row">
 						<label for="placeholder">
-							<?php _e( 'Additional Classes' , 'yikes-inc-easy-mailchimp-extender' ); ?>
+							<?php _e( 'Additional Classes', 'yikes-inc-easy-mailchimp-extender' ); ?>
 						</label>
 					</td>
 					<td>
-						<input type="text" class="widefat" name="field[<?php echo $merge_field_data['tag']; ?>][additional-classes]" value="<?php echo isset( $form_data_array['classes'] ) ? stripslashes( wp_strip_all_tags( $form_data_array['classes'] ) ) : '' ; ?>" />
-						<p class="description"><small><?php printf( __( "Assign additional classes to this field. %s.", 'yikes-inc-easy-mailchimp-extender' ), '<a target="_blank" href="' . esc_url( 'https://yikesplugins.com/support/knowledge-base/bundled-css-classes/' ) . '">' . __( 'View bundled classes', 'yikes-inc-easy-mailchimp-extender' ) . '</a>' );?></small></p>
+						<input type="text" class="widefat" name="field[<?php echo $merge_field_data[ 'tag' ]; ?>][additional-classes]" value="<?php echo isset( $form_data_array[ 'classes' ] ) ? stripslashes( wp_strip_all_tags( $form_data_array[ 'classes' ] ) ) : ''; ?>" />
+						<p class="description"><small><?php printf( __( "Assign additional classes to this field. %s.", 'yikes-inc-easy-mailchimp-extender' ), '<a target="_blank" href="' . esc_url( 'https://yikesplugins.com/support/knowledge-base/bundled-css-classes/' ) . '">' . __( 'View bundled classes', 'yikes-inc-easy-mailchimp-extender' ) . '</a>' ); ?></small></p>
 					</td>
 				</tr>
 					<!-- Required Toggle -->
 					<tr valign="top">
 						<td scope="row">
 							<label for="field-required">
-								<?php _e( 'Field Required?' , 'yikes-inc-easy-mailchimp-extender' ); ?>
+								<?php _e( 'Field Required?', 'yikes-inc-easy-mailchimp-extender' ); ?>
 							</label>
 						</td>
 						<td>
-							<input type="checkbox" class="widefat" value="1" name="field[<?php echo $merge_field_data['tag']; ?>][require]" <?php checked( $merge_field_data['req'], 1 ); ?> <?php if( $merge_field_data['tag'] == 'EMAIL' ) {  ?> disabled="disabled" checked="checked" title="<?php echo __( 'Email is a required field.' , 'yikes-inc-easy-mailchimp-extender' ); } ?>">
-							<p class="description"><small><?php _e( "Require this field to be filled in before the form can be submitted.", 'yikes-inc-easy-mailchimp-extender' );?></small></p>
+							<input type="checkbox" class="widefat" value="1" name="field[<?php echo $merge_field_data[ 'tag' ]; ?>][require]" <?php checked( $merge_field_data[ 'req' ], 1 ); ?> <?php if ( $merge_field_data[ 'tag' ] == 'EMAIL' ) {  ?> disabled="disabled" checked="checked" title="<?php echo __( 'Email is a required field.', 'yikes-inc-easy-mailchimp-extender' ); } ?>">
+							<p class="description"><small><?php _e( "Require this field to be filled in before the form can be submitted.", 'yikes-inc-easy-mailchimp-extender' ); ?></small></p>
 						</td>
 					</tr>
 					<!-- Visible Toggle -->
 					<tr valign="top">
 						<td scope="row">
 							<label for="hide-field">
-								<?php _e( 'Hide Field' , 'yikes-inc-easy-mailchimp-extender' ); ?>
+								<?php _e( 'Hide Field', 'yikes-inc-easy-mailchimp-extender' ); ?>
 							</label>
 						</td>
 						<td>
-							<input type="checkbox" class="widefat" value="1" name="field[<?php echo $merge_field_data['tag']; ?>][hide]" <?php checked( $merge_field_data['public'], '' ); ?> <?php if( $merge_field_data['tag'] == 'EMAIL' ) {  ?> disabled="disabled" title="<?php echo __( 'Cannot toggle email field visibility.' , 'yikes-inc-easy-mailchimp-extender' ); } ?>">
-							<p class="description"><small><?php _e( "Hide this field from being displayed on the front end.", 'yikes-inc-easy-mailchimp-extender' );?></small></p>
+							<input type="checkbox" class="widefat" value="1" name="field[<?php echo $merge_field_data[ 'tag' ]; ?>][hide]" <?php checked( $merge_field_data[ 'public' ], '' ); ?> <?php if ( $merge_field_data[ 'tag' ] == 'EMAIL' ) {  ?> disabled="disabled" title="<?php echo __( 'Cannot toggle email field visibility.', 'yikes-inc-easy-mailchimp-extender' ); } ?>">
+							<p class="description"><small><?php _e( "Hide this field from being displayed on the front end.", 'yikes-inc-easy-mailchimp-extender' ); ?></small></p>
 						</td>
 					</tr>
 					<!-- Toggle Field Label Visibility -->
 					<tr valign="top">
 						<td scope="row">
 							<label for="placeholder">
-								<?php _e( 'Hide Label' , 'yikes-inc-easy-mailchimp-extender' ); ?>
+								<?php _e( 'Hide Label', 'yikes-inc-easy-mailchimp-extender' ); ?>
 							</label>
 						</td>
 						<td>
-							<input type="checkbox" name="field[<?php echo $merge_field_data['tag']; ?>][hide-label]" value="1" />
-							<p class="description"><small><?php _e( "Toggle field label visibility.", 'yikes-inc-easy-mailchimp-extender' );?></small></p>
+							<input type="checkbox" name="field[<?php echo $merge_field_data[ 'tag' ]; ?>][hide-label]" value="1" />
+							<p class="description"><small><?php _e( "Toggle field label visibility.", 'yikes-inc-easy-mailchimp-extender' ); ?></small></p>
 						</td>
 					</tr>
 					<!-- Display Phone/Date Formats back to the user -->
 					<?php 
-						switch( $form_data_array['field_type'] ) {
+						switch ( $form_data_array[ 'field_type' ] ) {
 							
 							/* Store the phone format, for properly regex pattern */
 							case 'phone':
@@ -283,23 +283,23 @@ 
 									<td scope="row">
 										<label for="placeholder">		
 										<?php 
-											switch( $form_data_array['field_type'] ) {
+											switch ( $form_data_array[ 'field_type' ] ) {
 												default:
 												case 'birthday':
-													$type = __( 'Date Format' , 'yikes-inc-easy-mailchimp-extender' );
-													$format = $merge_field_data['dateformat'];
+													$type = __( 'Date Format', 'yikes-inc-easy-mailchimp-extender' );
+													$format = $merge_field_data[ 'dateformat' ];
 													$format_name = 'date_format';
 													break;
 													
 												case 'date':
-													$type = __( 'Date Format' , 'yikes-inc-easy-mailchimp-extender' );
-													$format = $merge_field_data['dateformat'];
+													$type = __( 'Date Format', 'yikes-inc-easy-mailchimp-extender' );
+													$format = $merge_field_data[ 'dateformat' ];
 													$format_name = 'date_format';
 													break;
 																				
 												case 'phone':
-													$type = __( 'Phone Format' , 'yikes-inc-easy-mailchimp-extender' );
-													$format = ( ( $merge_field_data['phoneformat'] == 'none' ) ? __( 'International', 'yikes-inc-easy-mailchimp-extender' ) : $merge_field_data['phoneformat'] );
+													$type = __( 'Phone Format', 'yikes-inc-easy-mailchimp-extender' );
+													$format = ( ( $merge_field_data[ 'phoneformat' ] == 'none' ) ? __( 'International', 'yikes-inc-easy-mailchimp-extender' ) : $merge_field_data[ 'phoneformat' ] );
 													$format_name = 'phone_format';
 													break;
 											}
@@ -309,7 +309,7 @@ 
 									</td>
 									<td>
 										<strong><?php echo $format; ?></strong>
-										<input type="hidden" name="field[<?php echo $merge_field_data['tag']; ?>][<?php echo $format_name; ?>]" value="<?php echo $format; ?>" />
+										<input type="hidden" name="field[<?php echo $merge_field_data[ 'tag' ]; ?>][<?php echo $format_name; ?>]" value="<?php echo $format; ?>" />
 										<p class="description"><small>
 											<?php printf( __( 'To change the %s please head over to <a href="%s" title="MailChimp" target="_blank">MailChimp</a>. If you alter the format, you should re-import this field.', 'yikes-inc-easy-mailchimp-extender' ), strtolower( $type ), esc_url( 'http://www.mailchimp.com' ) ); ?>
 										</small></p>
@@ -330,8 +330,8 @@ 
 						</td>
 						<td>
 							<span class="toggle-container">
-								<a href="#" class="hide-field"><?php _e( "Close" , 'yikes-inc-easy-mailchimp-extender' ); ?></a> |
-								<a href="#" class="remove-field" alt="<?php echo $merge_field_data['tag']; ?>"><?php _e( "Remove Field" , 'yikes-inc-easy-mailchimp-extender' ); ?></a>
+								<a href="#" class="hide-field"><?php _e( "Close", 'yikes-inc-easy-mailchimp-extender' ); ?></a> |
+								<a href="#" class="remove-field" alt="<?php echo $merge_field_data[ 'tag' ]; ?>"><?php _e( "Remove Field", 'yikes-inc-easy-mailchimp-extender' ); ?></a>
 							</span>
 						</td>
 					</tr>

Braces +4 added lines, -4 removed lines

@@ -132,7 +132,7 @@ 
 			?>
 			
 				<!-- Default Value -->
-				<?php switch( $form_data_array['field_type'] ) { 
+				<?php switch( $form_data_array['field_type'] ) {
 						
 						default:
 						case 'text':
@@ -147,7 +147,7 @@ 
 								<input type="text" class="widefat" name="field[<?php echo $merge_field_data['tag']; ?>][default]" <?php if( $form_data_array['field_type'] != 'url' ) { ?> value="<?php echo isset( $merge_field_data['default'] ) ? stripslashes( wp_strip_all_tags( $merge_field_data['default'] ) ) : ''; ?>" <?php } else { ?> value="<?php echo isset( $merge_field_data['default'] ) ? stripslashes( wp_strip_all_tags( esc_url_raw( $merge_field_data['default'] ) ) ) : ''; } ?>" />
 								<p class="description"><small><?php _e( "Assign a default value to populate this field with on initial page load.", 'yikes-inc-easy-mailchimp-extender' );?></small></p>
 								<?php 
-								switch( $form_data_array['field_type'] ) { 
+								switch( $form_data_array['field_type'] ) {
 									case 'text':
 										?>
 											<p><small class="pre-defined-tag-link"><a href="#TB_inline?width=600&height=550&inlineId=pre-defined-tag-container" class="thickbox" onclick="storeGlobalClicked( jQuery( this ) );"><?php _e( 'View Pre-Defined Tags' , 'yikes-inc-easy-mailchimp-extender' ); ?></a></small></p>
@@ -170,7 +170,7 @@ 
 								<td>
 									<?php 
 										$x = 0;
-										foreach( $merge_field_data['choices'] as $choice => $value ) { 
+										foreach( $merge_field_data['choices'] as $choice => $value ) {
 											$pre_selected = !empty( $merge_field_data['default_choice'] ) ? $merge_field_data['default_choice'] : '0';
 									?>
 										<label>
@@ -194,7 +194,7 @@ 
 								</td>
 								<td>
 									<select type="default" name="field[<?php echo $merge_field_data['tag']; ?>][default_choice]">
-										<?php foreach( $merge_field_data['choices'] as $choice => $value ) { 
+										<?php foreach( $merge_field_data['choices'] as $choice => $value ) {
 												$pre_selected = ! empty( $merge_field_data['default_choice'] ) ? $merge_field_data['default_choice'] : '0';
 										?>
 											<option value="<?php echo $choice; ?>" <?php selected( $pre_selected , $choice ); ?>><?php echo stripslashes( $value ); ?></option>

admin/partials/ajax/process_ajax.php

Spacing +46 added lines, -46 removed lines

@@ -8,37 +8,37 @@ 
 	*	@since 6.0.0
 	*	Author: Yikes Inc. | https://www.yikesinc.com
 	*/
-	$api_key = trim( get_option( 'yikes-mc-api-key' , '' ) );
+	$api_key = trim( get_option( 'yikes-mc-api-key', '' ) );
 	$dash_position = strpos( $api_key, '-' );
-	if( $dash_position !== false ) {
+	if ( $dash_position !== false ) {
 		$api_endpoint = 'https://' . substr( $api_key, $dash_position + 1 ) . '.api.mailchimp.com/2.0/lists/merge-vars.json';
 	}
 	$available_merge_variables = wp_remote_post( $api_endpoint, array( 
 		'body' => array( 
 			'apikey' => $api_key, 
-			'id' => array( $form_data_array['list_id'] ),
+			'id' => array( $form_data_array[ 'list_id' ] ),
 		),
 		'timeout' => 10,
 		'sslverify' => apply_filters( 'yikes-mailchimp-sslverify', true ) 
 	) );
 	$body = json_decode( wp_remote_retrieve_body( $available_merge_variables ), true );
-	if( isset( $body['error'] ) ) {	
-		if( WP_DEBUG || get_option( 'yikes-mailchimp-debug-status' , '' ) == '1' ) {
+	if ( isset( $body[ 'error' ] ) ) {	
+		if ( WP_DEBUG || get_option( 'yikes-mailchimp-debug-status', '' ) == '1' ) {
 			require_once YIKES_MC_PATH . 'includes/error_log/class-yikes-inc-easy-mailchimp-error-logging.php';
 			$error_logging = new Yikes_Inc_Easy_Mailchimp_Error_Logging();
-			$error_logging->yikes_easy_mailchimp_write_to_error_log( $body['error'], __( "Get Merge Variables" , 'yikes-inc-easy-mailchimp-extender' ), "process_ajax.php" );
+			$error_logging->yikes_easy_mailchimp_write_to_error_log( $body[ 'error' ], __( "Get Merge Variables", 'yikes-inc-easy-mailchimp-extender' ), "process_ajax.php" );
 		}
 	}
 	// find and return the location of this merge field in the array
-	$index = $this->findMCListIndex( $form_data_array['merge_tag'] , $body['data'][0]['merge_vars'], 'tag' );
+	$index = $this->findMCListIndex( $form_data_array[ 'merge_tag' ], $body[ 'data' ][ 0 ][ 'merge_vars' ], 'tag' );
 	// store it and use it to pre-populate field data (only on initial add to form)
-	$merge_field_data = $body['data'][0]['merge_vars'][$index];
+	$merge_field_data = $body[ 'data' ][ 0 ][ 'merge_vars' ][ $index ];
 ?>
-<section class="draggable" id="<?php echo $form_data_array['field_name']; ?>">
+<section class="draggable" id="<?php echo $form_data_array[ 'field_name' ]; ?>">
 	<!-- top -->
 	<a href="#" class="expansion-section-title settings-sidebar">
-		<span class="dashicons dashicons-plus"></span><?php echo $form_data_array['field_name']; ?>
-		<span class="field-type-text"><small><?php echo __( 'type' , 'yikes-inc-easy-mailchimp-extender' ) . ' : ' . $form_data_array['field_type']; ?></small></span>
+		<span class="dashicons dashicons-plus"></span><?php echo $form_data_array[ 'field_name' ]; ?>
+		<span class="field-type-text"><small><?php echo __( 'type', 'yikes-inc-easy-mailchimp-extender' ) . ' : ' . $form_data_array[ 'field_type' ]; ?></small></span>
 	</a>
 	<!-- expansion section -->
 	<div class="yikes-mc-settings-expansion-section">
@@ -46,13 +46,13 @@ 
 		<!-- Single or Double Opt-in -->
 		<p class="type-container form-field-container"><!-- necessary to prevent skipping on slideToggle(); -->
 			<!-- store the label -->
-			<input type="hidden" name="field[<?php echo $merge_field_data['tag']; ?>][label]" value="<?php echo $form_data_array['field_name']; ?>" />
-			<input type="hidden" name="field[<?php echo $merge_field_data['tag']; ?>][type]" value="<?php echo $form_data_array['field_type']; ?>" />
-			<input type="hidden" name="field[<?php echo $merge_field_data['tag']; ?>][merge]" value="<?php echo $merge_field_data['tag']; ?>" />
-			<input type="hidden" class="field-<?php echo $merge_field_data['tag']; ?>-position position-input" name="field[<?php echo $merge_field_data['tag']; ?>][position]" value="" />
+			<input type="hidden" name="field[<?php echo $merge_field_data[ 'tag' ]; ?>][label]" value="<?php echo $form_data_array[ 'field_name' ]; ?>" />
+			<input type="hidden" name="field[<?php echo $merge_field_data[ 'tag' ]; ?>][type]" value="<?php echo $form_data_array[ 'field_type' ]; ?>" />
+			<input type="hidden" name="field[<?php echo $merge_field_data[ 'tag' ]; ?>][merge]" value="<?php echo $merge_field_data[ 'tag' ]; ?>" />
+			<input type="hidden" class="field-<?php echo $merge_field_data[ 'tag' ]; ?>-position position-input" name="field[<?php echo $merge_field_data[ 'tag' ]; ?>][position]" value="" />
 			
-			<?php if ( $form_data_array['field_type'] == 'radio' || $form_data_array['field_type'] == 'dropdown' ) { ?>
-				<input type="hidden" name="field[<?php echo $merge_field_data['tag']; ?>][choices]" value='<?php echo stripslashes( json_encode( $merge_field_data['choices'] ) ); ?>' />
+			<?php if ( $form_data_array[ 'field_type' ] == 'radio' || $form_data_array[ 'field_type' ] == 'dropdown' ) { ?>
+				<input type="hidden" name="field[<?php echo $merge_field_data[ 'tag' ]; ?>][choices]" value='<?php echo stripslashes( json_encode( $merge_field_data[ 'choices' ] ) ); ?>' />
 			<?php } ?>
 				
 			<table class="form-table form-field-container">
@@ -60,16 +60,16 @@ 
 				<tr valign="top">
 					<td scope="row">
 						<label for="placeholder">
-							<?php _e( 'Placeholder' , 'yikes-inc-easy-mailchimp-extender' ); ?>
+							<?php _e( 'Placeholder', 'yikes-inc-easy-mailchimp-extender' ); ?>
 						</label>
 					</td>
 					<td>
-					<input type="text" class="widefat" name="field[<?php echo $merge_field_data['tag']; ?>][placeholder]" value="<?php echo isset( $merge_field_data['placeholder'] ) ? stripslashes( wp_strip_all_tags( $merge_field_data['placeholder'] ) ) : '' ; ?>" />
-						<p class="description"><small><?php _e( "Assign a placeholder value to this field.", 'yikes-inc-easy-mailchimp-extender' );?></small></p>
+					<input type="text" class="widefat" name="field[<?php echo $merge_field_data[ 'tag' ]; ?>][placeholder]" value="<?php echo isset( $merge_field_data[ 'placeholder' ] ) ? stripslashes( wp_strip_all_tags( $merge_field_data[ 'placeholder' ] ) ) : ''; ?>" />
+						<p class="description"><small><?php _e( "Assign a placeholder value to this field.", 'yikes-inc-easy-mailchimp-extender' ); ?></small></p>
 					</td>
 				</tr>
 				<!-- Default Value -->
-				<?php switch( $form_data_array['field_type'] ) { 
+				<?php switch ( $form_data_array[ 'field_type' ] ) { 
 						
 						default:
 						case 'text':
@@ -77,12 +77,12 @@ 
 							<tr valign="top">
 								<td scope="row">
 									<label for="placeholder">
-										<?php _e( 'Default Value' , 'yikes-inc-easy-mailchimp-extender' ); ?>
+										<?php _e( 'Default Value', 'yikes-inc-easy-mailchimp-extender' ); ?>
 									</label>
 								</td>
 							<td>
-								<input type="text" class="widefat" name="field[<?php echo $merge_field_data['tag']; ?>][default]" <?php if( $form_data_array['field_type'] != 'url' ) { ?> value="<?php echo isset( $merge_field_data['default'] ) ? stripslashes( wp_strip_all_tags( $merge_field_data['default'] ) ) : ''; ?>" <?php } else { ?> value="<?php echo isset( $merge_field_data['default'] ) ? stripslashes( wp_strip_all_tags( esc_url_raw( $merge_field_data['default'] ) ) ) : ''; } ?>" />
-								<p class="description"><small><?php _e( "Assign a default value to populate this field with on initial page load.", 'yikes-inc-easy-mailchimp-extender' );?></small></p>
+								<input type="text" class="widefat" name="field[<?php echo $merge_field_data[ 'tag' ]; ?>][default]" <?php if ( $form_data_array[ 'field_type' ] != 'url' ) { ?> value="<?php echo isset( $merge_field_data[ 'default' ] ) ? stripslashes( wp_strip_all_tags( $merge_field_data[ 'default' ] ) ) : ''; ?>" <?php } else { ?> value="<?php echo isset( $merge_field_data[ 'default' ] ) ? stripslashes( wp_strip_all_tags( esc_url_raw( $merge_field_data[ 'default' ] ) ) ) : ''; } ?>" />
+								<p class="description"><small><?php _e( "Assign a default value to populate this field with on initial page load.", 'yikes-inc-easy-mailchimp-extender' ); ?></small></p>
 							</td>
 							</tr>
 						<?php 
@@ -93,16 +93,16 @@ 
 							<tr valign="top">
 								<td scope="row">
 									<label for="placeholder">
-										<?php _e( 'Default Selection' , 'yikes-inc-easy-mailchimp-extender' ); ?>
+										<?php _e( 'Default Selection', 'yikes-inc-easy-mailchimp-extender' ); ?>
 									</label>
 								</td>
 								<td>
-									<?php foreach( $merge_field_data['choices'] as $choice => $value ) { 
-											$pre_selected = !empty( $merge_field_data['default_choice'] ) ? $merge_field_data['default_choice'] : '0';
+									<?php foreach ( $merge_field_data[ 'choices' ] as $choice => $value ) { 
+											$pre_selected = ! empty( $merge_field_data[ 'default_choice' ] ) ? $merge_field_data[ 'default_choice' ] : '0';
 									?>
-										<input type="radio" name="field[<?php echo $merge_field_data['tag']; ?>][default_choice]" value="<?php echo $choice; ?>" <?php checked( $pre_selected , $choice ); ?>><?php echo stripslashes( $value ); ?>
+										<input type="radio" name="field[<?php echo $merge_field_data[ 'tag' ]; ?>][default_choice]" value="<?php echo $choice; ?>" <?php checked( $pre_selected, $choice ); ?>><?php echo stripslashes( $value ); ?>
 									<?php } ?>
-									<p class="description"><small><?php _e( "Select the option that should be selected by default.", 'yikes-inc-easy-mailchimp-extender' );?></small></p>
+									<p class="description"><small><?php _e( "Select the option that should be selected by default.", 'yikes-inc-easy-mailchimp-extender' ); ?></small></p>
 								</td>
 							</tr>
 											
@@ -114,18 +114,18 @@ 
 							<tr valign="top">
 								<td scope="row">
 									<label for="placeholder">
-										<?php _e( 'Default Selection' , 'yikes-inc-easy-mailchimp-extender' ); ?>
+										<?php _e( 'Default Selection', 'yikes-inc-easy-mailchimp-extender' ); ?>
 									</label>
 								</td>
 								<td>
-									<select type="default" name="field[<?php echo $merge_field_data['tag']; ?>][default_choice]">
-										<?php foreach( $merge_field_data['choices'] as $choice => $value ) { 
-												$pre_selected = !empty( $merge_field_data['default_choice'] ) ? $merge_field_data['default_choice'] : '0';
+									<select type="default" name="field[<?php echo $merge_field_data[ 'tag' ]; ?>][default_choice]">
+										<?php foreach ( $merge_field_data[ 'choices' ] as $choice => $value ) { 
+												$pre_selected = ! empty( $merge_field_data[ 'default_choice' ] ) ? $merge_field_data[ 'default_choice' ] : '0';
 										?>
-											<option value="<?php echo $choice; ?>" <?php selected( $pre_selected , $choice ); ?>><?php echo stripslashes( $value ); ?></option>
+											<option value="<?php echo $choice; ?>" <?php selected( $pre_selected, $choice ); ?>><?php echo stripslashes( $value ); ?></option>
 										<?php } ?>
 									</select>
-									<p class="description"><small><?php _e( "Which option should be selected by default?", 'yikes-inc-easy-mailchimp-extender' );?></small></p>
+									<p class="description"><small><?php _e( "Which option should be selected by default?", 'yikes-inc-easy-mailchimp-extender' ); ?></small></p>
 								</td>
 							</tr>
 									
@@ -139,36 +139,36 @@ 
 				<tr valign="top">
 					<td scope="row">
 						<label for="placeholder">
-							<?php _e( 'Additional Classes' , 'yikes-inc-easy-mailchimp-extender' ); ?>
+							<?php _e( 'Additional Classes', 'yikes-inc-easy-mailchimp-extender' ); ?>
 						</label>
 					</td>
 					<td>
-						<input type="text" class="widefat" name="field[<?php echo $merge_field_data['tag']; ?>][additional-classes]" value="<?php echo isset( $form_data_array['classes'] ) ? stripslashes( esc_html( $form_data_array['classes'] ) ) : '' ; ?>" />
-						<p class="description"><small><?php printf( __( "Assign additional classes to this field. %s.", 'yikes-inc-easy-mailchimp-extender' ), '<a target="_blank" href="' . esc_url( 'https://yikesplugins.com/support/knowledge-base/bundled-css-classes/' ) . '">' . __( 'View bundled classes', 'yikes-inc-easy-mailchimp-extender' ) . '</a>' );?></small></p>
+						<input type="text" class="widefat" name="field[<?php echo $merge_field_data[ 'tag' ]; ?>][additional-classes]" value="<?php echo isset( $form_data_array[ 'classes' ] ) ? stripslashes( esc_html( $form_data_array[ 'classes' ] ) ) : ''; ?>" />
+						<p class="description"><small><?php printf( __( "Assign additional classes to this field. %s.", 'yikes-inc-easy-mailchimp-extender' ), '<a target="_blank" href="' . esc_url( 'https://yikesplugins.com/support/knowledge-base/bundled-css-classes/' ) . '">' . __( 'View bundled classes', 'yikes-inc-easy-mailchimp-extender' ) . '</a>' ); ?></small></p>
 					</td>
 					</tr>
 					<!-- Required Toggle -->
 					<tr valign="top">
 						<td scope="row">
 							<label for="field-required">
-								<?php _e( 'Field Required?' , 'yikes-inc-easy-mailchimp-extender' ); ?>
+								<?php _e( 'Field Required?', 'yikes-inc-easy-mailchimp-extender' ); ?>
 							</label>
 						</td>
 						<td>
-							<input type="checkbox" class="widefat" value="1" name="field[<?php echo $merge_field_data['tag']; ?>][require]" <?php checked( $merge_field_data['req'] , 1 ); ?> <?php if( $merge_field_data['tag'] == 'EMAIL' ) {  ?> disabled="disabled" checked="checked" title="<?php echo __( 'Email is a required field.' , 'yikes-inc-easy-mailchimp-extender' ); } ?>">
-							<p class="description"><small><?php _e( "Require this field to be filled in before the form can be submitted.", 'yikes-inc-easy-mailchimp-extender' );?></small></p>
+							<input type="checkbox" class="widefat" value="1" name="field[<?php echo $merge_field_data[ 'tag' ]; ?>][require]" <?php checked( $merge_field_data[ 'req' ], 1 ); ?> <?php if ( $merge_field_data[ 'tag' ] == 'EMAIL' ) {  ?> disabled="disabled" checked="checked" title="<?php echo __( 'Email is a required field.', 'yikes-inc-easy-mailchimp-extender' ); } ?>">
+							<p class="description"><small><?php _e( "Require this field to be filled in before the form can be submitted.", 'yikes-inc-easy-mailchimp-extender' ); ?></small></p>
 						</td>
 					</tr>
 					<!-- Visible Toggle -->
 					<tr valign="top">
 						<td scope="row">
 							<label for="hide-field">
-								<?php _e( 'Hide Field' , 'yikes-inc-easy-mailchimp-extender' ); ?>
+								<?php _e( 'Hide Field', 'yikes-inc-easy-mailchimp-extender' ); ?>
 							</label>
 						</td>
 						<td>
-							<input type="checkbox" class="widefat" value="1" name="field[<?php echo $merge_field_data['tag']; ?>][hide]" <?php if( empty( $merge_field_data['show'] ) ) { echo 'checked="checked"'; } ?> <?php if( $merge_field_data['tag'] == 'EMAIL' ) {  ?> disabled="disabled" title="<?php echo __( 'Cannot toggle email field visibility.' , 'yikes-inc-easy-mailchimp-extender' ); } ?>">
-							<p class="description"><small><?php _e( "Hide this field from being displayed on the front end.", 'yikes-inc-easy-mailchimp-extender' );?></small></p>
+							<input type="checkbox" class="widefat" value="1" name="field[<?php echo $merge_field_data[ 'tag' ]; ?>][hide]" <?php if ( empty( $merge_field_data[ 'show' ] ) ) { echo 'checked="checked"'; } ?> <?php if ( $merge_field_data[ 'tag' ] == 'EMAIL' ) {  ?> disabled="disabled" title="<?php echo __( 'Cannot toggle email field visibility.', 'yikes-inc-easy-mailchimp-extender' ); } ?>">
+							<p class="description"><small><?php _e( "Hide this field from being displayed on the front end.", 'yikes-inc-easy-mailchimp-extender' ); ?></small></p>
 						</td>
 					</tr>
 					<!-- Toggle Buttons -->
@@ -178,8 +178,8 @@ 
 						</td>
 						<td>
 							<span class="toggle-container">
-								<a href="#" class="hide-field"><?php _e( "Close" , 'yikes-inc-easy-mailchimp-extender' ); ?></a> |
-								<a href="#" class="remove-field" alt="<?php echo $merge_field_data['tag']; ?>"><?php _e( "Remove Field" , 'yikes-inc-easy-mailchimp-extender' ); ?></a>
+								<a href="#" class="hide-field"><?php _e( "Close", 'yikes-inc-easy-mailchimp-extender' ); ?></a> |
+								<a href="#" class="remove-field" alt="<?php echo $merge_field_data[ 'tag' ]; ?>"><?php _e( "Remove Field", 'yikes-inc-easy-mailchimp-extender' ); ?></a>
 							</span>
 						</td>
 					</tr>

Braces +4 added lines, -4 removed lines

@@ -22,7 +22,7 @@ 
 		'sslverify' => apply_filters( 'yikes-mailchimp-sslverify', true ) 
 	) );
 	$body = json_decode( wp_remote_retrieve_body( $available_merge_variables ), true );
-	if( isset( $body['error'] ) ) {	
+	if( isset( $body['error'] ) ) {
 		if( WP_DEBUG || get_option( 'yikes-mailchimp-debug-status' , '' ) == '1' ) {
 			require_once YIKES_MC_PATH . 'includes/error_log/class-yikes-inc-easy-mailchimp-error-logging.php';
 			$error_logging = new Yikes_Inc_Easy_Mailchimp_Error_Logging();
@@ -69,7 +69,7 @@ 
 					</td>
 				</tr>
 				<!-- Default Value -->
-				<?php switch( $form_data_array['field_type'] ) { 
+				<?php switch( $form_data_array['field_type'] ) {
 						
 						default:
 						case 'text':
@@ -97,7 +97,7 @@ 
 									</label>
 								</td>
 								<td>
-									<?php foreach( $merge_field_data['choices'] as $choice => $value ) { 
+									<?php foreach( $merge_field_data['choices'] as $choice => $value ) {
 											$pre_selected = !empty( $merge_field_data['default_choice'] ) ? $merge_field_data['default_choice'] : '0';
 									?>
 										<input type="radio" name="field[<?php echo $merge_field_data['tag']; ?>][default_choice]" value="<?php echo $choice; ?>" <?php checked( $pre_selected , $choice ); ?>><?php echo stripslashes( $value ); ?>
@@ -119,7 +119,7 @@ 
 								</td>
 								<td>
 									<select type="default" name="field[<?php echo $merge_field_data['tag']; ?>][default_choice]">
-										<?php foreach( $merge_field_data['choices'] as $choice => $value ) { 
+										<?php foreach( $merge_field_data['choices'] as $choice => $value ) {
 												$pre_selected = !empty( $merge_field_data['default_choice'] ) ? $merge_field_data['default_choice'] : '0';
 										?>
 											<option value="<?php echo $choice; ?>" <?php selected( $pre_selected , $choice ); ?>><?php echo stripslashes( $value ); ?></option>

admin/partials/ajax/add_interest_group_to_form.php

Spacing +52 added lines, -52 removed lines

@@ -1,48 +1,48 @@ 
 <?php
-	$api_key = trim( get_option( 'yikes-mc-api-key' , '' ) );
+	$api_key = trim( get_option( 'yikes-mc-api-key', '' ) );
 	$dash_position = strpos( $api_key, '-' );
-	if( $dash_position !== false ) {
+	if ( $dash_position !== false ) {
 		$api_endpoint = 'https://' . substr( $api_key, $dash_position + 1 ) . '.api.mailchimp.com/2.0/lists/interest-groupings.json';
 	}
 	// get the interest group data
 	$interest_groupings = wp_remote_post( $api_endpoint, array( 
 		'body' => array( 
 			'apikey' => $api_key, 
-			'id' => $form_data_array['list_id'] 
+			'id' => $form_data_array[ 'list_id' ] 
 		),
 		'timeout' => 10,
 		'sslverify' => apply_filters( 'yikes-mailchimp-sslverify', true ) 
 	) );
 	$interest_groupings_body = json_decode( wp_remote_retrieve_body( $interest_groupings ), true );
-	if( ! is_wp_error( $interest_groupings_body ) ) {
-		if( isset( $interest_groupings_body['error'] ) ) {
-			if( WP_DEBUG || get_option( 'yikes-mailchimp-debug-status' , '' ) == '1' ) {
+	if ( ! is_wp_error( $interest_groupings_body ) ) {
+		if ( isset( $interest_groupings_body[ 'error' ] ) ) {
+			if ( WP_DEBUG || get_option( 'yikes-mailchimp-debug-status', '' ) == '1' ) {
 				require_once YIKES_MC_PATH . 'includes/error_log/class-yikes-inc-easy-mailchimp-error-logging.php';
 				$error_logging = new Yikes_Inc_Easy_Mailchimp_Error_Logging();
-				$error_logging->yikes_easy_mailchimp_write_to_error_log( $interest_groupings_body['error'], __( "Get Interest Groups" , 'yikes-inc-easy-mailchimp-extender' ) , __( "Add Interest Group to Form" , 'yikes-inc-easy-mailchimp-extender' ) );
+				$error_logging->yikes_easy_mailchimp_write_to_error_log( $interest_groupings_body[ 'error' ], __( "Get Interest Groups", 'yikes-inc-easy-mailchimp-extender' ), __( "Add Interest Group to Form", 'yikes-inc-easy-mailchimp-extender' ) );
 			}
 			?>
 			<section class="draggable" id="error-container">
-				<p><span class="dashicons dashicons-no-alt"></span> <?php printf( __( 'Error: %s', 'yikes-inc-easy-mailchimp-extender' ), $interest_groupings_body['error'] ); ?></p>
+				<p><span class="dashicons dashicons-no-alt"></span> <?php printf( __( 'Error: %s', 'yikes-inc-easy-mailchimp-extender' ), $interest_groupings_body[ 'error' ] ); ?></p>
 			</section>
 			<?php 
 			return;
 		}
 		// find and return the location of this merge field in the array
-		$index = $this->findMCListIndex( $form_data_array['group_id'], $interest_groupings_body, 'id' );
+		$index = $this->findMCListIndex( $form_data_array[ 'group_id' ], $interest_groupings_body, 'id' );
 		// check for our index...
-		if( isset( $index) ) {
+		if ( isset( $index ) ) {
 			// store it and use it to pre-populate field data (only on initial add to form)
-			$merge_field_data = $interest_groupings_body[$index];
+			$merge_field_data = $interest_groupings_body[ $index ];
 		}
 	}			
 
 ?>
-<section class="draggable" id="<?php echo $form_data_array['group_id']; ?>">
+<section class="draggable" id="<?php echo $form_data_array[ 'group_id' ]; ?>">
 	<!-- top -->
 	<a href="#" class="expansion-section-title settings-sidebar">
-		<span class="dashicons dashicons-plus" title="<?php _e( 'Expand Field' , 'yikes-inc-easy-mailchimp-extender' ); ?>"></span><?php echo stripslashes( $form_data_array['field_name'] ); ?>
-		<span class="field-type-text"><small><?php echo __( 'type' , 'yikes-inc-easy-mailchimp-extender' ) . ' : ' . $form_data_array['field_type']; ?></small></span>
+		<span class="dashicons dashicons-plus" title="<?php _e( 'Expand Field', 'yikes-inc-easy-mailchimp-extender' ); ?>"></span><?php echo stripslashes( $form_data_array[ 'field_name' ] ); ?>
+		<span class="field-type-text"><small><?php echo __( 'type', 'yikes-inc-easy-mailchimp-extender' ) . ' : ' . $form_data_array[ 'field_type' ]; ?></small></span>
 	</a>
 	<!-- expansion section -->
 	<div class="yikes-mc-settings-expansion-section">
@@ -50,16 +50,16 @@ 
 		<!-- Single or Double Opt-in -->
 		<p class="type-container"><!-- necessary to prevent skipping on slideToggle(); -->
 			<!-- store the label -->
-			<input type="hidden" name="field[<?php echo $form_data_array['group_id']; ?>][label]" value="<?php echo $form_data_array['field_name']; ?>" />
-			<input type="hidden" name="field[<?php echo $form_data_array['group_id']; ?>][type]" value="<?php echo $form_data_array['field_type']; ?>" />
-			<input type="hidden" name="field[<?php echo $form_data_array['group_id']; ?>][group_id]" value="<?php echo $form_data_array['group_id']; ?>" />
-			<input type="hidden" name="field[<?php echo $form_data_array['group_id']; ?>][groups]" value='<?php echo str_replace( '\'' , '~' , json_encode( $merge_field_data['groups'] ) ); ?>' />
+			<input type="hidden" name="field[<?php echo $form_data_array[ 'group_id' ]; ?>][label]" value="<?php echo $form_data_array[ 'field_name' ]; ?>" />
+			<input type="hidden" name="field[<?php echo $form_data_array[ 'group_id' ]; ?>][type]" value="<?php echo $form_data_array[ 'field_type' ]; ?>" />
+			<input type="hidden" name="field[<?php echo $form_data_array[ 'group_id' ]; ?>][group_id]" value="<?php echo $form_data_array[ 'group_id' ]; ?>" />
+			<input type="hidden" name="field[<?php echo $form_data_array[ 'group_id' ]; ?>][groups]" value='<?php echo str_replace( '\'', '~', json_encode( $merge_field_data[ 'groups' ] ) ); ?>' />
 	
 				
 			<table class="form-table form-field-container">
 			
 				<!-- Default Value -->
-				<?php switch( $form_data_array['field_type'] ) { 
+				<?php switch ( $form_data_array[ 'field_type' ] ) { 
 						
 						default:
 						case 'radio':
@@ -67,19 +67,19 @@ 
 							<tr valign="top">
 								<td scope="row">
 									<label for="placeholder">
-										<?php _e( 'Default Selection' , 'yikes-inc-easy-mailchimp-extender' ); ?>
+										<?php _e( 'Default Selection', 'yikes-inc-easy-mailchimp-extender' ); ?>
 									</label>
 								</td>
 								<td>
-									<?php $i = 0; foreach( $merge_field_data['groups'] as $interest_group ) { 
-											$pre_selected = !empty( $merge_field_data['default_choice'] ) ? $merge_field_data['default_choice'] : '0';
+									<?php $i = 0; foreach ( $merge_field_data[ 'groups' ] as $interest_group ) { 
+											$pre_selected = ! empty( $merge_field_data[ 'default_choice' ] ) ? $merge_field_data[ 'default_choice' ] : '0';
 									?>
-										<input type="radio" name="field[<?php echo $form_data_array['group_id']; ?>][default_choice][]" value="<?php echo $i; ?>" <?php checked( $pre_selected , $i ); ?>><?php echo stripslashes( $interest_group['name'] ); ?>
+										<input type="radio" name="field[<?php echo $form_data_array[ 'group_id' ]; ?>][default_choice][]" value="<?php echo $i; ?>" <?php checked( $pre_selected, $i ); ?>><?php echo stripslashes( $interest_group[ 'name' ] ); ?>
 									<?php 
 										$i++;
 										} 
 									?>
-									<p class="description"><small><?php _e( "Select the option that should be selected by default.", 'yikes-inc-easy-mailchimp-extender' );?></small></p>
+									<p class="description"><small><?php _e( "Select the option that should be selected by default.", 'yikes-inc-easy-mailchimp-extender' ); ?></small></p>
 								</td>
 							</tr>
 											
@@ -91,19 +91,19 @@ 
 							<tr valign="top">
 								<td scope="row">
 									<label for="placeholder">
-										<?php _e( 'Default Selection' , 'yikes-inc-easy-mailchimp-extender' ); ?>
+										<?php _e( 'Default Selection', 'yikes-inc-easy-mailchimp-extender' ); ?>
 									</label>
 								</td>
 								<td>
-									<?php $i = 0; foreach( $merge_field_data['groups'] as $interest_group ) { 
-											$pre_selected = !empty( $merge_field_data['default_choice'] ) ? $merge_field_data['default_choice'] : '0';
+									<?php $i = 0; foreach ( $merge_field_data[ 'groups' ] as $interest_group ) { 
+											$pre_selected = ! empty( $merge_field_data[ 'default_choice' ] ) ? $merge_field_data[ 'default_choice' ] : '0';
 									?>
-										<input type="checkbox" name="field[<?php echo $form_data_array['group_id']; ?>][default_choice][]" value="<?php echo $i; ?>" <?php checked( $pre_selected , $i ); ?>><?php echo stripslashes( $interest_group['name'] ); ?>
+										<input type="checkbox" name="field[<?php echo $form_data_array[ 'group_id' ]; ?>][default_choice][]" value="<?php echo $i; ?>" <?php checked( $pre_selected, $i ); ?>><?php echo stripslashes( $interest_group[ 'name' ] ); ?>
 									<?php 
 										$i++;
 										} 
 									?>
-									<p class="description"><small><?php _e( "Select the option that should be selected by default.", 'yikes-inc-easy-mailchimp-extender' );?></small></p>
+									<p class="description"><small><?php _e( "Select the option that should be selected by default.", 'yikes-inc-easy-mailchimp-extender' ); ?></small></p>
 								</td>
 							</tr>
 											
@@ -115,18 +115,18 @@ 
 							<tr valign="top">
 								<td scope="row">
 									<label for="placeholder">
-										<?php _e( 'Default Selection' , 'yikes-inc-easy-mailchimp-extender' ); ?>
+										<?php _e( 'Default Selection', 'yikes-inc-easy-mailchimp-extender' ); ?>
 									</label>
 								</td>
 								<td>
-									<select type="default" name="field[<?php echo $form_data_array['group_id']; ?>][default_choice]">
-										<?php $i = 0; foreach( $merge_field_data['groups'] as $interest_group ) { 
-												$pre_selected = !empty( $merge_field_data['default_choice'] ) ? $merge_field_data['default_choice'] : '0';
+									<select type="default" name="field[<?php echo $form_data_array[ 'group_id' ]; ?>][default_choice]">
+										<?php $i = 0; foreach ( $merge_field_data[ 'groups' ] as $interest_group ) { 
+												$pre_selected = ! empty( $merge_field_data[ 'default_choice' ] ) ? $merge_field_data[ 'default_choice' ] : '0';
 										?>
-											<option value="<?php echo $i; ?>" <?php selected( $pre_selected , $i ); ?>><?php echo $interest_group['name']; ?></option>
+											<option value="<?php echo $i; ?>" <?php selected( $pre_selected, $i ); ?>><?php echo $interest_group[ 'name' ]; ?></option>
 										<?php $i++; } ?>
 									</select>
-									<p class="description"><small><?php _e( "Which option should be selected by default?", 'yikes-inc-easy-mailchimp-extender' );?></small></p>
+									<p class="description"><small><?php _e( "Which option should be selected by default?", 'yikes-inc-easy-mailchimp-extender' ); ?></small></p>
 								</td>
 							</tr>
 									
@@ -140,12 +140,12 @@ 
 				<tr valign="top">
 					<td scope="row">
 						<label for="placeholder">
-							<?php _e( 'Description' , 'yikes-inc-easy-mailchimp-extender' ); ?>
+							<?php _e( 'Description', 'yikes-inc-easy-mailchimp-extender' ); ?>
 						</label>
 					</td>
 					<td>
-						<textarea class="widefat field-description-input" name="field[<?php echo $form_data_array['group_id']; ?>][description]"></textarea>
-						<p class="description"><small><?php _e( "Enter the description for the form field. This will be displayed to the user and provide some direction on how the field should be filled out or selected.", 'yikes-inc-easy-mailchimp-extender' );?></small></p>
+						<textarea class="widefat field-description-input" name="field[<?php echo $form_data_array[ 'group_id' ]; ?>][description]"></textarea>
+						<p class="description"><small><?php _e( "Enter the description for the form field. This will be displayed to the user and provide some direction on how the field should be filled out or selected.", 'yikes-inc-easy-mailchimp-extender' ); ?></small></p>
 					</td>
 				</tr>
 				
@@ -153,48 +153,48 @@ 
 				<tr valign="top">
 					<td scope="row">
 						<label for="placeholder">
-							<?php _e( 'Additional Classes' , 'yikes-inc-easy-mailchimp-extender' ); ?>
+							<?php _e( 'Additional Classes', 'yikes-inc-easy-mailchimp-extender' ); ?>
 						</label>
 					</td>
 					<td>
-						<input type="text" class="widefat" name="field[<?php echo $form_data_array['group_id']; ?>][additional-classes]" value="<?php echo isset( $form_data_array['classes'] ) ? stripslashes( wp_strip_all_tags( $form_data_array['classes'] ) ) : '' ; ?>" />
-						<p class="description"><small><?php printf( __( "Assign additional classes to this field. %s.", 'yikes-inc-easy-mailchimp-extender' ), '<a target="_blank" href="' . esc_url( 'https://yikesplugins.com/support/knowledge-base/bundled-css-classes/' ) . '">' . __( 'View bundled classes', 'yikes-inc-easy-mailchimp-extender' ) . '</a>' );?></small></p>
+						<input type="text" class="widefat" name="field[<?php echo $form_data_array[ 'group_id' ]; ?>][additional-classes]" value="<?php echo isset( $form_data_array[ 'classes' ] ) ? stripslashes( wp_strip_all_tags( $form_data_array[ 'classes' ] ) ) : ''; ?>" />
+						<p class="description"><small><?php printf( __( "Assign additional classes to this field. %s.", 'yikes-inc-easy-mailchimp-extender' ), '<a target="_blank" href="' . esc_url( 'https://yikesplugins.com/support/knowledge-base/bundled-css-classes/' ) . '">' . __( 'View bundled classes', 'yikes-inc-easy-mailchimp-extender' ) . '</a>' ); ?></small></p>
 					</td>
 					</tr>
 					<!-- Required Toggle -->
 					<tr valign="top">
 						<td scope="row">
 							<label for="field-required">
-								<?php _e( 'Field Required?' , 'yikes-inc-easy-mailchimp-extender' ); ?>
+								<?php _e( 'Field Required?', 'yikes-inc-easy-mailchimp-extender' ); ?>
 							</label>
 						</td>
 						<td>
-							<input type="checkbox" class="widefat" value="1" name="field[<?php echo $form_data_array['group_id']; ?>][require]">
-							<p class="description"><small><?php _e( "Require this field to be filled in before the form can be submitted.", 'yikes-inc-easy-mailchimp-extender' );?></small></p>
+							<input type="checkbox" class="widefat" value="1" name="field[<?php echo $form_data_array[ 'group_id' ]; ?>][require]">
+							<p class="description"><small><?php _e( "Require this field to be filled in before the form can be submitted.", 'yikes-inc-easy-mailchimp-extender' ); ?></small></p>
 						</td>
 					</tr>
 					<!-- Visible Toggle -->
 					<tr valign="top">
 						<td scope="row">
 							<label for="hide-field">
-								<?php _e( 'Hide Field' , 'yikes-inc-easy-mailchimp-extender' ); ?>
+								<?php _e( 'Hide Field', 'yikes-inc-easy-mailchimp-extender' ); ?>
 							</label>
 						</td>
 						<td>
-							<input type="checkbox" class="widefat" value="1" name="field[<?php echo $form_data_array['group_id']; ?>][hide]">
-							<p class="description"><small><?php _e( "Hide this field from being displayed on the front end.", 'yikes-inc-easy-mailchimp-extender' );?></small></p>
+							<input type="checkbox" class="widefat" value="1" name="field[<?php echo $form_data_array[ 'group_id' ]; ?>][hide]">
+							<p class="description"><small><?php _e( "Hide this field from being displayed on the front end.", 'yikes-inc-easy-mailchimp-extender' ); ?></small></p>
 						</td>
 					</tr>
 					<!-- Toggle Field Label Visibility -->
 					<tr valign="top">
 						<td scope="row">
 							<label for="placeholder">
-								<?php _e( 'Hide Label' , 'yikes-inc-easy-mailchimp-extender' ); ?>
+								<?php _e( 'Hide Label', 'yikes-inc-easy-mailchimp-extender' ); ?>
 							</label>
 						</td>
 						<td>
-							<input type="checkbox" name="field[<?php echo $form_data_array['group_id']; ?>][hide-label]" value="1" />
-							<p class="description"><small><?php _e( "Toggle field label visibility.", 'yikes-inc-easy-mailchimp-extender' );?></small></p>
+							<input type="checkbox" name="field[<?php echo $form_data_array[ 'group_id' ]; ?>][hide-label]" value="1" />
+							<p class="description"><small><?php _e( "Toggle field label visibility.", 'yikes-inc-easy-mailchimp-extender' ); ?></small></p>
 						</td>
 					</tr>
 					<!-- Toggle Buttons -->
@@ -204,8 +204,8 @@ 
 						</td>
 						<td>
 							<span class="toggle-container">
-								<a href="#" class="hide-field"><?php _e( "Close" , 'yikes-inc-easy-mailchimp-extender' ); ?></a> |
-								<a href="#" class="remove-field" alt="<?php echo $form_data_array['group_id']; ?>"><?php _e( "Remove Field" , 'yikes-inc-easy-mailchimp-extender' ); ?></a>
+								<a href="#" class="hide-field"><?php _e( "Close", 'yikes-inc-easy-mailchimp-extender' ); ?></a> |
+								<a href="#" class="remove-field" alt="<?php echo $form_data_array[ 'group_id' ]; ?>"><?php _e( "Remove Field", 'yikes-inc-easy-mailchimp-extender' ); ?></a>
 							</span>
 						</td>
 					</tr>

Braces +4 added lines, -4 removed lines

@@ -59,7 +59,7 @@ 
 			<table class="form-table form-field-container">
 			
 				<!-- Default Value -->
-				<?php switch( $form_data_array['field_type'] ) { 
+				<?php switch( $form_data_array['field_type'] ) {
 						
 						default:
 						case 'radio':
@@ -71,7 +71,7 @@ 
 									</label>
 								</td>
 								<td>
-									<?php $i = 0; foreach( $merge_field_data['groups'] as $interest_group ) { 
+									<?php $i = 0; foreach( $merge_field_data['groups'] as $interest_group ) {
 											$pre_selected = !empty( $merge_field_data['default_choice'] ) ? $merge_field_data['default_choice'] : '0';
 									?>
 										<input type="radio" name="field[<?php echo $form_data_array['group_id']; ?>][default_choice][]" value="<?php echo $i; ?>" <?php checked( $pre_selected , $i ); ?>><?php echo stripslashes( $interest_group['name'] ); ?>
@@ -95,7 +95,7 @@ 
 									</label>
 								</td>
 								<td>
-									<?php $i = 0; foreach( $merge_field_data['groups'] as $interest_group ) { 
+									<?php $i = 0; foreach( $merge_field_data['groups'] as $interest_group ) {
 											$pre_selected = !empty( $merge_field_data['default_choice'] ) ? $merge_field_data['default_choice'] : '0';
 									?>
 										<input type="checkbox" name="field[<?php echo $form_data_array['group_id']; ?>][default_choice][]" value="<?php echo $i; ?>" <?php checked( $pre_selected , $i ); ?>><?php echo stripslashes( $interest_group['name'] ); ?>
@@ -120,7 +120,7 @@ 
 								</td>
 								<td>
 									<select type="default" name="field[<?php echo $form_data_array['group_id']; ?>][default_choice]">
-										<?php $i = 0; foreach( $merge_field_data['groups'] as $interest_group ) { 
+										<?php $i = 0; foreach( $merge_field_data['groups'] as $interest_group ) {
 												$pre_selected = !empty( $merge_field_data['default_choice'] ) ? $merge_field_data['default_choice'] : '0';
 										?>
 											<option value="<?php echo $i; ?>" <?php selected( $pre_selected , $i ); ?>><?php echo $interest_group['name']; ?></option>