yikesinc / yikes-inc-easy-mailchimp-extender

admin/partials/view-list.php

Indentation +6 added lines, -6 removed lines

@@ -356,9 +356,9 @@ 
 									?></ul><?php
 								}
 								/**
-								*	Custom action hook for our add-ons to hook into
-								*	@since 6.0.3.8
-								*/
+								 *	Custom action hook for our add-ons to hook into
+								 *	@since 6.0.3.8
+								 */
 								do_action( 'yikes-mailchimp-list-form-fields-metabox' );
 							?>
 							
@@ -385,9 +385,9 @@ 
 									<?php
 								}
 								/**
-								*	Custom action hook for our add-ons to hook into
-								*	@since 6.0.3.8
-								*/
+								 *	Custom action hook for our add-ons to hook into
+								 *	@since 6.0.3.8
+								 */
 								do_action( 'yikes-mailchimp-list-interest-groups-metabox' );
 							?>
 							

Spacing +106 added lines, -106 removed lines

@@ -1,9 +1,9 @@ 
 <?php
-	if( isset( $_REQUEST['list-id'] ) ) {
-		$list_id = sanitize_key( $_REQUEST['list-id'] );
+	if ( isset( $_REQUEST[ 'list-id' ] ) ) {
+		$list_id = sanitize_key( $_REQUEST[ 'list-id' ] );
 		$api_key = yikes_get_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(
@@ -15,40 +15,40 @@ 
 			'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' ), "View Lists Page" );
+				$error_logging->yikes_easy_mailchimp_write_to_error_log( $list_data[ 'error' ], __( "Get Account Lists", 'yikes-inc-easy-mailchimp-extender' ), "View Lists Page" );
 			}
 		}
 		// reset our data so we can easily use it
-		$list_data = $list_data['data'][0];
+		$list_data = $list_data[ 'data' ][ 0 ];
 
-		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';
 		}
 		$merge_variables = wp_remote_post( $api_endpoint, array(
 			'body' => array(
 				'apikey' => $api_key,
-				'id' => array( $list_id ) ,
+				'id' => array( $list_id ),
 			),
 			'timeout' => 10,
 			'sslverify' => apply_filters( 'yikes-mailchimp-sslverify', true ),
 		) );
 		$merge_variables = json_decode( wp_remote_retrieve_body( $merge_variables ), true );
-		if( isset( $merge_variables['error'] ) ) {
-			if( WP_DEBUG || get_option( 'yikes-mailchimp-debug-status' , '' ) == '1' ) {
+		if ( isset( $merge_variables[ '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( $merge_variables['error'], __( "Get Merge Variables" , 'yikes-inc-easy-mailchimp-extender' ), "View Lists Page" );
+				$error_logging->yikes_easy_mailchimp_write_to_error_log( $merge_variables[ 'error' ], __( "Get Merge Variables", 'yikes-inc-easy-mailchimp-extender' ), "View Lists Page" );
 			}
 		}
 		// re-store our data
-		$merge_variables = $merge_variables['data'][0]['merge_vars'];
+		$merge_variables = $merge_variables[ 'data' ][ 0 ][ 'merge_vars' ];
 
 		// get the interest group data
-		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(
@@ -62,20 +62,20 @@ 
 		) );
 		$interest_groupings = json_decode( wp_remote_retrieve_body( $interest_groupings ), true );
 
-		if( isset( $interest_groupings['error'] ) ) {
-			if( WP_DEBUG || get_option( 'yikes-mailchimp-debug-status' , '' ) == '1' ) {
+		if ( isset( $interest_groupings[ '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['error'], __( "Get Interest Groups" , 'yikes-inc-easy-mailchimp-extender' ), "View Lists Page" );
+				$error_logging->yikes_easy_mailchimp_write_to_error_log( $interest_groupings[ 'error' ], __( "Get Interest Groups", 'yikes-inc-easy-mailchimp-extender' ), "View Lists Page" );
 			}
 		}
 
 		$no_interest_groupings = '<p class="description">' . __( 'Interest groups are not enabled for this list.', 'yikes-inc-easy-mailchimp-extender' ) . '</p>';
 
 
-		$no_segments = __( 'No segments set up for this list.' , 'yikes-inc-easy-mailchimp-extender' );
+		$no_segments = __( 'No segments set up for this list.', 'yikes-inc-easy-mailchimp-extender' );
 		// get the segment data
-		if( $dash_position !== false ) {
+		if ( $dash_position !== false ) {
 			$api_endpoint = 'https://' . substr( $api_key, $dash_position + 1 ) . '.api.mailchimp.com/2.0/lists/segments.json';
 		}
 		$segments = wp_remote_post( $api_endpoint, array(
@@ -90,14 +90,14 @@ 
 
 
 		// setup pagination variables
-		$paged = isset( $_REQUEST['paged'] ) ? $_REQUEST['paged'] : '0';
+		$paged = isset( $_REQUEST[ 'paged' ] ) ? $_REQUEST[ 'paged' ] : '0';
 
-		$limit = apply_filters( 'yikes_admin_list_subscriber_limit' , '20' );
+		$limit = apply_filters( 'yikes_admin_list_subscriber_limit', '20' );
 
-		$sort_dir = isset( $_REQUEST['sort'] ) ? $_REQUEST['sort'] : 'DESC';
-		$column = isset( $_REQUEST['column'] ) ? $_REQUEST['column'] : 'optin_time';
+		$sort_dir = isset( $_REQUEST[ 'sort' ] ) ? $_REQUEST[ 'sort' ] : 'DESC';
+		$column = isset( $_REQUEST[ 'column' ] ) ? $_REQUEST[ 'column' ] : 'optin_time';
 
-		if( $sort_dir == 'DESC' ) {
+		if ( $sort_dir == 'DESC' ) {
 			$opposite_sort_dir = 'ASC';
 			$icon = '<span class="dashicons dashicons-arrow-down"></span>';
 		} else {
@@ -105,12 +105,12 @@ 
 			$icon = '<span class="dashicons dashicons-arrow-up"></span>';
 		}
 
-		if( !isset( $_REQUEST['sort'] ) ) {
+		if ( ! isset( $_REQUEST[ 'sort' ] ) ) {
 			$icon = '';
 		}
 
 		// get all subscribed members
-		if( $dash_position !== false ) {
+		if ( $dash_position !== false ) {
 			$api_endpoint = 'https://' . substr( $api_key, $dash_position + 1 ) . '.api.mailchimp.com/2.0/lists/members.json';
 		}
 		$subscribers_list = wp_remote_post( $api_endpoint, array(
@@ -128,16 +128,16 @@ 
 			'sslverify' => apply_filters( 'yikes-mailchimp-sslverify', true ),
 		) );
 		$subscribers_list = json_decode( wp_remote_retrieve_body( $subscribers_list ), true );
-		if( isset( $subscribers_list['error'] ) ) {
-			if( WP_DEBUG || get_option( 'yikes-mailchimp-debug-status' , '' ) == '1' ) {
+		if ( isset( $subscribers_list[ '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( $subscribers_list['error'], __( "Get Subscriber Count" , 'yikes-inc-easy-mailchimp-extender' ), "View Lists Page" );
+				$error_logging->yikes_easy_mailchimp_write_to_error_log( $subscribers_list[ 'error' ], __( "Get Subscriber Count", 'yikes-inc-easy-mailchimp-extender' ), "View Lists Page" );
 			}
 		}
 
-		$total_pages = ceil( $subscribers_list['total'] / $limit );
-		if( $total_pages == 0 ) {
+		$total_pages = ceil( $subscribers_list[ 'total' ] / $limit );
+		if ( $total_pages == 0 ) {
 			$total_pages = '1';
 		}
 
@@ -146,25 +146,25 @@ 
 ?>
 <div class="wrap">
 	<!-- Freddie Logo -->
-	<img src="<?php echo YIKES_MC_URL . 'includes/images/MailChimp_Assets/Freddie_60px.png'; ?>" alt="<?php __( 'Freddie - MailChimp Mascot' , 'yikes-inc-easy-mailchimp-extender' ); ?>" class="yikes-mc-freddie-logo" />
+	<img src="<?php echo YIKES_MC_URL . 'includes/images/MailChimp_Assets/Freddie_60px.png'; ?>" alt="<?php __( 'Freddie - MailChimp Mascot', 'yikes-inc-easy-mailchimp-extender' ); ?>" class="yikes-mc-freddie-logo" />
 
-	<h1>YIKES Easy Forms for MailChimp | <?php echo $list_data['name']; ?></h1>
+	<h1>YIKES Easy Forms for MailChimp | <?php echo $list_data[ 'name' ]; ?></h1>
 
 	<!-- Settings Page Description -->
-	<p class="yikes-easy-mc-about-text about-text"><?php _e( 'View all subscribers below. View additional subscriber info, or add additional fields to this list.' , 'yikes-inc-easy-mailchimp-extender' ); ?></p>
-	<!-- <p class="add-new-subscriber-button"><a href="#" onclick="jQuery(this).parent().next().slideToggle();" class="add-new-h2"><?php _e( 'New Subscriber' , 'yikes-inc-easy-mailchimp-extender' ); ?></a></p> -->
+	<p class="yikes-easy-mc-about-text about-text"><?php _e( 'View all subscribers below. View additional subscriber info, or add additional fields to this list.', 'yikes-inc-easy-mailchimp-extender' ); ?></p>
+	<!-- <p class="add-new-subscriber-button"><a href="#" onclick="jQuery(this).parent().next().slideToggle();" class="add-new-h2"><?php _e( 'New Subscriber', 'yikes-inc-easy-mailchimp-extender' ); ?></a></p> -->
 
 	<?php
 		/* Display our admin notices here */
 		// Unsubscribe user confirmation message
-		if( isset( $_REQUEST['user-unsubscribed'] ) && $_REQUEST['user-unsubscribed'] == 'true' ) {
+		if ( isset( $_REQUEST[ 'user-unsubscribed' ] ) && $_REQUEST[ 'user-unsubscribed' ] == 'true' ) {
 			?>
 			<div class="updated manage-form-admin-notice">
 				<p><?php _e( 'User successfully unsubscribed.', 'yikes-inc-easy-mailchimp-extender' ); ?></p>
 			</div>
 			<?php
 		}
-		if( isset( $_REQUEST['user-unsubscribed'] ) && $_REQUEST['user-unsubscribed'] == 'false' ) {
+		if ( isset( $_REQUEST[ 'user-unsubscribed' ] ) && $_REQUEST[ 'user-unsubscribed' ] == 'false' ) {
 			?>
 			<div class="error manage-form-admin-notice">
 				<p><?php _e( "We've encountered an error trying to remove the subscriber. Please try again. If the error persists please get in contact with the YIKES Inc. support staff.", 'yikes-inc-easy-mailchimp-extender' ); ?></p>
@@ -174,9 +174,9 @@ 
 	?>
 
 	<section class="add-new-subscriber-form-container">
-		<h4><?php _e( 'Add New Subscriber' , 'yikes-inc-easy-mailchimp-extender' ); ?></h4>
+		<h4><?php _e( 'Add New Subscriber', 'yikes-inc-easy-mailchimp-extender' ); ?></h4>
 		<form id="add-new-subcscriber">
-			<input type="text" class="regular-text" placeholder="<?php _e( 'User Email Address' , 'yikes-inc-easy-mailchimp-extender' ); ?>" /></p>
+			<input type="text" class="regular-text" placeholder="<?php _e( 'User Email Address', 'yikes-inc-easy-mailchimp-extender' ); ?>" /></p>
 			<p><?php echo submit_button( 'Add Subscriber' ); ?></p>
 		</form>
 	</section>
@@ -198,8 +198,8 @@ 
 									<!-- TABLE HEAD -->
 									<thead>
 										<tr>
-											<th id="user-email columnname" class="manage-column column-columnname" scope="col"><a id="user-email-sort" href="<?php echo esc_url_raw( add_query_arg( array( 'column' => 'email' , 'sort' => $opposite_sort_dir ) ) ); ?>"><?php _e( 'User Email' , 'yikes-inc-easy-mailchimp-extender' ); echo $icon;?></a></th>
-											<th id="columnname" class="manage-column column-columnname num" scope="col"><?php _e( 'Email Client' , 'yikes-inc-easy-mailchimp-extender' ); ?></th>
+											<th id="user-email columnname" class="manage-column column-columnname" scope="col"><a id="user-email-sort" href="<?php echo esc_url_raw( add_query_arg( array( 'column' => 'email', 'sort' => $opposite_sort_dir ) ) ); ?>"><?php _e( 'User Email', 'yikes-inc-easy-mailchimp-extender' ); echo $icon; ?></a></th>
+											<th id="columnname" class="manage-column column-columnname num" scope="col"><?php _e( 'Email Client', 'yikes-inc-easy-mailchimp-extender' ); ?></th>
 										</tr>
 									</thead>
 									<!-- end header -->
@@ -207,38 +207,38 @@ 
 									<!-- FOOTER -->
 									<tfoot>
 										<tr>
-											<th class="manage-column column-columnname" scope="col"><?php _e( 'User Email' , 'yikes-inc-easy-mailchimp-extender' ); ?></th>
-											<th class="manage-column column-columnname num" scope="col"><?php _e( 'Email Client' , 'yikes-inc-easy-mailchimp-extender' ); ?></th>
+											<th class="manage-column column-columnname" scope="col"><?php _e( 'User Email', 'yikes-inc-easy-mailchimp-extender' ); ?></th>
+											<th class="manage-column column-columnname num" scope="col"><?php _e( 'Email Client', 'yikes-inc-easy-mailchimp-extender' ); ?></th>
 										</tr>
 									</tfoot>
 									<!-- end footer -->
 
 									<!-- TABLE BODY -->
 									<tbody>
-										<?php if( $subscribers_list['total'] > 0 ) {
+										<?php if ( $subscribers_list[ 'total' ] > 0 ) {
 												$i = 1;
-												foreach( $subscribers_list['data'] as $subscriber ) {
-													$user_id = $subscriber['leid'];
+												foreach ( $subscribers_list[ 'data' ] as $subscriber ) {
+													$user_id = $subscriber[ 'leid' ];
 													// setup the email client name and icon
-													if( !empty( $subscriber['clients'] ) ) {
-														$user_email_client_name = $subscriber['clients']['name'];
-														$user_email_client_icon = "<img src='" . esc_url_raw( $subscriber['clients']['icon_url'] ) . "' alt=" . $user_email_client_name . " title=" . $user_email_client_name . ">";
+													if ( ! empty( $subscriber[ 'clients' ] ) ) {
+														$user_email_client_name = $subscriber[ 'clients' ][ 'name' ];
+														$user_email_client_icon = "<img src='" . esc_url_raw( $subscriber[ 'clients' ][ 'icon_url' ] ) . "' alt=" . $user_email_client_name . " title=" . $user_email_client_name . ">";
 													} else {
 														$path = YIKES_MC_URL . "includes/images/na.png";
-														$user_email_client_icon = "<img width='35' src='" . $path . "' alt='" . __( 'not set' , 'yikes-inc-easy-mailchimp-extender' ) . "' title='" .  __( 'not set' , 'yikes-inc-easy-mailchimp-extender' ) . "'>";
+														$user_email_client_icon = "<img width='35' src='" . $path . "' alt='" . __( 'not set', 'yikes-inc-easy-mailchimp-extender' ) . "' title='" . __( 'not set', 'yikes-inc-easy-mailchimp-extender' ) . "'>";
 													}
 
 										?>
-											<tr class="<?php if( $i % 2 == 0 ) { echo 'alternate'; } ?>">
+											<tr class="<?php if ( $i % 2 == 0 ) { echo 'alternate'; } ?>">
 												<td class="column-columnname">
-													<a class="user-email row-title" href="mailto:<?php echo sanitize_email( $subscriber['email'] ); ?>">
-														<?php echo sanitize_email( $subscriber['email'] ); ?>
+													<a class="user-email row-title" href="mailto:<?php echo sanitize_email( $subscriber[ 'email' ] ); ?>">
+														<?php echo sanitize_email( $subscriber[ 'email' ] ); ?>
 													</a>
 													<div class="row-actions">
-														<?php $view_user_info_url = esc_url_raw( add_query_arg( array( 'mailchimp-list' => $list_id , 'email-id' => $user_id ), admin_url() . 'admin.php?page=yikes-mailchimp-view-user' ) ); ?>
-														<span><a href="<?php echo $view_user_info_url; ?>"><?php _e( "View Info." , 'yikes-inc-easy-mailchimp-extender' ); ?></a> |</span>
-														<?php $url = esc_url_raw( add_query_arg( array( 'action' => 'yikes-easy-mc-unsubscribe-user', 'mailchimp-list' => $list_id , 'nonce' => wp_create_nonce( 'unsubscribe-user-'.$user_id ), 'email_id' => $user_id ) ) ); ?>
-														<span><a href="<?php echo $url; ?>" onclick="return confirm('<?php printf( __( "Are you sure you want to unsubscribe %s from this mailing list?" , 'yikes-inc-easy-mailchimp-extender' ), sanitize_email( $subscriber['email'] ) ); ?>');" class="yikes-delete-subscriber"><?php _e( "Unsubscribe" , 'yikes-inc-easy-mailchimp-extender' ); ?></a>
+														<?php $view_user_info_url = esc_url_raw( add_query_arg( array( 'mailchimp-list' => $list_id, 'email-id' => $user_id ), admin_url() . 'admin.php?page=yikes-mailchimp-view-user' ) ); ?>
+														<span><a href="<?php echo $view_user_info_url; ?>"><?php _e( "View Info.", 'yikes-inc-easy-mailchimp-extender' ); ?></a> |</span>
+														<?php $url = esc_url_raw( add_query_arg( array( 'action' => 'yikes-easy-mc-unsubscribe-user', 'mailchimp-list' => $list_id, 'nonce' => wp_create_nonce( 'unsubscribe-user-' . $user_id ), 'email_id' => $user_id ) ) ); ?>
+														<span><a href="<?php echo $url; ?>" onclick="return confirm('<?php printf( __( "Are you sure you want to unsubscribe %s from this mailing list?", 'yikes-inc-easy-mailchimp-extender' ), sanitize_email( $subscriber[ 'email' ] ) ); ?>');" class="yikes-delete-subscriber"><?php _e( "Unsubscribe", 'yikes-inc-easy-mailchimp-extender' ); ?></a>
 													</div>
 												</td>
 												<td class="column-columnname num"><?php echo $user_email_client_icon; ?></td>
@@ -248,7 +248,7 @@ 
 												}
 											} else { ?>
 											<tr class="no-items">
-												<td class="colspanchange no-current-subscriber-notice" colspan="2"><em><?php _e( 'No one is currently subscribed to this list.' , 'yikes-inc-easy-mailchimp-extender' ); ?></em></td>
+												<td class="colspanchange no-current-subscriber-notice" colspan="2"><em><?php _e( 'No one is currently subscribed to this list.', 'yikes-inc-easy-mailchimp-extender' ); ?></em></td>
 											</tr>
 										<?php } ?>
 									</tbody>
@@ -260,11 +260,11 @@ 
 						<!-- pagination -->
 						<div class="tablenav">
 							<div class="tablenav-pages">
-								<a class='first-page <?php if( $paged == 0 ) { echo 'disabled'; } ?>' title='<?php _e( "Go to the first page" , 'yikes-inc-easy-mailchimp-extender' ); ?>' href='<?php echo esc_url_raw( add_query_arg( array( "paged" => 0 ) ) ); ?>'>&laquo;</a>
-								<a class='prev-page <?php if( $paged == 0 ) { echo 'disabled'; } ?>' title='<?php _e( "Go to the previous page" , 'yikes-inc-easy-mailchimp-extender' ); ?>' href='<?php echo esc_url_raw( add_query_arg( array( "paged" => intval( $paged - 1 ) ) ) ); ?>'>&lsaquo;</a>
-								<span class="paging-input"><input class='current-page' title='<?php _e( "Current page" , 'yikes-inc-easy-mailchimp-extender' ); ?>' type='text' name='paged' value='<?php if( $paged == 0 ) { echo '1'; } else { echo intval( $paged + 1 ); } ?>' size='1' /> <?php _e( 'of', 'yikes-inc-easy-mailchimp-extender' ); ?> <span class='total-pages'><?php echo $total_pages; ?></span></span>
-								<a class='next-page <?php if( $paged == intval( $total_pages - 1 ) ) { echo 'disabled'; } ?>' title='<?php _e( "Go to the next page" , 'yikes-inc-easy-mailchimp-extender' ); ?>' href='<?php echo esc_url_raw( add_query_arg( array( "paged" => intval( $paged + 1 ) ) ) ); ?>'>&rsaquo;</a>
-								<a class='last-page <?php if( $paged == intval( $total_pages - 1 ) ) { echo 'disabled'; } ?>' title='<?php _e( "Go to the last page" , 'yikes-inc-easy-mailchimp-extender' ); ?>' href='<?php echo esc_url_raw( add_query_arg( array( "paged" => intval( $total_pages - 1 ) ) ) ); ?>'>&raquo;</a>
+								<a class='first-page <?php if ( $paged == 0 ) { echo 'disabled'; } ?>' title='<?php _e( "Go to the first page", 'yikes-inc-easy-mailchimp-extender' ); ?>' href='<?php echo esc_url_raw( add_query_arg( array( "paged" => 0 ) ) ); ?>'>&laquo;</a>
+								<a class='prev-page <?php if ( $paged == 0 ) { echo 'disabled'; } ?>' title='<?php _e( "Go to the previous page", 'yikes-inc-easy-mailchimp-extender' ); ?>' href='<?php echo esc_url_raw( add_query_arg( array( "paged" => intval( $paged - 1 ) ) ) ); ?>'>&lsaquo;</a>
+								<span class="paging-input"><input class='current-page' title='<?php _e( "Current page", 'yikes-inc-easy-mailchimp-extender' ); ?>' type='text' name='paged' value='<?php if ( $paged == 0 ) { echo '1'; } else { echo intval( $paged + 1 ); } ?>' size='1' /> <?php _e( 'of', 'yikes-inc-easy-mailchimp-extender' ); ?> <span class='total-pages'><?php echo $total_pages; ?></span></span>
+								<a class='next-page <?php if ( $paged == intval( $total_pages - 1 ) ) { echo 'disabled'; } ?>' title='<?php _e( "Go to the next page", 'yikes-inc-easy-mailchimp-extender' ); ?>' href='<?php echo esc_url_raw( add_query_arg( array( "paged" => intval( $paged + 1 ) ) ) ); ?>'>&rsaquo;</a>
+								<a class='last-page <?php if ( $paged == intval( $total_pages - 1 ) ) { echo 'disabled'; } ?>' title='<?php _e( "Go to the last page", 'yikes-inc-easy-mailchimp-extender' ); ?>' href='<?php echo esc_url_raw( add_query_arg( array( "paged" => intval( $total_pages - 1 ) ) ) ); ?>'>&raquo;</a>
 							</div>
 						</div>
 
@@ -279,21 +279,21 @@ 
 
 						<div class="postbox yikes-easy-mc-postbox">
 
-							<h3><?php _e( 'List Overview' , 'yikes-inc-easy-mailchimp-extender' ); ?></h3>
+							<h3><?php _e( 'List Overview', 'yikes-inc-easy-mailchimp-extender' ); ?></h3>
 
 							<?php
 								// store list rating
-								$list_rating = $list_data['list_rating'];
-								if( $list_rating > 0 ) {
-									$list_rating_explosion = explode( '.' , $list_rating );
+								$list_rating = $list_data[ 'list_rating' ];
+								if ( $list_rating > 0 ) {
+									$list_rating_explosion = explode( '.', $list_rating );
 									$star_array = array();
 									$x = 1;
-									while( $list_rating_explosion[0] >= $x ) {
-										$star_array[] = '<span class="dashicons dashicons-star-filled list-rating-star"></span>';
+									while ( $list_rating_explosion[ 0 ] >= $x ) {
+										$star_array[ ] = '<span class="dashicons dashicons-star-filled list-rating-star"></span>';
 										$x++;
 									}
-									if( $list_rating_explosion[1] == '5' ) {
-										$star_array[] = '<span class="dashicons dashicons-star-half list-rating-star"></span>';
+									if ( $list_rating_explosion[ 1 ] == '5' ) {
+										$star_array[ ] = '<span class="dashicons dashicons-star-half list-rating-star"></span>';
 									}
 								} else {
 									$star_array = array( 'n/a' );
@@ -301,40 +301,40 @@ 
 							?>
 							<table class="form-table">
 								<tr valign="top">
-									<td scope="row"><label for="tablecell"><strong><?php  _e( 'List Rating' , 'yikes-inc-easy-mailchimp-extender' ); ?></strong></label></td>
-									<td><?php echo implode( ' ' , $star_array ); ?></td>
+									<td scope="row"><label for="tablecell"><strong><?php  _e( 'List Rating', 'yikes-inc-easy-mailchimp-extender' ); ?></strong></label></td>
+									<td><?php echo implode( ' ', $star_array ); ?></td>
 								</tr>
 								<tr valign="top">
-									<td scope="row"><label for="tablecell"><strong><?php  _e( 'Average Subscribers' , 'yikes-inc-easy-mailchimp-extender' ); ?></strong></label></td>
-									<td><?php echo $list_data['stats']['avg_sub_rate']; ?><small> / <?php  _e( 'month' , 'yikes-inc-easy-mailchimp-extender' ); ?></small></td>
+									<td scope="row"><label for="tablecell"><strong><?php  _e( 'Average Subscribers', 'yikes-inc-easy-mailchimp-extender' ); ?></strong></label></td>
+									<td><?php echo $list_data[ 'stats' ][ 'avg_sub_rate' ]; ?><small> / <?php  _e( 'month', 'yikes-inc-easy-mailchimp-extender' ); ?></small></td>
 								</tr>
 								<tr valign="top">
-									<td scope="row"><label for="tablecell"><strong><?php  _e( 'Subscriber Count' , 'yikes-inc-easy-mailchimp-extender' ); ?></strong></label></td>
-									<td><?php echo intval( $list_data['stats']['member_count'] ); ?></td>
+									<td scope="row"><label for="tablecell"><strong><?php  _e( 'Subscriber Count', 'yikes-inc-easy-mailchimp-extender' ); ?></strong></label></td>
+									<td><?php echo intval( $list_data[ 'stats' ][ 'member_count' ] ); ?></td>
 								</tr>
 								<tr valign="top">
-									<td scope="row"><label for="tablecell"><strong><?php  _e( 'New Since Last Campaign' , 'yikes-inc-easy-mailchimp-extender' ); ?></strong></label></td>
-									<td><?php echo intval( $list_data['stats']['member_count_since_send'] ); ?></td>
+									<td scope="row"><label for="tablecell"><strong><?php  _e( 'New Since Last Campaign', 'yikes-inc-easy-mailchimp-extender' ); ?></strong></label></td>
+									<td><?php echo intval( $list_data[ 'stats' ][ 'member_count_since_send' ] ); ?></td>
 								</tr>
 								<tr valign="top">
-									<td scope="row"><label for="tablecell"><strong><?php  _e( 'Created' , 'yikes-inc-easy-mailchimp-extender' ); ?></strong></label></td>
-									<td><?php echo date( get_option('date_format') , strtotime( $list_data['date_created'] ) ); ?></td>
+									<td scope="row"><label for="tablecell"><strong><?php  _e( 'Created', 'yikes-inc-easy-mailchimp-extender' ); ?></strong></label></td>
+									<td><?php echo date( get_option( 'date_format' ), strtotime( $list_data[ 'date_created' ] ) ); ?></td>
 								</tr>
 								<tr valign="top">
-									<td scope="row"><label for="tablecell"><strong><?php  _e( 'List Fields' , 'yikes-inc-easy-mailchimp-extender' ); ?></strong></label></td>
-									<td><?php echo intval( $list_data['stats']['merge_var_count'] + 1 ); // add 1 for our email field.. ?></td>
+									<td scope="row"><label for="tablecell"><strong><?php  _e( 'List Fields', 'yikes-inc-easy-mailchimp-extender' ); ?></strong></label></td>
+									<td><?php echo intval( $list_data[ 'stats' ][ 'merge_var_count' ] + 1 ); // add 1 for our email field.. ?></td>
 								</tr>
 								<tr valign="top">
-									<td scope="row"><label for="tablecell"><strong><?php  _e( 'Short Signup URL' , 'yikes-inc-easy-mailchimp-extender' ); ?></strong></label></td>
-									<td><input type="text" class="widefat view-list-sidebar-input" value="<?php echo esc_url_raw( $list_data['subscribe_url_short'] ); ?>" readonly onclick="jQuery(this).select();"></td>
+									<td scope="row"><label for="tablecell"><strong><?php  _e( 'Short Signup URL', 'yikes-inc-easy-mailchimp-extender' ); ?></strong></label></td>
+									<td><input type="text" class="widefat view-list-sidebar-input" value="<?php echo esc_url_raw( $list_data[ 'subscribe_url_short' ] ); ?>" readonly onclick="jQuery(this).select();"></td>
 								</tr>
 								<tr valign="top">
-									<td scope="row"><label for="tablecell"><strong><?php  _e( 'Default From Email' , 'yikes-inc-easy-mailchimp-extender' ); ?></strong></label></td>
-									<td><input type="text" class="widefat view-list-sidebar-input" value="<?php echo sanitize_email( $list_data['default_from_email'] ); ?>" readonly onclick="jQuery(this).select();"></td>
+									<td scope="row"><label for="tablecell"><strong><?php  _e( 'Default From Email', 'yikes-inc-easy-mailchimp-extender' ); ?></strong></label></td>
+									<td><input type="text" class="widefat view-list-sidebar-input" value="<?php echo sanitize_email( $list_data[ 'default_from_email' ] ); ?>" readonly onclick="jQuery(this).select();"></td>
 								</tr>
 								<tr valign="top">
-									<td scope="row"><label for="tablecell"><strong><?php  _e( 'Default From Name' , 'yikes-inc-easy-mailchimp-extender' ); ?></strong></label></td>
-									<td><?php echo $list_data['default_from_name']; ?></td>
+									<td scope="row"><label for="tablecell"><strong><?php  _e( 'Default From Name', 'yikes-inc-easy-mailchimp-extender' ); ?></strong></label></td>
+									<td><?php echo $list_data[ 'default_from_name' ]; ?></td>
 								</tr>
 							</table>
 
@@ -344,14 +344,14 @@ 
 						<!-- Merge Field Info -->
 						<div class="postbox yikes-easy-mc-postbox">
 
-							<h3><?php _e( 'Form Fields' , 'yikes-inc-easy-mailchimp-extender' ); ?></h3>
+							<h3><?php _e( 'Form Fields', 'yikes-inc-easy-mailchimp-extender' ); ?></h3>
 							<?php
-								if( count( $merge_variables ) >= 1 ) {
+								if ( count( $merge_variables ) >= 1 ) {
 									?><ul class="merge-variable-ul"><?php
 										echo '<li class="interest-group-count">' . sprintf( _n( '%d Field', '%d Fields', intval( count( $merge_variables ) ), 'yikes-inc-easy-mailchimp-extender' ), intval( count( $merge_variables ) ) ) . '</li>';
-										foreach( $merge_variables as $merge_variable ) {
+										foreach ( $merge_variables as $merge_variable ) {
 											// new action hook @since 6.0.3.8
-											echo '<li class="' . $merge_variable['tag'] . '"><span class="dashicons dashicons-marker"></span>' . $merge_variable['name'] . ' ' . do_action( 'yikes-mailchimp-list-field', $merge_variable ) . '</li>';
+											echo '<li class="' . $merge_variable[ 'tag' ] . '"><span class="dashicons dashicons-marker"></span>' . $merge_variable[ 'name' ] . ' ' . do_action( 'yikes-mailchimp-list-field', $merge_variable ) . '</li>';
 										}
 									?></ul><?php
 								}
@@ -368,13 +368,13 @@ 
 						<div class="postbox yikes-easy-mc-postbox">
 
 
-							<h3><?php _e( 'Interest Groups Overview' , 'yikes-inc-easy-mailchimp-extender' ); ?></h3>
+							<h3><?php _e( 'Interest Groups Overview', 'yikes-inc-easy-mailchimp-extender' ); ?></h3>
 							<?php
-								if( isset( $interest_groupings ) && ! isset( $interest_groupings['error'] ) ) {
+								if ( isset( $interest_groupings ) && ! isset( $interest_groupings[ 'error' ] ) ) {
 									?><ul class="interest-group-ul"><?php
 										echo '<li class="interest-group-count">' . sprintf( _n( '%d Interest Group', '%d Interest Groups', intval( count( $interest_groupings ) ), 'yikes-inc-easy-mailchimp-extender' ), intval( count( $interest_groupings ) ) ) . '</li>';
-									foreach( $interest_groupings as $interest_group ) {
-										echo '<li><span class="dashicons dashicons-marker"></span>' . $interest_group['name'] . '<span class="interest-group-title"></span><small title="' . $interest_group['groups'][0]['subscribers'] . ' ' . __( "subscribers assigned to this group" , 'yikes-inc-easy-mailchimp-extender' ) . '">(' . $interest_group['groups'][0]['subscribers'] . ')</small></li>';
+									foreach ( $interest_groupings as $interest_group ) {
+										echo '<li><span class="dashicons dashicons-marker"></span>' . $interest_group[ 'name' ] . '<span class="interest-group-title"></span><small title="' . $interest_group[ 'groups' ][ 0 ][ 'subscribers' ] . ' ' . __( "subscribers assigned to this group", 'yikes-inc-easy-mailchimp-extender' ) . '">(' . $interest_group[ 'groups' ][ 0 ][ 'subscribers' ] . ')</small></li>';
 									}
 									?></ul><?php
 								} else {
@@ -397,17 +397,17 @@ 
 						<div class="postbox yikes-easy-mc-postbox">
 
 
-							<h3><?php _e( 'Segments Overview' , 'yikes-inc-easy-mailchimp-extender' ); ?></h3>
+							<h3><?php _e( 'Segments Overview', 'yikes-inc-easy-mailchimp-extender' ); ?></h3>
 							<?php
-								if( isset( $segments['saved'] ) && count( $segments['saved'] ) >= 1 ) {
+								if ( isset( $segments[ 'saved' ] ) && count( $segments[ 'saved' ] ) >= 1 ) {
 									$i = 1;
 									?><ul class="segment-ul"><?php
-										echo '<li class="segment-group-count">' . sprintf( _n( '%d Segment', '%d Segments', intval( count( $segments['saved'] ) ), 'yikes-inc-easy-mailchimp-extender' ), intval( count( $segments['saved'] ) ) ) . '</li>';
-									foreach( $segments['saved'] as $segment ) {
-										echo '<li><span class="dashicons dashicons-arrow-right"></span>' . $segment['name'] . ' <small><a href="#" onclick="jQuery(this).parent().parent().next().slideToggle();jQuery(this).toggleText();return false;" data-alt-text="' . __( 'hide conditions' , 'yikes-inc-easy-mailchimp-extender' ) . '">' . __( "view conditions" , 'yikes-inc-easy-mailchimp-extender' ) . '</a></small></li>';
+										echo '<li class="segment-group-count">' . sprintf( _n( '%d Segment', '%d Segments', intval( count( $segments[ 'saved' ] ) ), 'yikes-inc-easy-mailchimp-extender' ), intval( count( $segments[ 'saved' ] ) ) ) . '</li>';
+									foreach ( $segments[ 'saved' ] as $segment ) {
+										echo '<li><span class="dashicons dashicons-arrow-right"></span>' . $segment[ 'name' ] . ' <small><a href="#" onclick="jQuery(this).parent().parent().next().slideToggle();jQuery(this).toggleText();return false;" data-alt-text="' . __( 'hide conditions', 'yikes-inc-easy-mailchimp-extender' ) . '">' . __( "view conditions", 'yikes-inc-easy-mailchimp-extender' ) . '</a></small></li>';
 										?><div class="conditionals yikes-easy-mc-hidden"><?php
-										foreach( $segment['segment_opts']['conditions'] as $condition ) {
-											echo '<li><small>' . sprintf( __( 'condition #%s : If %s %s %s', 'yikes-inc-easy-mailchimp-extender' ), intval( $i ), $condition['field'],  $condition['op'], $condition['value'] ) . '</small></li>';
+										foreach ( $segment[ 'segment_opts' ][ 'conditions' ] as $condition ) {
+											echo '<li><small>' . sprintf( __( 'condition #%s : If %s %s %s', 'yikes-inc-easy-mailchimp-extender' ), intval( $i ), $condition[ 'field' ], $condition[ 'op' ], $condition[ 'value' ] ) . '</small></li>';
 											$i++;
 										}
 										?></div><?php
@@ -422,9 +422,9 @@ 
 								}
 							?>
 							<!--
-								<a class="edit-segments-button" href="#" onclick="return false;" class="button-primary"><?php _e( 'Edit Segments' , 'yikes-inc-easy-mailchimp-extender' ); ?></a>
+								<a class="edit-segments-button" href="#" onclick="return false;" class="button-primary"><?php _e( 'Edit Segments', 'yikes-inc-easy-mailchimp-extender' ); ?></a>
 							-->
-							<p class="description edit-segment-description"><?php _e( 'To edit this lists segments, head over to' , 'yikes-inc-easy-mailchimp-extender' ); ?> <a href="http://www.MailChimp.com" target="_blank">MailChimp</a></p>
+							<p class="description edit-segment-description"><?php _e( 'To edit this lists segments, head over to', 'yikes-inc-easy-mailchimp-extender' ); ?> <a href="http://www.MailChimp.com" target="_blank">MailChimp</a></p>
 
 						</div>
 

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

Spacing +53 added lines, -53 removed lines

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

Braces +4 added lines, -2 removed lines

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

public/partials/shortcodes/process_form_shortcode.php

Indentation +8 added lines, -8 removed lines

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

Braces +2 added lines, -1 removed lines

@@ -943,7 +943,8 @@
 
 						}
 
-					} else { // loop over interest groups
+					} else {
+// loop over interest groups
 
 
 						// store default choice

Spacing +306 added lines, -306 removed lines

@@ -21,7 +21,7 @@ 
 			'recaptcha_data_callback' => '', // set a custom js callback function to run after a successful recaptcha response - default none
 			'recaptcha_expired_callback' => '', // set a custom js callback function to run after the recaptcha has expired - default none
 			'inline' => '0',
-		), $atts , 'yikes-mailchimp' )
+		), $atts, 'yikes-mailchimp' )
 	);
 
 	// set globals
@@ -31,12 +31,12 @@ 
 	$form_submitted = isset( $form_submitted ) ? $form_submitted : 0;
 
 	/* If the user hasn't authenticated yet, lets kill off */
-	if( get_option( 'yikes-mc-api-validation' , 'invalid_api_key' ) != 'valid_api_key' ) {
-		return '<div class="invalid-api-key-error"><p>' . __( "Whoops, you're not connected to MailChimp. You need to enter a valid MailChimp API key." , 'yikes-inc-easy-mailchimp-extender' ) . '</p></div>';
+	if ( get_option( 'yikes-mc-api-validation', 'invalid_api_key' ) != 'valid_api_key' ) {
+		return '<div class="invalid-api-key-error"><p>' . __( "Whoops, you're not connected to MailChimp. You need to enter a valid MailChimp API key.", 'yikes-inc-easy-mailchimp-extender' ) . '</p></div>';
 	}
 
 	// if the user forgot to specify a form ID, lets kill of and warn them.
-	if( ! $form ) {
+	if ( ! $form ) {
 		return __( 'Whoops, it looks like you forgot to specify a form to display.', 'yikes-inc-easy-mailchimp-extender' );
 	}
 
@@ -45,39 +45,39 @@ 
 	$form_results = $wpdb->get_results( 'SELECT * FROM ' . $wpdb->prefix . 'yikes_easy_mc_forms WHERE id = ' . $form . '', ARRAY_A );
 
 	// confirm we have some results, or return an error
-	if( !$form_results ) {
-		return __( "Oh no...This form doesn't exist. Head back to the manage forms page and select a different form." , 'yikes-inc-easy-mailchimp-extender' );
+	if ( ! $form_results ) {
+		return __( "Oh no...This form doesn't exist. Head back to the manage forms page and select a different form.", 'yikes-inc-easy-mailchimp-extender' );
 	}
 
 	/*
 	*	Check if the user wants to use reCAPTCHA Spam Prevention
 	*/
-	if( get_option( 'yikes-mc-recaptcha-status' , '' ) == '1' ) {
+	if ( get_option( 'yikes-mc-recaptcha-status', '' ) == '1' ) {
 		// allow users to manually set recaptcha (instead of globally - recaptcha="1"/recaptcha="0" - but still needs to be globally enabled on the settings page)
-		if( ! isset( $atts['recaptcha'] ) || ( isset( $atts['recaptcha'] ) && $atts['recaptcha'] == '1' ) ) {
+		if ( ! isset( $atts[ 'recaptcha' ] ) || ( isset( $atts[ 'recaptcha' ] ) && $atts[ 'recaptcha' ] == '1' ) ) {
 			// if either of the Private the Secret key is left blank, we should display an error back to the user
-			if( get_option( 'yikes-mc-recaptcha-site-key' , '' ) == '' ) {
-				return __( "Whoops! It looks like you enabled reCAPTCHA but forgot to enter the reCAPTCHA site key!" , 'yikes-inc-easy-mailchimp-extender' ) . '<span class="edit-link yikes-easy-mc-edit-link"><a class="post-edit-link" href="' . esc_url( admin_url( 'admin.php?page=yikes-inc-easy-mailchimp-settings&section=recaptcha-settings' ) ) . '" title="' . __( 'ReCaptcha Settings' , 'yikes-inc-easy-mailchimp-extender' ) . '">' . __( 'Edit ReCaptcha Settings' , 'yikes-inc-easy-mailchimp-extender' ) . '</a></span>';
+			if ( get_option( 'yikes-mc-recaptcha-site-key', '' ) == '' ) {
+				return __( "Whoops! It looks like you enabled reCAPTCHA but forgot to enter the reCAPTCHA site key!", 'yikes-inc-easy-mailchimp-extender' ) . '<span class="edit-link yikes-easy-mc-edit-link"><a class="post-edit-link" href="' . esc_url( admin_url( 'admin.php?page=yikes-inc-easy-mailchimp-settings&section=recaptcha-settings' ) ) . '" title="' . __( 'ReCaptcha Settings', 'yikes-inc-easy-mailchimp-extender' ) . '">' . __( 'Edit ReCaptcha Settings', 'yikes-inc-easy-mailchimp-extender' ) . '</a></span>';
 			}
-			if( get_option( 'yikes-mc-recaptcha-secret-key' , '' ) == '' ) {
-				return __( "Whoops! It looks like you enabled reCAPTCHA but forgot to enter the reCAPTCHA secret key!" , 'yikes-inc-easy-mailchimp-extender' ) . '<span class="edit-link yikes-easy-mc-edit-link"><a class="post-edit-link" href="' . esc_url( admin_url( 'admin.php?page=yikes-inc-easy-mailchimp-settings&section=recaptcha-settings' ) ) . '" title="' . __( 'ReCaptcha Settings' , 'yikes-inc-easy-mailchimp-extender' ) . '">' . __( 'Edit ReCaptcha Settings' , 'yikes-inc-easy-mailchimp-extender' ) . '</a></span>';
+			if ( get_option( 'yikes-mc-recaptcha-secret-key', '' ) == '' ) {
+				return __( "Whoops! It looks like you enabled reCAPTCHA but forgot to enter the reCAPTCHA secret key!", 'yikes-inc-easy-mailchimp-extender' ) . '<span class="edit-link yikes-easy-mc-edit-link"><a class="post-edit-link" href="' . esc_url( admin_url( 'admin.php?page=yikes-inc-easy-mailchimp-settings&section=recaptcha-settings' ) ) . '" title="' . __( 'ReCaptcha Settings', 'yikes-inc-easy-mailchimp-extender' ) . '">' . __( 'Edit ReCaptcha Settings', 'yikes-inc-easy-mailchimp-extender' ) . '</a></span>';
 			}
 
-			if( ! empty( $atts['recaptcha_type'] ) ) {
-				echo $atts['recaptcha_type'];
+			if ( ! empty( $atts[ 'recaptcha_type' ] ) ) {
+				echo $atts[ 'recaptcha_type' ];
 			}
 
 			// Store the site language (to load recaptcha in a specific language)
 			$locale = get_locale();
 			$locale_split = explode( '_', $locale );
 			// Setup reCAPTCHA parameters
-			$lang = ( isset( $locale_split ) ? $locale_split[0] : $locale );
-			$lang = ( isset( $atts['recaptcha_lang'] ) ) ? $atts['recaptcha_lang'] : $locale_split[0];
-			$type = ( isset( $atts['recaptcha_type'] ) ) ? strtolower( $atts['recaptcha_type'] ) : 'image'; // setup recaptcha type
-			$theme= ( isset( $atts['recaptcha_theme'] ) ) ? strtolower( $atts['recaptcha_theme'] ) : 'light'; // setup recaptcha theme
-			$size = ( isset( $atts['recaptcha_size'] ) ) ? strtolower( $atts['recaptcha_size'] ) : 'normal'; // setup recaptcha size
-			$data_callback = ( isset( $atts['recaptcha_data_callback'] ) ) ? $atts['recaptcha_data_callback'] : false; // setup recaptcha size
-			$expired_callback = ( isset( $atts['recaptcha_expired_callback'] ) ) ? $atts['recaptcha_expired_callback'] : false; // setup recaptcha size
+			$lang = ( isset( $locale_split ) ? $locale_split[ 0 ] : $locale );
+			$lang = ( isset( $atts[ 'recaptcha_lang' ] ) ) ? $atts[ 'recaptcha_lang' ] : $locale_split[ 0 ];
+			$type = ( isset( $atts[ 'recaptcha_type' ] ) ) ? strtolower( $atts[ 'recaptcha_type' ] ) : 'image'; // setup recaptcha type
+			$theme = ( isset( $atts[ 'recaptcha_theme' ] ) ) ? strtolower( $atts[ 'recaptcha_theme' ] ) : 'light'; // setup recaptcha theme
+			$size = ( isset( $atts[ 'recaptcha_size' ] ) ) ? strtolower( $atts[ 'recaptcha_size' ] ) : 'normal'; // setup recaptcha size
+			$data_callback = ( isset( $atts[ 'recaptcha_data_callback' ] ) ) ? $atts[ 'recaptcha_data_callback' ] : false; // setup recaptcha size
+			$expired_callback = ( isset( $atts[ 'recaptcha_expired_callback' ] ) ) ? $atts[ 'recaptcha_expired_callback' ] : false; // setup recaptcha size
 			// Pass the shortcode parameters through a filter
 			$recaptcha_shortcode_params = apply_filters( 'yikes-mailchimp-recaptcha-parameters', array(
 				'language' => $lang,
@@ -88,10 +88,10 @@ 
 				'expired_callback' => $expired_callback,
 			), $form );
 			// enqueue Google recaptcha JS
-			wp_register_script( 'google-recaptcha-js' , 'https://www.google.com/recaptcha/api.js?hl=' . $recaptcha_shortcode_params['language'] . '&onload=renderReCaptchaCallback&render=explicit', array( 'jquery' ) , 'all' );
+			wp_register_script( 'google-recaptcha-js', 'https://www.google.com/recaptcha/api.js?hl=' . $recaptcha_shortcode_params[ 'language' ] . '&onload=renderReCaptchaCallback&render=explicit', array( 'jquery' ), 'all' );
 			wp_enqueue_script( 'google-recaptcha-js' );
-			$recaptcha_site_key = get_option( 'yikes-mc-recaptcha-site-key' , '' );
-			$recaptcha_box = '<div name="g-recaptcha" class="g-recaptcha" data-sitekey="' . $recaptcha_site_key . '" data-theme="' . $recaptcha_shortcode_params['theme'] . '" data-type="' . $recaptcha_shortcode_params['type'] . '" data-size="' . $recaptcha_shortcode_params['size'] . '" data-callback="' . $recaptcha_shortcode_params['success_callback'] . '" data-expired-callback="' . $recaptcha_shortcode_params['expired_callback'] . '"></div>';
+			$recaptcha_site_key = get_option( 'yikes-mc-recaptcha-site-key', '' );
+			$recaptcha_box = '<div name="g-recaptcha" class="g-recaptcha" data-sitekey="' . $recaptcha_site_key . '" data-theme="' . $recaptcha_shortcode_params[ 'theme' ] . '" data-type="' . $recaptcha_shortcode_params[ 'type' ] . '" data-size="' . $recaptcha_shortcode_params[ 'size' ] . '" data-callback="' . $recaptcha_shortcode_params[ 'success_callback' ] . '" data-expired-callback="' . $recaptcha_shortcode_params[ 'expired_callback' ] . '"></div>';
 			?>
 			<script type="text/javascript">
 				/* Script Callback to init. multiple recaptchas on a single page */
@@ -118,10 +118,10 @@ 
 	}
 
 	// place our results into a seperate variable for easy looping
-	$form_data = $form_results[0];
+	$form_data = $form_results[ 0 ];
 
 	// store our variables
-	$form_id = (int) $form_data['id']; // form id (the id of the form in the database)
+	$form_id = (int) $form_data[ 'id' ]; // form id (the id of the form in the database)
 
 	/*
 	*	Get the stored form settings
@@ -130,32 +130,32 @@ 
 	*/
 	$form_settings = Yikes_Inc_Easy_Mailchimp_Extender_Public::yikes_retrieve_form_settings( $form_id );
 
-	$additional_form_settings = ( isset( $form_data['form_settings'] ) ) ? json_decode( $form_data['form_settings'], true ) : false;
+	$additional_form_settings = ( isset( $form_data[ 'form_settings' ] ) ) ? json_decode( $form_data[ 'form_settings' ], true ) : false;
 	// store our options from the additional form settings array
-	$form_classes = ( $additional_form_settings ) ? $additional_form_settings['yikes-easy-mc-form-class-names'] : '';
-	$inline_form = ( $additional_form_settings ) ? $additional_form_settings['yikes-easy-mc-inline-form'] : '';
-	$submit_button_type = ( $additional_form_settings ) ? $additional_form_settings['yikes-easy-mc-submit-button-type'] : 'text';
-	$submit_button_text = ( $additional_form_settings && $additional_form_settings['yikes-easy-mc-submit-button-text'] != '' ) ? esc_attr( $additional_form_settings['yikes-easy-mc-submit-button-text'] ) : __( 'Submit', 'yikes-inc-easy-mailchimp-extender' );
-	$submit_button_image = ( $additional_form_settings ) ? esc_url( $additional_form_settings['yikes-easy-mc-submit-button-image'] ) : '';
-	$submit_button_classes = ( $additional_form_settings ) ? ' ' . esc_attr( $additional_form_settings['yikes-easy-mc-submit-button-classes'] ) : '';
+	$form_classes = ( $additional_form_settings ) ? $additional_form_settings[ 'yikes-easy-mc-form-class-names' ] : '';
+	$inline_form = ( $additional_form_settings ) ? $additional_form_settings[ 'yikes-easy-mc-inline-form' ] : '';
+	$submit_button_type = ( $additional_form_settings ) ? $additional_form_settings[ 'yikes-easy-mc-submit-button-type' ] : 'text';
+	$submit_button_text = ( $additional_form_settings && $additional_form_settings[ 'yikes-easy-mc-submit-button-text' ] != '' ) ? esc_attr( $additional_form_settings[ 'yikes-easy-mc-submit-button-text' ] ) : __( 'Submit', 'yikes-inc-easy-mailchimp-extender' );
+	$submit_button_image = ( $additional_form_settings ) ? esc_url( $additional_form_settings[ 'yikes-easy-mc-submit-button-image' ] ) : '';
+	$submit_button_classes = ( $additional_form_settings ) ? ' ' . esc_attr( $additional_form_settings[ 'yikes-easy-mc-submit-button-classes' ] ) : '';
 	// scheuldes
-	$form_schedule_state = ( $additional_form_settings ) ? $additional_form_settings['yikes-easy-mc-form-schedule'] : false;
-	$form_schedule_start = ( $additional_form_settings ) ? $additional_form_settings['yikes-easy-mc-form-restriction-start'] : '';;
-	$form_schedule_end = ( $additional_form_settings ) ? $additional_form_settings['yikes-easy-mc-form-restriction-end'] : '';
-	$form_pending_message = ( $additional_form_settings ) ? $additional_form_settings['yikes-easy-mc-form-restriction-pending-message'] : '';
-	$form_expired_message = ( $additional_form_settings ) ? $additional_form_settings['yikes-easy-mc-form-restriction-expired-message'] : '';
+	$form_schedule_state = ( $additional_form_settings ) ? $additional_form_settings[ 'yikes-easy-mc-form-schedule' ] : false;
+	$form_schedule_start = ( $additional_form_settings ) ? $additional_form_settings[ 'yikes-easy-mc-form-restriction-start' ] : ''; ;
+	$form_schedule_end = ( $additional_form_settings ) ? $additional_form_settings[ 'yikes-easy-mc-form-restriction-end' ] : '';
+	$form_pending_message = ( $additional_form_settings ) ? $additional_form_settings[ 'yikes-easy-mc-form-restriction-pending-message' ] : '';
+	$form_expired_message = ( $additional_form_settings ) ? $additional_form_settings[ 'yikes-easy-mc-form-restriction-expired-message' ] : '';
 	// register required
-	$form_login_required = ( $additional_form_settings ) ? $additional_form_settings['yikes-easy-mc-form-login-required'] : false;
-	$form_login_message = ( $additional_form_settings ) ? $additional_form_settings['yikes-easy-mc-form-restriction-login-message'] : '';
+	$form_login_required = ( $additional_form_settings ) ? $additional_form_settings[ 'yikes-easy-mc-form-login-required' ] : false;
+	$form_login_message = ( $additional_form_settings ) ? $additional_form_settings[ 'yikes-easy-mc-form-restriction-login-message' ] : '';
 	// store number of fields
-	$field_count = (int) count( $form_settings['fields'] );
+	$field_count = (int) count( $form_settings[ 'fields' ] );
 
 	// confirm we actually have fields, before looping
-	if( isset( $form_data['fields'] ) && ! empty( $form_data['fields'] ) ) {
+	if ( isset( $form_data[ 'fields' ] ) && ! empty( $form_data[ 'fields' ] ) ) {
 		// loop over each field, if it's set to hidden -- subtract it from the field count
 		// this throws off the layout for inline forms setup below
-		foreach( json_decode( $form_data['fields'] ) as $form_field ) {
-			if( isset( $form_field->hide ) && $form_field->hide == 1 ) {
+		foreach ( json_decode( $form_data[ 'fields' ] ) as $form_field ) {
+			if ( isset( $form_field->hide ) && $form_field->hide == 1 ) {
 				$field_count--;
 			}
 		}
@@ -165,8 +165,8 @@ 
 	*	If login is required, abort
 	*	@since 6.0.3.8
 	*/
-	if( $form_login_required ) {
-		if( apply_filters( 'yikes-mailchimp-required-login-requirement', ! is_user_logged_in() ) ) {
+	if ( $form_login_required ) {
+		if ( apply_filters( 'yikes-mailchimp-required-login-requirement', ! is_user_logged_in() ) ) {
 			ob_start();
 				?>
 					<div class="yikes-mailchimp-login-required yikes-mailchimp-form-<?php echo $form_id; ?>-login-required">
@@ -182,19 +182,19 @@ 
 	*	Check if schedule is set for this form
 	*	@since 6.0.3.8
 	*/
-	if( $form_schedule_state ) {
+	if ( $form_schedule_state ) {
 		// store current date
 		$current_date = strtotime( current_time( 'm/d/Y g:iA' ) );
 
 		// the the current date is less than the form scheduled start date
-		if( $current_date < $form_schedule_start ) {
+		if ( $current_date < $form_schedule_start ) {
 			echo apply_filters( 'yikes-mailchimp-frontend-content', $form_pending_message );
 			return;
 			// abort
 		}
 
 		// The current date is past or equal to the end date, aka form has now expired
-		if( $current_date >= $form_schedule_end ) {
+		if ( $current_date >= $form_schedule_end ) {
 			echo apply_filters( 'yikes-mailchimp-frontend-content', $form_expired_message );
 			return;
 			// abort
@@ -203,8 +203,8 @@ 
 
 	// setup the submit button text
 	// shortcode parameter takes precedence over option
-	if( isset( $atts['submit'] ) ) {
-		$submit = $atts['submit'];
+	if ( isset( $atts[ 'submit' ] ) ) {
+		$submit = $atts[ 'submit' ];
 	} else {
 		$submit = $submit_button_text;
 	}
@@ -214,7 +214,7 @@ 
 	$page_data = $post;
 
 	// Remove the post_password from this for security
-	if( isset( $page_data->post_password ) ) {
+	if ( isset( $page_data->post_password ) ) {
 		unset( $page_data->post_password );
 	}
 
@@ -228,7 +228,7 @@ 
 	*	to exclude styles from loading, add `define( 'YIKES_MAILCHIMP_EXCLUDE_STYLES', true );` to functions.php
 	*	@since 6.0.3.8
 	*/
-	if( ! defined( 'YIKES_MAILCHIMP_EXCLUDE_STYLES' ) ) {
+	if ( ! defined( 'YIKES_MAILCHIMP_EXCLUDE_STYLES' ) ) {
 		// enqueue the form styles
 		wp_enqueue_style( 'yikes-inc-easy-mailchimp-public-styles', YIKES_MC_URL . 'public/css/yikes-inc-easy-mailchimp-extender-public.min.css', array( $last_key ) );
 	}
@@ -236,12 +236,12 @@ 
 	/**
 	*	Check for form inline parameter
 	*/
-	$form_inline = ( isset( $atts['inline'] ) && ( $atts['inline'] == 1 || $atts['inline'] == 'true' ) ) ? true : false;
+	$form_inline = ( isset( $atts[ 'inline' ] ) && ( $atts[ 'inline' ] == 1 || $atts[ 'inline' ] == 'true' ) ) ? true : false;
 	// recheck from our form options
-	if( ! $form_inline ) {
-		$form_inline = ( isset( $additional_form_settings['yikes-easy-mc-inline-form'] ) && $additional_form_settings['yikes-easy-mc-inline-form'] == 1 ) ? true : false;
+	if ( ! $form_inline ) {
+		$form_inline = ( isset( $additional_form_settings[ 'yikes-easy-mc-inline-form' ] ) && $additional_form_settings[ 'yikes-easy-mc-inline-form' ] == 1 ) ? true : false;
 	}
-	if( $form_inline ) {
+	if ( $form_inline ) {
 		$field_width = (float) ( 100 / $field_count );
 		$submit_button_width = (float) ( 20 / $field_count );
 		/*
@@ -270,12 +270,12 @@ 
 	<?php
 
 		/* If the current user is logged in, and an admin...lets display our 'Edit Form' link */
-		if( is_user_logged_in() ) {
-			if( current_user_can( apply_filters( 'yikes-mailchimp-user-role-access' , 'manage_options' ) ) ) {
+		if ( is_user_logged_in() ) {
+			if ( current_user_can( apply_filters( 'yikes-mailchimp-user-role-access', 'manage_options' ) ) ) {
 				$edit_form_link = '<span class="edit-link">';
-					$edit_form_link .= '<a class="post-edit-link" href="' . esc_url( admin_url( 'admin.php?page=yikes-mailchimp-edit-form&id=' . $form ) ) . '" title="' . __( 'Edit' , 'yikes-inc-easy-mailchimp-extender' ) . ' ' . ucwords( $form_settings['form_name'] ) . '">' . __( 'Edit Form' , 'yikes-inc-easy-mailchimp-extender' ) . '</a>';
+					$edit_form_link .= '<a class="post-edit-link" href="' . esc_url( admin_url( 'admin.php?page=yikes-mailchimp-edit-form&id=' . $form ) ) . '" title="' . __( 'Edit', 'yikes-inc-easy-mailchimp-extender' ) . ' ' . ucwords( $form_settings[ 'form_name' ] ) . '">' . __( 'Edit Form', 'yikes-inc-easy-mailchimp-extender' ) . '</a>';
 				$edit_form_link .= '</span>';
-				$edit_form_link = apply_filters( 'yikes-mailchimp-front-end-form-action-links', $edit_form_link, $form, ucwords( $form_settings['form_name'] ) );
+				$edit_form_link = apply_filters( 'yikes-mailchimp-front-end-form-action-links', $edit_form_link, $form, ucwords( $form_settings[ 'form_name' ] ) );
 			} else {
 				$edit_form_link = '';
 			}
@@ -284,16 +284,16 @@ 
 		// ensure there is an 'email' field the user can fill out
 		// or else MailChimp throws errors at you
 			// extract our array keys
-			if( isset( $form_settings['fields'] ) && ! empty( $form_settings['fields'] ) ) {
-				$array_keys = array_keys( $form_settings['fields'] );
+			if ( isset( $form_settings[ 'fields' ] ) && ! empty( $form_settings[ 'fields' ] ) ) {
+				$array_keys = array_keys( $form_settings[ 'fields' ] );
 				// check for EMAIL in that array
-				if( !in_array( 'EMAIL', $array_keys ) && !in_array( 'email', $array_keys ) ) {
-					return '<p>' . __( "An email field is required for all MailChimp forms. Please add an email field to this form." , 'yikes-inc-easy-mailchimp-extender' ) . '</p><p>' . $edit_form_link . '</p>';
+				if ( ! in_array( 'EMAIL', $array_keys ) && ! in_array( 'email', $array_keys ) ) {
+					return '<p>' . __( "An email field is required for all MailChimp forms. Please add an email field to this form.", 'yikes-inc-easy-mailchimp-extender' ) . '</p><p>' . $edit_form_link . '</p>';
 				}
 			} else {
-				$error = '<p>' . __( "Whoops, it looks like you forgot to assign fields to this form." , 'yikes-inc-easy-mailchimp-extender' ) . '</p>';
-				if( is_user_logged_in() ) {
-					if( current_user_can( apply_filters( 'yikes-mailchimp-user-role-access' , 'manage_options' ) ) ) {
+				$error = '<p>' . __( "Whoops, it looks like you forgot to assign fields to this form.", 'yikes-inc-easy-mailchimp-extender' ) . '</p>';
+				if ( is_user_logged_in() ) {
+					if ( current_user_can( apply_filters( 'yikes-mailchimp-user-role-access', 'manage_options' ) ) ) {
 						return $error . $edit_form_link;
 					}
 				} else {
@@ -311,13 +311,13 @@ 
 		*	Set a custom title using custom_title="lorem ipsum" parameter in the shortcode
 		*	- This takes precedence over the title set
 		*/
-		if( ! empty( $title ) && $title == 1 && isset( $atts['custom_title'] ) ) {
-			echo '<h3 class="yikes-mailchimp-form-title yikes-mailchimp-form-title-'.$form_id.'">' . apply_filters( 'yikes-mailchimp-form-title', apply_filters( 'the_title', $atts['custom_title'] ), $form_id ) . '</h3>';
+		if ( ! empty( $title ) && $title == 1 && isset( $atts[ 'custom_title' ] ) ) {
+			echo '<h3 class="yikes-mailchimp-form-title yikes-mailchimp-form-title-' . $form_id . '">' . apply_filters( 'yikes-mailchimp-form-title', apply_filters( 'the_title', $atts[ 'custom_title' ] ), $form_id ) . '</h3>';
 		} else {
 			// display the form description if the user
 			// has specified to do so
-			if( ! empty( $title ) && $title == 1 ) {
-				echo '<h3 class="yikes-mailchimp-form-title yikes-mailchimp-form-title-'.$form_id.'">' . apply_filters( 'yikes-mailchimp-form-title', apply_filters( 'the_title', $form_settings['form_name'] ), $form_id ) . '</h3>';
+			if ( ! empty( $title ) && $title == 1 ) {
+				echo '<h3 class="yikes-mailchimp-form-title yikes-mailchimp-form-title-' . $form_id . '">' . apply_filters( 'yikes-mailchimp-form-title', apply_filters( 'the_title', $form_settings[ 'form_name' ] ), $form_id ) . '</h3>';
 			}
 		}
 
@@ -325,21 +325,21 @@ 
 		*	Allow users to specify a custom description for this form, no html support
 		*	@since 6.0.3.8
 		*/
-		if( ! empty( $description ) && $description == 1 && isset( $atts['custom_description'] ) ) {
-			echo '<section class="yikes-mailchimp-form-description yikes-mailchimp-form-description-'.$form_id.'">' . apply_filters( 'yikes-mailchimp-frontend-content', apply_filters( 'yikes-mailchimp-form-description', $atts['custom_description'], $form_id ) ) . '</section>';
+		if ( ! empty( $description ) && $description == 1 && isset( $atts[ 'custom_description' ] ) ) {
+			echo '<section class="yikes-mailchimp-form-description yikes-mailchimp-form-description-' . $form_id . '">' . apply_filters( 'yikes-mailchimp-frontend-content', apply_filters( 'yikes-mailchimp-form-description', $atts[ 'custom_description' ], $form_id ) ) . '</section>';
 		} else {
 			// display the form description if the user
 			// has specified to do so
-			if( ! empty( $description ) && $description == 1 ) {
-				echo '<section class="yikes-mailchimp-form-description yikes-mailchimp-form-description-'.$form_id.'">' . apply_filters( 'yikes-mailchimp-frontend-content', apply_filters( 'yikes-mailchimp-form-description', $form_settings['form_description'], $form_id ) ) . '</section>';
+			if ( ! empty( $description ) && $description == 1 ) {
+				echo '<section class="yikes-mailchimp-form-description yikes-mailchimp-form-description-' . $form_id . '">' . apply_filters( 'yikes-mailchimp-frontend-content', apply_filters( 'yikes-mailchimp-form-description', $form_settings[ 'form_description' ], $form_id ) ) . '</section>';
 			}
 		}
 
 		// Check for AJAX
-		if( ( ! empty( $atts['ajax'] ) && $atts['ajax'] == 1 ) || $form_settings['submission_settings']['ajax'] == 1 ) {
+		if ( ( ! empty( $atts[ 'ajax' ] ) && $atts[ 'ajax' ] == 1 ) || $form_settings[ 'submission_settings' ][ 'ajax' ] == 1 ) {
 			// enqueue our ajax script
-			wp_register_script( 'yikes-easy-mc-ajax' , YIKES_MC_URL . 'public/js/yikes-mc-ajax-forms.min.js' , array( 'jquery' ) , 'yikes-inc-easy-mailchimp-extender', false );
-			wp_localize_script( 'yikes-easy-mc-ajax' , 'object' , array(
+			wp_register_script( 'yikes-easy-mc-ajax', YIKES_MC_URL . 'public/js/yikes-mc-ajax-forms.min.js', array( 'jquery' ), 'yikes-inc-easy-mailchimp-extender', false );
+			wp_localize_script( 'yikes-easy-mc-ajax', 'object', array(
 				'ajax_url' => esc_url( admin_url( 'admin-ajax.php' ) ),
 				'page_data' => $page_data,
 				'interest_group_checkbox_error' => apply_filters( 'yikes-mailchimp-interest-group-checkbox-error', __( 'This field is required.', 'yikes-inc-easy-mailchimp-extender' ), $form_id ),
@@ -358,10 +358,10 @@ 
 
 		// render the form!
 		?>
-			<form id="<?php echo sanitize_title( $form_settings['form_name'] ); ?>-<?php echo $form_id; ?>" class="yikes-easy-mc-form yikes-easy-mc-form-<?php echo $form_id . ' '; if ( $form_inline )  { echo 'yikes-mailchimp-form-inline '; } echo ' ' . apply_filters( 'yikes-mailchimp-form-class', $form_classes, $form_id ); if( !empty( $_POST ) && $form_submitted == 1 && $form_settings['submission_settings']['hide_form_post_signup'] == 1 ) { echo ' yikes-easy-mc-display-none'; } ?>" action="" method="POST" data-attr-form-id="<?php echo $form_id; ?>">
+			<form id="<?php echo sanitize_title( $form_settings[ 'form_name' ] ); ?>-<?php echo $form_id; ?>" class="yikes-easy-mc-form yikes-easy-mc-form-<?php echo $form_id . ' '; if ( $form_inline ) { echo 'yikes-mailchimp-form-inline '; } echo ' ' . apply_filters( 'yikes-mailchimp-form-class', $form_classes, $form_id ); if ( ! empty( $_POST ) && $form_submitted == 1 && $form_settings[ 'submission_settings' ][ 'hide_form_post_signup' ] == 1 ) { echo ' yikes-easy-mc-display-none'; } ?>" action="" method="POST" data-attr-form-id="<?php echo $form_id; ?>">
 
 				<?php
-				foreach( $form_settings['fields'] as $field ) {
+				foreach ( $form_settings[ 'fields' ] as $field ) {
 						// input array
 						$field_array = array();
 						// label array
@@ -370,53 +370,53 @@ 
 						$hidden_label = false;
 						// label classes array
 						$label_class_array = array();
-						if( $field['additional-classes'] != '' ) {
+						if ( $field[ 'additional-classes' ] != '' ) {
 							// split custom classes at spaces
-							$custom_classes = explode( ' ' , $field['additional-classes'] );
+							$custom_classes = explode( ' ', $field[ 'additional-classes' ] );
 							// check our custom class array for field-left/field-right
 							// if it's set we need to assign it to our label and remove it from the field classes
 							 // input half left
-							if( in_array( 'field-left-half' , $custom_classes ) ) {
+							if ( in_array( 'field-left-half', $custom_classes ) ) {
 								// $label_array['class'] = 'class="field-left-half"';
-								$label_class_array[] = 'field-left-half';
-								$key = array_search( 'field-left-half' , $custom_classes );
-								unset( $custom_classes[$key] );
+								$label_class_array[ ] = 'field-left-half';
+								$key = array_search( 'field-left-half', $custom_classes );
+								unset( $custom_classes[ $key ] );
 							} // input half right
-							if( in_array( 'field-right-half' , $custom_classes ) ) {
+							if ( in_array( 'field-right-half', $custom_classes ) ) {
 								// $label_array['class'] = 'class="field-right-half"';
-								$label_class_array[] = 'field-right-half';
-								$key = array_search( 'field-right-half' , $custom_classes );
-								unset( $custom_classes[$key] );
+								$label_class_array[ ] = 'field-right-half';
+								$key = array_search( 'field-right-half', $custom_classes );
+								unset( $custom_classes[ $key ] );
 							} // input thirds (1/3 width, floated left)
-							if( in_array( 'field-third' , $custom_classes ) ) {
+							if ( in_array( 'field-third', $custom_classes ) ) {
 								// $label_array['class'] = 'class="field-third"';
-								$label_class_array[] = 'field-third';
-								$key = array_search( 'field-third' , $custom_classes );
-								unset( $custom_classes[$key] );
+								$label_class_array[ ] = 'field-third';
+								$key = array_search( 'field-third', $custom_classes );
+								unset( $custom_classes[ $key ] );
 							} // 2 column radio
-							if( in_array( 'option-2-col' , $custom_classes ) ) {
+							if ( in_array( 'option-2-col', $custom_classes ) ) {
 								// $label_array['class'] = 'class="option-2-col"';
-								$label_class_array[] = 'option-2-col';
-								$key = array_search( 'option-2-col' , $custom_classes );
-								unset( $custom_classes[$key] );
+								$label_class_array[ ] = 'option-2-col';
+								$key = array_search( 'option-2-col', $custom_classes );
+								unset( $custom_classes[ $key ] );
 							} // 3 column radio
-							if( in_array( 'option-3-col' , $custom_classes ) ) {
+							if ( in_array( 'option-3-col', $custom_classes ) ) {
 								// $label_array['class'] = 'class="option-3-col"';
-								$label_class_array[] = 'option-3-col';
-								$key = array_search( 'option-3-col' , $custom_classes );
-								unset( $custom_classes[$key] );
+								$label_class_array[ ] = 'option-3-col';
+								$key = array_search( 'option-3-col', $custom_classes );
+								unset( $custom_classes[ $key ] );
 							} // 4 column radio
-							if( in_array( 'option-4-col' , $custom_classes ) ) {
+							if ( in_array( 'option-4-col', $custom_classes ) ) {
 								// $label_array['class'] = 'class="option-4-col"';
-								$label_class_array[] = 'option-4-col';
-								$key = array_search( 'option-4-col' , $custom_classes );
-								unset( $custom_classes[$key] );
+								$label_class_array[ ] = 'option-4-col';
+								$key = array_search( 'option-4-col', $custom_classes );
+								unset( $custom_classes[ $key ] );
 							} // inline radio & checkboxes etc
-							if( in_array( 'option-inline' , $custom_classes ) ) {
+							if ( in_array( 'option-inline', $custom_classes ) ) {
 								// $label_array['class'] = 'class="option-inline"';
-								$label_class_array[] = 'option-inline';
-								$key = array_search( 'option-inline' , $custom_classes );
-								unset( $custom_classes[$key] );
+								$label_class_array[ ] = 'option-inline';
+								$key = array_search( 'option-inline', $custom_classes );
+								unset( $custom_classes[ $key ] );
 							}
 						} else {
 							$custom_classes = array();
@@ -424,68 +424,68 @@ 
 
 						// if the form is set to inline, add the inline class to our labels
 						// since @6.0.3.8
-						if( $form_inline ) {
-							$label_class_array[] = 'label-inline';
+						if ( $form_inline ) {
+							$label_class_array[ ] = 'label-inline';
 						}
 
-						if( isset( $field['hide-label'] ) ) {
-							if( $field['hide-label'] == 1 ) {
+						if ( isset( $field[ 'hide-label' ] ) ) {
+							if ( $field[ 'hide-label' ] == 1 ) {
 								$hidden_label = true;
-								$custom_classes[] = 'field-no-label';
+								$custom_classes[ ] = 'field-no-label';
 							}
 						}
 
 					/* Store tag variable based on field type */
-					if( isset( $field['merge'] ) ) {
+					if ( isset( $field[ 'merge' ] ) ) {
 						$tag = 'merge';
 					} else {
 						$tag = 'group_id';
 					}
 
 					// build up our array
-					$field_array['id'] = 'id="yikes-easy-mc-form-' . $form_id . '-' . esc_attr( $field[$tag] ) . '" ';
-					$field_array['name'] = 'name="' . esc_attr( $field[$tag] ) . '" ';
-					$field_array['placeholder'] = isset( $field['placeholder'] ) ? 'placeholder="' . esc_attr( stripslashes( $field['placeholder'] ) ) . '" ' : '';
-					$field_array['classes'] = 'class="yikes-easy-mc-'.$field['type'] . ' ' .  esc_attr( trim( implode( ' ' , $custom_classes ) ) ) . '" ';
+					$field_array[ 'id' ] = 'id="yikes-easy-mc-form-' . $form_id . '-' . esc_attr( $field[ $tag ] ) . '" ';
+					$field_array[ 'name' ] = 'name="' . esc_attr( $field[ $tag ] ) . '" ';
+					$field_array[ 'placeholder' ] = isset( $field[ 'placeholder' ] ) ? 'placeholder="' . esc_attr( stripslashes( $field[ 'placeholder' ] ) ) . '" ' : '';
+					$field_array[ 'classes' ] = 'class="yikes-easy-mc-' . $field[ 'type' ] . ' ' . esc_attr( trim( implode( ' ', $custom_classes ) ) ) . '" ';
 
 					// email must always be required and visible
-					if( $field['type'] == 'email' ) {
-						$field_array['required'] = 'required="required"';
-						$label_array['visible'] = '';
+					if ( $field[ 'type' ] == 'email' ) {
+						$field_array[ 'required' ] = 'required="required"';
+						$label_array[ 'visible' ] = '';
 						// $label_array['required'] = 'class="' . $field['merge'] . '-label yikes-mailchimp-field-required"';
-						$label_class_array[] = $field['merge'] . '-label';
-						$label_class_array[] = 'yikes-mailchimp-field-required';
+						$label_class_array[ ] = $field[ 'merge' ] . '-label';
+						$label_class_array[ ] = 'yikes-mailchimp-field-required';
 					} else {
-						if( $tag == 'merge' ) {
-							$field_array['required'] = isset( $field['require'] ) ? 'required="required"' : '';
-							$label_array['visible'] = isset( $field['hide'] ) ? 'style="display:none;"' : '';
+						if ( $tag == 'merge' ) {
+							$field_array[ 'required' ] = isset( $field[ 'require' ] ) ? 'required="required"' : '';
+							$label_array[ 'visible' ] = isset( $field[ 'hide' ] ) ? 'style="display:none;"' : '';
 							// $label_array['required'] = isset( $field['require'] ) ? 'class="' . $field['merge'] . '-label yikes-mailchimp-field-required"' : 'class="' . $field['merge'] . '-label"';
-							$label_class_array[] = isset( $field['require'] ) ? $field['merge'] . '-label yikes-mailchimp-field-required' : $field['merge'] . '-label';
+							$label_class_array[ ] = isset( $field[ 'require' ] ) ? $field[ 'merge' ] . '-label yikes-mailchimp-field-required' : $field[ 'merge' ] . '-label';
 						} else {
-							$field_array['required'] = isset( $field['require'] ) ? 'required="required"' : '';
-							$label_array['visible'] = isset( $field['hide'] ) ? 'style="display:none;"' : '';
+							$field_array[ 'required' ] = isset( $field[ 'require' ] ) ? 'required="required"' : '';
+							$label_array[ 'visible' ] = isset( $field[ 'hide' ] ) ? 'style="display:none;"' : '';
 							// $label_array['required'] = isset( $field['require'] ) ? 'class="' . $field['group_id'] . '-label yikes-mailchimp-field-required"' : 'class="' . $field['group_id'] . '-label"';
-							$label_class_array[] = isset( $field['require'] ) ? $field['group_id'] . '-label yikes-mailchimp-field-required' : $field['group_id'] . '-label';
+							$label_class_array[ ] = isset( $field[ 'require' ] ) ? $field[ 'group_id' ] . '-label yikes-mailchimp-field-required' : $field[ 'group_id' ] . '-label';
 						}
 					}
 
 					// if both hide label and hide field are checked, we gotta hide the field!
-					if( isset( $field['hide' ] ) && $field['hide'] == 1 ) {
-						if( isset( $field['hide-label' ] ) && $field['hide-label'] == 1 ) {
-							$field_array['visible'] = 'style="display:none;"';
+					if ( isset( $field[ 'hide' ] ) && $field[ 'hide' ] == 1 ) {
+						if ( isset( $field[ 'hide-label' ] ) && $field[ 'hide-label' ] == 1 ) {
+							$field_array[ 'visible' ] = 'style="display:none;"';
 						}
 					}
 
-					$label_array['classes'] = 'class="' . implode( ' ', $label_class_array ) . '"';
+					$label_array[ 'classes' ] = 'class="' . implode( ' ', $label_class_array ) . '"';
 
 					// filter the field array data
 					$field_array = apply_filters( 'yikes-mailchimp-field-data', $field_array, $field, $form_id );
 
 					/* Loop Over Standard Fields (aka merge variables) */
-					if( isset( $field['merge'] ) ) {
+					if ( isset( $field[ 'merge' ] ) ) {
 
 						// loop over our fields by Type
-						switch ( $field['type'] ) {
+						switch ( $field[ 'type' ] ) {
 
 							default:
 							case 'email':
@@ -493,25 +493,25 @@ 
 							case 'number':
 
 								// pass our default value through our filter to parse dynamic data by tag (used solely for 'text' type)
-								$default_value = ( isset( $field['default'] ) ? esc_attr( $field['default'] ) : '' );
+								$default_value = ( isset( $field[ 'default' ] ) ? esc_attr( $field[ 'default' ] ) : '' );
 								$default_value = apply_filters( 'yikes-mailchimp-process-default-tag', $default_value );
 									?>
-									<label for="<?php echo $field['merge']; ?>" <?php echo implode( ' ' , $label_array ); ?>>
+									<label for="<?php echo $field[ 'merge' ]; ?>" <?php echo implode( ' ', $label_array ); ?>>
 
 										<!-- dictate label visibility -->
-										<?php if( !isset( $field['hide-label'] ) ) { ?>
-											<span class="<?php echo esc_attr( $field['merge'] ) . '-label'; ?>">
-												<?php if( ! isset( $field['hide-label'] ) ) { echo apply_filters( 'yikes-mailchimp-'.$field['merge'].'-label' , esc_attr( stripslashes( $field['label'] ) ), $form_id ); } ?>
+										<?php if ( ! isset( $field[ 'hide-label' ] ) ) { ?>
+											<span class="<?php echo esc_attr( $field[ 'merge' ] ) . '-label'; ?>">
+												<?php if ( ! isset( $field[ 'hide-label' ] ) ) { echo apply_filters( 'yikes-mailchimp-' . $field[ 'merge' ] . '-label', esc_attr( stripslashes( $field[ 'label' ] ) ), $form_id ); } ?>
 											</span>
 										<?php } ?>
 
-										<input <?php echo implode( ' ' , $field_array ); if( $field['type'] != 'email' && $field['type'] != 'number' ) { ?> type="text" <?php } else if( $field['type'] == 'email' ) { ?> type="email" <?php } else { ?> type="number" <?php } ?> value="<?php if( isset( $_POST[$field['merge']] ) && $form_submitted != 1 ) { echo $_POST[$field['merge']]; } else { echo esc_attr( $default_value ); } ?>">
+										<input <?php echo implode( ' ', $field_array ); if ( $field[ 'type' ] != 'email' && $field[ 'type' ] != 'number' ) { ?> type="text" <?php } else if ( $field[ 'type' ] == 'email' ) { ?> type="email" <?php } else { ?> type="number" <?php } ?> value="<?php if ( isset( $_POST[ $field[ 'merge' ] ] ) && $form_submitted != 1 ) { echo $_POST[ $field[ 'merge' ] ]; } else { echo esc_attr( $default_value ); } ?>">
 
 										<!-- description -->
-										<?php if( isset( $field['description'] ) && trim( $field['description'] ) != '' ) { ?>
+										<?php if ( isset( $field[ 'description' ] ) && trim( $field[ 'description' ] ) != '' ) { ?>
 											<p class="form-field-description">
 												<small>
-													<?php echo apply_filters( 'yikes-mailchimp-' . $field['merge'] . '-description', esc_attr( stripslashes( $field['description'] ) ), $form_id ); ?>
+													<?php echo apply_filters( 'yikes-mailchimp-' . $field[ 'merge' ] . '-description', esc_attr( stripslashes( $field[ 'description' ] ) ), $form_id ); ?>
 												</small>
 											</p>
 										<?php } ?>
@@ -523,7 +523,7 @@ 
 
 							case 'url':
 							case 'imageurl':
-								$default_value = ( isset( $field['default'] ) ) ? $field['default'] : '';
+								$default_value = ( isset( $field[ 'default' ] ) ) ? $field[ 'default' ] : '';
 									?>
 
 									<script type="text/javascript">
@@ -535,22 +535,22 @@ 
 										}
 									</script>
 
-									<label for="<?php echo $field['merge']; ?>" <?php echo implode( ' ' , $label_array ); ?>>
+									<label for="<?php echo $field[ 'merge' ]; ?>" <?php echo implode( ' ', $label_array ); ?>>
 
 										<!-- dictate label visibility -->
-										<?php if( !isset( $field['hide-label'] ) ) { ?>
-											<span class="<?php echo esc_attr( $field['merge'] ) . '-label'; ?>">
-												<?php echo apply_filters( 'yikes-mailchimp-'.$field['merge'].'-label' , esc_attr( stripslashes( $field['label'] ) ) ); ?>
+										<?php if ( ! isset( $field[ 'hide-label' ] ) ) { ?>
+											<span class="<?php echo esc_attr( $field[ 'merge' ] ) . '-label'; ?>">
+												<?php echo apply_filters( 'yikes-mailchimp-' . $field[ 'merge' ] . '-label', esc_attr( stripslashes( $field[ 'label' ] ) ) ); ?>
 											</span>
 										<?php } ?>
 
-										<input <?php echo implode( ' ' , $field_array ); ?> type="url" <?php if( $field['type'] == 'url' ) { ?> title="<?php _e( 'Please enter a valid URL to the website.' , 'yikes-inc-easy-mailchimp-extender' ); ?>" <?php } else { ?> title="<?php _e( 'Please enter a valid URL to the image.' , 'yikes-inc-easy-mailchimp-extender' ); ?>" <?php } ?> value="<?php if( isset( $_POST[$field['merge']] ) && $form_submitted != 1 ) { echo $_POST[$field['merge']]; } else { echo esc_attr( $default_value ); } ?>" onblur="properlyFormatURLField(this);return false;">
+										<input <?php echo implode( ' ', $field_array ); ?> type="url" <?php if ( $field[ 'type' ] == 'url' ) { ?> title="<?php _e( 'Please enter a valid URL to the website.', 'yikes-inc-easy-mailchimp-extender' ); ?>" <?php } else { ?> title="<?php _e( 'Please enter a valid URL to the image.', 'yikes-inc-easy-mailchimp-extender' ); ?>" <?php } ?> value="<?php if ( isset( $_POST[ $field[ 'merge' ] ] ) && $form_submitted != 1 ) { echo $_POST[ $field[ 'merge' ] ]; } else { echo esc_attr( $default_value ); } ?>" onblur="properlyFormatURLField(this);return false;">
 
 										<!-- description -->
-										<?php if( isset( $field['description'] ) && trim( $field['description'] ) != '' ) { ?>
+										<?php if ( isset( $field[ 'description' ] ) && trim( $field[ 'description' ] ) != '' ) { ?>
 											<p class="form-field-description">
 												<small>
-													<?php echo apply_filters( 'yikes-mailchimp-' . $field['merge'] . '-description', esc_attr( stripslashes( $field['description'] ) ), $form_id ); ?>
+													<?php echo apply_filters( 'yikes-mailchimp-' . $field[ 'merge' ] . '-description', esc_attr( stripslashes( $field[ 'description' ] ) ), $form_id ); ?>
 												</small>
 											</p>
 										<?php } ?>
@@ -561,8 +561,8 @@ 
 							break;
 
 							case 'phone':
-								$default_value = ( isset( $field['default'] ) ? esc_attr( $field['default'] ) : '' );
-								$phone_format = $field['phone_format'];
+								$default_value = ( isset( $field[ 'default' ] ) ? esc_attr( $field[ 'default' ] ) : '' );
+								$phone_format = $field[ 'phone_format' ];
 								?>
 									<script type="text/javascript">
 										/* Replace incorrect values and format it correctly for MailChimp API */
@@ -575,22 +575,22 @@ 
 										}
 									</script>
 
-									<label for="<?php echo $field['merge']; ?>" <?php echo implode( ' ' , $label_array ); ?>>
+									<label for="<?php echo $field[ 'merge' ]; ?>" <?php echo implode( ' ', $label_array ); ?>>
 
 										<!-- dictate label visibility -->
-										<?php if( !isset( $field['hide-label'] ) ) { ?>
-											<span class="<?php echo esc_attr( $field['merge'] ) . '-label'; ?>">
-												<?php echo apply_filters( 'yikes-mailchimp-'.$field['merge'].'-label' , esc_attr( stripslashes( $field['label'] ) ) ); ?>
+										<?php if ( ! isset( $field[ 'hide-label' ] ) ) { ?>
+											<span class="<?php echo esc_attr( $field[ 'merge' ] ) . '-label'; ?>">
+												<?php echo apply_filters( 'yikes-mailchimp-' . $field[ 'merge' ] . '-label', esc_attr( stripslashes( $field[ 'label' ] ) ) ); ?>
 											</span>
 										<?php } ?>
 
-										<input <?php echo implode( ' ' , $field_array ); ?> type="text" <?php if( $phone_format != 'US' ) { ?>  title="<?php _e( 'International Phone Number' , 'yikes-inc-easy-mailchimp-extender' ); ?>" pattern="<?php echo apply_filters( 'yikes-mailchimp-international-phone-pattern' , '[0-9,-]{1,}' ); ?>" <?php } else { ?> title="<?php _e( 'US Phone Number (###) ### - ####' , 'yikes-inc-easy-mailchimp-extender' ); ?>" pattern="<?php echo apply_filters( 'yikes-mailchimp-us-phone-pattern' , '^(\([0-9]{3}\)|[0-9]{3}-)[0-9]{3}-[0-9]{4}$' ); ?>" onblur="formatUSPhoneNumber(this);"<?php } ?> value="<?php if( isset( $_POST[$field['merge']] ) && $form_submitted != 1 ) { echo $_POST[$field['merge']]; } else { echo esc_attr( $default_value ); } ?>">
+										<input <?php echo implode( ' ', $field_array ); ?> type="text" <?php if ( $phone_format != 'US' ) { ?>  title="<?php _e( 'International Phone Number', 'yikes-inc-easy-mailchimp-extender' ); ?>" pattern="<?php echo apply_filters( 'yikes-mailchimp-international-phone-pattern', '[0-9,-]{1,}' ); ?>" <?php } else { ?> title="<?php _e( 'US Phone Number (###) ### - ####', 'yikes-inc-easy-mailchimp-extender' ); ?>" pattern="<?php echo apply_filters( 'yikes-mailchimp-us-phone-pattern', '^(\([0-9]{3}\)|[0-9]{3}-)[0-9]{3}-[0-9]{4}$' ); ?>" onblur="formatUSPhoneNumber(this);"<?php } ?> value="<?php if ( isset( $_POST[ $field[ 'merge' ] ] ) && $form_submitted != 1 ) { echo $_POST[ $field[ 'merge' ] ]; } else { echo esc_attr( $default_value ); } ?>">
 
 										<!-- description -->
-										<?php if( isset( $field['description'] ) && trim( $field['description'] ) != '' ) { ?>
+										<?php if ( isset( $field[ 'description' ] ) && trim( $field[ 'description' ] ) != '' ) { ?>
 											<p class="form-field-description">
 												<small>
-													<?php echo apply_filters( 'yikes-mailchimp-' . esc_attr( $field['merge'] ) . '-description', stripslashes( $field['description'] ), $form_id ); ?>
+													<?php echo apply_filters( 'yikes-mailchimp-' . esc_attr( $field[ 'merge' ] ) . '-description', stripslashes( $field[ 'description' ] ), $form_id ); ?>
 												</small>
 											</p>
 										<?php } ?>
@@ -600,25 +600,25 @@ 
 							break;
 
 							case 'zip':
-								$default_value = ( isset( $field['default'] ) ? esc_attr( $field['default'] ) : '' );
+								$default_value = ( isset( $field[ 'default' ] ) ? esc_attr( $field[ 'default' ] ) : '' );
 
 									?>
-									<label for="<?php echo $field['merge']; ?>" <?php echo implode( ' ' , $label_array ); ?>>
+									<label for="<?php echo $field[ 'merge' ]; ?>" <?php echo implode( ' ', $label_array ); ?>>
 
 									<!-- dictate label visibility -->
-									<?php if( ! isset( $field['hide-label'] ) ) { ?>
-										<span class="<?php echo esc_attr( $field['merge'] ) . '-label'; ?>">
-											<?php echo apply_filters( 'yikes-mailchimp-'.$field['merge'].'-label' , esc_attr( stripslashes( $field['label'] ) ) ); ?>
+									<?php if ( ! isset( $field[ 'hide-label' ] ) ) { ?>
+										<span class="<?php echo esc_attr( $field[ 'merge' ] ) . '-label'; ?>">
+											<?php echo apply_filters( 'yikes-mailchimp-' . $field[ 'merge' ] . '-label', esc_attr( stripslashes( $field[ 'label' ] ) ) ); ?>
 										</span>
 									<?php } ?>
 
-									<input <?php echo implode( ' ' , $field_array ); ?> type="text" pattern="\d{5,5}(-\d{4,4})?" title="<?php _e( '5 digit zip code, numbers only' , 'yikes-inc-easy-mailchimp-extender' ); ?>" value="<?php if( isset( $_POST[$field['merge']] ) && $form_submitted != 1 ) { echo $_POST[$field['merge']]; } else { echo esc_attr( $default_value ); } ?>">
+									<input <?php echo implode( ' ', $field_array ); ?> type="text" pattern="\d{5,5}(-\d{4,4})?" title="<?php _e( '5 digit zip code, numbers only', 'yikes-inc-easy-mailchimp-extender' ); ?>" value="<?php if ( isset( $_POST[ $field[ 'merge' ] ] ) && $form_submitted != 1 ) { echo $_POST[ $field[ 'merge' ] ]; } else { echo esc_attr( $default_value ); } ?>">
 
 									<!-- description -->
-									<?php if( isset( $field['description'] ) ) { ?>
+									<?php if ( isset( $field[ 'description' ] ) ) { ?>
 										<p class="form-field-description">
 											<small>
-												<?php echo apply_filters( 'yikes-mailchimp-' . $field['merge'] . '-description', esc_attr( stripslashes( $field['description'] ) ), $form_id ); ?>
+												<?php echo apply_filters( 'yikes-mailchimp-' . $field[ 'merge' ] . '-description', esc_attr( stripslashes( $field[ 'description' ] ) ), $form_id ); ?>
 											</small>
 										</p>
 									<?php } ?>
@@ -630,28 +630,28 @@ 
 
 							case 'address':
 								// required fields
-								$required_fields = array( 'addr1' => 'address' , 'addr2' => 'address 2', 'city' => 'city', 'state' =>'state', 'zip' =>'zip' , 'country' => 'country' );
+								$required_fields = array( 'addr1' => 'address', 'addr2' => 'address 2', 'city' => 'city', 'state' =>'state', 'zip' =>'zip', 'country' => 'country' );
 
 								// setup the default country value
 								$default_country = apply_filters( 'yikes-mailchimp-default-country-value', 'US' );
 
 								// store number for looping
 								$x = 1;
-								foreach( $required_fields as $type => $label ) {
+								foreach ( $required_fields as $type => $label ) {
 
 									// set the field names for the addrress fields
-									$field_array['name'] = 'name="'.$field[$tag].'['.$type.']'.'"';
+									$field_array[ 'name' ] = 'name="' . $field[ $tag ] . '[' . $type . ']' . '"';
 
 									// reset the label classes for left-half/right-half for addresses
-									if( isset( $label_array['class'] ) ) {
+									if ( isset( $label_array[ 'class' ] ) ) {
 										if ( $x % 2 == 0 ) {
-											$label_array['class'] = str_replace( 'field-left-half', 'field-right-half', $label_array['class'] );
+											$label_array[ 'class' ] = str_replace( 'field-left-half', 'field-right-half', $label_array[ 'class' ] );
 										} else {
-											$label_array['class'] = str_replace( 'field-right-half', 'field-left-half', $label_array['class'] );
+											$label_array[ 'class' ] = str_replace( 'field-right-half', 'field-left-half', $label_array[ 'class' ] );
 										}
 									}
 
-									switch( $type ) {
+									switch ( $type ) {
 
 										default:
 										case 'addr1':
@@ -660,17 +660,17 @@ 
 
 
 											?>
-											<label for="<?php echo $field['merge']; ?>" data-attr-name="<?php echo esc_attr( $type ); ?>-field" <?php echo implode( ' ' , $label_array ); ?>>
+											<label for="<?php echo $field[ 'merge' ]; ?>" data-attr-name="<?php echo esc_attr( $type ); ?>-field" <?php echo implode( ' ', $label_array ); ?>>
 
 												<!-- dictate label visibility -->
-												<?php if( ! isset( $field['hide-label'] ) ) { ?>
-													<span class="<?php echo esc_attr( $field['merge'] ) . '-label'; ?>">
-														<?php echo ucwords( apply_filters( 'yikes-mailchimp-address-'.$type.'-label' , esc_attr( $label ) ) ); ?>
+												<?php if ( ! isset( $field[ 'hide-label' ] ) ) { ?>
+													<span class="<?php echo esc_attr( $field[ 'merge' ] ) . '-label'; ?>">
+														<?php echo ucwords( apply_filters( 'yikes-mailchimp-address-' . $type . '-label', esc_attr( $label ) ) ); ?>
 													</span>
 												<?php } ?>
 
 
-												<input <?php echo implode( ' ' , $field_array ); ?> type="text"  value="<?php if( isset( $_POST[$field['merge']] ) && $form_submitted != 1 ) { echo $_POST[$field['merge']]; } ?>">
+												<input <?php echo implode( ' ', $field_array ); ?> type="text"  value="<?php if ( isset( $_POST[ $field[ 'merge' ] ] ) && $form_submitted != 1 ) { echo $_POST[ $field[ 'merge' ] ]; } ?>">
 
 											</label>
 											<?php
@@ -680,16 +680,16 @@ 
 										case 'state':
 
 											?>
-											<label for="<?php echo $field['merge']; ?>" <?php echo implode( ' ' , $label_array ); ?> data-attr-name="state-dropdown"<?php if( ! in_array( $default_country, array( 'US' ) ) ) { ?> style="display: none;"<?php } ?>>
+											<label for="<?php echo $field[ 'merge' ]; ?>" <?php echo implode( ' ', $label_array ); ?> data-attr-name="state-dropdown"<?php if ( ! in_array( $default_country, array( 'US' ) ) ) { ?> style="display: none;"<?php } ?>>
 
 												<!-- dictate label visibility -->
-												<?php if( ! isset( $field['hide-label'] ) ) { ?>
-													<span class="<?php echo esc_attr( $field['merge'] ) . '-label'; ?>">
-														<?php echo ucwords( apply_filters( 'yikes-mailchimp-address-'.$type.'-label' , esc_attr( $label ) ) ); ?>
+												<?php if ( ! isset( $field[ 'hide-label' ] ) ) { ?>
+													<span class="<?php echo esc_attr( $field[ 'merge' ] ) . '-label'; ?>">
+														<?php echo ucwords( apply_filters( 'yikes-mailchimp-address-' . $type . '-label', esc_attr( $label ) ) ); ?>
 													</span>
 												<?php } ?>
 
-												<select <?php echo implode( ' ' , $field_array ); ?>>
+												<select <?php echo implode( ' ', $field_array ); ?>>
 													<?php include( YIKES_MC_PATH . 'public/partials/shortcodes/templates/state-dropdown.php' ); ?>
 												</select>
 
@@ -702,15 +702,15 @@ 
 										case 'zip':
 
 											?>
-											<label for="<?php echo $field['merge']; ?>" <?php echo implode( ' ' , $label_array ); ?> data-attr-name="zip-input"<?php if( ! in_array( $default_country, array( 'US', 'GB' ) ) ) { ?> style="display: none;"<?php } ?>>
+											<label for="<?php echo $field[ 'merge' ]; ?>" <?php echo implode( ' ', $label_array ); ?> data-attr-name="zip-input"<?php if ( ! in_array( $default_country, array( 'US', 'GB' ) ) ) { ?> style="display: none;"<?php } ?>>
 
-												<?php if( ! isset( $field['hide-label'] ) ) { ?>
-													<span class="<?php echo esc_attr( $field['merge'] ) . '-label'; ?>">
-														<?php echo ucwords( apply_filters( 'yikes-mailchimp-address-'.$type.'-label' , esc_attr( $label ) ) ); ?>
+												<?php if ( ! isset( $field[ 'hide-label' ] ) ) { ?>
+													<span class="<?php echo esc_attr( $field[ 'merge' ] ) . '-label'; ?>">
+														<?php echo ucwords( apply_filters( 'yikes-mailchimp-address-' . $type . '-label', esc_attr( $label ) ) ); ?>
 													</span>
 												<?php } ?>
 
-												<input <?php echo implode( ' ' , $field_array ); ?> type="text" pattern="<?php echo apply_filters( 'yikes-mailchimp-zip-pattern', '\d{5,5}(-\d{4,4})?' ); ?>" title="<?php _e( '5 digit zip code, numbers only' , 'yikes-inc-easy-mailchimp-extender' ); ?>" value="<?php if( isset( $_POST[$field['merge']] ) && $form_submitted != 1 ) { echo $_POST[$field['merge']]; } else { echo esc_attr( $default_value ); } ?>">
+												<input <?php echo implode( ' ', $field_array ); ?> type="text" pattern="<?php echo apply_filters( 'yikes-mailchimp-zip-pattern', '\d{5,5}(-\d{4,4})?' ); ?>" title="<?php _e( '5 digit zip code, numbers only', 'yikes-inc-easy-mailchimp-extender' ); ?>" value="<?php if ( isset( $_POST[ $field[ 'merge' ] ] ) && $form_submitted != 1 ) { echo $_POST[ $field[ 'merge' ] ]; } else { echo esc_attr( $default_value ); } ?>">
 
 											</label>
 											<?php
@@ -748,16 +748,16 @@ 
 												$default_country = apply_filters( 'yikes-mailchimp-default-country-value', 'US' );
 											?>
 
-											<label for="<?php echo $field['merge']; ?>" data-attr-name="<?php echo esc_attr( $type ); ?>-field" <?php echo implode( ' ' , $label_array ); ?>>
+											<label for="<?php echo $field[ 'merge' ]; ?>" data-attr-name="<?php echo esc_attr( $type ); ?>-field" <?php echo implode( ' ', $label_array ); ?>>
 
 												<!-- dictate label visibility -->
-												<?php if( !isset( $field['hide-label'] ) ) { ?>
-													<span class="<?php echo esc_attr( $field['merge'] ) . '-label'; ?>">
-														<?php echo ucwords( apply_filters( 'yikes-mailchimp-address-'.$type.'-label' , esc_attr( $label ) ) ); ?>
+												<?php if ( ! isset( $field[ 'hide-label' ] ) ) { ?>
+													<span class="<?php echo esc_attr( $field[ 'merge' ] ) . '-label'; ?>">
+														<?php echo ucwords( apply_filters( 'yikes-mailchimp-address-' . $type . '-label', esc_attr( $label ) ) ); ?>
 													</span>
 												<?php } ?>
 
-												<select <?php echo implode( ' ' , $field_array ); ?> onchange="checkCountry(this);return false;">
+												<select <?php echo implode( ' ', $field_array ); ?> onchange="checkCountry(this);return false;">
 													<?php include( YIKES_MC_PATH . 'public/partials/shortcodes/templates/country-dropdown.php' ); ?>
 												</select>
 											</label>
@@ -768,10 +768,10 @@ 
 								}
 
 								// description
-								if( isset( $field['description'] ) && trim( $field['description'] ) != '' ) { ?>
+								if ( isset( $field[ 'description' ] ) && trim( $field[ 'description' ] ) != '' ) { ?>
 									<p class="form-field-description">
 										<small>
-											<?php echo apply_filters( 'yikes-mailchimp-' . $field['merge'] . '-description', esc_attr( trim( stripslashes( $field['description'] ) ) ), $form_id ); ?>
+											<?php echo apply_filters( 'yikes-mailchimp-' . $field[ 'merge' ] . '-description', esc_attr( trim( stripslashes( $field[ 'description' ] ) ) ), $form_id ); ?>
 										</small>
 									</p>
 									<?php }
@@ -781,19 +781,19 @@ 
 							case 'birthday':
 
 								// bootstrap datepicker requirements
-								wp_enqueue_script( 'bootstrap-hover-dropdown' , YIKES_MC_URL . 'public/js/bootstrap-hover-dropdown.min.js' , array( 'jquery' ) );
-								wp_enqueue_script( 'bootstrap-datepicker-script' , YIKES_MC_URL . 'public/js/bootstrap-datepicker.min.js' , array( 'jquery' , 'bootstrap-hover-dropdown' ) );
-								wp_enqueue_style( 'bootstrap-datepicker-styles' , YIKES_MC_URL . 'public/css/bootstrap-datepicker3.standalone.min.css' );
-								wp_enqueue_style( 'override-datepicker-styles' , YIKES_MC_URL . 'public/css/yikes-inc-easy-mailchimp-datepicker-styles.css' , array( 'bootstrap-datepicker-styles' ) );
+								wp_enqueue_script( 'bootstrap-hover-dropdown', YIKES_MC_URL . 'public/js/bootstrap-hover-dropdown.min.js', array( 'jquery' ) );
+								wp_enqueue_script( 'bootstrap-datepicker-script', YIKES_MC_URL . 'public/js/bootstrap-datepicker.min.js', array( 'jquery', 'bootstrap-hover-dropdown' ) );
+								wp_enqueue_style( 'bootstrap-datepicker-styles', YIKES_MC_URL . 'public/css/bootstrap-datepicker3.standalone.min.css' );
+								wp_enqueue_style( 'override-datepicker-styles', YIKES_MC_URL . 'public/css/yikes-inc-easy-mailchimp-datepicker-styles.css', array( 'bootstrap-datepicker-styles' ) );
 
-								switch ( $field['type'] ) {
+								switch ( $field[ 'type' ] ) {
 									default:
 									case 'date':
-										$date_format = ( isset( $field['date_format'] ) ) ? $field['date_format'] : 'mm/dd/yy';
+										$date_format = ( isset( $field[ 'date_format' ] ) ) ? $field[ 'date_format' ] : 'mm/dd/yy';
 										break;
 
 									case 'birthday':
-										$date_format = ( isset( $field['date_format'] ) ) ? strtolower( $field['date_format'] ) : 'mm/dd';
+										$date_format = ( isset( $field[ 'date_format' ] ) ) ? strtolower( $field[ 'date_format' ] ) : 'mm/dd';
 										break;
 								}
 								// initialize the datepicker
@@ -804,7 +804,7 @@ 
 											padding: .85em .5em !important;
 										}
 										<?php
-											if( wp_is_mobile() ) {
+											if ( wp_is_mobile() ) {
 												?>
 												.datepicker-dropdown {
 													margin-top: 0px;
@@ -819,7 +819,7 @@ 
 											$day_names = $admin_class->yikes_jQuery_datepicker_strip_array_indices( $wp_locale->weekday );
 											$day_names_short = $admin_class->yikes_jQuery_datepicker_strip_array_indices( $wp_locale->weekday_abbrev );
 											$day_names_min = $admin_class->yikes_jQuery_datepicker_strip_array_indices( $wp_locale->weekday_initial );
-											$date_format = $admin_class->yikes_jQuery_datepicker_date_format_php_to_js( $date_format, $field['type'] );
+											$date_format = $admin_class->yikes_jQuery_datepicker_date_format_php_to_js( $date_format, $field[ 'type' ] );
 											$first_day = get_option( 'start_of_week' );
 											$isRTL = $wp_locale->is_rtl();
 										?>
@@ -840,10 +840,10 @@ 
 												numberOfMonths: 1,
 												today: '<?php _e( 'Today', 'yikes-inc-easy-mailchimp-extender' ); ?>'
 											};
-											jQuery('input[data-attr-type="<?php echo $field['type']; ?>"]').datepicker().on( 'show', function( e ) {
-												var date_picker_height = jQuery('input[data-attr-type="<?php echo $field['type']; ?>"]').css( 'height' );
+											jQuery('input[data-attr-type="<?php echo $field[ 'type' ]; ?>"]').datepicker().on( 'show', function( e ) {
+												var date_picker_height = jQuery('input[data-attr-type="<?php echo $field[ 'type' ]; ?>"]').css( 'height' );
 												date_picker_height = parseInt( date_picker_height.replace( 'px', '' ) ) + parseInt( 15 ) + 'px';
-												var date_picker_width = jQuery('input[data-attr-type="<?php echo $field['type']; ?>"]').css( 'width' ).replace( 'px', '' );
+												var date_picker_width = jQuery('input[data-attr-type="<?php echo $field[ 'type' ]; ?>"]').css( 'width' ).replace( 'px', '' );
 												if( date_picker_width > 500 ) {
 													date_picker_width = 500;
 												}
@@ -853,27 +853,27 @@ 
 									</script>
 								<?php
 
-								$default_value = ( isset( $field['default'] ) ? esc_attr( $field['default'] ) : '' );
+								$default_value = ( isset( $field[ 'default' ] ) ? esc_attr( $field[ 'default' ] ) : '' );
 								// store empty number for looping
 								$x = 0;
 
 								?>
-									<label for="<?php echo esc_attr( $field['merge'] ); ?>" <?php echo implode( ' ' , $label_array ); ?>>
+									<label for="<?php echo esc_attr( $field[ 'merge' ] ); ?>" <?php echo implode( ' ', $label_array ); ?>>
 
 										<!-- dictate label visibility -->
-										<?php if( !isset( $field['hide-label'] ) ) { ?>
-											<span class="<?php echo esc_attr( $field['merge'] ) . '-label'; ?>">
-												<?php echo apply_filters( 'yikes-mailchimp-'.$field['merge'].'-label' , esc_attr( stripslashes( $field['label'] ) ) ); ?>
+										<?php if ( ! isset( $field[ 'hide-label' ] ) ) { ?>
+											<span class="<?php echo esc_attr( $field[ 'merge' ] ) . '-label'; ?>">
+												<?php echo apply_filters( 'yikes-mailchimp-' . $field[ 'merge' ] . '-label', esc_attr( stripslashes( $field[ 'label' ] ) ) ); ?>
 											</span>
 										<?php } ?>
 
-										<input <?php echo implode( ' ' , $field_array ); ?> type="text" <?php if( $field['type'] == 'date' ) { ?> data-attr-type="date" <?php } else { ?> data-attr-type="birthday" <?php } ?> value="<?php if( isset( $_POST[$field['merge']] ) && $form_submitted != 1 ) { echo $_POST[$field['merge']]; } else { echo esc_attr( $default_value ); } ?>">
+										<input <?php echo implode( ' ', $field_array ); ?> type="text" <?php if ( $field[ 'type' ] == 'date' ) { ?> data-attr-type="date" <?php } else { ?> data-attr-type="birthday" <?php } ?> value="<?php if ( isset( $_POST[ $field[ 'merge' ] ] ) && $form_submitted != 1 ) { echo $_POST[ $field[ 'merge' ] ]; } else { echo esc_attr( $default_value ); } ?>">
 
 										<!-- description -->
-										<?php if( isset( $field['description'] ) && trim( $field['description'] ) != '' ) { ?>
+										<?php if ( isset( $field[ 'description' ] ) && trim( $field[ 'description' ] ) != '' ) { ?>
 											<p class="form-field-description">
 												<small>
-													<?php echo apply_filters( 'yikes-mailchimp-' . $field['merge'] . '-description', esc_attr( trim( stripslashes( $field['description'] ) ) ), $form_id ); ?>
+													<?php echo apply_filters( 'yikes-mailchimp-' . $field[ 'merge' ] . '-description', esc_attr( trim( stripslashes( $field[ 'description' ] ) ) ), $form_id ); ?>
 												</small>
 											</p>
 										<?php } ?>
@@ -884,36 +884,36 @@ 
 							break;
 
 							case 'dropdown':
-								$default_value = $field['default_choice'];
+								$default_value = $field[ 'default_choice' ];
 								// store empty number for looping
 								$x = 0;
 								// hidden labels
 
 									?>
-									<label for="<?php echo esc_attr( $field['merge'] ); ?>" <?php echo implode( ' ' , $label_array ); ?>>
+									<label for="<?php echo esc_attr( $field[ 'merge' ] ); ?>" <?php echo implode( ' ', $label_array ); ?>>
 										<!-- dictate label visibility -->
-										<?php if( ! isset( $field['hide-label'] ) ) { ?>
-											<span class="<?php echo esc_attr( $field['merge'] ) . '-label'; ?>">
-												<?php echo apply_filters( 'yikes-mailchimp-'.$field['merge'].'-label' , esc_attr( stripslashes( $field['label'] ) ) ); ?>
+										<?php if ( ! isset( $field[ 'hide-label' ] ) ) { ?>
+											<span class="<?php echo esc_attr( $field[ 'merge' ] ) . '-label'; ?>">
+												<?php echo apply_filters( 'yikes-mailchimp-' . $field[ 'merge' ] . '-label', esc_attr( stripslashes( $field[ 'label' ] ) ) ); ?>
 											</span>
 										<?php } ?>
 
-										<select <?php echo implode( ' ' , $field_array ); ?>>
+										<select <?php echo implode( ' ', $field_array ); ?>>
 											<?php
 												// decode for looping
-												$choices = json_decode( $field['choices'], true );
-												foreach( $choices as $choice ) {
-													?><option value="<?php echo $choice; ?>" <?php selected( $default_value , $x ); ?>><?php echo esc_attr( stripslashes( $choice ) ); ?></option><?php
+												$choices = json_decode( $field[ 'choices' ], true );
+												foreach ( $choices as $choice ) {
+													?><option value="<?php echo $choice; ?>" <?php selected( $default_value, $x ); ?>><?php echo esc_attr( stripslashes( $choice ) ); ?></option><?php
 													$x++;
 												}
 											?>
 										</select>
 
 										<!-- description -->
-										<?php if( isset( $field['description'] ) && trim( $field['description'] ) != '' ) { ?>
+										<?php if ( isset( $field[ 'description' ] ) && trim( $field[ 'description' ] ) != '' ) { ?>
 											<p class="form-field-description">
 												<small>
-													<?php echo apply_filters( 'yikes-mailchimp-' . $field['merge'] . '-description', esc_attr( trim( stripslashes( $field['description'] ) ) ), $form_id ); ?>
+													<?php echo apply_filters( 'yikes-mailchimp-' . $field[ 'merge' ] . '-description', esc_attr( trim( stripslashes( $field[ 'description' ] ) ) ), $form_id ); ?>
 												</small>
 											</p>
 										<?php } ?>
@@ -927,13 +927,13 @@ 
 							case 'radio':
 							case 'checkbox':
 								// remove the ID (as to not assign the same ID to every radio button)
-								unset( $field_array['id'] );
-								$choices = json_decode( $field['choices'], true );
+								unset( $field_array[ 'id' ] );
+								$choices = json_decode( $field[ 'choices' ], true );
 								// assign a default choice
-								$default_value = ( isset( $field['default_choice'] ) && $field['default_choice'] != '' ) ? $field['default_choice'] : $choices[0];
+								$default_value = ( isset( $field[ 'default_choice' ] ) && $field[ 'default_choice' ] != '' ) ? $field[ 'default_choice' ] : $choices[ 0 ];
 								// if the form was submit, but failed, let's reset the post data
-								if( isset( $_POST[$field['merge']] ) && $form_submitted != 1 ) {
-									$default_value = $_POST[$field['merge']];
+								if ( isset( $_POST[ $field[ 'merge' ] ] ) && $form_submitted != 1 ) {
+									$default_value = $_POST[ $field[ 'merge' ] ];
 								}
 								$count = count( $choices );
 								$i = 1;
@@ -942,20 +942,20 @@ 
 								// hidden labels
 
 									?>
-									<label for="<?php echo esc_attr( $field['merge'] ); ?>" <?php echo implode( ' ' , $label_array ); ?>>
+									<label for="<?php echo esc_attr( $field[ 'merge' ] ); ?>" <?php echo implode( ' ', $label_array ); ?>>
 
 										<!-- dictate label visibility -->
-										<?php if( ! isset( $field['hide-label'] ) ) { ?>
-											<span class="<?php echo esc_attr( $field['merge'] ). '-label'; ?> checkbox-parent-label">
-												<?php echo apply_filters( 'yikes-mailchimp-'.$field['merge'].'-label' , esc_attr( stripslashes( $field['label'] ) ) ); ?>
+										<?php if ( ! isset( $field[ 'hide-label' ] ) ) { ?>
+											<span class="<?php echo esc_attr( $field[ 'merge' ] ) . '-label'; ?> checkbox-parent-label">
+												<?php echo apply_filters( 'yikes-mailchimp-' . $field[ 'merge' ] . '-label', esc_attr( stripslashes( $field[ 'label' ] ) ) ); ?>
 											</span>
 										<?php }
 
-										foreach( $choices as $choice ) {
+										foreach ( $choices as $choice ) {
 											?>
-											<label for="<?php echo esc_attr( $field['merge'] ) . '-' . $i; ?>" class="yikes-easy-mc-checkbox-label <?php echo implode( ' ' , $custom_classes ); if( $i === $count ) { ?> last-selection<?php } ?>" <?php if( $i == 1 ) { echo $field_array['required']; } ?>>
-												<input type="<?php echo esc_attr( $field['type'] ); ?>" name="<?php echo $field['merge']; ?>" id="<?php echo $field['merge'] . '-' . $i; ?>" <?php checked( $default_value , $x ); ?> value="<?php echo esc_attr( $choice ); ?>">
-												<span class="<?php echo esc_attr( $field['merge'] ). '-label'; ?>"><?php echo stripslashes( $choice ); ?></span>
+											<label for="<?php echo esc_attr( $field[ 'merge' ] ) . '-' . $i; ?>" class="yikes-easy-mc-checkbox-label <?php echo implode( ' ', $custom_classes ); if ( $i === $count ) { ?> last-selection<?php } ?>" <?php if ( $i == 1 ) { echo $field_array[ 'required' ]; } ?>>
+												<input type="<?php echo esc_attr( $field[ 'type' ] ); ?>" name="<?php echo $field[ 'merge' ]; ?>" id="<?php echo $field[ 'merge' ] . '-' . $i; ?>" <?php checked( $default_value, $x ); ?> value="<?php echo esc_attr( $choice ); ?>">
+												<span class="<?php echo esc_attr( $field[ 'merge' ] ) . '-label'; ?>"><?php echo stripslashes( $choice ); ?></span>
 											</label>
 											<?php
 											$i++;
@@ -963,10 +963,10 @@ 
 										}
 
 										// description
-										if( isset( $field['description'] ) && trim( $field['description'] ) != '' ) { ?>
+										if ( isset( $field[ 'description' ] ) && trim( $field[ 'description' ] ) != '' ) { ?>
 											<p class="form-field-description">
 												<small>
-													<?php echo apply_filters( 'yikes-mailchimp-' . $field['merge'] . '-description', esc_attr( trim( stripslashes( $field['description'] ) ) ), $form_id ); ?>
+													<?php echo apply_filters( 'yikes-mailchimp-' . $field[ 'merge' ] . '-description', esc_attr( trim( stripslashes( $field[ 'description' ] ) ) ), $form_id ); ?>
 												</small>
 											</p>
 										<?php } ?>
@@ -982,26 +982,26 @@ 
 
 
 						// store default choice
-						$default_choice = ( isset( $field['default_choice'] ) && ! empty( $field['default_choice'] ) ) ? ( is_array( $field['default_choice'] ) ? $field['default_choice'] : $field['default_choice'] ) : ( isset( $field['default_choice'] ) ? $field['default_choice'] : '' );
+						$default_choice = ( isset( $field[ 'default_choice' ] ) && ! empty( $field[ 'default_choice' ] ) ) ? ( is_array( $field[ 'default_choice' ] ) ? $field[ 'default_choice' ] : $field[ 'default_choice' ] ) : ( isset( $field[ 'default_choice' ] ) ? $field[ 'default_choice' ] : '' );
 
 						// if the form was submit, but failed, let's reset the post data
-						if( isset( $_POST[$field['group_id']] ) && $form_submitted != 1 ) {
-							$default_choice = $_POST[$field['group_id']];
+						if ( isset( $_POST[ $field[ 'group_id' ] ] ) && $form_submitted != 1 ) {
+							$default_choice = $_POST[ $field[ 'group_id' ] ];
 						}
 
 						// get our groups
-						$groups = ( isset( $field['groups'] ) && ! empty( $field['groups'] ) ) ? json_decode( $field['groups'], true ) : array();
+						$groups = ( isset( $field[ 'groups' ] ) && ! empty( $field[ 'groups' ] ) ) ? json_decode( $field[ 'groups' ], true ) : array();
 
 						$count = count( $groups );
 
-						if( $field['type'] == 'checkboxes' ) {
+						if ( $field[ 'type' ] == 'checkboxes' ) {
 							$type = 'checkbox';
-						} else if( $field['type'] == 'radio' ) {
+						} else if ( $field[ 'type' ] == 'radio' ) {
 							$type = 'radio';
 						}
 
 						// loop over the interest group field types
-						switch ( $field['type'] ) {
+						switch ( $field[ 'type' ] ) {
 
 							case 'checkboxes':
 							case 'radio':
@@ -1009,18 +1009,18 @@ 
 								$x = 1; // used to find the last item of our array
 
 									?>
-									<label for="<?php echo esc_attr( $field['group_id'] ); ?>" <?php echo implode( ' ' , $label_array ); ?>>
-										<?php if( ! isset( $field['hide-label'] ) ) { ?>
+									<label for="<?php echo esc_attr( $field[ 'group_id' ] ); ?>" <?php echo implode( ' ', $label_array ); ?>>
+										<?php if ( ! isset( $field[ 'hide-label' ] ) ) { ?>
 											<!-- dictate label visibility -->
-											<span class="<?php echo esc_attr( $field['group_id'] ) . '-label'; ?> checkbox-parent-label">
-												<?php echo apply_filters( 'yikes-mailchimp-'.$field['group_id'].'-label' , esc_attr( $field['label'] ) ); ?>
+											<span class="<?php echo esc_attr( $field[ 'group_id' ] ) . '-label'; ?> checkbox-parent-label">
+												<?php echo apply_filters( 'yikes-mailchimp-' . $field[ 'group_id' ] . '-label', esc_attr( $field[ 'label' ] ) ); ?>
 											</span>
 									<?php
 										}
 
 										// Display Submission Errors
-										if( ! empty( $missing_required_checkbox_interest_groups ) ) {
-											if( in_array( $field['group_id'], $missing_required_checkbox_interest_groups ) ) {
+										if ( ! empty( $missing_required_checkbox_interest_groups ) ) {
+											if ( in_array( $field[ 'group_id' ], $missing_required_checkbox_interest_groups ) ) {
 												?>
 													<p class="yikes-mailchimp-required-interest-group-error">
 														<?php echo apply_filters( 'yikes-mailchimp-interest-group-checkbox-error', __( 'This field is required.', 'yikes-inc-easy-mailchimp-extender' ), $form_id ); ?>
@@ -1031,19 +1031,19 @@ 
 
 
 
-										foreach( $groups as $group ) {
-											if( $field['type'] == 'checkboxes' ) {
+										foreach ( $groups as $group ) {
+											if ( $field[ 'type' ] == 'checkboxes' ) {
 												/* Setup the defaults for this field - varies if the field was previously submitted */
-												if( isset( $_POST[$field['group_id']] ) && $form_submitted != 1 ) {
-													$default_choice = $_POST[$field['group_id']];
-												} elseif( ( ! isset( $_POST['yikes-mailchimp-honeypot'] ) && $form_submitted != 1 ) || ( isset( $_POST['yikes-mailchimp-honeypot'] ) && $form_submitted == 1 ) ) {
-													$default_choice = ( isset( $field['default_choice'] ) && ! empty( $field['default_choice'] ) ) ? ( is_array( $field['default_choice'] ) ? $field['default_choice'] : $field['default_choice'] ) : array();
+												if ( isset( $_POST[ $field[ 'group_id' ] ] ) && $form_submitted != 1 ) {
+													$default_choice = $_POST[ $field[ 'group_id' ] ];
+												} elseif ( ( ! isset( $_POST[ 'yikes-mailchimp-honeypot' ] ) && $form_submitted != 1 ) || ( isset( $_POST[ 'yikes-mailchimp-honeypot' ] ) && $form_submitted == 1 ) ) {
+													$default_choice = ( isset( $field[ 'default_choice' ] ) && ! empty( $field[ 'default_choice' ] ) ) ? ( is_array( $field[ 'default_choice' ] ) ? $field[ 'default_choice' ] : $field[ 'default_choice' ] ) : array();
 												}
 											}
 											?>
-											<label for="<?php echo $field['group_id'] . '-' . $i; ?>" class="yikes-easy-mc-checkbox-label <?php echo implode( ' ' , $custom_classes ); if( $x === $count ) { ?> last-selection<?php } ?>">
-												<input <?php if( isset( $field['require'] ) && $field['require'] == 1 ) { ?> class="yikes-interest-group-required" <?php } ?> type="<?php echo $type; ?>" name="<?php echo $field['group_id']; ?>[]" id="<?php echo $field['group_id'] . '-' . $i; ?>" <?php if( $field['type'] == 'checkboxes' ) { if( ( ( isset( $_POST['yikes-mailchimp-honeypot' ] ) && $form_submitted == 1 && in_array( $i , $default_choice )) || ! isset( $_POST['yikes-mailchimp-honeypot' ] ) && $form_submitted != 1 && in_array( $i , $default_choice ) ) || ( ( $form_submitted != 1 && isset( $_POST[$field['group_id']] ) ) && in_array( esc_attr( $group['name'] ), $default_choice ) ) ) { echo 'checked="checked"'; } } else { checked( ( isset( $default_choice ) && is_array( $default_choice ) ) ? $default_choice[0] : $default_choice , $i ); } ?> value="<?php echo esc_attr( $group['name'] ); ?>">
-												<?php echo $group['name']; ?>
+											<label for="<?php echo $field[ 'group_id' ] . '-' . $i; ?>" class="yikes-easy-mc-checkbox-label <?php echo implode( ' ', $custom_classes ); if ( $x === $count ) { ?> last-selection<?php } ?>">
+												<input <?php if ( isset( $field[ 'require' ] ) && $field[ 'require' ] == 1 ) { ?> class="yikes-interest-group-required" <?php } ?> type="<?php echo $type; ?>" name="<?php echo $field[ 'group_id' ]; ?>[]" id="<?php echo $field[ 'group_id' ] . '-' . $i; ?>" <?php if ( $field[ 'type' ] == 'checkboxes' ) { if ( ( ( isset( $_POST[ 'yikes-mailchimp-honeypot' ] ) && $form_submitted == 1 && in_array( $i, $default_choice ) ) || ! isset( $_POST[ 'yikes-mailchimp-honeypot' ] ) && $form_submitted != 1 && in_array( $i, $default_choice ) ) || ( ( $form_submitted != 1 && isset( $_POST[ $field[ 'group_id' ] ] ) ) && in_array( esc_attr( $group[ 'name' ] ), $default_choice ) ) ) { echo 'checked="checked"'; } } else { checked( ( isset( $default_choice ) && is_array( $default_choice ) ) ? $default_choice[ 0 ] : $default_choice, $i ); } ?> value="<?php echo esc_attr( $group[ 'name' ] ); ?>">
+												<?php echo $group[ 'name' ]; ?>
 											</label>
 											<?php
 											$i++;
@@ -1051,10 +1051,10 @@ 
 										}
 
 										// description
-										if( isset( $field['description'] ) && trim( $field['description'] ) != '' ) { ?>
+										if ( isset( $field[ 'description' ] ) && trim( $field[ 'description' ] ) != '' ) { ?>
 											<p class="form-field-description">
 												<small>
-													<?php echo apply_filters( 'yikes-mailchimp-' . $field['group_id'] . '-description', esc_attr( trim( $field['description'] ) ), $form_id ); ?>
+													<?php echo apply_filters( 'yikes-mailchimp-' . $field[ 'group_id' ] . '-description', esc_attr( trim( $field[ 'description' ] ) ), $form_id ); ?>
 												</small>
 											</p>
 										<?php } ?>
@@ -1068,28 +1068,28 @@ 
 
 									?>
 
-									<label for="<?php echo esc_attr( $field['group_id'] ); ?>" <?php echo implode( ' ' , $label_array ); ?>>
+									<label for="<?php echo esc_attr( $field[ 'group_id' ] ); ?>" <?php echo implode( ' ', $label_array ); ?>>
 										<!-- dictate label visibility -->
-										<?php if( ! isset( $field['hide-label'] ) ) { ?>
-											<span class="<?php echo esc_attr( $field['group_id'] ) . '-label'; ?>">
-												<?php echo apply_filters( 'yikes-mailchimp-'.$field['group_id'].'-label' , esc_attr( $field['label'] ) ); ?>
+										<?php if ( ! isset( $field[ 'hide-label' ] ) ) { ?>
+											<span class="<?php echo esc_attr( $field[ 'group_id' ] ) . '-label'; ?>">
+												<?php echo apply_filters( 'yikes-mailchimp-' . $field[ 'group_id' ] . '-label', esc_attr( $field[ 'label' ] ) ); ?>
 											</span>
 										<?php } ?>
 
-										<select <?php echo implode( ' ' , $field_array ); ?>>
+										<select <?php echo implode( ' ', $field_array ); ?>>
 											<?php
 												$i = 0;
-												foreach( $groups as $group ) {
-													?><option <?php selected( $i , $default_choice ); ?> value="<?php echo $group['name']; ?>"><?php echo esc_attr( $group['name'] ); ?></option><?php
+												foreach ( $groups as $group ) {
+													?><option <?php selected( $i, $default_choice ); ?> value="<?php echo $group[ 'name' ]; ?>"><?php echo esc_attr( $group[ 'name' ] ); ?></option><?php
 													$i++;
 												}
 											?>
 										</select>
 
-										<?php if( isset( $field['description'] ) && trim( $field['description'] ) != '' ) { ?>
+										<?php if ( isset( $field[ 'description' ] ) && trim( $field[ 'description' ] ) != '' ) { ?>
 											<p class="form-field-description">
 												<small>
-													<?php echo apply_filters( 'yikes-mailchimp-' . $field['group_id'] . '-description', esc_attr( trim( $field['description'] ) ), $form_id ); ?>
+													<?php echo apply_filters( 'yikes-mailchimp-' . $field[ 'group_id' ] . '-description', esc_attr( trim( $field[ 'description' ] ) ), $form_id ); ?>
 												</small>
 											</p>
 										<?php } ?>
@@ -1106,21 +1106,21 @@ 
 
 									?>
 
-									<label for="<?php echo esc_attr( $field['group_id'] ); ?>" <?php echo implode( ' ' , $label_array ); ?>>
+									<label for="<?php echo esc_attr( $field[ 'group_id' ] ); ?>" <?php echo implode( ' ', $label_array ); ?>>
 
 										<!-- dictate label visibility -->
-										<?php if( ! isset( $field['hide-label'] ) ) { ?>
-											<span class="<?php echo esc_attr( $field['group_id'] ) . '-label'; ?> checkbox-parent-label" style="display:none;">
-												<?php echo apply_filters( 'yikes-mailchimp-'.$field['group_id'].'-label' , esc_attr( stripslashes( $field['label'] ) ) ); ?>
+										<?php if ( ! isset( $field[ 'hide-label' ] ) ) { ?>
+											<span class="<?php echo esc_attr( $field[ 'group_id' ] ) . '-label'; ?> checkbox-parent-label" style="display:none;">
+												<?php echo apply_filters( 'yikes-mailchimp-' . $field[ 'group_id' ] . '-label', esc_attr( stripslashes( $field[ 'label' ] ) ) ); ?>
 											</span>
 										<?php }
 
 
-										foreach( $groups as $group ) {
+										foreach ( $groups as $group ) {
 											?>
-											<label for="<?php echo $field['group_id'] . '-' . $i; ?>" class="yikes-easy-mc-checkbox-label <?php echo implode( ' ' , $custom_classes ); if( $x === $count ) { ?> last-selection<?php } ?>" style="display:none;">
-												<input type="radio" name="<?php echo $field['group_id']; ?>[]" id="<?php echo $field['group_id'] . '-' . $i; ?>" <?php if( $field['type'] == 'checkboxes' ) { if( in_array( $i , $default_choice ) ) { echo 'checked="checked"'; } } else { checked( ( isset( $default_choice ) && is_array( $default_choice ) ) ? $default_choice[0] : $default_choice , $i ); } ?> value="<?php echo esc_attr( $group['name'] ); ?>">
-												<?php echo esc_attr( stripslashes( str_replace( '' , '\'', $group['name'] ) ) ); ?>
+											<label for="<?php echo $field[ 'group_id' ] . '-' . $i; ?>" class="yikes-easy-mc-checkbox-label <?php echo implode( ' ', $custom_classes ); if ( $x === $count ) { ?> last-selection<?php } ?>" style="display:none;">
+												<input type="radio" name="<?php echo $field[ 'group_id' ]; ?>[]" id="<?php echo $field[ 'group_id' ] . '-' . $i; ?>" <?php if ( $field[ 'type' ] == 'checkboxes' ) { if ( in_array( $i, $default_choice ) ) { echo 'checked="checked"'; } } else { checked( ( isset( $default_choice ) && is_array( $default_choice ) ) ? $default_choice[ 0 ] : $default_choice, $i ); } ?> value="<?php echo esc_attr( $group[ 'name' ] ); ?>">
+												<?php echo esc_attr( stripslashes( str_replace( '', '\'', $group[ 'name' ] ) ) ); ?>
 											</label>
 											<?php
 											$i++;
@@ -1128,10 +1128,10 @@ 
 										}
 
 										// description
-										if( isset( $field['description'] ) && trim( $field['description'] ) != '' ) { ?>
+										if ( isset( $field[ 'description' ] ) && trim( $field[ 'description' ] ) != '' ) { ?>
 											<p class="form-field-description">
 												<small>
-													<?php echo apply_filters( 'yikes-mailchimp-' . $field['group_id'] . '-description', esc_attr( trim( stripslashes( $field['description'] ) ) ), $form_id ); ?>
+													<?php echo apply_filters( 'yikes-mailchimp-' . $field[ 'group_id' ] . '-description', esc_attr( trim( stripslashes( $field[ 'description' ] ) ) ), $form_id ); ?>
 												</small>
 											</p>
 										<?php }
@@ -1148,11 +1148,11 @@ 
 				do_action( 'yikes-mailchimp-additional-form-fields', $form_data );
 
 				/* if we've enabled reCAPTCHA protection */
-				if( isset( $recaptcha_box ) ) {
+				if ( isset( $recaptcha_box ) ) {
 					echo $recaptcha_box;
 				}
-				if( is_user_logged_in() ) {
-					$admin_class = ( current_user_can( apply_filters( 'yikes-mailchimp-user-role-access' , 'manage_options' ) ) ) ? ' admin-logged-in' : '';
+				if ( is_user_logged_in() ) {
+					$admin_class = ( current_user_can( apply_filters( 'yikes-mailchimp-user-role-access', 'manage_options' ) ) ) ? ' admin-logged-in' : '';
 				} else {
 					$admin_class = '';
 				}
@@ -1162,27 +1162,27 @@ 
 				<input type="hidden" name="yikes-mailchimp-honeypot" id="yikes-mailchimp-honeypot" value="">
 
 				<!-- List ID -->
-				<input type="hidden" name="yikes-mailchimp-associated-list-id" id="yikes-mailchimp-associated-list-id" value="<?php echo $form_settings['list_id']; ?>">
+				<input type="hidden" name="yikes-mailchimp-associated-list-id" id="yikes-mailchimp-associated-list-id" value="<?php echo $form_settings[ 'list_id' ]; ?>">
 
 				<!-- Form that is being submitted! Used to display error/success messages above the correct form -->
 				<input type="hidden" name="yikes-mailchimp-submitted-form" id="yikes-mailchimp-submitted-form" value="<?php echo $form_id; ?>">
 
 				<!-- Submit Button -->
 				<?php
-					if( $form_inline ) {
+					if ( $form_inline ) {
 						$submit_button_label_classes = array( 'empty-label' );
 						if ( $hidden_label ) {
-							$submit_button_label_classes[] = 'labels-hidden';
+							$submit_button_label_classes[ ] = 'labels-hidden';
 						}
 						echo '<label class="empty-form-inline-label submit-button-inline-label"><span class="' . explode( ' ', $submit_button_label_classes ) . '">&nbsp;</span>';
 					}
 					// display the image or text based button
-					if( $submit_button_type == 'text' ) {
-						echo apply_filters( 'yikes-mailchimp-form-submit-button', '<button type="submit" class="' . apply_filters( 'yikes-mailchimp-form-submit-button-classes', 'yikes-easy-mc-submit-button yikes-easy-mc-submit-button-' . esc_attr( $form_data['id'] ) . ' btn btn-primary' . $submit_button_classes . $admin_class, $form_data['id'] ) . '">' .  apply_filters( 'yikes-mailchimp-form-submit-button-text', esc_attr( stripslashes( $submit ) ), $form_data['id'] ) . '</button>', $form_data['id'] );
+					if ( $submit_button_type == 'text' ) {
+						echo apply_filters( 'yikes-mailchimp-form-submit-button', '<button type="submit" class="' . apply_filters( 'yikes-mailchimp-form-submit-button-classes', 'yikes-easy-mc-submit-button yikes-easy-mc-submit-button-' . esc_attr( $form_data[ 'id' ] ) . ' btn btn-primary' . $submit_button_classes . $admin_class, $form_data[ 'id' ] ) . '">' . apply_filters( 'yikes-mailchimp-form-submit-button-text', esc_attr( stripslashes( $submit ) ), $form_data[ 'id' ] ) . '</button>', $form_data[ 'id' ] );
 					} else {
-						echo apply_filters( 'yikes-mailchimp-form-submit-button', '<input type="image" alt="' . apply_filters( 'yikes-mailchimp-form-submit-button-text', esc_attr( stripslashes( $submit ) ), $form_data['id'] ) . '" src="' . $submit_button_image . '" class="' . apply_filters( 'yikes-mailchimp-form-submit-button-classes', 'yikes-easy-mc-submit-button yikes-easy-mc-submit-button-image yikes-easy-mc-submit-button-' . esc_attr( $form_data['id'] ) . ' btn btn-primary' . $submit_button_classes . $admin_class, $form_data['id'] ) . '">', $form_data['id'] );
+						echo apply_filters( 'yikes-mailchimp-form-submit-button', '<input type="image" alt="' . apply_filters( 'yikes-mailchimp-form-submit-button-text', esc_attr( stripslashes( $submit ) ), $form_data[ 'id' ] ) . '" src="' . $submit_button_image . '" class="' . apply_filters( 'yikes-mailchimp-form-submit-button-classes', 'yikes-easy-mc-submit-button yikes-easy-mc-submit-button-image yikes-easy-mc-submit-button-' . esc_attr( $form_data[ 'id' ] ) . ' btn btn-primary' . $submit_button_classes . $admin_class, $form_data[ 'id' ] ) . '">', $form_data[ 'id' ] );
 					}
-					if( $form_inline ) {
+					if ( $form_inline ) {
 						echo '</label>';
 					}
 				?>
@@ -1194,8 +1194,8 @@ 
 
 		<?php
 			/* If the current user is logged in, and an admin...lets display our 'Edit Form' link */
-			if( is_user_logged_in() ) {
-				if( current_user_can( apply_filters( 'yikes-mailchimp-user-role-access' , 'manage_options' ) ) ) {
+			if ( is_user_logged_in() ) {
+				if ( current_user_can( apply_filters( 'yikes-mailchimp-user-role-access', 'manage_options' ) ) ) {
 					echo $edit_form_link;
 				}
 			}
@@ -1210,16 +1210,16 @@ 
 		*	Update the impressions count
 		*	for non-admins
 		*/
-		if( !current_user_can( 'manage_options' ) ) {
-			$form_data['impressions']++;
+		if ( ! current_user_can( 'manage_options' ) ) {
+			$form_data[ 'impressions' ]++;
 			$wpdb->update(
 				$wpdb->prefix . 'yikes_easy_mc_forms',
 					array(
-						'impressions' => $form_data['impressions'],
+						'impressions' => $form_data[ 'impressions' ],
 					),
 					array( 'ID' => $form ),
 					array(
-						'%d',	// send welcome email
+						'%d', // send welcome email
 					),
 					array( '%d' )
 				);

public/partials/shortcodes/process_form_shortcode_depracated.php

Spacing +1 added lines, -1 removed lines

@@ -18,7 +18,7 @@
 		), $atts )
 	);
 	
-	return '<p><em>' . __( 'This MailChimp shortcode is now deprecated. Please insert the new shortcode to display this form.' , 'yikes-inc-easy-mailchimp-extender' ) . '</em></p>';
+	return '<p><em>' . __( 'This MailChimp shortcode is now deprecated. Please insert the new shortcode to display this form.', 'yikes-inc-easy-mailchimp-extender' ) . '</em></p>';
 	
 }
 add_shortcode( 'yks-mailchimp-list', 'process_depracated_mailchimp_shortcode' ); ?>
\ No newline at end of file

public/partials/shortcodes/process/process_form_submission_ajax.php

Braces +4 added lines, -2 removed lines

@@ -96,9 +96,11 @@
 				$value = date( 'Y-m-d', strtotime( $value ) );
 			}
 		}
-		if( is_numeric( $merge_tag ) ) { // this is is an interest group!
+		if( is_numeric( $merge_tag ) ) {
+// this is is an interest group!
 			$merge_variables['groupings'][] = array( 'id' => $merge_tag , 'groups' => ( is_array( $value ) ) ? $value : array( $value ) );
-		} else { // or else it's just a standard merge variable
+		} else {
+// or else it's just a standard merge variable
 			$merge_variables[$merge_tag] = $value;
 		}
 	}

Spacing +70 added lines, -70 removed lines

@@ -5,34 +5,34 @@ 
 */
 
 // parse our form data
-parse_str( $_POST['form_data'], $data );
+parse_str( $_POST[ 'form_data' ], $data );
 // store the form ID to use in our hooks and filters
-$form = $_POST['form_id'];
+$form = $_POST[ 'form_id' ];
 
 // Retreive the form data from the database instead of posting it with the form-submission
 global $wpdb;
 // return it as an array, so we can work with it to build our form below
 $form_results = $wpdb->get_results( 'SELECT * FROM ' . $wpdb->prefix . 'yikes_easy_mc_forms WHERE id = ' . $form . '', ARRAY_A );
 
-if( $form_results ) {
-	$form_data = $form_results[0];
+if ( $form_results ) {
+	$form_data = $form_results[ 0 ];
 	// List ID
-	$list_id = $form_data['list_id'];
+	$list_id = $form_data[ 'list_id' ];
 	// decode our submission settings
-	$submission_settings = json_decode( stripslashes( $form_data['submission_settings'] ), true );
+	$submission_settings = json_decode( stripslashes( $form_data[ 'submission_settings' ] ), true );
 	// decode our optin settings
-	$optin_settings = json_decode( stripslashes( $form_data['optin_settings'] ), true );
+	$optin_settings = json_decode( stripslashes( $form_data[ 'optin_settings' ] ), true );
 	// decode our fields
-	$form_fields = json_decode( stripslashes( $form_data['fields'] ), true );
+	$form_fields = json_decode( stripslashes( $form_data[ 'fields' ] ), true );
 	/*	Decode our error messages
 	*	Workaround for international characters (cyrillic etc)
 	* 	See: https://wordpress.org/support/topic/custom-messages-do-not-support-cyrillic-characters?replies=11#post-7629620
 	*/
-	$error_messages = ( get_magic_quotes_gpc() ) ? json_decode( stripslashes( $form_data['error_messages'] ), true ) : json_decode( $form_data['error_messages'], true );
+	$error_messages = ( get_magic_quotes_gpc() ) ? json_decode( stripslashes( $form_data[ 'error_messages' ] ), true ) : json_decode( $form_data[ 'error_messages' ], true );
 	/** Submit Process **/
-	$notifications = json_decode( stripslashes( $form_data['custom_notifications'] ), true );
+	$notifications = json_decode( stripslashes( $form_data[ 'custom_notifications' ] ), true );
 	/* Page Data */
-	$page_data = $_POST['page_data'];
+	$page_data = $_POST[ 'page_data' ];
 }
 
 // Empty array to build up merge variables
@@ -42,39 +42,39 @@ 
 $error = 0;
 
 /* Check for Honeypot filled */
-$honey_pot_filled = ( isset( $data['yikes-mailchimp-honeypot'] ) && $data['yikes-mailchimp-honeypot'] != '' ) ? true : false;
+$honey_pot_filled = ( isset( $data[ 'yikes-mailchimp-honeypot' ] ) && $data[ 'yikes-mailchimp-honeypot' ] != '' ) ? true : false;
 // if it was filled out, return an error...
-if( $honey_pot_filled ) {
+if ( $honey_pot_filled ) {
 	wp_send_json_error( array(
 		'hide' => '0',
 		'error' => 1,
-		'response' => __( "Error: It looks like the honeypot was filled out and the form was not properly be submitted." , 'yikes-inc-easy-mailchimp-extender' )
+		'response' => __( "Error: It looks like the honeypot was filled out and the form was not properly be submitted.", 'yikes-inc-easy-mailchimp-extender' )
 	) );
 	return;
 }
 
 // Check reCAPTCHA Response was submitted with the form data
-if( isset( $data['g-recaptcha-response'] ) ) {
-	$url = esc_url_raw( 'https://www.google.com/recaptcha/api/siteverify?secret=' . get_option( 'yikes-mc-recaptcha-secret-key' , '' ) . '&response=' . $data['g-recaptcha-response'] . '&remoteip=' . $_SERVER["REMOTE_ADDR"] );
+if ( isset( $data[ 'g-recaptcha-response' ] ) ) {
+	$url = esc_url_raw( 'https://www.google.com/recaptcha/api/siteverify?secret=' . get_option( 'yikes-mc-recaptcha-secret-key', '' ) . '&response=' . $data[ 'g-recaptcha-response' ] . '&remoteip=' . $_SERVER[ "REMOTE_ADDR" ] );
 	$response = wp_remote_get( $url );
-	$response_body = json_decode( $response['body'] , true );
+	$response_body = json_decode( $response[ 'body' ], true );
 	// if we've hit an error, lets return the error!
-	if( $response_body['success'] != 1 ) {
+	if ( $response_body[ 'success' ] != 1 ) {
 		$error_messages = array(); // empty array to store error messages
-		if( isset( $response_body['error-codes'] ) ) {
-			foreach( $response_body['error-codes'] as $error_code ) {
-				if( $error_code == 'missing-input-response' ) {
+		if ( isset( $response_body[ 'error-codes' ] ) ) {
+			foreach ( $response_body[ 'error-codes' ] as $error_code ) {
+				if ( $error_code == 'missing-input-response' ) {
 					$error_code = __( 'Please check the reCAPTCHA field.', 'yikes-inc-easy-mailchimp-extender' );
 				}
-				$error_messages[] = __( 'Error', 'yikes-inc-easy-mailchimp-extender' ) . ': ' . $error_code;
+				$error_messages[ ] = __( 'Error', 'yikes-inc-easy-mailchimp-extender' ) . ': ' . $error_code;
 			}
 		} else {
-			$error_messages[] = __( 'Please refresh the page and try again.', 'yikes-inc-easy-mailchimp-extender' );
+			$error_messages[ ] = __( 'Please refresh the page and try again.', 'yikes-inc-easy-mailchimp-extender' );
 		}
 		$error = 1;
 		wp_send_json_error( array(
 			'hide' => '0',
-			'error' => $error ,
+			'error' => $error,
 			'response' => apply_filters( 'yikes-mailchimp-recaptcha-required-error', implode( ' ', $error_messages ) ),
 		) );
 		exit();
@@ -83,12 +83,12 @@ 
 
 // loop to push variables to our array
 foreach ( $data as $merge_tag => $value ) {
-	if( $merge_tag != 'yikes_easy_mc_new_subscriber' && $merge_tag != '_wp_http_referer' ) {
+	if ( $merge_tag != 'yikes_easy_mc_new_subscriber' && $merge_tag != '_wp_http_referer' ) {
 		// check if the current iteration has a 'date_format' key set
 		// (aka - date/birthday fields)
-		if( isset( $form_fields[$merge_tag]['date_format'] ) ) {
+		if ( isset( $form_fields[ $merge_tag ][ 'date_format' ] ) ) {
 			// check if EU date format
-			if( $form_fields[$merge_tag]['date_format'] == 'DD/MM/YYYY' ) {
+			if ( $form_fields[ $merge_tag ][ 'date_format' ] == 'DD/MM/YYYY' ) {
 				// convert '/' to '.' and to UNIX timestamp
 				$value = date( 'Y-m-d', strtotime( str_replace( '/', '.', $value ) ) );
 			} else {
@@ -96,22 +96,22 @@ 
 				$value = date( 'Y-m-d', strtotime( $value ) );
 			}
 		}
-		if( is_numeric( $merge_tag ) ) { // this is is an interest group!
-			$merge_variables['groupings'][] = array( 'id' => $merge_tag , 'groups' => ( is_array( $value ) ) ? $value : array( $value ) );
+		if ( is_numeric( $merge_tag ) ) { // this is is an interest group!
+			$merge_variables[ 'groupings' ][ ] = array( 'id' => $merge_tag, 'groups' => ( is_array( $value ) ) ? $value : array( $value ) );
 		} else { // or else it's just a standard merge variable
-			$merge_variables[$merge_tag] = $value;
+			$merge_variables[ $merge_tag ] = $value;
 		}
 	}
 }
 // store the opt-in time
-$merge_variables['optin_time'] = current_time( 'Y-m-d H:i:s', 1 );
+$merge_variables[ 'optin_time' ] = current_time( 'Y-m-d H:i:s', 1 );
 
 // Submit our form data
 $api_key = yikes_get_mc_api_key();
 $dash_position = strpos( $api_key, '-' );
 
 // setup the end point
-if( $dash_position !== false ) {
+if ( $dash_position !== false ) {
 	$api_endpoint = 'https://' . substr( $api_key, $dash_position + 1 ) . '.api.mailchimp.com/2.0/lists/subscribe.json';
 }
 
@@ -137,9 +137,9 @@ 
 *	Allow users to check for submit value
 *	and pass back an error to the user
 */
-if( isset( $merge_variables['error'] ) ) {
+if ( isset( $merge_variables[ 'error' ] ) ) {
 	// send our error response back
-	wp_send_json_error( array( 'hide' => '0', 'error' => $merge_variables['error']  , 'response' => $merge_variables['message']  ) );
+	wp_send_json_error( array( 'hide' => '0', 'error' => $merge_variables[ 'error' ], 'response' => $merge_variables[ 'message' ] ) );
 	return;
 }
 
@@ -147,9 +147,9 @@ 
  * Setup whether or not we should update the user, or display the error with email generation
  * @since 6.1
  */
-if ( isset( $optin_settings['update_existing_user'] ) && 1 === absint( $optin_settings['update_existing_user'] ) ) {
+if ( isset( $optin_settings[ 'update_existing_user' ] ) && 1 === absint( $optin_settings[ 'update_existing_user' ] ) ) {
 	// Should we send the update email
-	if ( isset( $optin_settings['send_update_email'] ) && 1 === absint( $optin_settings['send_update_email'] ) ) {
+	if ( isset( $optin_settings[ 'send_update_email' ] ) && 1 === absint( $optin_settings[ 'send_update_email' ] ) ) {
 		$update_existing_user = 0;
 	} else {
 		$update_existing_user = 1;
@@ -164,38 +164,38 @@ 
 		'body' => apply_filters( 'yikes-mailchimp-user-subscribe-api-request', array(
 			'apikey' => $api_key,
 			'id' => $list_id,
-			'email' => array( 'email' => sanitize_email( $data['EMAIL'] ) ),
+			'email' => array( 'email' => sanitize_email( $data[ 'EMAIL' ] ) ),
 			'merge_vars' => $merge_variables,
-			'double_optin' => $optin_settings['optin'],
+			'double_optin' => $optin_settings[ 'optin' ],
 			'update_existing' => $update_existing_user, // Decide if we should update the user or not
-			'send_welcome' => $optin_settings['send_welcome_email'],
-			'replace_interests' => ( isset( $submission_settings['replace_interests'] ) ) ? $submission_settings['replace_interests'] : 1, // defaults to replace
-		), $form, $list_id, $data['EMAIL'] ),
+			'send_welcome' => $optin_settings[ 'send_welcome_email' ],
+			'replace_interests' => ( isset( $submission_settings[ 'replace_interests' ] ) ) ? $submission_settings[ 'replace_interests' ] : 1, // defaults to replace
+		), $form, $list_id, $data[ 'EMAIL' ] ),
 		'timeout' => 10,
 		'sslverify' => apply_filters( 'yikes-mailchimp-sslverify', true )
 	) );
 
 	$subscribe_response = json_decode( wp_remote_retrieve_body( $subscribe_response ), true );
 
-	if( isset( $subscribe_response['error'] ) ) {
+	if ( isset( $subscribe_response[ 'error' ] ) ) {
 
-		if( WP_DEBUG || get_option( 'yikes-mailchimp-debug-status' , '' ) == '1' ) {
+		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( $subscribe_response['error'], __( "Subscribe New User" , 'yikes-inc-easy-mailchimp-extender' ), "process_form_submission_ajax.php" );
+			$error_logging->yikes_easy_mailchimp_write_to_error_log( $subscribe_response[ 'error' ], __( "Subscribe New User", 'yikes-inc-easy-mailchimp-extender' ), "process_form_submission_ajax.php" );
 		}
 
 		$update_account_details_link = '';
 		$error = 1;
-		switch( $subscribe_response['code'] ) {
+		switch ( $subscribe_response[ 'code' ] ) {
 			// user already subscribed
 			case '214':
-				$custom_already_subscribed_text = apply_filters( 'yikes-easy-mailchimp-update-existing-subscriber-text', sprintf( __( ' To update your MailChimp profile, please %s.', 'yikes-inc-easy-mailchimp-extender' ), '<a class="send-update-email" data-list-id="' . $list_id . '" data-user-email="' . sanitize_email( $data['EMAIL'] ) . '" href="#">' . __( 'click to send yourself an update link', 'yikes-inc-easy-mailchimp-extender' ) . '</a>' ), $form, '<a class="send-update-email" data-list-id="' . $_POST['yikes-mailchimp-associated-list-id'] . '" data-user-email="' . sanitize_email( $data['EMAIL'] ) . '" href="#">' . __( 'click to send yourself an update link', 'yikes-inc-easy-mailchimp-extender' ) . '</a>' );
-				$update_account_details_link = ( 1 === absint( $optin_settings['update_existing_user'] ) && 1 === absint( $optin_settings['send_update_email'] ) ) ? $custom_already_subscribed_text : false;
-				if( ! empty( $error_messages['already-subscribed'] ) ) {
-					$error_response = apply_filters( 'yikes-easy-mailchimp-user-already-subscribed-text', $error_messages['already-subscribed'] , $form, $data['EMAIL'] ) . ' ' . $update_account_details_link;
+				$custom_already_subscribed_text = apply_filters( 'yikes-easy-mailchimp-update-existing-subscriber-text', sprintf( __( ' To update your MailChimp profile, please %s.', 'yikes-inc-easy-mailchimp-extender' ), '<a class="send-update-email" data-list-id="' . $list_id . '" data-user-email="' . sanitize_email( $data[ 'EMAIL' ] ) . '" href="#">' . __( 'click to send yourself an update link', 'yikes-inc-easy-mailchimp-extender' ) . '</a>' ), $form, '<a class="send-update-email" data-list-id="' . $_POST[ 'yikes-mailchimp-associated-list-id' ] . '" data-user-email="' . sanitize_email( $data[ 'EMAIL' ] ) . '" href="#">' . __( 'click to send yourself an update link', 'yikes-inc-easy-mailchimp-extender' ) . '</a>' );
+				$update_account_details_link = ( 1 === absint( $optin_settings[ 'update_existing_user' ] ) && 1 === absint( $optin_settings[ 'send_update_email' ] ) ) ? $custom_already_subscribed_text : false;
+				if ( ! empty( $error_messages[ 'already-subscribed' ] ) ) {
+					$error_response = apply_filters( 'yikes-easy-mailchimp-user-already-subscribed-text', $error_messages[ 'already-subscribed' ], $form, $data[ 'EMAIL' ] ) . ' ' . $update_account_details_link;
 				} else {
-					$error_response = $subscribe_response['error'] . ' ' . $update_account_details_link;
+					$error_response = $subscribe_response[ 'error' ] . ' ' . $update_account_details_link;
 				}
 				break;
 			// missing a required field
@@ -203,34 +203,34 @@ 
 					// get all merge variables in array, loop and str_replace error code with field name
 					$api_key = yikes_get_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';
 					}
 					$merge_variables = wp_remote_post( $api_endpoint, array(
 						'body' => array(
 							'apikey' => $api_key,
-							'id' => array( $list_id ) ,
+							'id' => array( $list_id ),
 						),
 						'timeout' => 10,
 						'sslverify' => apply_filters( 'yikes-mailchimp-sslverify', true ),
 					) );
 					$merge_variables = json_decode( wp_remote_retrieve_body( $merge_variables ), true );
-					if( is_wp_error( $merge_variables ) || isset( $merge_variables['error'] ) ) {
-						if( WP_DEBUG || get_option( 'yikes-mailchimp-debug-status' , '' ) == '1' ) {
+					if ( is_wp_error( $merge_variables ) || isset( $merge_variables[ '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( $merge_variables['error'], __( "Get Merge Variables" , 'yikes-inc-easy-mailchimp-extender' ), "process_form_submission_ajax.php" );
+							$error_logging->yikes_easy_mailchimp_write_to_error_log( $merge_variables[ 'error' ], __( "Get Merge Variables", 'yikes-inc-easy-mailchimp-extender' ), "process_form_submission_ajax.php" );
 						}
 					}
 					// re-store our data
-					$merge_variables = $merge_variables['data'][0]['merge_vars'];
+					$merge_variables = $merge_variables[ 'data' ][ 0 ][ 'merge_vars' ];
 					$merge_variable_name_array = array();
-					foreach( $merge_variables as $merge_var ) {
-						$merge_variables_name_array[$merge_var['tag']] = $merge_var['name'];
+					foreach ( $merge_variables as $merge_var ) {
+						$merge_variables_name_array[ $merge_var[ 'tag' ] ] = $merge_var[ 'name' ];
 					}
-					$error_message = $subscribe_response['error'];
+					$error_message = $subscribe_response[ 'error' ];
 					// replace tag with name in the error message.
-					foreach( $merge_variables_name_array as $tag => $name ) {
+					foreach ( $merge_variables_name_array as $tag => $name ) {
 						$error_message = str_replace( $tag, $name, $error_message );
 					}
 					$error_response = $error_message;
@@ -238,14 +238,14 @@ 
 			// test@email.com is not allowed
 			case '-99':
 				// generic error
-				$error_response = str_replace( ' and cannot be imported', '', str_replace( 'List_RoleEmailMember:', '', $subscribe_response['error'] ) );
+				$error_response = str_replace( ' and cannot be imported', '', str_replace( 'List_RoleEmailMember:', '', $subscribe_response[ 'error' ] ) );
 				break;
 			// invalid email (or no email at all)
 				case '-100':
-					$error_response = ( ! empty( $error_messages['invalid-email'] ) ) ? $error_messages['invalid-email'] : __( 'Please provide a valid email address.', 'yikes-inc-easy-mailchimp-extender' );
+					$error_response = ( ! empty( $error_messages[ 'invalid-email' ] ) ) ? $error_messages[ 'invalid-email' ] : __( 'Please provide a valid email address.', 'yikes-inc-easy-mailchimp-extender' );
 					break;
 			default:
-				$error_response = ( ! empty( $error_messages['general-error'] ) ) ? $error_messages['general-error'] : $subscribe_response['error'];
+				$error_response = ( ! empty( $error_messages[ 'general-error' ] ) ) ? $error_messages[ 'general-error' ] : $subscribe_response[ 'error' ];
 				break;
 		}
 		// send the response
@@ -263,9 +263,9 @@ 
 	/*
 	*	Successful form submission redirect
 	*/
-	if( $submission_settings['redirect_on_submission'] == '1' ) {
+	if ( $submission_settings[ 'redirect_on_submission' ] == '1' ) {
 		$redirection = '1';
-		$redirect_url = ( 'custom_url' != $submission_settings['redirect_page'] ) ? get_permalink( $submission_settings['redirect_page'] ) : $submission_settings['custom_redirect_url'];
+		$redirect_url = ( 'custom_url' != $submission_settings[ 'redirect_page' ] ) ? get_permalink( $submission_settings[ 'redirect_page' ] ) : $submission_settings[ 'custom_redirect_url' ];
 		$redirect = '<script type="text/javascript">setTimeout(function() { window.location="' . apply_filters( 'yikes-mailchimp-redirect-url', esc_url( $redirect_url ), $form, $page_data ) . '"; }, ' . apply_filters( 'yikes-mailchimp-redirect-timer', 1500 ) . ');</script>';
 	}
 
@@ -281,16 +281,16 @@ 
 	do_action( 'yikes-mailchimp-after-submission-' . $form, $merge_variables );
 
 	// send our notifications if setup (must go before wp_send_json())
-	do_action( 'yikes-mailchimp-form-submission' , sanitize_email( $data['EMAIL'] ), $merge_variables , $form , $notifications );
-	do_action( 'yikes-mailchimp-form-submission-' . $form, sanitize_email( $data['EMAIL'] ), $merge_variables , $form , $notifications );
+	do_action( 'yikes-mailchimp-form-submission', sanitize_email( $data[ 'EMAIL' ] ), $merge_variables, $form, $notifications );
+	do_action( 'yikes-mailchimp-form-submission-' . $form, sanitize_email( $data[ 'EMAIL' ] ), $merge_variables, $form, $notifications );
 
-	$default_success_response = ( 1 === $optin_settings['optin'] ) ? __( "Thank you for subscribing! Check your email for the confirmation message." , 'yikes-inc-easy-mailchimp-extender' ) : __( "Thank you for subscribing!" , 'yikes-inc-easy-mailchimp-extender' );
+	$default_success_response = ( 1 === $optin_settings[ 'optin' ] ) ? __( "Thank you for subscribing! Check your email for the confirmation message.", 'yikes-inc-easy-mailchimp-extender' ) : __( "Thank you for subscribing!", 'yikes-inc-easy-mailchimp-extender' );
 
 	wp_send_json_success(
 		array(
-			'hide' => $submission_settings['hide_form_post_signup'],
+			'hide' => $submission_settings[ 'hide_form_post_signup' ],
 			'error' => $error,
-			'response' => apply_filters( 'yikes-mailchimp-success-response', ( ! empty( $error_messages['success'] ) ? $error_messages['success'] : $default_success_response ), $form, $merge_variables ),
+			'response' => apply_filters( 'yikes-mailchimp-success-response', ( ! empty( $error_messages[ 'success' ] ) ? $error_messages[ 'success' ] : $default_success_response ), $form, $merge_variables ),
 			'redirection' => isset( $redirection ) ? '1' : '0',
 			'redirect' => isset( $redirect ) ? $redirect : '',
 		)

public/partials/shortcodes/process/process_form_submission.php

Braces +4 added lines, -2 removed lines

@@ -92,9 +92,11 @@
 					$value = ( '' != $value ) ? date( 'Y-m-d', strtotime( $value ) ) : '';
 				}
 			}
-			if( is_numeric( $merge_tag ) ) { // this is is an interest group!
+			if( is_numeric( $merge_tag ) ) {
+// this is is an interest group!
 				$merge_variables['groupings'][] = array( 'id' => $merge_tag , 'groups' => ( is_array( $value ) ) ? $value : array( $value ) );
-			} else { // or else it's just a standard merge variable
+			} else {
+// or else it's just a standard merge variable
 				$merge_variables[$merge_tag] = $value;
 			}
 		}

Indentation +6 added lines, -6 removed lines

@@ -18,7 +18,7 @@ 
 // Process our form submissions (non ajax forms)
 if ( ! isset( $_POST['yikes_easy_mc_new_subscriber'] ) || ! wp_verify_nonce( $_POST['yikes_easy_mc_new_subscriber'], 'yikes_easy_mc_form_submit' ) ) {
 
-    $process_submission_response = '<p><small class="form_submission_error">' . __( "Error : Sorry, the nonce security check didn't pass. Please reload the page and try again. You may want to try clearing your browser cache as a last attempt." , 'yikes-inc-easy-mailchimp-extender' ) . '</small></p>';
+	 $process_submission_response = '<p><small class="form_submission_error">' . __( "Error : Sorry, the nonce security check didn't pass. Please reload the page and try again. You may want to try clearing your browser cache as a last attempt." , 'yikes-inc-easy-mailchimp-extender' ) . '</small></p>';
 	return;
 
 } else {
@@ -124,11 +124,11 @@ 
 	$merge_variables = apply_filters( 'yikes-mailchimp-before-submission-' . $form_id, $merge_variables );
 
 	/**
-	* Action hooks fired before API request
-	* @since 6.0.5.5
-	* @param $merge_variables 	array 	Array of merge variable to use
-	* @param $form_id						integer	The form ID to target (eg: 1, 2 etc.)
-	*/
+	 * Action hooks fired before API request
+	 * @since 6.0.5.5
+	 * @param $merge_variables 	array 	Array of merge variable to use
+	 * @param $form_id						integer	The form ID to target (eg: 1, 2 etc.)
+	 */
 	do_action( 'yikes-mailchimp-before-submission', $merge_variables );
 	do_action( 'yikes-mailchimp-before-submission-' . $form_id, $merge_variables );
 

Spacing +76 added lines, -76 removed lines

@@ -8,45 +8,45 @@ 
 global $form_submitted, $process_submission_response;
 
 // confirm we have a form id to work with
-$form_id = ( ! empty( $_POST['yikes-mailchimp-submitted-form'] ) ) ? $_POST['yikes-mailchimp-submitted-form'] : false;
-if( ! $form_id ) {
+$form_id = ( ! empty( $_POST[ 'yikes-mailchimp-submitted-form' ] ) ) ? $_POST[ 'yikes-mailchimp-submitted-form' ] : false;
+if ( ! $form_id ) {
 	return;
 }
 
-$form_settings = Yikes_Inc_Easy_Mailchimp_Extender_Public::yikes_retrieve_form_settings( $_POST['yikes-mailchimp-submitted-form'] );
+$form_settings = Yikes_Inc_Easy_Mailchimp_Extender_Public::yikes_retrieve_form_settings( $_POST[ 'yikes-mailchimp-submitted-form' ] );
 
 // Process our form submissions (non ajax forms)
-if ( ! isset( $_POST['yikes_easy_mc_new_subscriber'] ) || ! wp_verify_nonce( $_POST['yikes_easy_mc_new_subscriber'], 'yikes_easy_mc_form_submit' ) ) {
+if ( ! isset( $_POST[ 'yikes_easy_mc_new_subscriber' ] ) || ! wp_verify_nonce( $_POST[ 'yikes_easy_mc_new_subscriber' ], 'yikes_easy_mc_form_submit' ) ) {
 
-    $process_submission_response = '<p><small class="form_submission_error">' . __( "Error : Sorry, the nonce security check didn't pass. Please reload the page and try again. You may want to try clearing your browser cache as a last attempt." , 'yikes-inc-easy-mailchimp-extender' ) . '</small></p>';
+    $process_submission_response = '<p><small class="form_submission_error">' . __( "Error : Sorry, the nonce security check didn't pass. Please reload the page and try again. You may want to try clearing your browser cache as a last attempt.", 'yikes-inc-easy-mailchimp-extender' ) . '</small></p>';
 	return;
 
 } else {
 
 	/* Check for Honeypot filled */
-	$honey_pot_filled = ( isset( $_POST['yikes-mailchimp-honeypot'] ) && $_POST['yikes-mailchimp-honeypot'] != '' ) ? true : false;
+	$honey_pot_filled = ( isset( $_POST[ 'yikes-mailchimp-honeypot' ] ) && $_POST[ 'yikes-mailchimp-honeypot' ] != '' ) ? true : false;
 	// if it was filled out, return an error...
 	if ( $honey_pot_filled ) {
-		$process_submission_response = '<p><small class="form_submission_error">' . __( "Error: It looks like the honeypot was filled out and the form was not properly be submitted." , 'yikes-inc-easy-mailchimp-extender' ) . '</small></p>';
+		$process_submission_response = '<p><small class="form_submission_error">' . __( "Error: It looks like the honeypot was filled out and the form was not properly be submitted.", 'yikes-inc-easy-mailchimp-extender' ) . '</small></p>';
 		return;
 	}
 
 	// Check reCAPTCHA Response
-	if( isset( $_POST['g-recaptcha-response'] ) ) {
-		$url = esc_url_raw( 'https://www.google.com/recaptcha/api/siteverify?secret=' . get_option( 'yikes-mc-recaptcha-secret-key' , '' ) . '&response=' . $_POST['g-recaptcha-response'] . '&remoteip=' . $_SERVER["REMOTE_ADDR"] );
+	if ( isset( $_POST[ 'g-recaptcha-response' ] ) ) {
+		$url = esc_url_raw( 'https://www.google.com/recaptcha/api/siteverify?secret=' . get_option( 'yikes-mc-recaptcha-secret-key', '' ) . '&response=' . $_POST[ 'g-recaptcha-response' ] . '&remoteip=' . $_SERVER[ "REMOTE_ADDR" ] );
 		$response = wp_remote_get( $url );
-		$response_body = json_decode( $response['body'] , true );
+		$response_body = json_decode( $response[ 'body' ], true );
 
 		// if we've hit an error, lets return the error!
-		if( $response_body['success'] != 1 ) {
+		if ( $response_body[ 'success' ] != 1 ) {
 			$recaptcha_error = array(); // empty array to store error messages
-			foreach( $response_body['error-codes'] as $error_code ) {
-				if( $error_code == 'missing-input-response' ) {
+			foreach ( $response_body[ 'error-codes' ] as $error_code ) {
+				if ( $error_code == 'missing-input-response' ) {
 					$error_code = __( 'Please check the reCAPTCHA field.', 'yikes-inc-easy-mailchimp-extender' );
 				}
-				$recaptcha_error[] = $error_code;
+				$recaptcha_error[ ] = $error_code;
 			}
-			$process_submission_response .= "<p class='yikes-easy-mc-error-message'>" . apply_filters( 'yikes-mailchimp-recaptcha-required-error', __( 'Error' , 'yikes-inc-easy-mailchimp-extender' )  . ': ' . implode( ' ' , $recaptcha_error ) ) . "</p>";
+			$process_submission_response .= "<p class='yikes-easy-mc-error-message'>" . apply_filters( 'yikes-mailchimp-recaptcha-required-error', __( 'Error', 'yikes-inc-easy-mailchimp-extender' ) . ': ' . implode( ' ', $recaptcha_error ) ) . "</p>";
 			return;
 		}
 	}
@@ -56,20 +56,20 @@ 
 	*	No HTML5 validation, and don't want to use jQuery for non-ajax forms
 	*/
 	$missing_required_checkbox_interest_groups = array();
-	foreach( $form_settings['fields'] as $merge_tag => $field_data ) {
-		if( is_numeric( $merge_tag ) ) {
+	foreach ( $form_settings[ 'fields' ] as $merge_tag => $field_data ) {
+		if ( is_numeric( $merge_tag ) ) {
 			// check if the checkbox group was set to required, if so return an error
-			if( isset( $field_data['require'] ) && $field_data['require'] == 1 ) {
-				if( $field_data['type'] == 'checkboxes' ) {
-					if( ! isset( $_POST[$merge_tag] ) ) {
-						$missing_required_checkbox_interest_groups[] = $merge_tag;
+			if ( isset( $field_data[ 'require' ] ) && $field_data[ 'require' ] == 1 ) {
+				if ( $field_data[ 'type' ] == 'checkboxes' ) {
+					if ( ! isset( $_POST[ $merge_tag ] ) ) {
+						$missing_required_checkbox_interest_groups[ ] = $merge_tag;
 					}
 				}
 			}
 		}
 	}
 
-	if( ! empty( $missing_required_checkbox_interest_groups ) ) {
+	if ( ! empty( $missing_required_checkbox_interest_groups ) ) {
 		$process_submission_response = '<p class="yikes-easy-mc-error-message">' . apply_filters( 'yikes-mailchimp-interest-group-required-top-error', sprintf( _n( 'It looks like you forgot to fill in a required field.', 'It looks like you forgot to fill in %s required fields.', count( $missing_required_checkbox_interest_groups ), 'yikes-inc-easy-mailchimp-extender' ), count( $missing_required_checkbox_interest_groups ) ), count( $missing_required_checkbox_interest_groups ), $form_id ) . '</p>';
 		return;
 	}
@@ -79,12 +79,12 @@ 
 
 	// loop to push variables to our array
 	foreach ( $_POST as $merge_tag => $value ) {
-		if( $merge_tag != 'yikes_easy_mc_new_subscriber' && $merge_tag != '_wp_http_referer' ) {
+		if ( $merge_tag != 'yikes_easy_mc_new_subscriber' && $merge_tag != '_wp_http_referer' ) {
 			// check if the current iteration has a 'date_format' key set
 			// (aka - date/birthday fields)
-			if( isset( $form_settings['fields'][$merge_tag]['date_format'] ) ) {
+			if ( isset( $form_settings[ 'fields' ][ $merge_tag ][ 'date_format' ] ) ) {
 				// check if EU date format
-				if( $form_settings['fields'][$merge_tag]['date_format'] == 'DD/MM/YYYY' ) {
+				if ( $form_settings[ 'fields' ][ $merge_tag ][ 'date_format' ] == 'DD/MM/YYYY' ) {
 					// convert '/' to '.' and to UNIX timestamp
 					$value = ( '' != $value ) ? date( 'Y-m-d', strtotime( str_replace( '/', '.', $value ) ) ) : '';
 				} else {
@@ -92,23 +92,23 @@ 
 					$value = ( '' != $value ) ? date( 'Y-m-d', strtotime( $value ) ) : '';
 				}
 			}
-			if( is_numeric( $merge_tag ) ) { // this is is an interest group!
-				$merge_variables['groupings'][] = array( 'id' => $merge_tag , 'groups' => ( is_array( $value ) ) ? $value : array( $value ) );
+			if ( is_numeric( $merge_tag ) ) { // this is is an interest group!
+				$merge_variables[ 'groupings' ][ ] = array( 'id' => $merge_tag, 'groups' => ( is_array( $value ) ) ? $value : array( $value ) );
 			} else { // or else it's just a standard merge variable
-				$merge_variables[$merge_tag] = $value;
+				$merge_variables[ $merge_tag ] = $value;
 			}
 		}
 	}
 
 	// store the opt-in time
-	$merge_variables['optin_time'] = current_time( 'Y-m-d H:i:s', 1 );
+	$merge_variables[ 'optin_time' ] = current_time( 'Y-m-d H:i:s', 1 );
 
 	// Submit our form data
 	$api_key = yikes_get_mc_api_key();
 	$dash_position = strpos( $api_key, '-' );
 
 	// setup the end point
-	if( $dash_position !== false ) {
+	if ( $dash_position !== false ) {
 		$api_endpoint = 'https://' . substr( $api_key, $dash_position + 1 ) . '.api.mailchimp.com/2.0/lists/subscribe.json';
 	}
 
@@ -136,8 +136,8 @@ 
 	*	Allow users to check for submit value
 	*	and pass back an error to the user
 	*/
-	if( isset( $merge_variables['error'] ) ) {
-		$process_submission_response = apply_filters( 'yikes-mailchimp-frontend-content' , $merge_variables['message'] );
+	if ( isset( $merge_variables[ 'error' ] ) ) {
+		$process_submission_response = apply_filters( 'yikes-mailchimp-frontend-content', $merge_variables[ 'message' ] );
 		return;
 	}
 
@@ -145,10 +145,10 @@ 
 	 * Setup whether or not we should update the user, or display the error with email generation
 	 * @since 6.1
 	 */
-	if ( isset( $form_settings['optin_settings']['update_existing_user'] ) && 1 === absint( $form_settings['optin_settings']['update_existing_user'] ) ) {
+	if ( isset( $form_settings[ 'optin_settings' ][ 'update_existing_user' ] ) && 1 === absint( $form_settings[ 'optin_settings' ][ 'update_existing_user' ] ) ) {
 		$update_existing_user = 1;
 		// Should we send the update email
-		if ( isset( $form_settings['optin_settings']['send_update_email'] ) && 1 === absint( $form_settings['optin_settings']['send_update_email'] ) ) {
+		if ( isset( $form_settings[ 'optin_settings' ][ 'send_update_email' ] ) && 1 === absint( $form_settings[ 'optin_settings' ][ 'send_update_email' ] ) ) {
 			$update_existing_user = 0;
 		}
 	} else {
@@ -160,14 +160,14 @@ 
 		$subscribe_response = wp_remote_post( $api_endpoint, array(
 			'body' => apply_filters( 'yikes-mailchimp-user-subscribe-api-request', array(
 				'apikey' => $api_key,
-				'id' => $_POST['yikes-mailchimp-associated-list-id'],
-				'email' => array( 'email' => sanitize_email( $_POST['EMAIL'] ) ),
+				'id' => $_POST[ 'yikes-mailchimp-associated-list-id' ],
+				'email' => array( 'email' => sanitize_email( $_POST[ 'EMAIL' ] ) ),
 				'merge_vars' => $merge_variables,
-				'double_optin' => $form_settings['optin_settings']['optin'],
+				'double_optin' => $form_settings[ 'optin_settings' ][ 'optin' ],
 				'update_existing' => $update_existing_user, // Decide if we should update the user or not
-				'send_welcome' => $form_settings['optin_settings']['send_welcome_email'],
-				'replace_interests' => ( isset( $form_settings['submission_settings']['replace_interests'] ) ) ? $form_settings['submission_settings']['replace_interests'] : 1, // defaults to replace
-			), $form_id, $_POST['yikes-mailchimp-associated-list-id'], $_POST['EMAIL'] ),
+				'send_welcome' => $form_settings[ 'optin_settings' ][ 'send_welcome_email' ],
+				'replace_interests' => ( isset( $form_settings[ 'submission_settings' ][ 'replace_interests' ] ) ) ? $form_settings[ 'submission_settings' ][ 'replace_interests' ] : 1, // defaults to replace
+			), $form_id, $_POST[ 'yikes-mailchimp-associated-list-id' ], $_POST[ 'EMAIL' ] ),
 			'timeout' => 10,
 			'sslverify' => apply_filters( 'yikes-mailchimp-sslverify', true )
 		) );
@@ -175,32 +175,32 @@ 
 		$subscribe_response = json_decode( wp_remote_retrieve_body( $subscribe_response ), true );
 
 		// check for any errors
-		if( isset( $subscribe_response['error'] ) ) {
+		if ( isset( $subscribe_response[ 'error' ] ) ) {
 
-			if( WP_DEBUG || get_option( 'yikes-mailchimp-debug-status' , '' ) == '1' ) {
+			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( $subscribe_response['error'], __( "Subscribe New User" , 'yikes-inc-easy-mailchimp-extender' ), "process_form_submission.php" );
+				$error_logging->yikes_easy_mailchimp_write_to_error_log( $subscribe_response[ 'error' ], __( "Subscribe New User", 'yikes-inc-easy-mailchimp-extender' ), "process_form_submission.php" );
 			}
 
 			$update_account_details_link = '';
-			switch( $subscribe_response['code'] ) {
+			switch ( $subscribe_response[ 'code' ] ) {
 				// user already subscribed
 				case '214':
-					$custom_already_subscribed_text = apply_filters( 'yikes-easy-mailchimp-update-existing-subscriber-text', sprintf( __( ' To update your MailChimp profile, please %s.', 'yikes-inc-easy-mailchimp-extender' ), '<a class="send-update-email" data-list-id="' . $_POST['yikes-mailchimp-associated-list-id'] . '" data-user-email="' . sanitize_email( $_POST['EMAIL'] ) . '" href="#">' . __( 'click to send yourself an update link', 'yikes-inc-easy-mailchimp-extender' ) . '</a>' ), $form_id, '<a class="send-update-email" data-list-id="' . $_POST['yikes-mailchimp-associated-list-id'] . '" data-user-email="' . sanitize_email( $_POST['EMAIL'] ) . '" href="#">' . __( 'click to send yourself an update link', 'yikes-inc-easy-mailchimp-extender' ) . '</a>' );
-					$update_account_details_link = ( 1 === absint( $form_settings['optin_settings']['update_existing_user'] ) && 1 === absint( $form_settings['optin_settings']['send_update_email'] ) ) ? $custom_already_subscribed_text : false;
-					if( $update_account_details_link ) {
+					$custom_already_subscribed_text = apply_filters( 'yikes-easy-mailchimp-update-existing-subscriber-text', sprintf( __( ' To update your MailChimp profile, please %s.', 'yikes-inc-easy-mailchimp-extender' ), '<a class="send-update-email" data-list-id="' . $_POST[ 'yikes-mailchimp-associated-list-id' ] . '" data-user-email="' . sanitize_email( $_POST[ 'EMAIL' ] ) . '" href="#">' . __( 'click to send yourself an update link', 'yikes-inc-easy-mailchimp-extender' ) . '</a>' ), $form_id, '<a class="send-update-email" data-list-id="' . $_POST[ 'yikes-mailchimp-associated-list-id' ] . '" data-user-email="' . sanitize_email( $_POST[ 'EMAIL' ] ) . '" href="#">' . __( 'click to send yourself an update link', 'yikes-inc-easy-mailchimp-extender' ) . '</a>' );
+					$update_account_details_link = ( 1 === absint( $form_settings[ 'optin_settings' ][ 'update_existing_user' ] ) && 1 === absint( $form_settings[ 'optin_settings' ][ 'send_update_email' ] ) ) ? $custom_already_subscribed_text : false;
+					if ( $update_account_details_link ) {
 						// if update account details is set, we need to include our script to send out the update email
-						wp_enqueue_script( 'update-existing-subscriber.js', YIKES_MC_URL . 'public/js/yikes-update-existing-subscriber.js' , array( 'jquery' ), 'all' );
+						wp_enqueue_script( 'update-existing-subscriber.js', YIKES_MC_URL . 'public/js/yikes-update-existing-subscriber.js', array( 'jquery' ), 'all' );
 						wp_localize_script( 'update-existing-subscriber.js', 'update_subscriber_details_data', array(
 							'ajax_url' => esc_url( admin_url( 'admin-ajax.php' ) ),
 							'preloader_url' => apply_filters( 'yikes-mailchimp-preloader', esc_url_raw( admin_url( 'images/wpspin_light.gif' ) ) ),
 						) );
 					}
-					if( ! empty( $form_settings['error_messages']['already-subscribed'] ) ) {
-						$process_submission_response = '<p class="yikes-easy-mc-error-message">' . apply_filters( 'yikes-easy-mailchimp-user-already-subscribed-text', $form_settings['error_messages']['already-subscribed'], $form_id, $_POST['EMAIL'] ) . ' ' . $update_account_details_link . '</p>';
+					if ( ! empty( $form_settings[ 'error_messages' ][ 'already-subscribed' ] ) ) {
+						$process_submission_response = '<p class="yikes-easy-mc-error-message">' . apply_filters( 'yikes-easy-mailchimp-user-already-subscribed-text', $form_settings[ 'error_messages' ][ 'already-subscribed' ], $form_id, $_POST[ 'EMAIL' ] ) . ' ' . $update_account_details_link . '</p>';
 					} else {
-						$process_submission_response = '<p class="yikes-easy-mc-error-message">' . $subscribe_response['error'] . ' ' . $update_account_details_link . '</p>';
+						$process_submission_response = '<p class="yikes-easy-mc-error-message">' . $subscribe_response[ 'error' ] . ' ' . $update_account_details_link . '</p>';
 					}
 					break;
 				// missing a required field
@@ -208,34 +208,34 @@ 
 						// get all merge variables in array, loop and str_replace error code with field name
 						$api_key = yikes_get_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';
 						}
 						$merge_variables = wp_remote_post( $api_endpoint, array(
 							'body' => array(
 								'apikey' => $api_key,
-								'id' => array( $_POST['yikes-mailchimp-associated-list-id'] ) ,
+								'id' => array( $_POST[ 'yikes-mailchimp-associated-list-id' ] ),
 							),
 							'timeout' => 10,
 							'sslverify' => apply_filters( 'yikes-mailchimp-sslverify', true ),
 						) );
 						$merge_variables = json_decode( wp_remote_retrieve_body( $merge_variables ), true );
-						if( isset( $merge_variables['error'] ) ) {
-							if( WP_DEBUG || get_option( 'yikes-mailchimp-debug-status' , '' ) == '1' ) {
+						if ( isset( $merge_variables[ '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( $merge_variables['error'], __( "Get Merge Variables" , 'yikes-inc-easy-mailchimp-extender' ), "process_form_submission.php" );
+								$error_logging->yikes_easy_mailchimp_write_to_error_log( $merge_variables[ 'error' ], __( "Get Merge Variables", 'yikes-inc-easy-mailchimp-extender' ), "process_form_submission.php" );
 							}
 						}
 						// re-store our data
-						$merge_variables = $merge_variables['data'][0]['merge_vars'];
+						$merge_variables = $merge_variables[ 'data' ][ 0 ][ 'merge_vars' ];
 						$merge_variable_name_array = array();
-						foreach( $merge_variables as $merge_var ) {
-							$merge_variables_name_array[$merge_var['tag']] = $merge_var['name'];
+						foreach ( $merge_variables as $merge_var ) {
+							$merge_variables_name_array[ $merge_var[ 'tag' ] ] = $merge_var[ 'name' ];
 						}
-						$error_message = $subscribe_response['error'];
+						$error_message = $subscribe_response[ 'error' ];
 						// replace tag with name in the error message.
-						foreach( $merge_variables_name_array as $tag => $name ) {
+						foreach ( $merge_variables_name_array as $tag => $name ) {
 							$error_message = str_replace( $tag, $name, $error_message );
 						}
 						$process_submission_response = '<p class="yikes-easy-mc-error-message">' . $error_message . '.</p>';
@@ -243,18 +243,18 @@ 
 				// test@email.com is not allowed
 				case '-99':
 					// generic error
-					$process_submission_response = '<p class="yikes-easy-mc-error-message">' .  str_replace( ' and cannot be imported', '', str_replace( 'List_RoleEmailMember:', '', $subscribe_response['error'] ) ) . '</p>';
+					$process_submission_response = '<p class="yikes-easy-mc-error-message">' . str_replace( ' and cannot be imported', '', str_replace( 'List_RoleEmailMember:', '', $subscribe_response[ 'error' ] ) ) . '</p>';
 					break;
 				// invalid email (or no email at all)
 				case '-100':
-					$process_submission_response = ( ! empty( $form_settings['error_messages']['invalid-email'] ) ) ? '<p class="yikes-easy-mc-error-message">' . $form_settings['error_messages']['invalid-email'] . '</p>' : '<p class="yikes-easy-mc-error-message">' . __( 'Please provide a valid email address.', 'yikes-inc-easy-mailchimp-extender' ) . '</p>';
+					$process_submission_response = ( ! empty( $form_settings[ 'error_messages' ][ 'invalid-email' ] ) ) ? '<p class="yikes-easy-mc-error-message">' . $form_settings[ 'error_messages' ][ 'invalid-email' ] . '</p>' : '<p class="yikes-easy-mc-error-message">' . __( 'Please provide a valid email address.', 'yikes-inc-easy-mailchimp-extender' ) . '</p>';
 					break;
 				default:
 					// generic error
-					if( ! empty( $form_settings['error_messages']['general-error'] ) ) {
-						$process_submission_response = '<p class="yikes-easy-mc-error-message">' . $form_settings['error_messages']['general-error'] . '</p>';
+					if ( ! empty( $form_settings[ 'error_messages' ][ 'general-error' ] ) ) {
+						$process_submission_response = '<p class="yikes-easy-mc-error-message">' . $form_settings[ 'error_messages' ][ 'general-error' ] . '</p>';
 					} else {
-						$process_submission_response = '<p class="yikes-easy-mc-error-message">' .  $subscribe_response['error'] . '</p>';
+						$process_submission_response = '<p class="yikes-easy-mc-error-message">' . $subscribe_response[ 'error' ] . '</p>';
 					}
 					break;
 			}
@@ -265,11 +265,11 @@ 
 		$form_submitted = 1;
 
 		// Display the success message
-		if( ! empty( $form_settings['error_messages']['success'] ) ) {
-			$process_submission_response = '<p class="yikes-easy-mc-success-message">' . apply_filters( 'yikes-mailchimp-success-response', stripslashes( esc_html( $form_settings['error_messages']['success'] ) ), $form_id, $merge_variables ) . '</p>';
+		if ( ! empty( $form_settings[ 'error_messages' ][ 'success' ] ) ) {
+			$process_submission_response = '<p class="yikes-easy-mc-success-message">' . apply_filters( 'yikes-mailchimp-success-response', stripslashes( esc_html( $form_settings[ 'error_messages' ][ 'success' ] ) ), $form_id, $merge_variables ) . '</p>';
 			// echo stripslashes( esc_html( $error_messages['success'] ) );
 		} else {
-			$default_success_response = ( 1 === $form_settings['optin_settings']['optin'] ) ? __( 'Thank you for subscribing! Check your email for the confirmation message.' , 'yikes-inc-easy-mailchimp-extender' ) : __( 'Thank you for subscribing!' , 'yikes-inc-easy-mailchimp-extender' );
+			$default_success_response = ( 1 === $form_settings[ 'optin_settings' ][ 'optin' ] ) ? __( 'Thank you for subscribing! Check your email for the confirmation message.', 'yikes-inc-easy-mailchimp-extender' ) : __( 'Thank you for subscribing!', 'yikes-inc-easy-mailchimp-extender' );
 			$process_submission_response = '<p class="yikes-easy-mc-success-message">' . apply_filters( 'yikes-mailchimp-success-response', $default_success_response, $form_id, $merge_variables ) . '</p>';
 			// echo $default_success_response;
 		}
@@ -282,8 +282,8 @@ 
 		* 	optional @form - the ID of the form to filter
 		*	@since 6.0.0
 		*/
-		do_action( 'yikes-mailchimp-after-submission' , $merge_variables );
-		do_action( 'yikes-mailchimp-after-submission-' . $form_id , $merge_variables );
+		do_action( 'yikes-mailchimp-after-submission', $merge_variables );
+		do_action( 'yikes-mailchimp-after-submission-' . $form_id, $merge_variables );
 
 		/*
 		*	Non-AJAX redirects now handled in class-yikes-inc-easy-mailchimp-extender-public.php
@@ -301,23 +301,23 @@ 
 		*	@$notifications - the notification array
 		*	@since 6.0.0
 		*/
-		do_action( 'yikes-mailchimp-form-submission' , $_POST['EMAIL'] , $merge_variables , $form_id , $form_settings['notifications'] );
-		do_action( 'yikes-mailchimp-form-submission-' . $form_id , $_POST['EMAIL'] , $merge_variables , $form_id , $form_settings['notifications'] );
+		do_action( 'yikes-mailchimp-form-submission', $_POST[ 'EMAIL' ], $merge_variables, $form_id, $form_settings[ 'notifications' ] );
+		do_action( 'yikes-mailchimp-form-submission-' . $form_id, $_POST[ 'EMAIL' ], $merge_variables, $form_id, $form_settings[ 'notifications' ] );
 
 		/*
 		*	Increase the submission count for this form
 		*	on a successful submission
 		*	@since 6.0.0
 		*/
-		$form_settings['submissions']++;
+		$form_settings[ 'submissions' ]++;
 		$wpdb->update(
 			$wpdb->prefix . 'yikes_easy_mc_forms',
 			array(
-				'submissions' => $form_settings['submissions'],
+				'submissions' => $form_settings[ 'submissions' ],
 			),
 			array( 'ID' => $form_id ),
 			array(
-				'%d',	// send welcome email
+				'%d', // send welcome email
 			),
 			array( '%d' )
 		);

public/partials/ajax/class.public_ajax.php

Braces +1 added lines, -2 removed lines

@@ -1,6 +1,5 @@
 <?php
-	class YIKES_Inc_Easy_MailChimp_Public_Ajax
-	{
+	class YIKES_Inc_Easy_MailChimp_Public_Ajax {
 
 		/**
 		 * Thetext domain of this plugin

Spacing +41 added lines, -41 removed lines

@@ -11,16 +11,16 @@ 
 		 */
 		public function __construct() {
 			// ajax process form submission
-			add_action( 'wp_ajax_nopriv_process_form_submission', array( $this , 'process_form_submission' ), 10 );
-			add_action( 'wp_ajax_process_form_submission', array( $this , 'process_form_submission' ), 10 );
+			add_action( 'wp_ajax_nopriv_process_form_submission', array( $this, 'process_form_submission' ), 10 );
+			add_action( 'wp_ajax_process_form_submission', array( $this, 'process_form_submission' ), 10 );
 
 			// ajax send update emails
-			add_action( 'wp_ajax_nopriv_easy_forms_send_email', array( $this , 'sendUpdateProfileEmail' ), 10 );
-			add_action( 'wp_ajax_easy_forms_send_email', array( $this , 'sendUpdateProfileEmail' ), 10 );
+			add_action( 'wp_ajax_nopriv_easy_forms_send_email', array( $this, 'sendUpdateProfileEmail' ), 10 );
+			add_action( 'wp_ajax_easy_forms_send_email', array( $this, 'sendUpdateProfileEmail' ), 10 );
 
 			// increase submission count for a given form on successful submit
-			add_action( 'wp_ajax_nopriv_increase_submission_count' , array( $this , 'increase_submission_count' ), 10 );
-			add_action( 'wp_ajax_increase_submission_count' , array( $this , 'increase_submission_count' ), 10 );
+			add_action( 'wp_ajax_nopriv_increase_submission_count', array( $this, 'increase_submission_count' ), 10 );
+			add_action( 'wp_ajax_increase_submission_count', array( $this, 'increase_submission_count' ), 10 );
 		}
 
 		/*
@@ -40,18 +40,18 @@ 
 		*/
 		public function increase_submission_count() {
 			// store our posted form ID
-			$form_id = $_POST['form_id'];
+			$form_id = $_POST[ 'form_id' ];
 			global $wpdb;
 			// query the form
 			$form_results = $wpdb->get_results( 'SELECT * FROM ' . $wpdb->prefix . 'yikes_easy_mc_forms WHERE id = ' . $form_id . '', ARRAY_A );
-			$form_data = $form_results[0];
+			$form_data = $form_results[ 0 ];
 			// increase the submission
-			$form_data['submissions']++;
+			$form_data[ 'submissions' ]++;
 			// update the value in the database
 			$wpdb->update(
 				$wpdb->prefix . 'yikes_easy_mc_forms',
 					array(
-						'submissions' => $form_data['submissions'],
+						'submissions' => $form_data[ 'submissions' ],
 					),
 					array( 'ID' => $form_id ),
 					array(
@@ -68,17 +68,17 @@ 
 			@since v6.0.4.1
 		*/
 		public function sendUpdateProfileEmail() {
-			$user_email = $_POST['user_email'];
-			$list_id = $_POST['list_id'];
+			$user_email = $_POST[ 'user_email' ];
+			$list_id = $_POST[ 'list_id' ];
 
 			$api_key = yikes_get_mc_api_key();
 			$dash_position = strpos( $api_key, '-' );
-			$explode_key = explode( '-' , $api_key );
-			$data_center = $explode_key[1];
-			$full_site_url = get_bloginfo('url');
+			$explode_key = explode( '-', $api_key );
+			$data_center = $explode_key[ 1 ];
+			$full_site_url = get_bloginfo( 'url' );
 
 			// list details api call
-			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_details = wp_remote_post( $api_endpoint, array(
@@ -92,16 +92,16 @@ 
 				'sslverify' => apply_filters( 'yikes-mailchimp-sslverify', true )
 			) );
 			$list_details = json_decode( wp_remote_retrieve_body( $list_details ), true );
-			if( isset( $list_details['error'] ) ) {
-				if( WP_DEBUG || get_option( 'yikes-mailchimp-debug-status' , '' ) == '1' ) {
+			if ( isset( $list_details[ '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_details['error'], __( "Send Update Profile Email - Get Account Lists" , 'yikes-inc-easy-mailchimp-extender' ), "class.public_ajax.php" );
+					$error_logging->yikes_easy_mailchimp_write_to_error_log( $list_details[ 'error' ], __( "Send Update Profile Email - Get Account Lists", 'yikes-inc-easy-mailchimp-extender' ), "class.public_ajax.php" );
 				}
 			}
 
 			// account details api call
-			if( $dash_position !== false ) {
+			if ( $dash_position !== false ) {
 				$api_endpoint = 'https://' . substr( $api_key, $dash_position + 1 ) . '.api.mailchimp.com/2.0/helper/account-details.json';
 			}
 			$account_details = wp_remote_post( $api_endpoint, array(
@@ -112,16 +112,16 @@ 
 				'sslverify' => apply_filters( 'yikes-mailchimp-sslverify', true )
 			) );
 			$account_details = json_decode( wp_remote_retrieve_body( $account_details ), true );
-			if( isset( $account_details['error'] ) ) {
-				if( WP_DEBUG || get_option( 'yikes-mailchimp-debug-status' , '' ) == '1' ) {
+			if ( isset( $account_details[ '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( $account_details['error'], __( "Send Update Profile Email - Get Account Details" , 'yikes-inc-easy-mailchimp-extender' ), "class.public_ajax.php" );
+					$error_logging->yikes_easy_mailchimp_write_to_error_log( $account_details[ 'error' ], __( "Send Update Profile Email - Get Account Details", 'yikes-inc-easy-mailchimp-extender' ), "class.public_ajax.php" );
 				}
 			}
 
 			// subscriber details api call
-			if( $dash_position !== false ) {
+			if ( $dash_position !== false ) {
 				$api_endpoint = 'https://' . substr( $api_key, $dash_position + 1 ) . '.api.mailchimp.com/2.0/lists/member-info.json';
 			}
 			$subscriber_account_details = wp_remote_post( $api_endpoint, array(
@@ -136,27 +136,27 @@ 
 				'sslverify' => apply_filters( 'yikes-mailchimp-sslverify', true )
 			) );
 			$subscriber_account_details = json_decode( wp_remote_retrieve_body( $subscriber_account_details ), true );
-			if( isset( $subscriber_account_details['error'] ) ) {
-				if( WP_DEBUG || get_option( 'yikes-mailchimp-debug-status' , '' ) == '1' ) {
+			if ( isset( $subscriber_account_details[ '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( $subscriber_account_details['error'], __( "Send Update Profile Email - Get Member Info." , 'yikes-inc-easy-mailchimp-extender' ), "class.public_ajax.php" );
+					$error_logging->yikes_easy_mailchimp_write_to_error_log( $subscriber_account_details[ 'error' ], __( "Send Update Profile Email - Get Member Info.", 'yikes-inc-easy-mailchimp-extender' ), "class.public_ajax.php" );
 				}
 			}
 
 			// check for errors in any of the calls
-			if( isset( $list_details['error'] ) || isset( $account_details['error'] ) || isset( $subscriber_account_details['error'] ) ) {
-				$error_message = ( isset( $list_details['error'] ) ) ? $list_details['error'] : false;
-				if( ! $error_message ) {
-					$error_message = ( isset( $account_details['error'] ) ) ? $account_details['error'] : false;
-					if( ! $error_message ) {
-						$error_message = ( isset( $subscriber_account_details['error'] ) ) ? $subscriber_account_details['error'] : false;
-						if( ! $error_message ) {
+			if ( isset( $list_details[ 'error' ] ) || isset( $account_details[ 'error' ] ) || isset( $subscriber_account_details[ 'error' ] ) ) {
+				$error_message = ( isset( $list_details[ 'error' ] ) ) ? $list_details[ 'error' ] : false;
+				if ( ! $error_message ) {
+					$error_message = ( isset( $account_details[ 'error' ] ) ) ? $account_details[ 'error' ] : false;
+					if ( ! $error_message ) {
+						$error_message = ( isset( $subscriber_account_details[ 'error' ] ) ) ? $subscriber_account_details[ 'error' ] : false;
+						if ( ! $error_message ) {
 							$error_message = '';
 						}
 					}
 				}
-				$errorMessage = sprintf( __( 'Error sending update profile email. <strong>Error: %s</strong>. Please contact the site administrator.' , 'yikes-inc-easy-mailchimp-extender' ), $error_message );
+				$errorMessage = sprintf( __( 'Error sending update profile email. <strong>Error: %s</strong>. Please contact the site administrator.', 'yikes-inc-easy-mailchimp-extender' ), $error_message );
 				wp_send_json_error(
 					array(
 						'response_text' => '<div class="yikes-easy-mc-error-message">&#10005; ' . $errorMessage . '</div>',
@@ -166,11 +166,11 @@ 
 			}
 
 			// send the email!
-			$subscriber_id = $subscriber_account_details['data'][0]['id'];
-			$explode_url = explode( '.' , $account_details['contact']['url'] );
-			$update_link_href = 'http://' . $explode_url[1] . '.' . $data_center . '.list-manage1.com/profile?u=' . $account_details['user_id'] . '&id=' . $list_id .'&e=' . $subscriber_id;
+			$subscriber_id = $subscriber_account_details[ 'data' ][ 0 ][ 'id' ];
+			$explode_url = explode( '.', $account_details[ 'contact' ][ 'url' ] );
+			$update_link_href = 'http://' . $explode_url[ 1 ] . '.' . $data_center . '.list-manage1.com/profile?u=' . $account_details[ 'user_id' ] . '&id=' . $list_id . '&e=' . $subscriber_id;
 			$subject = 'MailChimp Profile Update';
-			$headers = 'From: ' . $list_details['data'][0]['default_from_name'] . ' <' . $list_details['data'][0]['default_from_email'] . '>' . "\r\n";
+			$headers = 'From: ' . $list_details[ 'data' ][ 0 ][ 'default_from_name' ] . ' <' . $list_details[ 'data' ][ 0 ][ 'default_from_email' ] . '>' . "\r\n";
 			$headers .= 'Content-type: text/html';
 				$email_content = '<p>Greetings,</p> <p>A request has been made to update your MailChimp account profile information. To do so please use the following link: <a href="' . $update_link_href . '" title="Update MailChimp Profile">Update MailChimp Profile Info.</a>';
 				$email_content .= "<p>If you did not request this update, please disregard this email.</p>";
@@ -183,14 +183,14 @@ 
 			if ( wp_mail( $user_email, apply_filters( 'yikes-mailchimp-update-email-subject', $subject ), apply_filters( 'yikes-mailchimp-update-email-content', $email_content, $update_link_href ), $headers ) ) {
 				wp_send_json_success(
 					array(
-						'response_text' => '<div class="yikes-easy-mc-success-message">' . sprintf( __( '%s Update email successfully sent. Please check your inbox for the message.' , 'yikes-inc-easy-mailchimp-extender' ), '&#10004;' ) . '</div>',
+						'response_text' => '<div class="yikes-easy-mc-success-message">' . sprintf( __( '%s Update email successfully sent. Please check your inbox for the message.', 'yikes-inc-easy-mailchimp-extender' ), '&#10004;' ) . '</div>',
 					)
 				);
 				exit;
 			} else {
 				wp_send_json_error(
 					array(
-						'response_text' => '<div class="yikes-easy-mc-error-message">' . sprintf( __( '%s Email failed to send. Please contact the site administrator.' , 'yikes-inc-easy-mailchimp-extender' ), '&#10005;' ) . '</div>',
+						'response_text' => '<div class="yikes-easy-mc-error-message">' . sprintf( __( '%s Email failed to send. Please contact the site administrator.', 'yikes-inc-easy-mailchimp-extender' ), '&#10005;' ) . '</div>',
 					)
 				);
 				exit;

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

Indentation +3 added lines, -3 removed lines

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

Spacing +6 added lines, -6 removed lines

@@ -6,7 +6,7 @@ 
 	*/
 	
 	// Prevent direct access to the file
-	defined('ABSPATH') or die( __( "Whoops, you shouldn't be accessing this file directly. Abort!" , 'yikes-inc-easy-mailchimp-extender' ) );
+	defined( 'ABSPATH' ) or die( __( "Whoops, you shouldn't be accessing this file directly. Abort!", 'yikes-inc-easy-mailchimp-extender' ) );
 	
 	class Yikes_Easy_MC_Comment_Checkbox_Class extends Yikes_Easy_MC_Checkbox_Integration_Class {
 	
@@ -27,12 +27,12 @@ 
 		* Outputs a checkbox, if user is not already subscribed
 		*/
 		public function output_checkbox( $comment_field ) {
-			if( $this->is_user_already_subscribed( $this->type ) == '1' ) {
+			if ( $this->is_user_already_subscribed( $this->type ) == '1' ) {
 				return $comment_field;
 			}
-				echo do_action( 'yikes-mailchimp-before-checkbox' , $this->type );
+				echo do_action( 'yikes-mailchimp-before-checkbox', $this->type );
 					echo $comment_field . $this->yikes_get_checkbox();
-				echo do_action( 'yikes-mailchimp-after-checkbox' , $this->type );
+				echo do_action( 'yikes-mailchimp-after-checkbox', $this->type );
 		}		
 	
 		/**
@@ -41,7 +41,7 @@ 
 		 *
 		 *	@since 6.0.0
 		**/
-		public function subscribe_from_comment( $comment_id , $comment_approved ) {	
+		public function subscribe_from_comment( $comment_id, $comment_approved ) {	
 			// was sign-up checkbox checked?
 			if ( $this->was_checkbox_checked( $this->type ) === false ) {
 				return false;
@@ -58,7 +58,7 @@ 
 				'OPTIN_IP' => $comment_data->comment_author_IP,
 			);
 			// subscribe the user 
-			$this->subscribe_user_integration( sanitize_email( $comment_data->comment_author_email ) , $this->type , $merge_vars );
+			$this->subscribe_user_integration( sanitize_email( $comment_data->comment_author_email ), $this->type, $merge_vars );
 		}
 		
 	}

Braces +2 added lines, -2 removed lines

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

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

Indentation +5 added lines, -5 removed lines

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

Spacing +11 added lines, -11 removed lines

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