yikesinc / yikes-inc-easy-mailchimp-extender

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

Spacing +1 added lines, -1 removed lines

@@ -29,7 +29,7 @@
 		<?php settings_fields( 'yikes_inc_easy_mc_recaptcha_settings_page' ); ?>
 
 			<label for="yikes-mc-recaptcha-setting">
-				<input type="checkbox" id="yikes-mc-recaptcha-setting" name="yikes-mc-recaptcha-status" class="recaptcha-setting-checkbox" value="1" <?php checked( get_option( 'yikes-mc-recaptcha-status', '' ) , '1' ); ?>>
+				<input type="checkbox" id="yikes-mc-recaptcha-setting" name="yikes-mc-recaptcha-status" class="recaptcha-setting-checkbox" value="1" <?php checked( get_option( 'yikes-mc-recaptcha-status', '' ), '1' ); ?>>
 				<strong><?php _e( 'Enable reCAPTCHA Protection', 'yikes-inc-easy-mailchimp-extender' ); ?></strong>
 			</label>
 

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

Spacing +3 added lines, -3 removed lines

@@ -64,13 +64,13 @@ 
 		$checkbox_options = get_option( 'optin-checkbox-init', array() );
 
 		// Only display the field if a list is set.
-		if ( isset( $checkbox_options[ $this->type ] ) && isset( $checkbox_options[ $this->type ]['associated-list'] ) && '-' !== $checkbox_options[ $this->type ]['associated-list'] ) {
+		if ( isset( $checkbox_options[ $this->type ] ) && isset( $checkbox_options[ $this->type ][ 'associated-list' ] ) && '-' !== $checkbox_options[ $this->type ][ 'associated-list' ] ) {
 
 			if ( $this->is_user_already_subscribed( $this->type ) ) {
 				return $fields;
 			}
 
-			$precheck = isset( $checkbox_options[ $this->type ]['precheck'] ) && 'true' === $checkbox_options[ $this->type ]['precheck'] ? '1' : '0';
+			$precheck = isset( $checkbox_options[ $this->type ][ 'precheck' ] ) && 'true' === $checkbox_options[ $this->type ][ 'precheck' ] ? '1' : '0';
 
 			/**
 			* Filter where the checkbox goes.
@@ -85,7 +85,7 @@ 
 				'id'      => 'yikes_mailchimp_checkbox_' . $this->type,
 				'type'    => 'checkbox',
 				'class'   => apply_filters( 'yikes-mailchimp-wooco-integration-checkbox-classes', array( 'form-row-wide' ) ),
-				'label'   => $checkbox_options[ $this->type ]['label'],
+				'label'   => $checkbox_options[ $this->type ][ 'label' ],
 				'default' => $precheck,
 			);
 

blocks/api/api.php

Spacing +3 added lines, -3 removed lines

@@ -40,7 +40,7 @@ 
 			wp_send_json_error( '1' );
 		}
 
-		$form_id = isset( $_POST['form_id'] ) ? filter_var( wp_unslash( $_POST['form_id'] ), FILTER_SANITIZE_NUMBER_INT ) : '';
+		$form_id = isset( $_POST[ 'form_id' ] ) ? filter_var( wp_unslash( $_POST[ 'form_id' ] ), FILTER_SANITIZE_NUMBER_INT ) : '';
 
 		if ( empty( $form_id ) ) {
 			wp_send_json_error( '1' );
@@ -75,12 +75,12 @@ 
 
 			$locale   = get_locale();
 			$locale_a = explode( '_', $locale );
-			$locale   = isset( $locale_a[0] ) ? $locale_a[0] : $locale;
+			$locale   = isset( $locale_a[ 0 ] ) ? $locale_a[ 0 ] : $locale;
 			$return   = apply_filters( 'yikes_mailchimp_recaptcha_data', array(
 				'site_key'   => $site_key,
 				'secret_key' => $secret_key,
 				'locale'     => $locale,
-			));
+			) );
 
 			wp_send_json_success( $return );
 		}

admin/partials/view-user.php

Spacing +29 added lines, -29 removed lines

@@ -3,8 +3,8 @@ 
 *	Get and store our variables
 *	@since 6.0
 */
-$list_id     = $_GET['mailchimp-list'];
-$email_id    = esc_attr( $_GET['email-id'] );
+$list_id     = $_GET[ 'mailchimp-list' ];
+$email_id    = esc_attr( $_GET[ 'email-id' ] );
 $list_helper = yikes_get_mc_api_manager()->get_list_handler();
 
 /*
@@ -36,14 +36,14 @@ 
 }
 
 $other_lists      = $list_helper->get_members_lists( $email_id );
-$merge_data_array = $user_data['merge_fields'];
+$merge_data_array = $user_data[ 'merge_fields' ];
 
 $additional_lists = array();
 $merge_variable_fields = array();
 
 /* Build the array of mailing lists the user is subscribed to */
 foreach ( $other_lists as $id => $value ) {
-	if ( 'subscribed' !== $value['status'] ) {
+	if ( 'subscribed' !== $value[ 'status' ] ) {
 		continue;
 	}
 
@@ -58,7 +58,7 @@ 
 		continue;
 	}
 
-	$additional_lists[ $list_data['id'] ] = $list_data['name'];
+	$additional_lists[ $list_data[ 'id' ] ] = $list_data[ 'name' ];
 }
 
 /* Build the array of merge variables => value */
@@ -74,21 +74,21 @@ 
 }
 // loop and display
 if ( $merge_variables ) {
-	foreach ( $merge_variables['merge_fields'] as $merge_variable ) {
-		if ( $merge_variable['tag'] != 'EMAIL' ) {
-			$merge_variable_fields[ $merge_variable['name'] ] = ( isset( $merge_data_array[ $merge_variable['tag'] ] ) ) ? $merge_data_array[ $merge_variable['tag'] ] : '';
+	foreach ( $merge_variables[ 'merge_fields' ] as $merge_variable ) {
+		if ( $merge_variable[ 'tag' ] != 'EMAIL' ) {
+			$merge_variable_fields[ $merge_variable[ 'name' ] ] = ( isset( $merge_data_array[ $merge_variable[ 'tag' ] ] ) ) ? $merge_data_array[ $merge_variable[ 'tag' ] ] : '';
 		}
 	}
 }
 
 
 // store usable data
-$user_email = sanitize_email( $user_data['email_address'] );
+$user_email = sanitize_email( $user_data[ 'email_address' ] );
 // prepend our email address to the beginning
 $merge_variable_fields = array( 'Email Address' => $user_email ) + $merge_variable_fields;
 $gravatar_image        = get_avatar( $user_email, 120 );
-$email_type            = $user_data['email_type'];
-$member_rating         = ( ! empty( $user_data['member_rating'] ) ) ? (int) $user_data['member_rating'] : 0;
+$email_type            = $user_data[ 'email_type' ];
+$member_rating         = ( ! empty( $user_data[ 'member_rating' ] ) ) ? (int) $user_data[ 'member_rating' ] : 0;
 $member_rating_stars   = '';
 
 // Create member rating stars
@@ -100,8 +100,8 @@ 
 	}
 }
 
-$last_changed  = strtotime( $user_data['last_changed'] );
-$user_language = ( ! empty( $user_data['language'] ) ) ? $user_data['language'] : '';
+$last_changed  = strtotime( $user_data[ 'last_changed' ] );
+$user_language = ( ! empty( $user_data[ 'language' ] ) ) ? $user_data[ 'language' ] : '';
 $list_name     = $additional_lists[ $list_id ];
 
 // Generate our display page
@@ -144,11 +144,11 @@ 
 							echo sprintf( esc_html__( 'Subscribed: %1$1s', 'yikes-inc-easy-mailchimp-extender' ), esc_html( gmdate( 'F jS, Y h:i a', $last_changed ) ) );
 						?>
 					</span>
-				<?php if ( isset( $user_data['location'] ) && isset( $user_data['location']['timezone'] ) && ! empty( $user_data['location']['timezone'] ) && isset( $user_data['location']['country_code'] ) && ! empty( $user_data['location']['country_code'] ) ) { ?>
+				<?php if ( isset( $user_data[ 'location' ] ) && isset( $user_data[ 'location' ][ 'timezone' ] ) && ! empty( $user_data[ 'location' ][ 'timezone' ] ) && isset( $user_data[ 'location' ][ 'country_code' ] ) && ! empty( $user_data[ 'location' ][ 'country_code' ] ) ) { ?>
 					<span class="member-location-data">
 						<?php
 							/* translators: the placeholders are a timezone and a country code */
-							echo sprintf( esc_html__( 'Location: %1$1s, %2$2s', 'yikes-inc-easy-mailchimp-extender' ), esc_html( $user_data['location']['timezone'] ), esc_html( $user_data['location']['country_code'] ) );
+							echo sprintf( esc_html__( 'Location: %1$1s, %2$2s', 'yikes-inc-easy-mailchimp-extender' ), esc_html( $user_data[ 'location' ][ 'timezone' ] ), esc_html( $user_data[ 'location' ][ 'country_code' ] ) );
 						?>
 					</span>
 				<?php } ?>
@@ -157,7 +157,7 @@ 
 			<hr class="yikes-mc-subscriber-hr" />
 
 			<?php
-			if ( ! isset( $_GET['section'] ) || ( isset( $_GET['section'] ) && filter_var( wp_unslash( $_GET['section'] ), FILTER_SANITIZE_STRING ) === 'subscriber-data' ) ) {
+			if ( ! isset( $_GET[ 'section' ] ) || ( isset( $_GET[ 'section' ] ) && filter_var( wp_unslash( $_GET[ 'section' ] ), FILTER_SANITIZE_STRING ) === 'subscriber-data' ) ) {
 				?>
 			<section class="yikes-mc-card-body merge-variable-section">
 				<h3><?php esc_html_e( 'Fields:', 'yikes-inc-easy-mailchimp-extender' ); ?></h3>
@@ -177,12 +177,12 @@ 
 					<strong><?php esc_html_e( 'No Subscriber Data Found', 'yikes-inc-easy-mailchimp-extender' ); ?></strong>
 					<?php
 				}
-				if ( isset( $user_data['ip_signup'] ) && ! empty( $user_data['ip_signup'] ) ) {
+				if ( isset( $user_data[ 'ip_signup' ] ) && ! empty( $user_data[ 'ip_signup' ] ) ) {
 					?>
 					<li>
 						<label>
 							<strong class="section-label"><?php esc_html_e( 'Signup IP', 'yikes-inc-easy-mailchimp-extender' ); ?></strong>
-							<p class="section-value"><em><?php esc_html_e( $user_data['ip_signup'] ); ?></em></p>
+							<p class="section-value"><em><?php esc_html_e( $user_data[ 'ip_signup' ] ); ?></em></p>
 						</label>
 					</li>
 					<?php
@@ -193,7 +193,7 @@ 
 			<?php
 
 
-			if ( isset( $_GET['section'] ) && $_GET['section'] == 'additional-subscriptions' ) {
+			if ( isset( $_GET[ 'section' ] ) && $_GET[ 'section' ] == 'additional-subscriptions' ) {
 				?>
 				<section class="yikes-mc-card-body">
 					<?php
@@ -222,7 +222,7 @@ 
 			?>
 
 			<?php
-			if ( isset( $_GET['section'] ) && $_GET['section'] == 'delete-subscriber' ) {
+			if ( isset( $_GET[ 'section' ] ) && $_GET[ 'section' ] == 'delete-subscriber' ) {
 				$unsubscribe_subscriber_url = esc_url_raw( add_query_arg( array(
 					'action'         => 'yikes-easy-mc-unsubscribe-user',
 					'mailchimp-list' => $list_id,
@@ -277,36 +277,36 @@ 
 		<div id="customer-tab-wrapper">
 			<ul id="customer-tab-wrapper-list">
 
-				<?php if ( isset( $_GET['section'] ) && $_GET['section'] != 'subscriber-data' ) { ?>
+				<?php if ( isset( $_GET[ 'section' ] ) && $_GET[ 'section' ] != 'subscriber-data' ) { ?>
 				<a title="<?php _e( 'Subscriber Details', 'yikes-inc-easy-mailchimp-extender' ); ?>" aria-label="<?php _e( 'Subscriber Details', 'yikes-inc-easy-mailchimp-extender' ); ?>" href="<?php echo $subscriber_details; ?>">
 					<?php } ?>
 
-					<li <?php if ( ! isset( $_GET['section'] ) || ( isset( $_GET['section'] ) && $_GET['section'] == 'subscriber-data' ) ) { ?>class="active" <?php } else { ?>class="inactive"<?php } ?>>
+					<li <?php if ( ! isset( $_GET[ 'section' ] ) || ( isset( $_GET[ 'section' ] ) && $_GET[ 'section' ] == 'subscriber-data' ) ) { ?>class="active" <?php } else { ?>class="inactive"<?php } ?>>
 						<span class="dashicons  dashicons-id"></span></li>
 
-					<?php if ( isset( $_GET['section'] ) && $_GET['section'] != 'subscriber-data' ) { ?>
+					<?php if ( isset( $_GET[ 'section' ] ) && $_GET[ 'section' ] != 'subscriber-data' ) { ?>
 				</a>
 			<?php } ?>
 
-				<?php if ( ! isset( $_GET['section'] ) || ( isset( $_GET['section'] ) && $_GET['section'] != 'additional-subscriptions' ) ) { ?>
+				<?php if ( ! isset( $_GET[ 'section' ] ) || ( isset( $_GET[ 'section' ] ) && $_GET[ 'section' ] != 'additional-subscriptions' ) ) { ?>
 				<a title="<?php _e( 'Additional Subscriptions', 'yikes-inc-easy-mailchimp-extender' ); ?>" aria-label="<?php _e( 'Additional Subscriptions', 'yikes-inc-easy-mailchimp-extender' ); ?>" href="<?php echo $additional_subscription_url; ?>">
 					<?php } ?>
 
-					<li <?php if ( isset( $_GET['section'] ) && $_GET['section'] == 'additional-subscriptions' ) { ?>class="active" <?php } else { ?>class="inactive"<?php } ?>>
+					<li <?php if ( isset( $_GET[ 'section' ] ) && $_GET[ 'section' ] == 'additional-subscriptions' ) { ?>class="active" <?php } else { ?>class="inactive"<?php } ?>>
 						<span class="dashicons dashicons-portfolio"></span></li>
 
-					<?php if ( ! isset( $_GET['section'] ) || ( isset( $_GET['section'] ) && $_GET['section'] == 'additional-subscriptions' ) ) { ?>
+					<?php if ( ! isset( $_GET[ 'section' ] ) || ( isset( $_GET[ 'section' ] ) && $_GET[ 'section' ] == 'additional-subscriptions' ) ) { ?>
 				</a>
 			<?php } ?>
 
-				<?php if ( ! isset( $_GET['section'] ) || isset( $_GET['section'] ) && $_GET['section'] != 'delete-subscriber' ) { ?>
+				<?php if ( ! isset( $_GET[ 'section' ] ) || isset( $_GET[ 'section' ] ) && $_GET[ 'section' ] != 'delete-subscriber' ) { ?>
 				<a title="<?php _e( 'Delete Subscriber', 'yikes-inc-easy-mailchimp-extender' ); ?>" aria-label="<?php _e( 'Delete Subscriber', 'yikes-inc-easy-mailchimp-extender' ); ?>" href="<?php echo $delete_subscriber_url; ?>">
 					<?php } ?>
 
-					<li <?php if ( isset( $_GET['section'] ) && $_GET['section'] == 'delete-subscriber' ) { ?>class="active" <?php } else { ?>class="inactive"<?php } ?>>
+					<li <?php if ( isset( $_GET[ 'section' ] ) && $_GET[ 'section' ] == 'delete-subscriber' ) { ?>class="active" <?php } else { ?>class="inactive"<?php } ?>>
 						<span class="dashicons dashicons-trash"></span></li>
 
-					<?php if ( ! isset( $_GET['section'] ) || ( isset( $_GET['section'] ) && $_GET['section'] == 'delete-subscriber' ) ) { ?>
+					<?php if ( ! isset( $_GET[ 'section' ] ) || ( isset( $_GET[ 'section' ] ) && $_GET[ 'section' ] == 'delete-subscriber' ) ) { ?>
 				</a>
 			<?php } ?>
 

admin/partials/ajax/add_interest_group_to_form.php

Spacing +52 added lines, -52 removed lines

@@ -5,8 +5,8 @@ 
 $error = 0;
 
 // Get our $_POST variables
-$list_id = isset( $_POST['list_id'] ) ? $_POST['list_id'] : '';
-$interest_groups = isset( $_POST['interest_groups'] ) ? $_POST['interest_groups'] : array();
+$list_id = isset( $_POST[ 'list_id' ] ) ? $_POST[ 'list_id' ] : '';
+$interest_groups = isset( $_POST[ 'interest_groups' ] ) ? $_POST[ 'interest_groups' ] : array();
 
 // Make sure our $_POST variables aren't empty
 if ( empty( $list_id ) ) {
@@ -49,20 +49,20 @@ 
 
 
 // Loop through the interest groups data (group_id, field_name, field_type) and add the fields to the form
-foreach( $interest_groups as $group ) {
+foreach ( $interest_groups as $group ) {
 
 	// find and return the location of this merge field in the array
-	$index      = $this->findMCListIndex( $group['group_id'], $interest_groupings, 'id' );
+	$index      = $this->findMCListIndex( $group[ 'group_id' ], $interest_groupings, 'id' );
 	$field_data = $interest_groupings[ $index ];
-	$groups     = wp_list_pluck( $field_data['items'], 'name' );
+	$groups     = wp_list_pluck( $field_data[ 'items' ], 'name' );
 
 	?>
-	<section class="draggable" id="<?php echo $group['group_id']; ?>">
+	<section class="draggable" id="<?php echo $group[ 'group_id' ]; ?>">
 		<!-- top -->
 		<a href="#" class="expansion-section-title settings-sidebar">
-			<span class="dashicons dashicons-plus yikes-mc-expansion-toggle" title="<?php _e( 'Expand Field' , 'yikes-inc-easy-mailchimp-extender' ); ?>"></span>
-			<?php echo stripslashes( $group['field_name'] ); ?>
-			<span class="field-type-text"><small><?php echo __( 'type' , 'yikes-inc-easy-mailchimp-extender' ) . ' : ' . $group['field_type']; ?></small></span>
+			<span class="dashicons dashicons-plus yikes-mc-expansion-toggle" title="<?php _e( 'Expand Field', 'yikes-inc-easy-mailchimp-extender' ); ?>"></span>
+			<?php echo stripslashes( $group[ 'field_name' ] ); ?>
+			<span class="field-type-text"><small><?php echo __( 'type', 'yikes-inc-easy-mailchimp-extender' ) . ' : ' . $group[ 'field_type' ]; ?></small></span>
 		</a>
 		<!-- expansion section -->
 		<div class="yikes-mc-settings-expansion-section">
@@ -70,37 +70,37 @@ 
 			<!-- Single or Double Opt-in -->
 			<p class="type-container"><!-- necessary to prevent skipping on slideToggle(); -->
 				<!-- store the label -->
-				<input type="hidden" name="field[<?php echo $group['group_id']; ?>][label]" value="<?php echo htmlspecialchars( $group['field_name'] ); ?>" />
-				<input type="hidden" name="field[<?php echo $group['group_id']; ?>][type]" value="<?php echo $group['field_type']; ?>" />
-				<input type="hidden" name="field[<?php echo $group['group_id']; ?>][group_id]" value="<?php echo $group['group_id']; ?>" />
-				<input type="hidden" name="field[<?php echo $group['group_id']; ?>][groups]" value='<?php echo esc_attr( json_encode( $groups, true ) ); ?>' />
+				<input type="hidden" name="field[<?php echo $group[ 'group_id' ]; ?>][label]" value="<?php echo htmlspecialchars( $group[ 'field_name' ] ); ?>" />
+				<input type="hidden" name="field[<?php echo $group[ 'group_id' ]; ?>][type]" value="<?php echo $group[ 'field_type' ]; ?>" />
+				<input type="hidden" name="field[<?php echo $group[ 'group_id' ]; ?>][group_id]" value="<?php echo $group[ 'group_id' ]; ?>" />
+				<input type="hidden" name="field[<?php echo $group[ 'group_id' ]; ?>][groups]" value='<?php echo esc_attr( json_encode( $groups, true ) ); ?>' />
 
 
 				<table class="form-table form-field-container">
 
 					<!-- Default Value -->
-					<?php switch( $group['field_type'] ) {
+					<?php switch ( $group[ 'field_type' ] ) {
 
 						case 'radio':
 						?>
 							<tr valign="top">
 								<td scope="row">
 									<label for="placeholder">
-										<?php _e( 'Default Selection' , 'yikes-inc-easy-mailchimp-extender' ); ?>
+										<?php _e( 'Default Selection', 'yikes-inc-easy-mailchimp-extender' ); ?>
 									</label>
 								</td>
 								<td>
 
-									<?php $pre_selected = ! empty( $field_data['default_choice'] ) ? $field_data['default_choice'] : 'no-default'; ?>
+									<?php $pre_selected = ! empty( $field_data[ 'default_choice' ] ) ? $field_data[ 'default_choice' ] : 'no-default'; ?>
 
 									<!-- No Default option for radio buttons -->
-									<input type="radio" name="field[<?php echo $group['group_id']; ?>][default_choice][]" value="no-default" <?php checked( $pre_selected, 'no-default' ); ?>>No Default
+									<input type="radio" name="field[<?php echo $group[ 'group_id' ]; ?>][default_choice][]" value="no-default" <?php checked( $pre_selected, 'no-default' ); ?>>No Default
 
-									<?php foreach ( $field_data['items'] as $id => $interest_group ) { ?>
-										<input type="radio" name="field[<?php echo $group['group_id']; ?>][default_choice][]" value="<?php echo esc_attr( $id ); ?>" <?php checked( $pre_selected, $id ); ?>><?php echo stripslashes( $interest_group['name'] );
+									<?php foreach ( $field_data[ 'items' ] as $id => $interest_group ) { ?>
+										<input type="radio" name="field[<?php echo $group[ 'group_id' ]; ?>][default_choice][]" value="<?php echo esc_attr( $id ); ?>" <?php checked( $pre_selected, $id ); ?>><?php echo stripslashes( $interest_group[ 'name' ] );
 									} ?>
 
-									<p class="description"><small><?php _e( "Select the option that should be selected by default.", 'yikes-inc-easy-mailchimp-extender' );?></small></p>
+									<p class="description"><small><?php _e( "Select the option that should be selected by default.", 'yikes-inc-easy-mailchimp-extender' ); ?></small></p>
 								</td>
 							</tr>
 
@@ -114,19 +114,19 @@ 
 							<tr valign="top" class="yikes-checkbox-container">
 								<td scope="row">
 									<label for="placeholder">
-										<?php _e( 'Default Selection' , 'yikes-inc-easy-mailchimp-extender' ); ?>
+										<?php _e( 'Default Selection', 'yikes-inc-easy-mailchimp-extender' ); ?>
 									</label>
 								</td>
 								<td>
 									<?php
-									foreach ( $field_data['items'] as $id => $interest_group ) {
-										$pre_selected = ! empty( $field_data['default_choice'] ) ? $field_data['default_choice'] : '0';
+									foreach ( $field_data[ 'items' ] as $id => $interest_group ) {
+										$pre_selected = ! empty( $field_data[ 'default_choice' ] ) ? $field_data[ 'default_choice' ] : '0';
 										?>
-										<input type="checkbox" name="field[<?php echo $group['group_id']; ?>][default_choice][]" value="<?php echo $id; ?>" <?php checked( $pre_selected, $id ); ?>><?php echo stripslashes( $interest_group['name'] ); ?>
+										<input type="checkbox" name="field[<?php echo $group[ 'group_id' ]; ?>][default_choice][]" value="<?php echo $id; ?>" <?php checked( $pre_selected, $id ); ?>><?php echo stripslashes( $interest_group[ 'name' ] ); ?>
 										<?php
 									}
 									?>
-									<p class="description"><small><?php _e( "Select the option that should be selected by default.", 'yikes-inc-easy-mailchimp-extender' );?></small></p>
+									<p class="description"><small><?php _e( "Select the option that should be selected by default.", 'yikes-inc-easy-mailchimp-extender' ); ?></small></p>
 								</td>
 							</tr>
 
@@ -138,18 +138,18 @@ 
 							<tr valign="top">
 								<td scope="row">
 									<label for="placeholder">
-										<?php _e( 'Default Selection' , 'yikes-inc-easy-mailchimp-extender' ); ?>
+										<?php _e( 'Default Selection', 'yikes-inc-easy-mailchimp-extender' ); ?>
 									</label>
 								</td>
 								<td>
-									<select type="default" name="field[<?php echo $group['group_id']; ?>][default_choice]">
-										<?php $pre_selected = ! empty( $field_data['default_choice'] ) ? $field_data['default_choice'] : 'no-default'; ?>
+									<select type="default" name="field[<?php echo $group[ 'group_id' ]; ?>][default_choice]">
+										<?php $pre_selected = ! empty( $field_data[ 'default_choice' ] ) ? $field_data[ 'default_choice' ] : 'no-default'; ?>
 										<option value="no-default">No Default</option>
-										<?php foreach ( $field_data['items'] as $id => $interest_group ) { ?>
-											<option value="<?php echo $id; ?>" <?php selected( $pre_selected, $id ); ?>><?php echo $interest_group['name']; ?></option>
+										<?php foreach ( $field_data[ 'items' ] as $id => $interest_group ) { ?>
+											<option value="<?php echo $id; ?>" <?php selected( $pre_selected, $id ); ?>><?php echo $interest_group[ 'name' ]; ?></option>
 										<?php } ?>
 									</select>
-									<p class="description"><small><?php _e( "Which option should be selected by default?", 'yikes-inc-easy-mailchimp-extender' );?></small></p>
+									<p class="description"><small><?php _e( "Which option should be selected by default?", 'yikes-inc-easy-mailchimp-extender' ); ?></small></p>
 								</td>
 							</tr>
 
@@ -161,25 +161,25 @@ 
 					<tr valign="top">
 						<td scope="row">
 							<label for="placeholder">
-								<?php _e( 'Description' , 'yikes-inc-easy-mailchimp-extender' ); ?>
+								<?php _e( 'Description', 'yikes-inc-easy-mailchimp-extender' ); ?>
 							</label>
 						</td>
 						<td>
-							<textarea class="widefat field-description-input" name="field[<?php echo $group['group_id']; ?>][description]"></textarea>
-							<p class="description"><small><?php _e( "Enter the description for the form field. This will be displayed to the user and provide some direction on how the field should be filled out or selected.", 'yikes-inc-easy-mailchimp-extender' );?></small></p>
+							<textarea class="widefat field-description-input" name="field[<?php echo $group[ 'group_id' ]; ?>][description]"></textarea>
+							<p class="description"><small><?php _e( "Enter the description for the form field. This will be displayed to the user and provide some direction on how the field should be filled out or selected.", 'yikes-inc-easy-mailchimp-extender' ); ?></small></p>
 						</td>
 					</tr>
 
 					<!-- Description Above Field -->
 					<tr valign="top" class="yikes-checkbox-container">
 						<td scope="row">
-							<label for="description_above_<?php echo esc_attr( $group['group_id'] ); ?>">
-								<?php _e( 'Description Above Field' , 'yikes-inc-easy-mailchimp-extender' ); ?>
+							<label for="description_above_<?php echo esc_attr( $group[ 'group_id' ] ); ?>">
+								<?php _e( 'Description Above Field', 'yikes-inc-easy-mailchimp-extender' ); ?>
 							</label>
 						</td>
 						<td>
-							<input type="checkbox" id="description_above_<?php echo esc_attr( $group['group_id'] ); ?>" class="widefat field-description-input" name="field[<?php echo $group['group_id']; ?>][description_above]" value="1" />
-							<p class="description"><small><?php _e( "By default the description will appear undearneath the field. Check this box if you'd like the description to appear above the field.", 'yikes-inc-easy-mailchimp-extender' );?></small></p>
+							<input type="checkbox" id="description_above_<?php echo esc_attr( $group[ 'group_id' ] ); ?>" class="widefat field-description-input" name="field[<?php echo $group[ 'group_id' ]; ?>][description_above]" value="1" />
+							<p class="description"><small><?php _e( "By default the description will appear undearneath the field. Check this box if you'd like the description to appear above the field.", 'yikes-inc-easy-mailchimp-extender' ); ?></small></p>
 						</td>
 					</tr>
 
@@ -187,48 +187,48 @@ 
 					<tr valign="top">
 						<td scope="row">
 							<label for="placeholder">
-								<?php _e( 'Additional Classes' , 'yikes-inc-easy-mailchimp-extender' ); ?>
+								<?php _e( 'Additional Classes', 'yikes-inc-easy-mailchimp-extender' ); ?>
 							</label>
 						</td>
 						<td>
-							<input type="text" class="widefat" name="field[<?php echo $group['group_id']; ?>][additional-classes]" value="<?php echo isset( $group['classes'] ) ? stripslashes( wp_strip_all_tags( $group['classes'] ) ) : '' ; ?>" />
-							<p class="description"><small><?php printf( __( "Assign additional classes to this field. %s.", 'yikes-inc-easy-mailchimp-extender' ), '<a target="_blank" href="' . esc_url( 'https://yikesplugins.com/support/knowledge-base/bundled-css-classes/' ) . '">' . __( 'View bundled classes', 'yikes-inc-easy-mailchimp-extender' ) . '</a>' );?></small></p>
+							<input type="text" class="widefat" name="field[<?php echo $group[ 'group_id' ]; ?>][additional-classes]" value="<?php echo isset( $group[ 'classes' ] ) ? stripslashes( wp_strip_all_tags( $group[ 'classes' ] ) ) : ''; ?>" />
+							<p class="description"><small><?php printf( __( "Assign additional classes to this field. %s.", 'yikes-inc-easy-mailchimp-extender' ), '<a target="_blank" href="' . esc_url( 'https://yikesplugins.com/support/knowledge-base/bundled-css-classes/' ) . '">' . __( 'View bundled classes', 'yikes-inc-easy-mailchimp-extender' ) . '</a>' ); ?></small></p>
 						</td>
 						</tr>
 						<!-- Required Toggle -->
 						<tr valign="top" class="yikes-checkbox-container">
 							<td scope="row">
 								<label for="field-required">
-									<?php _e( 'Field Required?' , 'yikes-inc-easy-mailchimp-extender' ); ?>
+									<?php _e( 'Field Required?', 'yikes-inc-easy-mailchimp-extender' ); ?>
 								</label>
 							</td>
 							<td>
-								<input type="checkbox" class="widefat" value="1" name="field[<?php echo $group['group_id']; ?>][require]">
-								<p class="description"><small><?php _e( "Require this field to be filled in before the form can be submitted.", 'yikes-inc-easy-mailchimp-extender' );?></small></p>
+								<input type="checkbox" class="widefat" value="1" name="field[<?php echo $group[ 'group_id' ]; ?>][require]">
+								<p class="description"><small><?php _e( "Require this field to be filled in before the form can be submitted.", 'yikes-inc-easy-mailchimp-extender' ); ?></small></p>
 							</td>
 						</tr>
 						<!-- Visible Toggle -->
 						<tr valign="top" class="yikes-checkbox-container">
 							<td scope="row">
 								<label for="hide-field">
-									<?php _e( 'Hide Field' , 'yikes-inc-easy-mailchimp-extender' ); ?>
+									<?php _e( 'Hide Field', 'yikes-inc-easy-mailchimp-extender' ); ?>
 								</label>
 							</td>
 							<td>
-								<input type="checkbox" class="widefat" value="1" name="field[<?php echo $group['group_id']; ?>][hide]">
-								<p class="description"><small><?php _e( "Hide this field from being displayed on the front end.", 'yikes-inc-easy-mailchimp-extender' );?></small></p>
+								<input type="checkbox" class="widefat" value="1" name="field[<?php echo $group[ 'group_id' ]; ?>][hide]">
+								<p class="description"><small><?php _e( "Hide this field from being displayed on the front end.", 'yikes-inc-easy-mailchimp-extender' ); ?></small></p>
 							</td>
 						</tr>
 						<!-- Toggle Field Label Visibility -->
 						<tr valign="top" class="yikes-checkbox-container">
 							<td scope="row">
 								<label for="placeholder">
-									<?php _e( 'Hide Label' , 'yikes-inc-easy-mailchimp-extender' ); ?>
+									<?php _e( 'Hide Label', 'yikes-inc-easy-mailchimp-extender' ); ?>
 								</label>
 							</td>
 							<td>
-								<input type="checkbox" name="field[<?php echo $group['group_id']; ?>][hide-label]" value="1" />
-								<p class="description"><small><?php _e( "Toggle field label visibility.", 'yikes-inc-easy-mailchimp-extender' );?></small></p>
+								<input type="checkbox" name="field[<?php echo $group[ 'group_id' ]; ?>][hide-label]" value="1" />
+								<p class="description"><small><?php _e( "Toggle field label visibility.", 'yikes-inc-easy-mailchimp-extender' ); ?></small></p>
 							</td>
 						</tr>
 						<!-- Toggle Buttons -->
@@ -238,8 +238,8 @@ 
 							</td>
 							<td>
 								<span class="toggle-container">
-									<a href="#" class="hide-field"><?php _e( "Close" , 'yikes-inc-easy-mailchimp-extender' ); ?></a> |
-									<a href="#" class="remove-field" alt="<?php echo $group['group_id']; ?>"><?php _e( "Remove Field" , 'yikes-inc-easy-mailchimp-extender' ); ?></a>
+									<a href="#" class="hide-field"><?php _e( "Close", 'yikes-inc-easy-mailchimp-extender' ); ?></a> |
+									<a href="#" class="remove-field" alt="<?php echo $group[ 'group_id' ]; ?>"><?php _e( "Remove Field", 'yikes-inc-easy-mailchimp-extender' ); ?></a>
 								</span>
 							</td>
 						</tr>

admin/partials/ajax/class.ajax.php

Spacing +21 added lines, -21 removed lines

@@ -12,7 +12,7 @@ 
 		public function __construct() {
 
 			// Ajax send merge variable to form builder.
-			add_action( 'wp_ajax_add_field_to_form', array( $this , 'send_field_to_form' ), 10 );
+			add_action( 'wp_ajax_add_field_to_form', array( $this, 'send_field_to_form' ), 10 );
 
 			// Ajax send interest group to form builder.
 			add_action( 'wp_ajax_add_interest_group_to_form', array( $this, 'send_interest_group_to_form' ), 10 );
@@ -41,7 +41,7 @@ 
 		*	- return a single container
 		*/
 		public function add_notification_to_form() {
-			if ( isset( $_POST['notification_name'] ) ) {
+			if ( isset( $_POST[ 'notification_name' ] ) ) {
 				include_once YIKES_MC_PATH . 'admin/partials/ajax/add_notification_to_form.php';
 			}
 			exit();
@@ -51,7 +51,7 @@ 
 		// when the user wants to switch which form data
 		// is displayed on the dashboard
 		public function get_new_list_data() {
-			$list_id   = $_POST['list_id'];
+			$list_id   = $_POST[ 'list_id' ];
 			$list_data = yikes_get_mc_api_manager()->get_list_handler()->get_list( $list_id );
 			if ( is_wp_error( $list_data ) ) {
 				$error_logging = new Yikes_Inc_Easy_Mailchimp_Error_Logging();
@@ -74,10 +74,10 @@ 
 		/* note: this function is called statically from the integration settings page */
 		public static function check_list_for_interest_groups( $list_id = '', $integration_type = '', $load = false ) {
 			if ( ! $list_id ) {
-				$list_id = $_POST['list_id'];
+				$list_id = $_POST[ 'list_id' ];
 			}
 			if ( ! $integration_type ) {
-				$integration_type = $_POST['integration'];
+				$integration_type = $_POST[ 'integration' ];
 			}
 
 
@@ -122,9 +122,9 @@ 
 			if ( ! check_ajax_referer( 'add-tag', 'nonce', false ) ) {
 				wp_send_json_error( '1' );
 			}
-			$tags    = isset( $_POST['tags'] ) ? wp_unslash( $_POST['tags'] ) : array();
-			$list_id = isset( $_POST['list_id'] ) ? filter_var( wp_unslash( $_POST['list_id'] ), FILTER_SANITIZE_STRING ) : '';
-			$form_id = isset( $_POST['form_id'] ) ? filter_var( wp_unslash( $_POST['form_id'] ), FILTER_SANITIZE_NUMBER_INT ) : 0;
+			$tags    = isset( $_POST[ 'tags' ] ) ? wp_unslash( $_POST[ 'tags' ] ) : array();
+			$list_id = isset( $_POST[ 'list_id' ] ) ? filter_var( wp_unslash( $_POST[ 'list_id' ] ), FILTER_SANITIZE_STRING ) : '';
+			$form_id = isset( $_POST[ 'form_id' ] ) ? filter_var( wp_unslash( $_POST[ 'form_id' ] ), FILTER_SANITIZE_NUMBER_INT ) : 0;
 
 			if ( empty( $tags ) || empty( $list_id ) || empty( $form_id ) ) {
 				wp_send_json_error( '2' );
@@ -136,13 +136,13 @@ 
 
 			// This data came from $_POST so sanitize it.
 			foreach ( $tags as $tag ) {
-				$form_tags[ filter_var( $tag['tag_id'], FILTER_SANITIZE_NUMBER_INT ) ] = array(
-					'name' => filter_var( $tag['tag_name'], FILTER_SANITIZE_STRING ),
-					'id'   => filter_var( $tag['tag_id'], FILTER_SANITIZE_NUMBER_INT ),
+				$form_tags[ filter_var( $tag[ 'tag_id' ], FILTER_SANITIZE_NUMBER_INT ) ] = array(
+					'name' => filter_var( $tag[ 'tag_name' ], FILTER_SANITIZE_STRING ),
+					'id'   => filter_var( $tag[ 'tag_id' ], FILTER_SANITIZE_NUMBER_INT ),
 				);
 			}
 
-			$form['tags'] = $form_tags + ( isset( $form['tags'] ) ? $form['tags'] : array() );
+			$form[ 'tags' ] = $form_tags + ( isset( $form[ 'tags' ] ) ? $form[ 'tags' ] : array() );
 			$form_interface->update_form( $form_id, $form );
 			wp_send_json_success( array( 'tags' => $form_tags ) );
 		}
@@ -155,9 +155,9 @@ 
 			if ( ! check_ajax_referer( 'remove-tag', 'nonce', false ) ) {
 				wp_send_json_error( '1' );
 			}
-			$tag     = isset( $_POST['tag'] ) ? filter_var( wp_unslash( $_POST['tag'] ), FILTER_SANITIZE_NUMBER_INT ) : array();
-			$list_id = isset( $_POST['list_id'] ) ? filter_var( wp_unslash( $_POST['list_id'] ), FILTER_SANITIZE_STRING ) : '';
-			$form_id = isset( $_POST['form_id'] ) ? filter_var( wp_unslash( $_POST['form_id'] ), FILTER_SANITIZE_NUMBER_INT ) : 0;
+			$tag     = isset( $_POST[ 'tag' ] ) ? filter_var( wp_unslash( $_POST[ 'tag' ] ), FILTER_SANITIZE_NUMBER_INT ) : array();
+			$list_id = isset( $_POST[ 'list_id' ] ) ? filter_var( wp_unslash( $_POST[ 'list_id' ] ), FILTER_SANITIZE_STRING ) : '';
+			$form_id = isset( $_POST[ 'form_id' ] ) ? filter_var( wp_unslash( $_POST[ 'form_id' ] ), FILTER_SANITIZE_NUMBER_INT ) : 0;
 
 			if ( empty( $tag ) || empty( $list_id ) || empty( $form_id ) ) {
 				wp_send_json_error( '2' );
@@ -165,8 +165,8 @@ 
 
 			$form_interface = yikes_easy_mailchimp_extender_get_form_interface();
 			$form           = $form_interface->get_form( $form_id );
-			if ( isset( $form['tags'] ) && isset( $form['tags'][ $tag ] ) ) {
-				unset( $form['tags'][ $tag ] );
+			if ( isset( $form[ 'tags' ] ) && isset( $form[ 'tags' ][ $tag ] ) ) {
+				unset( $form[ 'tags' ][ $tag ] );
 			}
 			$form_interface->update_form( $form_id, $form );
 			wp_send_json_success();			
@@ -190,10 +190,10 @@ 
 		public function save_field_label_edits() {
 
 			// Capture our $_POST variables
-			$list_id	= isset( $_POST['list_id'] ) ? $_POST['list_id'] : '';
-			$field_data = isset( $_POST['field_data'] ) ? $_POST['field_data'] : array();
-			$field_name = isset( $field_data['field_name'] ) ? $field_data['field_name'] : '';
-			$field_id	= isset( $field_data['field_id'] ) ? $field_data['field_id'] : '';
+			$list_id = isset( $_POST[ 'list_id' ] ) ? $_POST[ 'list_id' ] : '';
+			$field_data = isset( $_POST[ 'field_data' ] ) ? $_POST[ 'field_data' ] : array();
+			$field_name = isset( $field_data[ 'field_name' ] ) ? $field_data[ 'field_name' ] : '';
+			$field_id = isset( $field_data[ 'field_id' ] ) ? $field_data[ 'field_id' ] : '';
 
 			// Make sure we have our required variables before continuing
 			if ( $list_id === '' || $field_name === '' || $field_id === '' ) {

blocks/easy-forms-block/easy-forms-block.php

Spacing +31 added lines, -31 removed lines

@@ -66,46 +66,46 @@
 	 */
 	public function render_block( $attributes, $content ) {
 
-		if ( ! isset( $attributes['form_id'] ) ) {
+		if ( ! isset( $attributes[ 'form_id' ] ) ) {
 			return;
 		}
 
 		$shortcode_attributes = array(
-			'form'                       => $attributes['form_id'],
-			'submit'                     => isset( $attributes['submit_button_text'] ) && ! empty( $attributes['submit_button_text'] ) ? $attributes['submit_button_text'] : '',
-			'title'                      => isset( $attributes['show_title'] ) && true === $attributes['show_title'] ? '1' : '0',
-			'custom_title'               => isset( $attributes['form_title'] ) ? $attributes['form_title'] : '',
-			'description'                => isset( $attributes['show_description'] ) && true === $attributes['show_description'] ? '1' : '0',
-			'custom_description'         => isset( $attributes['form_description'] ) ? $attributes['form_description'] : '',
-			'ajax'                       => isset( $attributes['is_ajax'] ) && true === $attributes['is_ajax'] ? '1' : '0',
-			'recaptcha'                  => ! isset( $attributes['recaptcha'] ) || isset( $attributes['recaptcha'] ) && false === $attributes['recaptcha'] ? '0' : '',
-			'recaptcha_lang'             => isset( $attributes['recaptcha_lang'] ) ? $attributes['recaptcha_lang'] : '',
-			'recaptcha_type'             => isset( $attributes['recaptcha_type'] ) ? $attributes['recaptcha_type'] : '',
-			'recaptcha_theme'            => isset( $attributes['recaptcha_theme'] ) ? $attributes['recaptcha_theme'] : '',
-			'recaptcha_size'             => isset( $attributes['recaptcha_size'] ) ? $attributes['recaptcha_size'] : '',
-			'recaptcha_data_callback'    => isset( $attributes['recaptcha_verify_callback'] ) ? $attributes['recaptcha_verify_callback'] : '',
-			'recaptcha_expired_callback' => isset( $attributes['recaptcha_expired_callback'] ) ? $attributes['recaptcha_expired_callback'] : '',
-			'inline'                     => isset( $attributes['inline'] ) && true === $attributes['inline'] ? '1' : '0',
+			'form'                       => $attributes[ 'form_id' ],
+			'submit'                     => isset( $attributes[ 'submit_button_text' ] ) && ! empty( $attributes[ 'submit_button_text' ] ) ? $attributes[ 'submit_button_text' ] : '',
+			'title'                      => isset( $attributes[ 'show_title' ] ) && true === $attributes[ 'show_title' ] ? '1' : '0',
+			'custom_title'               => isset( $attributes[ 'form_title' ] ) ? $attributes[ 'form_title' ] : '',
+			'description'                => isset( $attributes[ 'show_description' ] ) && true === $attributes[ 'show_description' ] ? '1' : '0',
+			'custom_description'         => isset( $attributes[ 'form_description' ] ) ? $attributes[ 'form_description' ] : '',
+			'ajax'                       => isset( $attributes[ 'is_ajax' ] ) && true === $attributes[ 'is_ajax' ] ? '1' : '0',
+			'recaptcha'                  => ! isset( $attributes[ 'recaptcha' ] ) || isset( $attributes[ 'recaptcha' ] ) && false === $attributes[ 'recaptcha' ] ? '0' : '',
+			'recaptcha_lang'             => isset( $attributes[ 'recaptcha_lang' ] ) ? $attributes[ 'recaptcha_lang' ] : '',
+			'recaptcha_type'             => isset( $attributes[ 'recaptcha_type' ] ) ? $attributes[ 'recaptcha_type' ] : '',
+			'recaptcha_theme'            => isset( $attributes[ 'recaptcha_theme' ] ) ? $attributes[ 'recaptcha_theme' ] : '',
+			'recaptcha_size'             => isset( $attributes[ 'recaptcha_size' ] ) ? $attributes[ 'recaptcha_size' ] : '',
+			'recaptcha_data_callback'    => isset( $attributes[ 'recaptcha_verify_callback' ] ) ? $attributes[ 'recaptcha_verify_callback' ] : '',
+			'recaptcha_expired_callback' => isset( $attributes[ 'recaptcha_expired_callback' ] ) ? $attributes[ 'recaptcha_expired_callback' ] : '',
+			'inline'                     => isset( $attributes[ 'inline' ] ) && true === $attributes[ 'inline' ] ? '1' : '0',
 		);
 
 		// We want to run process_mailchimp_shortcode() but we need to return the plaintext shortcode or Gutenberg will autop() the shortcode content.
 		return sprintf(
 			'[yikes-mailchimp form="%s" submit="%s" title="%s" custom_title="%s" description="%s" custom_description="%s" ajax="%s" recaptcha="%s"  recaptcha_lang="%s" recaptcha_type="%s" recaptcha_theme="%s" recaptcha_size="%s" recaptcha_data_callback="%s" recaptcha_expired_callback="%s" inline="%s"]',
-			$shortcode_attributes['form'],
-			$shortcode_attributes['submit'],
-			$shortcode_attributes['title'],
-			$shortcode_attributes['custom_title'],
-			$shortcode_attributes['description'],
-			$shortcode_attributes['custom_description'],
-			$shortcode_attributes['ajax'],
-			$shortcode_attributes['recaptcha'],
-			$shortcode_attributes['recaptcha_lang'],
-			$shortcode_attributes['recaptcha_type'],
-			$shortcode_attributes['recaptcha_theme'],
-			$shortcode_attributes['recaptcha_size'],
-			$shortcode_attributes['recaptcha_data_callback'],
-			$shortcode_attributes['recaptcha_expired_callback'],
-			$shortcode_attributes['inline']
+			$shortcode_attributes[ 'form' ],
+			$shortcode_attributes[ 'submit' ],
+			$shortcode_attributes[ 'title' ],
+			$shortcode_attributes[ 'custom_title' ],
+			$shortcode_attributes[ 'description' ],
+			$shortcode_attributes[ 'custom_description' ],
+			$shortcode_attributes[ 'ajax' ],
+			$shortcode_attributes[ 'recaptcha' ],
+			$shortcode_attributes[ 'recaptcha_lang' ],
+			$shortcode_attributes[ 'recaptcha_type' ],
+			$shortcode_attributes[ 'recaptcha_theme' ],
+			$shortcode_attributes[ 'recaptcha_size' ],
+			$shortcode_attributes[ 'recaptcha_data_callback' ],
+			$shortcode_attributes[ 'recaptcha_expired_callback' ],
+			$shortcode_attributes[ 'inline' ]
 		);
 	}
 }

admin/partials/ajax/add_field_to_form.php

Spacing +83 added lines, -83 removed lines

@@ -1,15 +1,15 @@ 
 <?php
 $form_data = array(
-	'field_name' => $_POST['field_name'],
-	'merge_tag'  => $_POST['merge_tag'],
-	'field_type' => $_POST['field_type'],
-	'list_id'    => $_POST['list_id'],
+	'field_name' => $_POST[ 'field_name' ],
+	'merge_tag'  => $_POST[ 'merge_tag' ],
+	'field_type' => $_POST[ 'field_type' ],
+	'list_id'    => $_POST[ 'list_id' ],
 );
 
 // Grab our list handler.
 $list_handler = yikes_get_mc_api_manager()->get_list_handler();
 
-$available_merge_variables = $list_handler->get_merge_fields( $form_data['list_id'] );
+$available_merge_variables = $list_handler->get_merge_fields( $form_data[ 'list_id' ] );
 if ( is_wp_error( $available_merge_variables ) ) {
 	$error_logging = new Yikes_Inc_Easy_Mailchimp_Error_Logging();
 	$error_logging->maybe_write_to_log(
@@ -28,17 +28,17 @@ 
 }
 
 // find and return the location of this merge field in the array
-$index = $this->findMCListIndex( $form_data['merge_tag'], $available_merge_variables['merge_fields'], 'tag' );
+$index = $this->findMCListIndex( $form_data[ 'merge_tag' ], $available_merge_variables[ 'merge_fields' ], 'tag' );
 
 // store it and use it to pre-populate field data (only on initial add to form)
-$merge_field_data = $available_merge_variables['merge_fields'][ $index ];
+$merge_field_data = $available_merge_variables[ 'merge_fields' ][ $index ];
 ?>
-<section class="draggable" id="<?php echo $form_data['field_name']; ?>">
+<section class="draggable" id="<?php echo $form_data[ 'field_name' ]; ?>">
 	<!-- top -->
 	<a href="#" class="expansion-section-title settings-sidebar">
-		<span class="dashicons dashicons-plus yikes-mc-expansion-toggle" title="<?php _e( 'Expand Field' , 'yikes-inc-easy-mailchimp-extender' ); ?>"></span>
-		<?php echo stripslashes( $form_data['field_name'] ); ?>
-		<span class="field-type-text"><small><?php echo __( 'type' , 'yikes-inc-easy-mailchimp-extender' ) . ' : ' . $form_data['field_type']; ?></small></span>
+		<span class="dashicons dashicons-plus yikes-mc-expansion-toggle" title="<?php _e( 'Expand Field', 'yikes-inc-easy-mailchimp-extender' ); ?>"></span>
+		<?php echo stripslashes( $form_data[ 'field_name' ] ); ?>
+		<span class="field-type-text"><small><?php echo __( 'type', 'yikes-inc-easy-mailchimp-extender' ) . ' : ' . $form_data[ 'field_type' ]; ?></small></span>
 	</a>
 	<!-- expansion section -->
 	<div class="yikes-mc-settings-expansion-section">
@@ -46,14 +46,14 @@ 
 		<!-- Single or Double Opt-in -->
 		<p class="type-container form-field-container"><!-- necessary to prevent skipping on slideToggle(); -->
 			<!-- store the label -->
-			<input type="hidden" name="field[<?php echo $merge_field_data['tag']; ?>][label]" value="<?php echo htmlspecialchars( $form_data['field_name'] ); ?>" />
-			<input type="hidden" name="field[<?php echo $merge_field_data['tag']; ?>][type]" value="<?php echo $form_data['field_type']; ?>" />
-			<input type="hidden" name="field[<?php echo $merge_field_data['tag']; ?>][merge]" value="<?php echo $merge_field_data['tag']; ?>" />
-			<input type="hidden" class="field-<?php echo $merge_field_data['tag']; ?>-position position-input" name="field[<?php echo $merge_field_data['tag']; ?>][position]" value="" />
+			<input type="hidden" name="field[<?php echo $merge_field_data[ 'tag' ]; ?>][label]" value="<?php echo htmlspecialchars( $form_data[ 'field_name' ] ); ?>" />
+			<input type="hidden" name="field[<?php echo $merge_field_data[ 'tag' ]; ?>][type]" value="<?php echo $form_data[ 'field_type' ]; ?>" />
+			<input type="hidden" name="field[<?php echo $merge_field_data[ 'tag' ]; ?>][merge]" value="<?php echo $merge_field_data[ 'tag' ]; ?>" />
+			<input type="hidden" class="field-<?php echo $merge_field_data[ 'tag' ]; ?>-position position-input" name="field[<?php echo $merge_field_data[ 'tag' ]; ?>][position]" value="" />
 
-			<?php if ( $form_data['field_type'] == 'radio' || $form_data['field_type'] == 'dropdown' ) { ?>
-				<?php $choices = ( isset( $merge_field_data['options']['choices'] ) ) ? esc_attr( json_encode( $merge_field_data['options']['choices'] ) ) : ''; ?>
-				<input type="hidden" name="field[<?php echo $merge_field_data['tag']; ?>][choices]" value='<?php echo $choices; ?>' />
+			<?php if ( $form_data[ 'field_type' ] == 'radio' || $form_data[ 'field_type' ] == 'dropdown' ) { ?>
+				<?php $choices = ( isset( $merge_field_data[ 'options' ][ 'choices' ] ) ) ? esc_attr( json_encode( $merge_field_data[ 'options' ][ 'choices' ] ) ) : ''; ?>
+				<input type="hidden" name="field[<?php echo $merge_field_data[ 'tag' ]; ?>][choices]" value='<?php echo $choices; ?>' />
 			<?php } ?>
 
 			<table class="form-table form-field-container">
@@ -62,15 +62,15 @@ 
 					<tr valign="top">
 						<td scope="row">
 							<label for="merge-tag">
-								<?php _e( 'Merge Tag' , 'yikes-inc-easy-mailchimp-extender' ); ?>
+								<?php _e( 'Merge Tag', 'yikes-inc-easy-mailchimp-extender' ); ?>
 							</label>
 						</td>
 						<td>
-							<input class="widefat merge-tag-text" type="text" readonly value="<?php echo $merge_field_data['tag']; ?>">
+							<input class="widefat merge-tag-text" type="text" readonly value="<?php echo $merge_field_data[ 'tag' ]; ?>">
 						</td>
 					</tr>
 
-			<?php switch( $form_data['field_type'] ) {
+			<?php switch ( $form_data[ 'field_type' ] ) {
 
 					default:
 						break;
@@ -87,12 +87,12 @@ 
 					<tr valign="top">
 						<td scope="row">
 							<label for="placeholder">
-								<?php _e( 'Placeholder' , 'yikes-inc-easy-mailchimp-extender' ); ?>
+								<?php _e( 'Placeholder', 'yikes-inc-easy-mailchimp-extender' ); ?>
 							</label>
 						</td>
 						<td>
-						<input type="text" class="widefat" name="field[<?php echo $merge_field_data['tag']; ?>][placeholder]" value="<?php echo isset( $merge_field_data['placeholder'] ) ? stripslashes( wp_strip_all_tags( $merge_field_data['placeholder'] ) ): '' ; ?>" />
-							<p class="description"><small><?php _e( "Assign a placeholder value to this field.", 'yikes-inc-easy-mailchimp-extender' );?></small></p>
+						<input type="text" class="widefat" name="field[<?php echo $merge_field_data[ 'tag' ]; ?>][placeholder]" value="<?php echo isset( $merge_field_data[ 'placeholder' ] ) ? stripslashes( wp_strip_all_tags( $merge_field_data[ 'placeholder' ] ) ) : ''; ?>" />
+							<p class="description"><small><?php _e( "Assign a placeholder value to this field.", 'yikes-inc-easy-mailchimp-extender' ); ?></small></p>
 						</td>
 					</tr>
 
@@ -101,27 +101,27 @@ 
 					*	Loop over field types and store necessary formats
 					*	( date, birthday - dateformat ; phone - phoneformat )
 					*/
-					switch( $form_data['field_type'] ) {
+					switch ( $form_data[ 'field_type' ] ) {
 
 						/* Store the date format, for properly rendering dates on the front end */
 						case 'date':
-							$date_format = isset( $merge_field_data['options']['dateformat'] ) ? $merge_field_data['options']['dateformat'] : 'MM/DD/YYYY';
+							$date_format = isset( $merge_field_data[ 'options' ][ 'dateformat' ] ) ? $merge_field_data[ 'options' ][ 'dateformat' ] : 'MM/DD/YYYY';
 							?>
-							<input type="hidden" name="field[<?php echo $merge_field_data['tag']; ?>][date_format]" value="<?php echo strtolower( $date_format ); ?>" />
+							<input type="hidden" name="field[<?php echo $merge_field_data[ 'tag' ]; ?>][date_format]" value="<?php echo strtolower( $date_format ); ?>" />
 							<?php
 						break;
 
 						case 'birthday':
-							$date_format = isset( $merge_field_data['options']['dateformat'] ) ? $merge_field_data['options']['dateformat'] : 'MM/DD';
+							$date_format = isset( $merge_field_data[ 'options' ][ 'dateformat' ] ) ? $merge_field_data[ 'options' ][ 'dateformat' ] : 'MM/DD';
 							?>
-							<input type="hidden" name="field[<?php echo $merge_field_data['tag']; ?>][date_format]" value="<?php echo strtolower( $date_format ); ?>" />
+							<input type="hidden" name="field[<?php echo $merge_field_data[ 'tag' ]; ?>][date_format]" value="<?php echo strtolower( $date_format ); ?>" />
 							<?php
 						break;
 
 						/* Store the phone format, for properly regex pattern */
 						case 'phone':
 							?>
-							<input type="hidden" name="field[<?php echo $merge_field_data['tag']; ?>][phone_format]" value="<?php echo $merge_field_data['options']['phone_format']; ?>" />
+							<input type="hidden" name="field[<?php echo $merge_field_data[ 'tag' ]; ?>][phone_format]" value="<?php echo $merge_field_data[ 'options' ][ 'phone_format' ]; ?>" />
 							<?php
 						break;
 					}
@@ -132,13 +132,13 @@ 
 						?>
 							<tr valign="top">
 								<td scope="row">
-									<label for="placeholder_<?php echo esc_attr( $field['merge'] ); ?>">
-										<?php _e( 'Placeholder' , 'yikes-inc-easy-mailchimp-extender' ); ?>
+									<label for="placeholder_<?php echo esc_attr( $field[ 'merge' ] ); ?>">
+										<?php _e( 'Placeholder', 'yikes-inc-easy-mailchimp-extender' ); ?>
 									</label>
 								</td>
 								<td>
-									<input type="checkbox" class="widefat" name="field[<?php echo $merge_field_data['tag']; ?>][placeholder]" value="1" />
-									<span class="description"><small><?php _e( "Use placeholders for this field (these will be automatically filled in with field names).", 'yikes-inc-easy-mailchimp-extender' );?></small></span>
+									<input type="checkbox" class="widefat" name="field[<?php echo $merge_field_data[ 'tag' ]; ?>][placeholder]" value="1" />
+									<span class="description"><small><?php _e( "Use placeholders for this field (these will be automatically filled in with field names).", 'yikes-inc-easy-mailchimp-extender' ); ?></small></span>
 								</td>
 							</tr>
 						<?php
@@ -148,7 +148,7 @@ 
 			?>
 
 				<!-- Default Value -->
-				<?php switch( $form_data['field_type'] ) {
+				<?php switch ( $form_data[ 'field_type' ] ) {
 
 					default:
 					case 'text':
@@ -156,17 +156,17 @@ 
 						<tr valign="top">
 							<td scope="row">
 								<label for="placeholder">
-									<?php _e( 'Default Value' , 'yikes-inc-easy-mailchimp-extender' ); ?>
+									<?php _e( 'Default Value', 'yikes-inc-easy-mailchimp-extender' ); ?>
 								</label>
 							</td>
 							<td>
-								<input type="text" class="widefat" name="field[<?php echo $merge_field_data['tag']; ?>][default]" <?php if( $form_data['field_type'] != 'url' ) { ?> value="<?php echo isset( $merge_field_data['default_value'] ) ? stripslashes( wp_strip_all_tags( $merge_field_data['default_value'] ) ) : ''; ?>" <?php } else { ?> value="<?php echo isset( $merge_field_data['default_value'] ) ? stripslashes( wp_strip_all_tags( esc_url_raw( $merge_field_data['default_value'] ) ) ) : ''; } ?>" />
-								<p class="description"><small><?php _e( "Assign a default value to populate this field with on initial page load.", 'yikes-inc-easy-mailchimp-extender' );?></small></p>
+								<input type="text" class="widefat" name="field[<?php echo $merge_field_data[ 'tag' ]; ?>][default]" <?php if ( $form_data[ 'field_type' ] != 'url' ) { ?> value="<?php echo isset( $merge_field_data[ 'default_value' ] ) ? stripslashes( wp_strip_all_tags( $merge_field_data[ 'default_value' ] ) ) : ''; ?>" <?php } else { ?> value="<?php echo isset( $merge_field_data[ 'default_value' ] ) ? stripslashes( wp_strip_all_tags( esc_url_raw( $merge_field_data[ 'default_value' ] ) ) ) : ''; } ?>" />
+								<p class="description"><small><?php _e( "Assign a default value to populate this field with on initial page load.", 'yikes-inc-easy-mailchimp-extender' ); ?></small></p>
 								<?php
-								switch ( $form_data['field_type'] ) {
+								switch ( $form_data[ 'field_type' ] ) {
 									case 'text':
 										?>
-										<p><small class="pre-defined-tag-link"><a href="#TB_inline?width=600&height=550&inlineId=pre-defined-tag-container" class="thickbox" onclick="storeGlobalClicked( jQuery( this ) );"><?php _e( 'View Pre-Defined Tags' , 'yikes-inc-easy-mailchimp-extender' ); ?></a></small></p>
+										<p><small class="pre-defined-tag-link"><a href="#TB_inline?width=600&height=550&inlineId=pre-defined-tag-container" class="thickbox" onclick="storeGlobalClicked( jQuery( this ) );"><?php _e( 'View Pre-Defined Tags', 'yikes-inc-easy-mailchimp-extender' ); ?></a></small></p>
 										<?php
 									break;
 								} ?>
@@ -180,28 +180,28 @@ 
 							<tr valign="top">
 								<td scope="row">
 									<label for="placeholder">
-										<?php _e( 'Default Selection' , 'yikes-inc-easy-mailchimp-extender' ); ?>
+										<?php _e( 'Default Selection', 'yikes-inc-easy-mailchimp-extender' ); ?>
 									</label>
 								</td>
 								<td>
-									<?php $pre_selected = ! empty( $merge_field_data['default_choice'] ) ? $merge_field_data['default_choice'] : 'no-default'; ?>
-									<label for="<?php echo $merge_field_data['tag'] . '-no-default'; ?>">
-										<input id="<?php echo $merge_field_data['tag'] . '-no-default'; ?>"
+									<?php $pre_selected = ! empty( $merge_field_data[ 'default_choice' ] ) ? $merge_field_data[ 'default_choice' ] : 'no-default'; ?>
+									<label for="<?php echo $merge_field_data[ 'tag' ] . '-no-default'; ?>">
+										<input id="<?php echo $merge_field_data[ 'tag' ] . '-no-default'; ?>"
 										       type="radio"
-										       name="field[<?php echo $merge_field_data['tag']; ?>][default_choice]"
+										       name="field[<?php echo $merge_field_data[ 'tag' ]; ?>][default_choice]"
 										       value="no-default" <?php checked( $pre_selected, 'no-default' ); ?>
 										>
 										No Default&nbsp;
 									</label>
 									<?php
 									$x = 0;
-									foreach ( $merge_field_data['options']['choices'] as $choice => $value ) { ?>
+									foreach ( $merge_field_data[ 'options' ][ 'choices' ] as $choice => $value ) { ?>
 										<label>
-											<input type="radio" name="field[<?php echo $merge_field_data['tag']; ?>][default_choice]" value="<?php echo $x; ?>" <?php checked( $pre_selected, $choice ); ?>><?php echo $value; ?>
+											<input type="radio" name="field[<?php echo $merge_field_data[ 'tag' ]; ?>][default_choice]" value="<?php echo $x; ?>" <?php checked( $pre_selected, $choice ); ?>><?php echo $value; ?>
 										</label>
 										<?php $x++;
 									} ?>
-									<p class="description"><small><?php _e( "Select the option that should be selected by default.", 'yikes-inc-easy-mailchimp-extender' );?></small></p>
+									<p class="description"><small><?php _e( "Select the option that should be selected by default.", 'yikes-inc-easy-mailchimp-extender' ); ?></small></p>
 								</td>
 							</tr>
 
@@ -213,18 +213,18 @@ 
 							<tr valign="top">
 								<td scope="row">
 									<label for="placeholder">
-										<?php _e( 'Default Selection' , 'yikes-inc-easy-mailchimp-extender' ); ?>
+										<?php _e( 'Default Selection', 'yikes-inc-easy-mailchimp-extender' ); ?>
 									</label>
 								</td>
 								<td>
-									<select type="default" name="field[<?php echo $merge_field_data['tag']; ?>][default_choice]">
-										<?php $pre_selected = ! empty( $merge_field_data['default_choice'] ) ? $merge_field_data['default_choice'] : 'no-default'; ?>
+									<select type="default" name="field[<?php echo $merge_field_data[ 'tag' ]; ?>][default_choice]">
+										<?php $pre_selected = ! empty( $merge_field_data[ 'default_choice' ] ) ? $merge_field_data[ 'default_choice' ] : 'no-default'; ?>
 										<option value="no-default" <?php selected( $pre_selected, $choice ); ?>>No Default</option>
-										<?php foreach ( $merge_field_data['options']['choices'] as $choice => $value ) { ?>
+										<?php foreach ( $merge_field_data[ 'options' ][ 'choices' ] as $choice => $value ) { ?>
 											<option value="<?php echo $choice; ?>" <?php selected( $pre_selected, $choice ); ?>><?php echo stripslashes( $value ); ?></option>
 										<?php } ?>
 									</select>
-									<p class="description"><small><?php _e( "Which option should be selected by default?", 'yikes-inc-easy-mailchimp-extender' );?></small></p>
+									<p class="description"><small><?php _e( "Which option should be selected by default?", 'yikes-inc-easy-mailchimp-extender' ); ?></small></p>
 								</td>
 							</tr>
 
@@ -237,77 +237,77 @@ 
 				<tr valign="top">
 					<td scope="row">
 						<label for="placeholder">
-							<?php _e( 'Description' , 'yikes-inc-easy-mailchimp-extender' ); ?>
+							<?php _e( 'Description', 'yikes-inc-easy-mailchimp-extender' ); ?>
 						</label>
 					</td>
 					<td>
-						<textarea class="widefat field-description-input" name="field[<?php echo $merge_field_data['tag']; ?>][description]"></textarea>
-						<p class="description"><small><?php _e( "Enter the description for the form field. This will be displayed to the user and provide some direction on how the field should be filled out or selected.", 'yikes-inc-easy-mailchimp-extender' );?></small></p>
+						<textarea class="widefat field-description-input" name="field[<?php echo $merge_field_data[ 'tag' ]; ?>][description]"></textarea>
+						<p class="description"><small><?php _e( "Enter the description for the form field. This will be displayed to the user and provide some direction on how the field should be filled out or selected.", 'yikes-inc-easy-mailchimp-extender' ); ?></small></p>
 					</td>
 				</tr>
 				<!-- Description Above Field -->
 				<tr valign="top" class="yikes-checkbox-container">
 					<td scope="row">
-						<label for="description_above_<?php echo esc_attr( $merge_field_data['tag'] ); ?>">
-							<?php _e( 'Description Above Field' , 'yikes-inc-easy-mailchimp-extender' ); ?>
+						<label for="description_above_<?php echo esc_attr( $merge_field_data[ 'tag' ] ); ?>">
+							<?php _e( 'Description Above Field', 'yikes-inc-easy-mailchimp-extender' ); ?>
 						</label>
 					</td>
 					<td>
-						<input type="checkbox" id="description_above_<?php echo esc_attr( $merge_field_data['tag'] ); ?>" class="widefat field-description-input" name="field[<?php echo $merge_field_data['tag']; ?>][description_above]" value="1" />
-						<p class="description"><small><?php _e( "By default the description will appear undearneath the field. Check this box if you'd like the description to appear above the field.", 'yikes-inc-easy-mailchimp-extender' );?></small></p>
+						<input type="checkbox" id="description_above_<?php echo esc_attr( $merge_field_data[ 'tag' ] ); ?>" class="widefat field-description-input" name="field[<?php echo $merge_field_data[ 'tag' ]; ?>][description_above]" value="1" />
+						<p class="description"><small><?php _e( "By default the description will appear undearneath the field. Check this box if you'd like the description to appear above the field.", 'yikes-inc-easy-mailchimp-extender' ); ?></small></p>
 					</td>
 				</tr>
 				<!-- Additional Classes -->
 				<tr valign="top">
 					<td scope="row">
 						<label for="placeholder">
-							<?php _e( 'Additional Classes' , 'yikes-inc-easy-mailchimp-extender' ); ?>
+							<?php _e( 'Additional Classes', 'yikes-inc-easy-mailchimp-extender' ); ?>
 						</label>
 					</td>
 					<td>
-						<input type="text" class="widefat" name="field[<?php echo $merge_field_data['tag']; ?>][additional-classes]" value="<?php echo isset( $form_data['classes'] ) ? stripslashes( wp_strip_all_tags( $form_data['classes'] ) ) : '' ; ?>" />
-						<p class="description"><small><?php printf( __( "Assign additional classes to this field. %s.", 'yikes-inc-easy-mailchimp-extender' ), '<a target="_blank" href="' . esc_url( 'https://yikesplugins.com/support/knowledge-base/bundled-css-classes/' ) . '">' . __( 'View bundled classes', 'yikes-inc-easy-mailchimp-extender' ) . '</a>' );?></small></p>
+						<input type="text" class="widefat" name="field[<?php echo $merge_field_data[ 'tag' ]; ?>][additional-classes]" value="<?php echo isset( $form_data[ 'classes' ] ) ? stripslashes( wp_strip_all_tags( $form_data[ 'classes' ] ) ) : ''; ?>" />
+						<p class="description"><small><?php printf( __( "Assign additional classes to this field. %s.", 'yikes-inc-easy-mailchimp-extender' ), '<a target="_blank" href="' . esc_url( 'https://yikesplugins.com/support/knowledge-base/bundled-css-classes/' ) . '">' . __( 'View bundled classes', 'yikes-inc-easy-mailchimp-extender' ) . '</a>' ); ?></small></p>
 					</td>
 				</tr>
 					<!-- Required Toggle -->
 					<tr valign="top" class="yikes-checkbox-container">
 						<td scope="row">
 							<label for="field-required">
-								<?php _e( 'Field Required?' , 'yikes-inc-easy-mailchimp-extender' ); ?>
+								<?php _e( 'Field Required?', 'yikes-inc-easy-mailchimp-extender' ); ?>
 							</label>
 						</td>
 						<td>
-							<input type="checkbox" class="widefat" value="1" name="field[<?php echo $merge_field_data['tag']; ?>][require]" <?php checked( $merge_field_data['required'], 1 ); ?> <?php if( $merge_field_data['tag'] == 'EMAIL' ) {  ?> disabled="disabled" checked="checked" title="<?php echo __( 'Email is a required field.' , 'yikes-inc-easy-mailchimp-extender' ); } ?>">
-							<p class="description"><small><?php _e( "Require this field to be filled in before the form can be submitted.", 'yikes-inc-easy-mailchimp-extender' );?></small></p>
+							<input type="checkbox" class="widefat" value="1" name="field[<?php echo $merge_field_data[ 'tag' ]; ?>][require]" <?php checked( $merge_field_data[ 'required' ], 1 ); ?> <?php if ( $merge_field_data[ 'tag' ] == 'EMAIL' ) {  ?> disabled="disabled" checked="checked" title="<?php echo __( 'Email is a required field.', 'yikes-inc-easy-mailchimp-extender' ); } ?>">
+							<p class="description"><small><?php _e( "Require this field to be filled in before the form can be submitted.", 'yikes-inc-easy-mailchimp-extender' ); ?></small></p>
 						</td>
 					</tr>
 					<!-- Visible Toggle -->
 					<tr valign="top" class="yikes-checkbox-container">
 						<td scope="row">
 							<label for="hide-field">
-								<?php _e( 'Hide Field' , 'yikes-inc-easy-mailchimp-extender' ); ?>
+								<?php _e( 'Hide Field', 'yikes-inc-easy-mailchimp-extender' ); ?>
 							</label>
 						</td>
 						<td>
-							<input type="checkbox" class="widefat" value="1" name="field[<?php echo $merge_field_data['tag']; ?>][hide]" <?php checked( $merge_field_data['public'], '' ); ?> <?php if( $merge_field_data['tag'] == 'EMAIL' ) {  ?> disabled="disabled" title="<?php echo __( 'Cannot toggle email field visibility.' , 'yikes-inc-easy-mailchimp-extender' ); } ?>">
-							<p class="description"><small><?php _e( "Hide this field from being displayed on the front end.", 'yikes-inc-easy-mailchimp-extender' );?></small></p>
+							<input type="checkbox" class="widefat" value="1" name="field[<?php echo $merge_field_data[ 'tag' ]; ?>][hide]" <?php checked( $merge_field_data[ 'public' ], '' ); ?> <?php if ( $merge_field_data[ 'tag' ] == 'EMAIL' ) {  ?> disabled="disabled" title="<?php echo __( 'Cannot toggle email field visibility.', 'yikes-inc-easy-mailchimp-extender' ); } ?>">
+							<p class="description"><small><?php _e( "Hide this field from being displayed on the front end.", 'yikes-inc-easy-mailchimp-extender' ); ?></small></p>
 						</td>
 					</tr>
 					<!-- Toggle Field Label Visibility -->
 					<tr valign="top" class="yikes-checkbox-container">
 						<td scope="row">
 							<label for="placeholder">
-								<?php _e( 'Hide Label' , 'yikes-inc-easy-mailchimp-extender' ); ?>
+								<?php _e( 'Hide Label', 'yikes-inc-easy-mailchimp-extender' ); ?>
 							</label>
 						</td>
 						<td>
-							<input type="checkbox" name="field[<?php echo $merge_field_data['tag']; ?>][hide-label]" value="1" />
-							<p class="description"><small><?php _e( "Toggle field label visibility.", 'yikes-inc-easy-mailchimp-extender' );?></small></p>
+							<input type="checkbox" name="field[<?php echo $merge_field_data[ 'tag' ]; ?>][hide-label]" value="1" />
+							<p class="description"><small><?php _e( "Toggle field label visibility.", 'yikes-inc-easy-mailchimp-extender' ); ?></small></p>
 						</td>
 					</tr>
 					<!-- Display Phone/Date Formats back to the user -->
 					<?php
-						switch( $form_data['field_type'] ) {
+						switch ( $form_data[ 'field_type' ] ) {
 
 							/* Store the phone format, for properly regex pattern */
 							case 'phone':
@@ -318,23 +318,23 @@ 
 									<td scope="row">
 										<label for="placeholder">
 										<?php
-											switch( $form_data['field_type'] ) {
+											switch ( $form_data[ 'field_type' ] ) {
 												default:
 												case 'birthday':
-													$type = __( 'Date Format' , 'yikes-inc-easy-mailchimp-extender' );
-													$format = $merge_field_data['options']['date_format'];
+													$type = __( 'Date Format', 'yikes-inc-easy-mailchimp-extender' );
+													$format = $merge_field_data[ 'options' ][ 'date_format' ];
 													$format_name = 'date_format';
 													break;
 
 												case 'date':
-													$type = __( 'Date Format' , 'yikes-inc-easy-mailchimp-extender' );
-													$format = $merge_field_data['options']['date_format'];
+													$type = __( 'Date Format', 'yikes-inc-easy-mailchimp-extender' );
+													$format = $merge_field_data[ 'options' ][ 'date_format' ];
 													$format_name = 'date_format';
 													break;
 
 												case 'phone':
-													$type = __( 'Phone Format' , 'yikes-inc-easy-mailchimp-extender' );
-													$format = ( ( $merge_field_data['options']['phone_format'] == 'none' ) ? __( 'International', 'yikes-inc-easy-mailchimp-extender' ) : $merge_field_data['options']['phone_format'] );
+													$type = __( 'Phone Format', 'yikes-inc-easy-mailchimp-extender' );
+													$format = ( ( $merge_field_data[ 'options' ][ 'phone_format' ] == 'none' ) ? __( 'International', 'yikes-inc-easy-mailchimp-extender' ) : $merge_field_data[ 'options' ][ 'phone_format' ] );
 													$format_name = 'phone_format';
 													break;
 											}
@@ -344,7 +344,7 @@ 
 									</td>
 									<td>
 										<strong><?php echo $format; ?></strong>
-										<input type="hidden" name="field[<?php echo $merge_field_data['tag']; ?>][<?php echo $format_name; ?>]" value="<?php echo $format; ?>" />
+										<input type="hidden" name="field[<?php echo $merge_field_data[ 'tag' ]; ?>][<?php echo $format_name; ?>]" value="<?php echo $format; ?>" />
 										<p class="description"><small>
 											<?php printf( __( 'To change the %s please head over to <a href="%s" title="Mailchimp" target="_blank">Mailchimp</a>. If you alter the format, you should re-import this field.', 'yikes-inc-easy-mailchimp-extender' ), strtolower( $type ), esc_url( 'http://www.mailchimp.com' ) ); ?>
 										</small></p>
@@ -365,8 +365,8 @@ 
 						</td>
 						<td>
 							<span class="toggle-container">
-								<a href="#" class="hide-field"><?php _e( "Close" , 'yikes-inc-easy-mailchimp-extender' ); ?></a> |
-								<a href="#" class="remove-field" alt="<?php echo $merge_field_data['tag']; ?>"><?php _e( "Remove Field" , 'yikes-inc-easy-mailchimp-extender' ); ?></a>
+								<a href="#" class="hide-field"><?php _e( "Close", 'yikes-inc-easy-mailchimp-extender' ); ?></a> |
+								<a href="#" class="remove-field" alt="<?php echo $merge_field_data[ 'tag' ]; ?>"><?php _e( "Remove Field", 'yikes-inc-easy-mailchimp-extender' ); ?></a>
 							</span>
 						</td>
 					</tr>

admin/partials/menu/options-sections/import-export-forms.php

Spacing +17 added lines, -17 removed lines

@@ -3,15 +3,15 @@ 
 $form_interface = yikes_easy_mailchimp_extender_get_form_interface();
 $all_forms = $form_interface->get_all_forms();
 ?>
-<h3><span><?php _e( 'Import/Export Forms & Settings' , 'yikes-inc-easy-mailchimp-extender' ); ?></span></h3>
+<h3><span><?php _e( 'Import/Export Forms & Settings', 'yikes-inc-easy-mailchimp-extender' ); ?></span></h3>
 
 <div class="inside">
 
 	<!-- Export Form -->
-	<form action="<?php echo esc_url_raw( add_query_arg( array( 'action' => 'yikes-easy-mc-export-forms' , 'nonce' => wp_create_nonce( 'export-forms' ) ) ) ); ?>" method="post">
-		<p><strong><?php _e( "Export Forms" , 'yikes-inc-easy-mailchimp-extender' ); ?></strong></p>
+	<form action="<?php echo esc_url_raw( add_query_arg( array( 'action' => 'yikes-easy-mc-export-forms', 'nonce' => wp_create_nonce( 'export-forms' ) ) ) ); ?>" method="post">
+		<p><strong><?php _e( "Export Forms", 'yikes-inc-easy-mailchimp-extender' ); ?></strong></p>
 		<p class="description">
-			<?php _e( "Select the forms you would like to export. When you click the download button below, Easy Forms for Mailchimp will create a CSV file for you to save to your computer. Once you've saved the download file, you can use the Import tool to import the forms to this or any other site." , "yikes-inc-easy-mailchimp-extender" ); ?>
+			<?php _e( "Select the forms you would like to export. When you click the download button below, Easy Forms for Mailchimp will create a CSV file for you to save to your computer. Once you've saved the download file, you can use the Import tool to import the forms to this or any other site.", "yikes-inc-easy-mailchimp-extender" ); ?>
 		</p>
 
 		<?php if ( empty( $all_forms ) ) { ?>
@@ -20,44 +20,44 @@ 
 			</p>
 		<?php } else { ?>
 			<!-- custom list so users can export specific forms -->
-			<a class="toggle-custom-lists button-secondary" onclick="jQuery(this).next().slideToggle();return false;"><?php _e( 'Select Forms' , 'yikes-inc-easy-mailchimp-extender' ); ?></a>
+			<a class="toggle-custom-lists button-secondary" onclick="jQuery(this).next().slideToggle();return false;"><?php _e( 'Select Forms', 'yikes-inc-easy-mailchimp-extender' ); ?></a>
 			<ul class="export-custom-forms-list">
-				<p class="description"><?php _e( 'Select which forms to export. Leave all checkboxes unchecked to export all of your forms.' , 'yikes-inc-easy-mailchimp-extender' ); ?></p>
-				<?php foreach( $all_forms as $id => $form ) { ?>
-					<li><label><input type="checkbox" name="yikes_export_forms[]" value="<?php echo (int) $id; ?>"><?php echo esc_html( $form['form_name'] ); ?></label></li>
+				<p class="description"><?php _e( 'Select which forms to export. Leave all checkboxes unchecked to export all of your forms.', 'yikes-inc-easy-mailchimp-extender' ); ?></p>
+				<?php foreach ( $all_forms as $id => $form ) { ?>
+					<li><label><input type="checkbox" name="yikes_export_forms[]" value="<?php echo (int) $id; ?>"><?php echo esc_html( $form[ 'form_name' ] ); ?></label></li>
 				<?php } ?>
 			</ul>
 		<?php } ?>
 		<!-- check if any of our transients contain data -->
-		<p><input type="submit" class="button-primary" value="<?php _e( 'Export Opt-in Forms' , 'yikes-inc-easy-mailchimp-extender' ); ?>" /></p>
+		<p><input type="submit" class="button-primary" value="<?php _e( 'Export Opt-in Forms', 'yikes-inc-easy-mailchimp-extender' ); ?>" /></p>
 	</form>
 	
 	<hr />
 	
 	<!-- Export Form -->
-	<form action="<?php echo esc_url_raw( add_query_arg( array( 'action' => 'yikes-easy-mc-export-settings' , 'nonce' => wp_create_nonce( 'export-settings' ) ) ) ); ?>" method="post">
-		<p><strong><?php _e( "Export Settings" , 'yikes-inc-easy-mailchimp-extender' ); ?></strong></p>
+	<form action="<?php echo esc_url_raw( add_query_arg( array( 'action' => 'yikes-easy-mc-export-settings', 'nonce' => wp_create_nonce( 'export-settings' ) ) ) ); ?>" method="post">
+		<p><strong><?php _e( "Export Settings", 'yikes-inc-easy-mailchimp-extender' ); ?></strong></p>
 		<p class="description">
-			<?php _e( "Export YIKES Easy Forms for Mailchimp plugin settings." , 'yikes-inc-easy-mailchimp-extender' ); ?>
+			<?php _e( "Export YIKES Easy Forms for Mailchimp plugin settings.", 'yikes-inc-easy-mailchimp-extender' ); ?>
 		</p>
 
 		<!-- check if any of our transients contain data -->
-		<p><input type="submit" class="button-primary" value="<?php _e( 'Export Plugin Settings' , 'yikes-inc-easy-mailchimp-extender' ); ?>" /></p>
+		<p><input type="submit" class="button-primary" value="<?php _e( 'Export Plugin Settings', 'yikes-inc-easy-mailchimp-extender' ); ?>" /></p>
 	</form>
 	
 	<hr />
 	
 	<!-- Import Form -->
-	<form action="<?php echo esc_url_raw( add_query_arg( array( 'action' => 'yikes-easy-mc-import-forms' , 'nonce' => wp_create_nonce( 'import-forms' ) ) ) ); ?>" method="post" enctype="multipart/form-data">
-		<p><strong><?php _e( "Import" , 'yikes-inc-easy-mailchimp-extender' ); ?></strong></p>
+	<form action="<?php echo esc_url_raw( add_query_arg( array( 'action' => 'yikes-easy-mc-import-forms', 'nonce' => wp_create_nonce( 'import-forms' ) ) ) ); ?>" method="post" enctype="multipart/form-data">
+		<p><strong><?php _e( "Import", 'yikes-inc-easy-mailchimp-extender' ); ?></strong></p>
 		<p class="description">
-			<?php _e( "Select the Easy Forms for Mailchimp export file you would like to import. You can use this field to import your opt-in forms or settings. " , 'yikes-inc-easy-mailchimp-extender' ); ?>
+			<?php _e( "Select the Easy Forms for Mailchimp export file you would like to import. You can use this field to import your opt-in forms or settings. ", 'yikes-inc-easy-mailchimp-extender' ); ?>
 		</p>
 		<label>
 			<input type="file" name="csv" id="forms_to_import">
 		</label>
 		<!-- check if any of our transients contain data -->
-		<p><input type="submit" class="button-primary" value="<?php _e( 'Import' , 'yikes-inc-easy-mailchimp-extender' ); ?>" /></p>
+		<p><input type="submit" class="button-primary" value="<?php _e( 'Import', 'yikes-inc-easy-mailchimp-extender' ); ?>" /></p>
 	</form>
 	
 </div> <!-- .inside -->