yikesinc / yikes-inc-easy-mailchimp-extender

admin/partials/front-end-widgets/front-end-widget-form.php

Spacing +18 added lines, -18 removed lines

@@ -25,7 +25,7 @@ 
 			// Widget name will appear in UI
 			__( 'Easy Mailchimp Forms', 'yikes-inc-easy-mailchimp-extender' ),
 			// Widget description
-			array( 'description' => __( 'Mailchimp opt-in widget for your sidebar.', 'yikes-inc-easy-mailchimp-extender' ), )
+			array( 'description' => __( 'Mailchimp opt-in widget for your sidebar.', 'yikes-inc-easy-mailchimp-extender' ),)
 		);
 	}
 
@@ -39,10 +39,10 @@ 
 		// Get all form IDs so we can use the first one as a default.
 		$form_ids = $this->form_interface->get_form_ids();
 
-		$title              = isset( $instance['title'] ) ? apply_filters( 'widget_title', $instance['title'] ) : __( 'Mailchimp Signup Form', 'yikes-inc-easy-mailchimp-extender' );
-		$form_id            = isset( $instance['form_id'] ) ? $instance['form_id'] : $form_ids[0];
-		$form_description   = isset( $instance['form_description'] ) ? $instance['form_description'] : '';
-		$submit_button_text = isset( $instance['submit_text'] ) ? $instance['submit_text'] : __( 'Submit', 'yikes-inc-easy-mailchimp-extender' );
+		$title              = isset( $instance[ 'title' ] ) ? apply_filters( 'widget_title', $instance[ 'title' ] ) : __( 'Mailchimp Signup Form', 'yikes-inc-easy-mailchimp-extender' );
+		$form_id            = isset( $instance[ 'form_id' ] ) ? $instance[ 'form_id' ] : $form_ids[ 0 ];
+		$form_description   = isset( $instance[ 'form_description' ] ) ? $instance[ 'form_description' ] : '';
+		$submit_button_text = isset( $instance[ 'submit_text' ] ) ? $instance[ 'submit_text' ] : __( 'Submit', 'yikes-inc-easy-mailchimp-extender' );
 
 		// Build our array based on settings chosen
 		$shortcode_attributes = array(
@@ -54,10 +54,10 @@ 
 		$shortcode_attributes = apply_filters( 'yikes_mailchimp_widget_shortcode_attributes', $shortcode_attributes, $instance );
 
 		// before and after widget arguments are defined by themes
-		echo $args['before_widget'];
+		echo $args[ 'before_widget' ];
 
 		if ( ! empty( $title ) ) {
-			echo $args['before_title'] . $title . $args['after_title'];
+			echo $args[ 'before_title' ] . $title . $args[ 'after_title' ];
 		}
 
 		// Custom action hooks to place content in the widget before the form
@@ -73,7 +73,7 @@ 
 		do_action( 'yikes-mailchimp-after-form-' . $form_id );
 		do_action( 'yikes-mailchimp-after-form' );
 
-		echo $args['after_widget'];
+		echo $args[ 'after_widget' ];
 	}
 
 	// Widget Backend 
@@ -83,7 +83,7 @@ 
 		if ( empty( $all_forms ) ) {
 			?>
 				<section class="no-forms-widget">
-				<strong><span class="dashicons dashicons-no-alt no-forms-found-icon"></span><?php echo sprintf( __( 'No forms found. It looks like you need to <a href="%s" title="%s">%s</a>.', 'yikes-inc-easy-mailchimp-extender' ), esc_url_raw( admin_url( 'admin.php?page=yikes-inc-easy-mailchimp' ) ), __( 'Create a form' , 'yikes-inc-easy-mailchimp-extender' ), __( 'create a form' , 'yikes-inc-easy-mailchimp-extender' ) ); ?></strong>
+				<strong><span class="dashicons dashicons-no-alt no-forms-found-icon"></span><?php echo sprintf( __( 'No forms found. It looks like you need to <a href="%s" title="%s">%s</a>.', 'yikes-inc-easy-mailchimp-extender' ), esc_url_raw( admin_url( 'admin.php?page=yikes-inc-easy-mailchimp' ) ), __( 'Create a form', 'yikes-inc-easy-mailchimp-extender' ), __( 'create a form', 'yikes-inc-easy-mailchimp-extender' ) ); ?></strong>
 				</section>
 			<?php
 			return;
@@ -110,9 +110,9 @@ 
 			$submit_text = __( 'Submit', 'yikes-inc-easy-mailchimp-extender' );
 		}
 
-		 if( get_option( 'yikes-mc-api-validation' , 'invalid_api_key' ) == 'invalid_api_key' ) {
+		 if ( get_option( 'yikes-mc-api-validation', 'invalid_api_key' ) == 'invalid_api_key' ) {
 			?>
-				<p class="enter-valid-api-error-widget"><strong><?php _e( 'Please enter a valid Mailchimp API key to connect your site to Mailchimp.' , 'yikes-inc-easy-mailchimp-extender' ); ?></strong></p>
+				<p class="enter-valid-api-error-widget"><strong><?php _e( 'Please enter a valid Mailchimp API key to connect your site to Mailchimp.', 'yikes-inc-easy-mailchimp-extender' ); ?></strong></p>
 			<?php
 			return;
 		}
@@ -129,9 +129,9 @@ 
 			<select id="<?php echo $this->get_field_id( 'form_id' ); ?>" name="<?php echo $this->get_field_name( 'form_id' ); ?>" class="widefat">
 				<?php
 				// build our array
-				foreach( $all_forms as $id => $form ) {
+				foreach ( $all_forms as $id => $form ) {
 					?>
-						<option <?php selected( $selected_form , $id ); ?> name="<?php echo $this->get_field_name( 'form_id' ); ?>" value="<?php echo $id; ?>"><?php echo stripslashes( $form['form_name'] ); ?></option>
+						<option <?php selected( $selected_form, $id ); ?> name="<?php echo $this->get_field_name( 'form_id' ); ?>" value="<?php echo $id; ?>"><?php echo stripslashes( $form[ 'form_name' ] ); ?></option>
 					<?php
 				}
 				?>
@@ -140,7 +140,7 @@ 
 
 		<p>
 			<label for="<?php echo $this->get_field_id( 'form_description' ); ?>"><?php _e( 'Display Form Description:' ); ?></label>
-			<input class="widefat" id="<?php echo $this->get_field_id( 'form_description' ); ?>" name="<?php echo $this->get_field_name( 'form_description' ); ?>" type="checkbox" value="1" <?php if( isset( $instance['form_description'] ) ) { checked( $instance['form_description'] , 1 ); } ?> />
+			<input class="widefat" id="<?php echo $this->get_field_id( 'form_description' ); ?>" name="<?php echo $this->get_field_name( 'form_description' ); ?>" type="checkbox" value="1" <?php if ( isset( $instance[ 'form_description' ] ) ) { checked( $instance[ 'form_description' ], 1 ); } ?> />
 		</p>
 
 		<p>
@@ -153,10 +153,10 @@ 
 	// Updating widget replacing old instances with new
 	public function update( $new_instance, $old_instance ) {
 		$instance = array();
-		$instance['title'] = ( ! empty( $new_instance['title'] ) ) ? strip_tags( $new_instance['title'] ) : '';
-		$instance['form_id'] = $new_instance['form_id'];
-		$instance['form_description'] = isset( $new_instance['form_description'] ) ? '1' : '';
-		$instance['submit_text'] = ( ! empty( $new_instance['submit_text'] ) ) ? strip_tags( $new_instance['submit_text'] ) : 'Submit';
+		$instance[ 'title' ] = ( ! empty( $new_instance[ 'title' ] ) ) ? strip_tags( $new_instance[ 'title' ] ) : '';
+		$instance[ 'form_id' ] = $new_instance[ 'form_id' ];
+		$instance[ 'form_description' ] = isset( $new_instance[ 'form_description' ] ) ? '1' : '';
+		$instance[ 'submit_text' ] = ( ! empty( $new_instance[ 'submit_text' ] ) ) ? strip_tags( $new_instance[ 'submit_text' ] ) : 'Submit';
 		return $instance;
 	}
 	

includes/third-party-integrations/visual-composer/visual-composer.php

Spacing +1 added lines, -1 removed lines

@@ -115,7 +115,7 @@
 		if ( ! empty( $all_forms ) ) {

 			// build an array to pass to our javascript

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

-				$lists[ $form['form_name'] ] = $id;

+				$lists[ $form[ 'form_name' ] ] = $id;

 			}

 		} else {

 			$lists[ __( 'Please Import Some Mailchimp Lists', 'yikes-inc-easy-mailchimp-extender' ) ] = '-';

public/classes/process/class.process_form_submission_handler.php

Spacing +65 added lines, -65 removed lines

@@ -255,13 +255,13 @@ 
 		$this->handle_updating_existing_user_link_message     = __( 'To update your Mailchimp profile, please click to send yourself an update link', 'yikes-inc-easy-mailchimp-extender' );
 		$this->handle_empty_required_field_message            = __( 'A required field is missing.', 'yikes-inc-easy-mailchimp-extender' );
 		$this->handle_empty_required_interest_group_message   = __( 'A required interest group is missing.', 'yikes-inc-easy-mailchimp-extender' );
-		$this->handle_nonce_message                           = __( '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' );
+		$this->handle_nonce_message                           = __( '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' );
 		$this->handle_non_filled_recaptcha_message_message    = __( 'Please check the reCAPTCHA field.', 'yikes-inc-easy-mailchimp-extender' );
 		$this->generic_recaptcha_error_message                = __( 'Please refresh the page and try again.', 'yikes-inc-easy-mailchimp-extender' );
 
 		// Define our success messages
-		$this->default_response_single_optin_success_message  = __( 'Thank you for subscribing!' , 'yikes-inc-easy-mailchimp-extender' );
-		$this->default_response_double_optin_success_message  = __( 'Thank you for subscribing. Check your email for the confirmation message.' , 'yikes-inc-easy-mailchimp-extender' );
+		$this->default_response_single_optin_success_message  = __( 'Thank you for subscribing!', 'yikes-inc-easy-mailchimp-extender' );
+		$this->default_response_double_optin_success_message  = __( 'Thank you for subscribing. Check your email for the confirmation message.', 'yikes-inc-easy-mailchimp-extender' );
 		$this->existing_subscriber_profile_update_message     = __( 'Thank you for already being a subscriber! Your profile info has been updated.', 'yikes-inc-easy-mailchimp-extender' );
 	}
 
@@ -373,16 +373,16 @@ 
 			}
 
 			// Check if the current iteration has a 'date_format' key set (i.e. date/birthday fields)
-			if ( isset( $form_fields[ $merge_tag ]['date_format'] ) ) {
-				$sanitized = $this->handle_date_format_merge_values( $sanitized, $form_fields[ $merge_tag ]['date_format'] );
+			if ( isset( $form_fields[ $merge_tag ][ 'date_format' ] ) ) {
+				$sanitized = $this->handle_date_format_merge_values( $sanitized, $form_fields[ $merge_tag ][ 'date_format' ] );
 			}
 
 			$merge_variables[ $merge_tag ] = $sanitized;
 		}
 
 		// Make sure we send the lower-cased, sanitized email so it matches the one we're sending in the body of the request.
-		if ( isset( $merge_variables['EMAIL'] ) ) {
-			$merge_variables['EMAIL'] = $this->email;
+		if ( isset( $merge_variables[ 'EMAIL' ] ) ) {
+			$merge_variables[ 'EMAIL' ] = $this->email;
 		}
 
 		/**
@@ -459,7 +459,7 @@ 
 		if ( count( $pieces ) === 3 ) {
 
 			// $pieces[1] = MM. $pieces[0] = DD. $date = MM/DD/YYYY
-			$date = $pieces[1] . '/' . $pieces[0] . '/' . $pieces[2];
+			$date = $pieces[ 1 ] . '/' . $pieces[ 0 ] . '/' . $pieces[ 2 ];
 		}
 
 		return $date;
@@ -484,7 +484,7 @@ 
 		if ( count( $pieces ) === 2 ) {
 
 			// $pieces[1] = MM. $pieces[0] = DD. $birthday = MM/DD
-			$birthday = $pieces[1] . '/' . $pieces[0];
+			$birthday = $pieces[ 1 ] . '/' . $pieces[ 0 ];
 		}
 
 		return $birthday;
@@ -517,12 +517,12 @@ 
 			// Loop through the interest groups and create a single array like {group_id} => false
 			foreach ( $interest_groupings as $group_data ) {
 
-				if ( empty( $group_data['items'] ) || ! is_array( $group_data['items'] ) ) {
+				if ( empty( $group_data[ 'items' ] ) || ! is_array( $group_data[ 'items' ] ) ) {
 					continue;
 				}
 
-				foreach ( $group_data['items'] as $item ) {
-					$groups[ $item['id'] ] = false;
+				foreach ( $group_data[ 'items' ] as $item ) {
+					$groups[ $item[ 'id' ] ] = false;
 				}
 
 			}
@@ -635,7 +635,7 @@ 
 		do_action( "yikes-mailchimp-form-submission-{$this->form_id}", $this->email, $merge_variables, $this->form_id, $notifications );
 
 		// Get the optin value
-		$optin = isset( $optin_settings['optin'] ) ? (int) $optin_settings['optin'] : 0;
+		$optin = isset( $optin_settings[ 'optin' ] ) ? (int) $optin_settings[ 'optin' ] : 0;
 
 		if ( 1 === $optin ) {
 
@@ -665,13 +665,13 @@ 
 
 		// Construct our success array variables
 		$return_success_array = array(
-			'hide'        		=> $submission_settings['hide_form_post_signup'],
+			'hide'        		=> $submission_settings[ 'hide_form_post_signup' ],
 			'error'       		=> 0,
 			'response'    		=> $response_message,
-			'redirection' 		=> $redirect_array['redirection'],
-			'redirect'    		=> $redirect_array['redirect'],
-			'new_window' 		=> $redirect_array['new_window'],
-			'redirect_timer'	=> $redirect_array['redirect_timer'],
+			'redirection' 		=> $redirect_array[ 'redirection' ],
+			'redirect'    		=> $redirect_array[ 'redirect' ],
+			'new_window' 		=> $redirect_array[ 'new_window' ],
+			'redirect_timer'	=> $redirect_array[ 'redirect_timer' ],
 		);
 
 		// Return success array
@@ -693,12 +693,12 @@ 
 		$details    = '';
 
 		// Loop through the error data and retrieve any fields and messages
-		if ( isset( $error_data['data'] ) ) {
-			foreach ( $error_data['data'] as $datum ) {
-				if ( ! isset( $datum['field'], $datum['message'] ) ) {
+		if ( isset( $error_data[ 'data' ] ) ) {
+			foreach ( $error_data[ 'data' ] as $datum ) {
+				if ( ! isset( $datum[ 'field' ], $datum[ 'message' ] ) ) {
 					continue;
 				}
-				$details .= sprintf( '<br>Error with %1$s field: <strong>%2$s</strong>', $form_fields[ $datum['field'] ]['label'], $datum['message'] );
+				$details .= sprintf( '<br>Error with %1$s field: <strong>%2$s</strong>', $form_fields[ $datum[ 'field' ] ][ 'label' ], $datum[ 'message' ] );
 			}
 		}
 
@@ -741,21 +741,21 @@ 
 		$missing_fields = array();
 
 		// Loop through submitted form data
-		foreach( $data as $merge_tag => $value ) {
+		foreach ( $data as $merge_tag => $value ) {
 
 			// Skip interest groups
-			if ( isset( $form_fields[ $merge_tag ]['group_id'] ) ) {
+			if ( isset( $form_fields[ $merge_tag ][ 'group_id' ] ) ) {
 				continue;
 			}
 
 			// check if this field is required
-			if ( isset( $form_fields[ $merge_tag ] ) && isset( $form_fields[ $merge_tag ]['require'] ) && $form_fields[ $merge_tag ]['require'] === '1' ) {
+			if ( isset( $form_fields[ $merge_tag ] ) && isset( $form_fields[ $merge_tag ][ 'require' ] ) && $form_fields[ $merge_tag ][ 'require' ] === '1' ) {
 
 				// Check if the field(s) are empty
 				if ( is_array( $value ) ) {
 
 					// Loop through the data and check if any are empty
-					foreach( $value as $field => $val ) {
+					foreach ( $value as $field => $val ) {
 
 						/**
 						*	'yikes-mailchimp-ignore-required-array-field'
@@ -774,13 +774,13 @@ 
 
 							// Set the merge label (e.g. MMERGE6) as the key so we don't get the same field multiple times
 							// (e.g. For arrays, like an address, where multiple address fields are empty)
-							$missing_fields[ $form_fields[ $merge_tag ]['merge'] ] = $form_fields[ $merge_tag ];
+							$missing_fields[ $form_fields[ $merge_tag ][ 'merge' ] ] = $form_fields[ $merge_tag ];
 						}
 					}
 
 				} else if ( empty( $value ) ) {
 					$field_is_missing = true;
-					$missing_fields[ $form_fields[ $merge_tag ]['merge'] ] = $form_fields[ $merge_tag ];
+					$missing_fields[ $form_fields[ $merge_tag ][ 'merge' ] ] = $form_fields[ $merge_tag ];
 				}
 			}
 		}
@@ -830,7 +830,7 @@ 
 		foreach ( $form_fields as $merge_tag => $field_data ) {
 
 			// If an interest group and it's required
-			if ( isset( $field_data['group_id'] ) && isset( $field_data['require'] ) && $field_data['require'] === '1' ) {
+			if ( isset( $field_data[ 'group_id' ] ) && isset( $field_data[ 'require' ] ) && $field_data[ 'require' ] === '1' ) {
 				
 				// Check if it was submitted (meaning, check if it's set in our $data array)
 				if ( ! isset( $data[ 'group-' . $merge_tag ] ) ) {
@@ -892,30 +892,30 @@ 
 		}
 
 		// Construct the API URL
-		$url           = esc_url_raw( 'https://www.google.com/recaptcha/api/siteverify?secret=' . get_option( 'yikes-mc-recaptcha-secret-key', '' ) . '&response=' . $recaptcha_response . '&remoteip=' . $_SERVER['REMOTE_ADDR'] );
+		$url           = esc_url_raw( 'https://www.google.com/recaptcha/api/siteverify?secret=' . get_option( 'yikes-mc-recaptcha-secret-key', '' ) . '&response=' . $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 );
 
 		// Set up errors array
 		$recaptcha_errors = array();
 
 		// if we've hit an error, lets return the error!
-		if ( true !== $response_body['success'] ) {
+		if ( true !== $response_body[ 'success' ] ) {
 
-			if( isset( $response_body['error-codes'] ) ) {
+			if ( isset( $response_body[ 'error-codes' ] ) ) {
 
 				// Loop through response error codes
-				foreach ( $response_body['error-codes'] as $error_code ) {
+				foreach ( $response_body[ 'error-codes' ] as $error_code ) {
 					if ( 'missing-input-response' === $error_code ) {
 						$error_code = $this->handle_non_filled_recaptcha_message;
 					}
 
 					// Add our error_code to the errors array
-					$recaptcha_errors[] = $error_code;
+					$recaptcha_errors[ ] = $error_code;
 				}
 
 			} else {
-				$recaptcha_errors[] = $this->generic_recaptcha_error_message;
+				$recaptcha_errors[ ] = $this->generic_recaptcha_error_message;
 			}
 
 			/**
@@ -1023,7 +1023,7 @@ 
 	* @param array | $fields_array | An array of fields to loop through and make sure they're not null
 	*/
 	public function handle_empty_fields_generic( $fields_array ) {
-		foreach( $fields_array as $field ) {
+		foreach ( $fields_array as $field ) {
 			if ( $field === null ) {
 				return $this->yikes_fail( $hide = 0, $error = 1, $this->handle_empty_fields_generic_message );
 			}
@@ -1089,7 +1089,7 @@ 
 
 		// Append our 'send-update-email' link and text
 		$response .= $link_start_tag;
-		$response .= 	$this->handle_updating_existing_user_link_message;
+		$response .= $this->handle_updating_existing_user_link_message;
 		$response .= $link_close_tag;
 
 		// Check for a user-defined message
@@ -1112,14 +1112,14 @@ 
 	*/
 	protected function check_for_user_defined_response_message( $slug, $response_text, $data = false ) {
 
-		switch( $slug ) {
+		switch ( $slug ) {
 			case 'already-subscribed':
 
 				// Check if this error message exists
-				if ( isset( $this->error_messages['already-subscribed'] ) && ! empty( $this->error_messages['already-subscribed'] ) ) {
+				if ( isset( $this->error_messages[ 'already-subscribed' ] ) && ! empty( $this->error_messages[ 'already-subscribed' ] ) ) {
 
 					// Check if the substring (that we replace) '[email]' is located in the string and replace it
-					$response_text = str_replace( '[email]', $this->email, $this->error_messages['already-subscribed'] );
+					$response_text = str_replace( '[email]', $this->email, $this->error_messages[ 'already-subscribed' ] );
 				}
 
 				/**
@@ -1138,13 +1138,13 @@ 
 			case 'update-link':
 
 				// Check if this error message exists
-				if ( $data !== false && isset( $this->error_messages['update-link'] ) && ! empty( $this->error_messages['update-link'] ) ) {
+				if ( $data !== false && isset( $this->error_messages[ 'update-link' ] ) && ! empty( $this->error_messages[ 'update-link' ] ) ) {
 
 					// Check if the substring (that we replace) '[link]' is located in the string and replace it
-					$response_text = str_replace( '[link]', $data['link_start_tag'], $this->error_messages['update-link'] );
+					$response_text = str_replace( '[link]', $data[ 'link_start_tag' ], $this->error_messages[ 'update-link' ] );
 
 					// Remove [/link]
-					$response_text = str_replace( '[/link]', $data['link_close_tag'], $response_text );
+					$response_text = str_replace( '[/link]', $data[ 'link_close_tag' ], $response_text );
 				}
 
 				/**
@@ -1163,8 +1163,8 @@ 
 			case 'success':
 
 				// 'success' is the user-defined success message for double opt-in
-				if ( isset( $this->error_messages['success'] ) && ! empty( $this->error_messages['success'] ) ) {
-					$response_text = $this->error_messages['success'];
+				if ( isset( $this->error_messages[ 'success' ] ) && ! empty( $this->error_messages[ 'success' ] ) ) {
+					$response_text = $this->error_messages[ 'success' ];
 				}
 
 				/**
@@ -1183,8 +1183,8 @@ 
 
 			case 'success-single-optin':
 
-				if ( isset( $this->error_messages['success-single-optin'] ) && ! empty( $this->error_messages['success-single-optin'] ) ) {
-					$response_text = $this->error_messages['success-single-optin'];
+				if ( isset( $this->error_messages[ 'success-single-optin' ] ) && ! empty( $this->error_messages[ 'success-single-optin' ] ) ) {
+					$response_text = $this->error_messages[ 'success-single-optin' ];
 				}
 
 				/**
@@ -1203,8 +1203,8 @@ 
 
 			case 'success-resubscribed':
 
-				if ( isset( $this->error_messages['success-resubscribed'] ) && ! empty( $this->error_messages['success-resubscribed'] ) ) {
-					$response_text = $this->error_messages['success-resubscribed'];
+				if ( isset( $this->error_messages[ 'success-resubscribed' ] ) && ! empty( $this->error_messages[ 'success-resubscribed' ] ) ) {
+					$response_text = $this->error_messages[ 'success-resubscribed' ];
 				}
 
 				/**
@@ -1226,8 +1226,8 @@ 
 				$original_response_text     = $response_text;
 				$user_defined_response_text = '';
 
-				if ( isset( $this->error_messages['general-error'] ) && ! empty( $this->error_messages['general-error'] ) ) {
-					$user_defined_response_text = $this->error_messages['general-error'];
+				if ( isset( $this->error_messages[ 'general-error' ] ) && ! empty( $this->error_messages[ 'general-error' ] ) ) {
+					$user_defined_response_text = $this->error_messages[ 'general-error' ];
 				}
 
 				/**
@@ -1289,7 +1289,7 @@ 
 		} else {
 			global $process_submission_response;
 
-			$process_submission_response = isset( $success_array['response'] ) ? $success_array['response'] : ''; // DEFAULT SUCCESS?
+			$process_submission_response = isset( $success_array[ 'response' ] ) ? $success_array[ 'response' ] : ''; // DEFAULT SUCCESS?
 			$process_submission_response = $this->wrap_form_submission_response( $process_submission_response, $is_success = true );
 		}
 	}
@@ -1342,8 +1342,8 @@ 
 		// Add additional fields we've been supplied
 		if ( ! empty( $additional_fields ) ) {
 
-			foreach( $additional_fields as $key => $value ) {
-				$response_array[$key] = $value;
+			foreach ( $additional_fields as $key => $value ) {
+				$response_array[ $key ] = $value;
 			}
 		}
 
@@ -1374,20 +1374,20 @@ 
 		);
 
 		// Let's confirm we have a value before trying to use it
-		$redirect_setting = isset( $submission_settings['redirect_on_submission'] ) ? $submission_settings['redirect_on_submission'] : false;
+		$redirect_setting = isset( $submission_settings[ 'redirect_on_submission' ] ) ? $submission_settings[ 'redirect_on_submission' ] : false;
 
 		// Check the redirect flag
 		if ( '1' === $redirect_setting ) {
 
 			// Supply return array with default value of 1
-			$redirect_array['redirection']	= apply_filters( 'yikes-mailchimp-redirection', 1, $form_id, $page_data );
+			$redirect_array[ 'redirection' ] = apply_filters( 'yikes-mailchimp-redirection', 1, $form_id, $page_data );
 
 			// Let's confirm we have redirect_page/custom_redirect_url/new_window values
-			$redirect_page_setting	 = isset( $submission_settings['redirect_page'] ) ? $submission_settings['redirect_page'] : false;
-			$custom_redirect_setting = isset( $submission_settings['custom_redirect_url'] ) ? $submission_settings['custom_redirect_url'] : false;
-			$redirect_new_window	 = isset( $submission_settings['redirect_new_window'] ) ? $submission_settings['redirect_new_window'] : false;
+			$redirect_page_setting = isset( $submission_settings[ 'redirect_page' ] ) ? $submission_settings[ 'redirect_page' ] : false;
+			$custom_redirect_setting = isset( $submission_settings[ 'custom_redirect_url' ] ) ? $submission_settings[ 'custom_redirect_url' ] : false;
+			$redirect_new_window = isset( $submission_settings[ 'redirect_new_window' ] ) ? $submission_settings[ 'redirect_new_window' ] : false;
 
-			$redirect_array['new_window'] = apply_filters( 'yikes-mailchimp-redirect-new-window', $redirect_new_window, $form_id, $page_data );
+			$redirect_array[ 'new_window' ] = apply_filters( 'yikes-mailchimp-redirect-new-window', $redirect_new_window, $form_id, $page_data );
 
 			// Check if we're redirecting to a custom_url or just the redirect_page
 			$redirect_url = 'custom_url' !== $redirect_page_setting ? get_permalink( $redirect_page_setting ) : $custom_redirect_setting;
@@ -1412,9 +1412,9 @@ 
 			*/
 			$redirect_timer = apply_filters( 'yikes-mailchimp-redirect-timer', $default_redirect_time_ms, $form_id, $page_data );
 
-			$redirect_array['redirect_timer'] = $redirect_timer;
+			$redirect_array[ 'redirect_timer' ] = $redirect_timer;
 
-			$redirect_array['redirect'] = $redirect_url;
+			$redirect_array[ 'redirect' ] = $redirect_url;
 		}
 
 		return $redirect_array;
@@ -1423,7 +1423,7 @@ 
 	public function maybe_add_tags( $form_data, $subscriber_data ) {
 
 		// Add the form's tags
-		$form_tags = isset( $form_data['tags'] ) ? $form_data['tags'] : array();
+		$form_tags = isset( $form_data[ 'tags' ] ) ? $form_data[ 'tags' ] : array();
 		$form_tags = apply_filters( 'yikes_mailchimp_subscriber_tags', $form_tags, $form_data, $this->list_id, $subscriber_data );
 
 		if ( ! empty( $form_tags ) ) {
@@ -1432,7 +1432,7 @@ 
 				$add_tag = apply_filters( 'yikes_mailchimp_subscriber_tag_active', true, $tag, $this->list_id, $subscriber_data );
 
 				if ( $add_tag ) {
-					$list_handler->create_member_tags( $this->list_id, $tag['id'], array( 'email_address' => $this->email ) );
+					$list_handler->create_member_tags( $this->list_id, $tag[ 'id' ], array( 'email_address' => $this->email ) );
 				}
 			}
 		}

includes/api/class-yikes-inc-easy-mailchimp-api.php

Spacing +9 added lines, -9 removed lines

@@ -103,7 +103,7 @@ 
 	 * @return array|WP_Error
 	 */
 	public function patch( $path = '', $headers = array(), $params = array() ) {
-		if ( ! isset( $params['body'] ) ) {
+		if ( ! isset( $params[ 'body' ] ) ) {
 			return new WP_Error(
 				'yikesinc_eme_missing_body',
 				sprintf(
@@ -130,7 +130,7 @@ 
 	 * @return array|WP_Error
 	 */
 	public function post( $path = '', $headers = array(), $params = array() ) {
-		if ( ! isset( $params['body'] ) ) {
+		if ( ! isset( $params[ 'body' ] ) ) {
 			return new WP_Error(
 				'yikesinc_eme_missing_body',
 				sprintf(
@@ -157,7 +157,7 @@ 
 	 * @return array|WP_Error
 	 */
 	public function put( $path = '', $headers = array(), $params = array() ) {
-		if ( ! isset( $params['body'] ) ) {
+		if ( ! isset( $params[ 'body' ] ) ) {
 			return new WP_Error(
 				'yikesinc_eme_missing_body',
 				sprintf(
@@ -288,13 +288,13 @@ 
 		$authorized_args = $this->get_authorized_args();
 
 		// If we have body data, maybe convert it to JSON.
-		if ( isset( $params['body'] ) && ( is_array( $params['body'] ) || is_object( $params['body'] ) ) ) {
-			$params['body']          = json_encode( wp_parse_args( $authorized_args['body'], $params['body'] ) );
-			$headers['Content-Type'] = 'application/json';
+		if ( isset( $params[ 'body' ] ) && ( is_array( $params[ 'body' ] ) || is_object( $params[ 'body' ] ) ) ) {
+			$params[ 'body' ]          = json_encode( wp_parse_args( $authorized_args[ 'body' ], $params[ 'body' ] ) );
+			$headers[ 'Content-Type' ] = 'application/json';
 		}
 
 		// Combine the given headers and auth headers
-		$headers = wp_parse_args( $authorized_args['headers'], $headers );
+		$headers = wp_parse_args( $authorized_args[ 'headers' ], $headers );
 		/**
 		 * Filter the headers used for a request to the Mailchimp API.
 		 *
@@ -358,12 +358,12 @@ 
 
 		// Version 2.0 uses body authorization
 		if ( version_compare( '3.0', $this->api_version, '>' ) ) {
-			$args['body'] = $this->get_auth_body();
+			$args[ 'body' ] = $this->get_auth_body();
 		}
 
 		// Version 3.0 uses authorization headers.
 		if ( version_compare( '3.0', $this->api_version, '<=' ) ) {
-			$args['headers'] = $this->get_auth_headers();
+			$args[ 'headers' ] = $this->get_auth_headers();
 		}
 
 		return $args;

admin/partials/menu/options-sections/api-cache-settings.php

Spacing +5 added lines, -5 removed lines

@@ -3,18 +3,18 @@
 	-	Clear Mailchimp transient data such as forms, form fields, list data, subscribers etc.
 		*	transient cache is stored for 60 minutes.
 -->
-<h3><span><?php _e( 'API Cache Settings' , 'yikes-inc-easy-mailchimp-extender' ); ?></span></h3>
+<h3><span><?php _e( 'API Cache Settings', 'yikes-inc-easy-mailchimp-extender' ); ?></span></h3>
 <div class="inside">
 									
 	<!-- Settings Form -->
-	<form action="<?php echo esc_url_raw( add_query_arg( array( 'action' => 'yikes-easy-mc-clear-transient-data' , 'nonce' => wp_create_nonce( 'clear-mc-transient-data' ) ) ) ); ?>" method="post">							
+	<form action="<?php echo esc_url_raw( add_query_arg( array( 'action' => 'yikes-easy-mc-clear-transient-data', 'nonce' => wp_create_nonce( 'clear-mc-transient-data' ) ) ) ); ?>" method="post">							
 									
-		<p><?php _e( "Delete all Mailchimp data stored in your sites cache. Most data is stored in the cache for 1 hour." , 'yikes-inc-easy-mailchimp-extender' ); ?></p>
+		<p><?php _e( "Delete all Mailchimp data stored in your sites cache. Most data is stored in the cache for 1 hour.", 'yikes-inc-easy-mailchimp-extender' ); ?></p>
 			<!-- check if any of our transients contain data -->							
 			<?php if ( false === get_transient( 'yikes-easy-mailchimp-list-data' ) && false === get_transient( 'yikes-easy-mailchimp-profile-data' ) && false === get_transient( 'yikes-easy-mailchimp-account-data' ) && false === get_transient( 'yikesinc_eme_list_ids' ) && false === get_transient( 'yikes_eme_lists' ) ) { ?>
-				<p><a href="#" class="button-secondary" disabled="disabled" title="<?php _e( 'No Mailchimp data found in temporary cache storage.' , 'yikes-inc-easy-mailchimp-extender' ); ?>"><?php _e( 'Clear Mailchimp API Cache' , 'yikes-inc-easy-mailchimp-extender' ); ?></a></p>
+				<p><a href="#" class="button-secondary" disabled="disabled" title="<?php _e( 'No Mailchimp data found in temporary cache storage.', 'yikes-inc-easy-mailchimp-extender' ); ?>"><?php _e( 'Clear Mailchimp API Cache', 'yikes-inc-easy-mailchimp-extender' ); ?></a></p>
 			<?php } else { ?>
-				<p><input type="submit" class="button-primary" value="<?php _e( 'Clear Mailchimp API Cache' , 'yikes-inc-easy-mailchimp-extender' ); ?>" /></p>
+				<p><input type="submit" class="button-primary" value="<?php _e( 'Clear Mailchimp API Cache', 'yikes-inc-easy-mailchimp-extender' ); ?>" /></p>
 			<?php } ?>
 									
 	</form>

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

Spacing +354 added lines, -354 removed lines

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

 		/** Create A Form **/

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

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

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

 

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

 

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

 		/** Delete A Form **/

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

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

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

 

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

 

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

 		/** Duplicate/Clone A Form    **/

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

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

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

 

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

 

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

 		/**  Reset Form Impression Stats **/

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

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

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

 

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

 

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

 		/**         Update A Form        **/

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

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

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

 

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

 

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

 		/**     Clear Store Mailchimp Transient Data   **/

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

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

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

 

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

 

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

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

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

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

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

 

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

 

@@ -164,7 +164,7 @@ 
 		/*******************************************/

 		/**    Create misisng error log file  **/

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

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

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

 

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

 

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

 		/**        Clear Mailchimp Error Log Data        **/

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

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

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

 

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

 

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

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

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

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

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

 

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

 

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

 		/**                Export Plugin Settings           **/

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

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

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

 

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

 

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

 		/**        Import Class Inclusion       **/

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

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

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

 

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

 

@@ -232,7 +232,7 @@ 
 		/*******************************************/

 		/**    Premium Support Request     **/

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

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

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

 

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

 

@@ -241,7 +241,7 @@ 
 		/****************************************/

 		/**    Dismiss Options Migrations        **/

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

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

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

 

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

 

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

 		 */

 		public function easy_forms_plugin_action_links( $links ) {

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

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

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

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

 			return $links;

 		}

 

@@ -379,17 +379,17 @@ 
 		*/

 		public function yikes_easy_mailchimp_export_forms() {

 			// grab our nonce.

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

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

 			// grab the forms.

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

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

 			// validate nonce.

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

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

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

 			}

 

 			// run the export function.

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

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

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

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

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

 			die();

@@ -403,10 +403,10 @@ 
 		*/

 		public function yikes_easy_mailchimp_export_plugin_settings() {

 			// grab our nonce

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

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

 			// validate nonce.

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

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

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

 			}

 

 			// run the export function.

@@ -423,10 +423,10 @@ 
 		*/

 		public function yikes_easy_mailchimp_import_forms() {

 			// grab our nonce.

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

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

 			// validate nonce.

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

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

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

 			}

 			// include the export class.

 			if ( ! class_exists( 'Yikes_Inc_Easy_Mailchimp_Import_Class' ) ) {

@@ -447,18 +447,18 @@ 
 		*/

 		public function yikes_easy_mailchimp_premium_support_request() {

 

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

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

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

 			}

 

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

 

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

 

@@ -493,7 +493,7 @@ 
 

 		public function get_premium_license( $plugin_slug ) {

 

-			switch( $plugin_slug ) {

+			switch ( $plugin_slug ) {

 

 				case 'form-customizer':

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

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

 			// @since v6.0.0.

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

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

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

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

 			}

 

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

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

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

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

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

 				}

 			}

 

@@ -576,13 +576,13 @@ 
 		*/

 		public function yikes_easy_mailchimp_display_review_us_notice() {

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

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

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

 

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

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

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

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

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

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

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

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

 

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

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

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

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

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

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

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

 

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

 				$review_message .= sprintf( 

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

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

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

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

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

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

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

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

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

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

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

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

 				?>

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

 		*/

 		public function yikes_easy_mailchimp_stop_bugging_me() {

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

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

 				add_option( 'yikes_easy_mailchimp_review_stop_bugging_me', true );

 			}

 		}

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

 	public function yks_mc_add_tinymce_plugin( $plugin_array ) {

 

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

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

 

 		return $plugin_array;

 	}

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

 			// build an array to pass to our javascript.

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

-				$lists[] = array(

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

+				$lists[ ] = array(

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

 					'value' => $id,

 				);

 			}

 		} else {

-			$lists[0] = array(

+			$lists[ 0 ] = array(

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

 				'value' => '-',

 			);

@@ -766,8 +766,8 @@ 
 

 		wp_enqueue_style( 'wp-color-picker' );

 		wp_enqueue_script( 'wp-color-picker' );

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

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

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

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

 

 		$localized_data = array(

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

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

 	 */

 	public function yikes_jQuery_datepicker_date_format( $site_option ) {

-		switch( $site_option ) {

+		switch ( $site_option ) {

 			//Predefined WP date formats

 			default:

 			case 'F j, Y':

@@ -1065,7 +1065,7 @@ 
 

 		/* Register General Settings Section */

 

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

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

 

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

 

@@ -1110,7 +1110,7 @@ 
 		add_settings_field(

 			'optin-checkbox-init',

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

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

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

 			'yikes_inc_easy_mc_checkbox_settings'

 		);

 		/* End Checkbox Settings */

@@ -1132,21 +1132,21 @@ 
 			add_settings_field(

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

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

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

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

 				'yikes_easy_mc_settings_recpatcha_section'

 			);

 

 			add_settings_field(

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

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

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

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

 				'yikes_easy_mc_settings_recpatcha_section'

 			);

 

 			add_settings_field(

 				'yikes-mc-recaptcha-status',

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

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

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

 				'yikes_easy_mc_settings_recpatcha_section'

 			);

 

@@ -1166,7 +1166,7 @@ 
 			add_settings_field(

 				'yikes-mailchimp-debug-status',

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

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

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

 				'yikes_easy_mc_settings_debug_section'

 			);

 

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

 			return '';

 		}

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

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

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

 		if ( $dash_position !== false ) {

 			$manager = new Yikes_Inc_Easy_Mailchimp_API_Manager( $api_key );

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

 				// Clear the API key transient data

 			$this->delete_yikes_mailchimp_transients();

-		}  else {

+		} else {

 			$error_logging = new Yikes_Inc_Easy_Mailchimp_Error_Logging();

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

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

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

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

 		}

@@ -1252,11 +1252,11 @@ 
 	public function check_for_old_yks_mc_options() {

 		$old_plugin_options = get_option( 'ykseme_storage' );

 		// only perform options migrations if the site is not a multi-site setup

-		if ( !is_multisite() ) {

+		if ( ! is_multisite() ) {

 			if ( apply_filters( 'yikes_mc_old_options_filter', $old_plugin_options ) ) {

 				// display a notice to the user that they should 'migrate'

 				// from the old plugin settings to the new ones

-				add_action( 'admin_notices', array( $this , 'display_options_migrate_notice' ) , 11 );

+				add_action( 'admin_notices', array( $this, 'display_options_migrate_notice' ), 11 );

 			}

 		}

 	}

@@ -1279,11 +1279,11 @@ 
 

 			// Confirm that the necessary forms table in the database exists, else bail

 			global $wpdb;

-			if ( $wpdb->get_var("show tables like '" . $wpdb->prefix . "yikes_easy_mc_forms'") != $wpdb->prefix . "yikes_easy_mc_forms" ) {

+			if ( $wpdb->get_var( "show tables like '" . $wpdb->prefix . "yikes_easy_mc_forms'" ) != $wpdb->prefix . "yikes_easy_mc_forms" ) {

 				return;

 			}

 

-			if ( isset( $_GET['yikes-mc-options-migration-dismissed'] ) && $_GET['yikes-mc-options-migration-dismissed'] == 'true' ) {

+			if ( isset( $_GET[ 'yikes-mc-options-migration-dismissed' ] ) && $_GET[ 'yikes-mc-options-migration-dismissed' ] == 'true' ) {

 					// Delete the options, start a-new! (this will disable the migration notice altogether)

 					delete_option( 'widget_yikes_mc_widget' );

 					delete_option( 'api_validation' );

@@ -1297,7 +1297,7 @@ 
 			} else {

 			?>

 				<div class="yikes-easy-mc-updated migrate-options-notice">

-					<p><?php printf( __( "It looks like you're upgrading from a previous version of %s.", 'yikes-inc-easy-mailchimp-extender' ), '<strong>Us Easy Forms for Mailchimp</strong>' ); ?> <?php printf( __( "In the newest version of %s, the options data structure has changed. We've also moved the mailing lists into its own database table to allow for some higher level customization. Now you can easily create multiple forms and assign them to the same mailing list." , 'yikes-inc-easy-mailchimp-extender' ), '<strong>Us Easy Forms for Mailchimp</strong>' ); ?></p>

+					<p><?php printf( __( "It looks like you're upgrading from a previous version of %s.", 'yikes-inc-easy-mailchimp-extender' ), '<strong>Us Easy Forms for Mailchimp</strong>' ); ?> <?php printf( __( "In the newest version of %s, the options data structure has changed. We've also moved the mailing lists into its own database table to allow for some higher level customization. Now you can easily create multiple forms and assign them to the same mailing list.", 'yikes-inc-easy-mailchimp-extender' ), '<strong>Us Easy Forms for Mailchimp</strong>' ); ?></p>

 					<p><?php _e( "Before you continue, it's strongly recommended you the perform the migration to ensure the plugin continues to function properly.", 'yikes-inc-easy-mailchimp-extender' ); ?></p>

 					<p><em><?php _e( "It's also strongly recommended that you take a backup of your database.", 'yikes-inc-easy-mailchimp-extender' ); ?></em></p>

 					<section id="migration-buttons">

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

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

 		*/

-		function findMCListID($id, $array) {

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

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

+		function findMCListID( $id, $array ) {

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

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

 				   return $key;

 			   }

 		   }

@@ -1334,8 +1334,8 @@ 
 		/* Ajax Migrate Options */

 		function migrate_archived_options() {

 			// all options prefixed with 'yikes-mc-'

-			$option_name = 'yikes-mc-'.$_POST['option_name'];

-			$option_value = $_POST['option_value'];

+			$option_name = 'yikes-mc-' . $_POST[ 'option_name' ];

+			$option_value = $_POST[ 'option_value' ];

 			if ( json_decode( $option_value ) ) {

 				// decode our lists() array, and store it

 				$opt_value = json_decode( $option_value, true );

@@ -1349,22 +1349,22 @@ 
 

 		/* Ajax Migrate Forms */

 		function migrate_previously_setup_forms() {

-			$option_name = $_POST['option_name'];

-			$done = $_POST['done_import'];

+			$option_name = $_POST[ 'option_name' ];

+			$done = $_POST[ 'done_import' ];

 			// Create some starter forms for the user

 			// based on previously imported lists (to our old version)

 			if ( $option_name == 'yikes-mc-lists' ) {

-				$option_value = $_POST['option_value'];

-				$new_options = json_decode( stripslashes_deep( $option_value ) , true );

+				$option_value = $_POST[ 'option_value' ];

+				$new_options = json_decode( stripslashes_deep( $option_value ), true );

 

-				$list_id = $new_options['id'];

-				$form_name = $new_options['name'];

-				$fields = $new_options['fields']; // our fields array

+				$list_id = $new_options[ 'id' ];

+				$form_name = $new_options[ 'name' ];

+				$fields = $new_options[ 'fields' ]; // our fields array

 

-				$custom_styles = isset( $new_options['custom_styles'] ) ? $new_options['custom_styles']: '0'; // store as an array with all of our styles

-				$custom_template = isset( $new_options['custom_template'] ) ? $new_options['custom_template'] : '0'; // store template data as an array ( active , template used )

-				$redirect_user_on_submit = isset( $new_options['yks_mailchimp_redirect_'.$list_id] ) ? '1' : '0';

-				$redirect_page = isset( $new_options['page_id_'.$list_id] ) ? $new_options['page_id_'.$list_id] : '';

+				$custom_styles = isset( $new_options[ 'custom_styles' ] ) ? $new_options[ 'custom_styles' ] : '0'; // store as an array with all of our styles

+				$custom_template = isset( $new_options[ 'custom_template' ] ) ? $new_options[ 'custom_template' ] : '0'; // store template data as an array ( active , template used )

+				$redirect_user_on_submit = isset( $new_options[ 'yks_mailchimp_redirect_' . $list_id ] ) ? '1' : '0';

+				$redirect_page = isset( $new_options[ 'page_id_' . $list_id ] ) ? $new_options[ 'page_id_' . $list_id ] : '';

 

 				/* Insert Forms Function  */

 				$this->form_interface->create_form( array(

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

 		*/

 		public function generate_options_pages_sidebar_menu() {

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

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

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

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

 			}

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

 

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

 				<div class="inside">

 					<ul id="settings-nav">

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

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

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

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

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

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

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

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

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

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

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

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

 					</ul>

 					<?php

 						// create our add-on settings pages

-						if ( !empty( $installed_addons ) ) {

+						if ( ! empty( $installed_addons ) ) {

 							?>

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

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

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

 							<?php

-							foreach( $installed_addons as $addon_name ) {

+							foreach ( $installed_addons as $addon_name ) {

 								?>

 									<li>

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

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

 								<?php

 							}

 							?>

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

 							<?php

 							if ( ! empty( $lists ) ) {

-								foreach( $lists as $mailing_list ) {

+								foreach ( $lists as $mailing_list ) {

 									?>

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

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

 									<?php

 								}

 							} else {

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

 									?>

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

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

 									<?php

 								} else {

 									?>

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

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

 									<?php

 

 								}

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

 

 						<?php

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

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

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

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

 								?>

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

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

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

 								?>

 									<p class="description">

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

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

 									</p>

 								<?php

 							}

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

 					<?php

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

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

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

 						} else {

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

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

 							?>

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

 							<?php

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

 				?>

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

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

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

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

 				<?php

 

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

 

 						// loop over registered post types, and query!

-						foreach( $post_types as $registered_post_type ) {

+						foreach ( $post_types as $registered_post_type ) {

 

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

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

@@ -1599,8 +1599,8 @@ 
 									?>

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

 									<?php

-											foreach( $post_ids as $post_id ) {

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

+											foreach ( $post_ids as $post_id ) {

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

 											}

 									?>

 										</optgroup>

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

 

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

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

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

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

 					</label>

 

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

 						</div>

 

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

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

 

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

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

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

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

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

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

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

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

 						</div>

 

@@ -1720,11 +1720,11 @@ 
 

 			// if no list id, die!

 			if ( ! $list_id ) {

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

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

 			}

 

 			if ( ! $merge_variables ) {

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

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

 			}

 

 			if ( ! empty( $form_fields ) ) {

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

 

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

-				$merge_field_ids			= array();

-				$mailchimp_merge_field_ids	= array();

+				$merge_field_ids = array();

+				$mailchimp_merge_field_ids = array();

 

 				// loop over merge variables

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

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

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

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

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

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

 					

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

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

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

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

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

 					}

 				}

 

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

 

 				$i = 1;

-				foreach( $form_fields as $field ) {

+				foreach ( $form_fields as $field ) {

 

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

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

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

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

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

 						?>

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

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

 							<!-- top -->

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

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

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

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

 								<?php if ( $excluded_field ) { ?>

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

 								<?php } ?>

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

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

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

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

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

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

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

 							</a>

 							<!-- expansion section -->

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

 

 								<?php if ( $excluded_field ) { ?>

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

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

 								<?php } ?>

 

 								<!-- store field data -->

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

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

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

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

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

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

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

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

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

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

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

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

 								<?php } ?>

 

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

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

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

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

 								?>

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

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

 								<?php } ?>

 

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

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

 											</td>

 											<td>

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

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

 											</td>

 										</tr>

 

 										<!-- Placeholder Value -->

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

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

 

 											case 'text':

 											case 'email':

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

 										<tr valign="top">

 											<td scope="row">

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

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

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

 												</label>

 											</td>

 											<td>

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

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

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

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

 											</td>

 										</tr>

 										<?php

@@ -1851,13 +1851,13 @@ 
 											?>

 												<tr valign="top">

 													<td scope="row">

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

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

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

 														</label>

 													</td>

 													<td>

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

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

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

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

 													</td>

 												</tr>

 											<?php

@@ -1867,7 +1867,7 @@ 
 										?>

 

 										<!-- Default Value -->

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

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

 											default:

 											case 'text':

 											case 'number':

@@ -1875,15 +1875,15 @@ 
 										?>

 											<tr valign="top">

 												<td scope="row">

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

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

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

 													</label>

 												</td>

 												<td>

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

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

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

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

 													<?php

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

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

 														case 'text':

 															?>

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

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

 													<td>

 														<?php

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

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

 															$x = 0;

 														?>

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

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

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

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

 															       type="radio"

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

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

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

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

 															>

 															No Default&nbsp;

 														</label>

 														<?php

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

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

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

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

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

 																       type="radio"

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

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

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

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

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

 															</label>

 														<?php $x++; } ?>

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

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

 													</td>

 												</tr>

 

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

 													</td>

 													<td>

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

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

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

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

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

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

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

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

 															<?php } ?>

 														</select>

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

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

 													</td>

 												</tr>

 

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

 										<tr valign="top">

 											<td scope="row">

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

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

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

 												</label>

 											</td>

 											<td>

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

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

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

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

 											</td>

 										</tr>

 										<!-- Description Above Field -->

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

 											<td scope="row">

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

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

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

 												</label>

 											</td>

 											<td>

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

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

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

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

 											</td>

 										</tr>

 										<!-- Additional Classes -->

 										<tr valign="top">

 											<td scope="row">

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

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

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

 												</label>

 											</td>

 											<td>

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

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

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

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

 											</td>

 										</tr>

 										<!-- Required Toggle -->

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

 											<td scope="row">

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

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

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

 												</label>

 											</td>

 											<td>

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

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

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

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

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

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

 											</td>

 										</tr>

 										<!-- Visible Toggle -->

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

 											<td scope="row">

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

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

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

 												</label>

 											</td>

 											<td>

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

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

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

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

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

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

 											</td>

 										</tr>

 										<!-- Toggle Field Label Visibility -->

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

 											<td scope="row">

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

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

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

 												</label>

 											</td>

 											<td>

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

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

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

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

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

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

 											</td>

 										</tr>

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

 										<!-- Phone Format Initial Load -->

 										<?php

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

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

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

 												case 'phone':

 												case 'birthday':

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

 																<label for="placeholder">

 																	<?php

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

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

 																			default:

 																			case 'birthday':

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

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

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

 																				$format_name = 'date_format';

 																				break;

 

 																			case 'date':

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

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

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

 																				$format_name = 'date_format';

 																				break;

 

 																			case 'phone':

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

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

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

 																				$format_name = 'phone_format';

 																				break;

 																		}

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

 															<td>

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

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

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

 																<p class="description"><small>

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

 																</small></p>

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

 											<td>

 												<span class="toggle-container">

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

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

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

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

 												</span>

 											</td>

 										</tr>

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

 

 						?>

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

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

 							<!-- top -->

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

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

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

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

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

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

 								<?php } ?>

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

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

 							</a>

 							<!-- expansion section -->

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

 

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

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

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

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

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

 								<?php } ?>

 

 								<!-- store the label -->

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

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

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

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

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

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

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

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

 

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

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

 

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

 										<!-- Default Value -->

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

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

 											default:

 											case 'radio':

 											case 'checkboxes':

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

 													<td>

 														<?php

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

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

 

 														$default_shown = false;

 

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

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

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

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

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

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

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

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

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

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

 

 															// Determine if the current group is checked.

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

 																case 'radio':

 																default:

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

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

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

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

 																break;

 

 																case 'checkbox':

 																case 'hidden':

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

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

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

 																	}

 																break;

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

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

 																	    value="no-default" 

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

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

 																	No Default&nbsp;

 																</label>

 																<?php

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

 															<?php

 														} ?>

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

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

 													</td>

 												</tr>

 

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

 													</td>

 													<td>

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

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

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

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

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

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

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

 															<?php } ?>

 														</select>

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

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

 													</td>

 												</tr>

 

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

 										<tr valign="top">

 											<td scope="row">

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

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

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

 												</label>

 											</td>

 											<td>

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

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

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

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

 											</td>

 										</tr>

 

 										<!-- Description Above Field -->

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

 											<td scope="row">

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

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

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

 												</label>

 											</td>

 											<td>

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

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

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

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

 											</td>

 										</tr>

 

 										<!-- Additional Classes -->

 										<tr valign="top">

 											<td scope="row">

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

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

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

 												</label>

 											</td>

 											<td>

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

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

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

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

 											</td>

 										</tr>

 										<!-- Required Toggle -->

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

 											<td scope="row">

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

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

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

 												</label>

 											</td>

 											<td>

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

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

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

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

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

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

 											</td>

 										</tr>

 										<!-- Visible Toggle -->

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

 											<td scope="row">

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

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

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

 												</label>

 											</td>

 											<td>

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

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

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

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

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

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

 											</td>

 										</tr>

 										<!-- Toggle Field Label Visibility -->

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

 											<td scope="row">

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

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

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

 												</label>

 											</td>

 											<td>

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

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

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

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

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

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

 											</td>

 										</tr>

 										<!-- Toggle Buttons -->

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

 											<td>

 												<span class="toggle-container">

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

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

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

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

 												</span>

 											</td>

 										</tr>

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

 				// enqueue jquery qtip for our tooltip

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

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

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

 					$available_tags = array(

 						array(

 							'tag' => '{page_title}',

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

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

 						<ul>

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

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

 								<li class="tooltop-tag">

 									<!-- link/tag -->

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

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

 									<!-- help icon -->

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

 									<!-- tooltip -->

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

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

 								</li>

 							<?php } ?>

 						</ul>

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

 			$fields_assigned_to_form = array();

 			foreach ( $form_fields as $field ) {

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

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

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

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

 				}

 			}

 

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

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

 				?>

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

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

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

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

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

 					?>

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

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

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

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

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

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

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

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

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

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

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

 					>

 						<?php

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

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

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

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

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

 							}

 						?>

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

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

 					</li>

 					<?php

 				}

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

 			if ( ! empty( $form_fields ) ) {

 				foreach ( $form_fields as $field ) {

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

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

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

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

 					}

 				}

 			}

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

 				<?php

 					foreach ( $available_interest_groups as $interest_group ) {

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

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

 						?>

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

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

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

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

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

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

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

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

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

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

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

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

 						>

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

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

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

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

 						</li>

 						<?php

 					}

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

 				?>

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

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

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

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

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

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

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

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

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

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

 				>

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

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

 				</li>

 				<?php

 			}

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

 		*/

 		public function yikes_easy_mailchimp_create_form() {

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

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

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

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

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

 			}

 

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

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

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

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

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

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

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

 			) );

 

 			// if an error occurs during the form creation process

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

 				// if the form was not created successfully

 				$error_logging = new Yikes_Inc_Easy_Mailchimp_Error_Logging();

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

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

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

 			} else {

 				// redirect the user to the new form edit page

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

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

 			}

 			exit();

 		}

@@ -2588,11 +2588,11 @@ 
 		*/

 		public function yikes_easy_mailchimp_delete_form() {

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

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

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

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

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

 			// verify our nonce

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

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

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

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

 			}

 

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

@@ -2608,19 +2608,19 @@ 
 		*/

 		public function yikes_easy_mailchimp_duplicate_form() {

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

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

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

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

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

 			// verify our nonce

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

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

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

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

 			}

 

 			// Get the current form data.

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

 

 			// Update some of the data before duplication

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

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

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

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

 

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

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

@@ -2651,11 +2651,11 @@ 
 		*/

 		public function yikes_easy_mailchimp_reset_impression_stats() {

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

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

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

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

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

 			// verify our nonce

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

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

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

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

 			}

 

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

@@ -2683,8 +2683,8 @@ 
 		*/

 		public function yikes_easy_mailchimp_update_form() {

 

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

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

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

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

 

 			// verify our nonce

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

@@ -2698,70 +2698,70 @@ 
 			}

 

 			// Store our values!

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

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

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

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

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

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

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

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

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

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

 

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

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

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

 

 			// setup our submission settings serialized array

 			$submission_settings = array(

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

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

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

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

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

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

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

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

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

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

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

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

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

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

 			);

 

 			// setup our opt-in settings serialized array

 			$optin_settings = array(

-				'optin'                => $_POST['single-double-optin'],

-				'update_existing_user' => $_POST['update-existing-user'],

-				'send_update_email'    => $_POST['update-existing-email'],

+				'optin'                => $_POST[ 'single-double-optin' ],

+				'update_existing_user' => $_POST[ 'update-existing-user' ],

+				'send_update_email'    => $_POST[ 'update-existing-email' ],

 			);

 

 			// Setup our error settings serialized array

 			$error_settings = array(

-				'success'				=> trim( $_POST['yikes-easy-mc-success-message'] ) ? trim( stripslashes( $_POST['yikes-easy-mc-success-message'] ) ) : '',

-				'success-single-optin'	=> trim( $_POST['yikes-easy-mc-success-single-optin-message'] ) ? trim( stripslashes( $_POST['yikes-easy-mc-success-single-optin-message'] ) ) : '',

-				'success-resubscribed'	=> trim( $_POST['yikes-easy-mc-user-resubscribed-success-message'] ) ? trim( stripslashes( $_POST['yikes-easy-mc-user-resubscribed-success-message'] ) ) : '',

-				'general-error'			=> trim( $_POST['yikes-easy-mc-general-error-message'] ) ? trim( stripslashes( $_POST['yikes-easy-mc-general-error-message'] ) ) : '',

-				'already-subscribed'	=> trim( $_POST['yikes-easy-mc-user-subscribed-message'] ) ? trim( stripslashes( $_POST['yikes-easy-mc-user-subscribed-message'] ) ) : '',

-				'update-link'			=> trim( $_POST['yikes-easy-mc-user-update-link'] ) ? trim( stripslashes( $_POST['yikes-easy-mc-user-update-link'] ) ) : '',

-				'email-subject'			=> trim( $_POST['yikes-easy-mc-user-email-subject'] ) ? trim( stripslashes( $_POST['yikes-easy-mc-user-email-subject'] ) ) : '',

-				'email-body'			=> trim( $_POST['yikes-easy-mc-user-email-body'] ) ? trim( stripslashes( $_POST['yikes-easy-mc-user-email-body'] ) ) : '',

-				'update-email-success'  => trim( $_POST['yikes-easy-mc-update-email-successful'] ) ? trim( stripslashes( $_POST['yikes-easy-mc-update-email-successful'] ) ) : '',

-				'update-email-failure'  => trim( $_POST['yikes-easy-mc-update-email-failure'] ) ? trim( stripslashes( $_POST['yikes-easy-mc-update-email-failure'] ) ) : '',

+				'success'				=> trim( $_POST[ 'yikes-easy-mc-success-message' ] ) ? trim( stripslashes( $_POST[ 'yikes-easy-mc-success-message' ] ) ) : '',

+				'success-single-optin'	=> trim( $_POST[ 'yikes-easy-mc-success-single-optin-message' ] ) ? trim( stripslashes( $_POST[ 'yikes-easy-mc-success-single-optin-message' ] ) ) : '',

+				'success-resubscribed'	=> trim( $_POST[ 'yikes-easy-mc-user-resubscribed-success-message' ] ) ? trim( stripslashes( $_POST[ 'yikes-easy-mc-user-resubscribed-success-message' ] ) ) : '',

+				'general-error'			=> trim( $_POST[ 'yikes-easy-mc-general-error-message' ] ) ? trim( stripslashes( $_POST[ 'yikes-easy-mc-general-error-message' ] ) ) : '',

+				'already-subscribed'	=> trim( $_POST[ 'yikes-easy-mc-user-subscribed-message' ] ) ? trim( stripslashes( $_POST[ 'yikes-easy-mc-user-subscribed-message' ] ) ) : '',

+				'update-link'			=> trim( $_POST[ 'yikes-easy-mc-user-update-link' ] ) ? trim( stripslashes( $_POST[ 'yikes-easy-mc-user-update-link' ] ) ) : '',

+				'email-subject'			=> trim( $_POST[ 'yikes-easy-mc-user-email-subject' ] ) ? trim( stripslashes( $_POST[ 'yikes-easy-mc-user-email-subject' ] ) ) : '',

+				'email-body'			=> trim( $_POST[ 'yikes-easy-mc-user-email-body' ] ) ? trim( stripslashes( $_POST[ 'yikes-easy-mc-user-email-body' ] ) ) : '',

+				'update-email-success'  => trim( $_POST[ 'yikes-easy-mc-update-email-successful' ] ) ? trim( stripslashes( $_POST[ 'yikes-easy-mc-update-email-successful' ] ) ) : '',

+				'update-email-failure'  => trim( $_POST[ 'yikes-easy-mc-update-email-failure' ] ) ? trim( stripslashes( $_POST[ 'yikes-easy-mc-update-email-failure' ] ) ) : '',

 			);

 

 			// Setup the new form settings array

 			// @since 6.0.3.8

 			// To Do: Combine date & time so it's a single unix timestamp

 			$form_settings = array(

-				'yikes-easy-mc-form-class-names'                 => trim( $_POST['yikes-easy-mc-form-class-names'] ),

-				'yikes-easy-mc-inline-form'                      => $_POST['yikes-easy-mc-inline-form'][0],

-				'yikes-easy-mc-submit-button-type'               => $_POST['yikes-easy-mc-submit-button-type'][0],

-				'yikes-easy-mc-submit-button-text'               => trim( $_POST['yikes-easy-mc-submit-button-text'] ),

-				'yikes-easy-mc-submit-button-image'              => esc_url( trim( $_POST['yikes-easy-mc-submit-button-image'] ) ),

-				'yikes-easy-mc-submit-button-classes'            => trim( $_POST['yikes-easy-mc-submit-button-classes'] ),

-				'yikes-easy-mc-form-schedule'                    => ( isset( $_POST['yikes-easy-mc-form-schedule'] ) ) ? '1' : '0',

-				'yikes-easy-mc-form-restriction-start'           => strtotime( $_POST['yikes-easy-mc-form-restriction-start-date'] . ' ' . $_POST['yikes-easy-mc-form-restriction-start-time'] ),

-				'yikes-easy-mc-form-restriction-end'             => strtotime( $_POST['yikes-easy-mc-form-restriction-end-date'] . ' ' . $_POST['yikes-easy-mc-form-restriction-end-time'] ),

-				'yikes-easy-mc-form-restriction-pending-message' => trim( $_POST['yikes-easy-mc-form-restriction-pending-message'] ),

-				'yikes-easy-mc-form-restriction-expired-message' => trim( $_POST['yikes-easy-mc-form-restriction-expired-message'] ),

-				'yikes-easy-mc-form-login-required'              => ( isset( $_POST['yikes-easy-mc-form-login-required'] ) ) ? '1' : '0',

-				'yikes-easy-mc-form-restriction-login-message'   => trim( $_POST['yikes-easy-mc-form-restriction-login-message'] ),

+				'yikes-easy-mc-form-class-names'                 => trim( $_POST[ 'yikes-easy-mc-form-class-names' ] ),

+				'yikes-easy-mc-inline-form'                      => $_POST[ 'yikes-easy-mc-inline-form' ][ 0 ],

+				'yikes-easy-mc-submit-button-type'               => $_POST[ 'yikes-easy-mc-submit-button-type' ][ 0 ],

+				'yikes-easy-mc-submit-button-text'               => trim( $_POST[ 'yikes-easy-mc-submit-button-text' ] ),

+				'yikes-easy-mc-submit-button-image'              => esc_url( trim( $_POST[ 'yikes-easy-mc-submit-button-image' ] ) ),

+				'yikes-easy-mc-submit-button-classes'            => trim( $_POST[ 'yikes-easy-mc-submit-button-classes' ] ),

+				'yikes-easy-mc-form-schedule'                    => ( isset( $_POST[ 'yikes-easy-mc-form-schedule' ] ) ) ? '1' : '0',

+				'yikes-easy-mc-form-restriction-start'           => strtotime( $_POST[ 'yikes-easy-mc-form-restriction-start-date' ] . ' ' . $_POST[ 'yikes-easy-mc-form-restriction-start-time' ] ),

+				'yikes-easy-mc-form-restriction-end'             => strtotime( $_POST[ 'yikes-easy-mc-form-restriction-end-date' ] . ' ' . $_POST[ 'yikes-easy-mc-form-restriction-end-time' ] ),

+				'yikes-easy-mc-form-restriction-pending-message' => trim( $_POST[ 'yikes-easy-mc-form-restriction-pending-message' ] ),

+				'yikes-easy-mc-form-restriction-expired-message' => trim( $_POST[ 'yikes-easy-mc-form-restriction-expired-message' ] ),

+				'yikes-easy-mc-form-login-required'              => ( isset( $_POST[ 'yikes-easy-mc-form-login-required' ] ) ) ? '1' : '0',

+				'yikes-easy-mc-form-restriction-login-message'   => trim( $_POST[ 'yikes-easy-mc-form-restriction-login-message' ] ),

 			);

 

 			// additional custom fields (extensions / user defined fields)

 			$custom_fields = array();

-			if ( isset( $_POST['custom-field'] ) ) {

-				foreach ( $_POST['custom-field'] as $custom_field => $custom_value ) {

+			if ( isset( $_POST[ 'custom-field' ] ) ) {

+				foreach ( $_POST[ 'custom-field' ] as $custom_field => $custom_value ) {

 					if ( is_array( $custom_value ) ) {

 						$custom_fields[ $custom_field ] = array_filter( stripslashes_deep( $custom_value ) ); // array_filters to remove empty items (don't save them!)

 					} else {

@@ -2793,7 +2793,7 @@ 
 			$this->form_interface->update_form( $form_id, $form_updates );

 

 			/* Custom action hook which allows users to update specific options when a form is updated - used in add ons */

-			do_action( 'yikes-mailchimp-save-form', $form_id,  $custom_fields );

+			do_action( 'yikes-mailchimp-save-form', $form_id, $custom_fields );

 

 			// redirect the user to the manage forms page, display confirmation

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

@@ -2804,11 +2804,11 @@ 
 			$email_body  = '<p>' . __( 'Greetings,', 'yikes-inc-easy-mailchimp-extender' ) . '</p>'; 

 

 			$email_body .= '<p>';

-			$email_body .= 	__( 'A request has been made to update your Mailchimp account profile information.', 'yikes-inc-easy-mailchimp-extender' );

-			$email_body .=	__( ' To do so please use the following link: ', 'yikes-inc-easy-mailchimp-extender' );

-			$email_body .=	'[link]';

-			$email_body .=		__( 'Update Mailchimp Profile Info', 'yikes-inc-easy-mailchimp-extender' );

-			$email_body .= 	'[/link]';

+			$email_body .= __( 'A request has been made to update your Mailchimp account profile information.', 'yikes-inc-easy-mailchimp-extender' );

+			$email_body .= __( ' To do so please use the following link: ', 'yikes-inc-easy-mailchimp-extender' );

+			$email_body .= '[link]';

+			$email_body .= __( 'Update Mailchimp Profile Info', 'yikes-inc-easy-mailchimp-extender' );

+			$email_body .= '[/link]';

 			$email_body .= '</p>';

 

 			$email_body .= '<p>' . __( 'If you did not request this update, please disregard this email.', 'yikes-inc-easy-mailchimp-extender' ) . '</p>';

@@ -2824,13 +2824,13 @@ 
 

 		/* Unsubscribe a given user from our list */

 		public function yikes_easy_mailchimp_unsubscribe_user() {

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

-			$list_id  = $_REQUEST['mailchimp-list'];

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

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

+			$list_id  = $_REQUEST[ 'mailchimp-list' ];

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

 

 			// verify our nonce

 			if ( ! wp_verify_nonce( $nonce, 'unsubscribe-user-' . $email_id ) ) {

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

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

 			}

 

 			$response = yikes_get_mc_api_manager()->get_list_handler()->member_unsubscribe( $list_id, $email_id );

@@ -2849,21 +2849,21 @@ 
 

 		public function yikes_easy_mailchimp_create_missing_error_log() {

 			// grab our nonnce

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

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

 			// validate nonce

-			if ( !wp_verify_nonce( $nonce, 'create_error_log' ) ) {

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

+			if ( ! wp_verify_nonce( $nonce, 'create_error_log' ) ) {

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

 			}

 			// setup the path to the error log

 			$error_log = fopen( plugin_dir_path( __FILE__ ) . '../includes/error_log/yikes-easy-mailchimp-error-log.php', 'w' );

 			try {

 				// create the file

-				fwrite( $error_log , '' );

+				fwrite( $error_log, '' );

 				// close out

 				fclose( $error_log );

 				wp_redirect( esc_url_raw( admin_url( 'admin.php?page=yikes-inc-easy-mailchimp-settings&section=debug-settings&error_log_created=true' ) ) );

 			} catch ( Exception $e ) {

-				wp_redirect( esc_url_raw( admin_url( 'admin.php?page=yikes-inc-easy-mailchimp-settings&section=debug-settings&error_log_created=false&error_message='.urlencode( $e->getMessage() ) ) ) );

+				wp_redirect( esc_url_raw( admin_url( 'admin.php?page=yikes-inc-easy-mailchimp-settings&section=debug-settings&error_log_created=false&error_message=' . urlencode( $e->getMessage() ) ) ) );

 			}

 		}

 

@@ -2874,9 +2874,9 @@ 
 		public function yikes_easy_mailchimp_clear_transient_data() {

 

 			// verify our nonce

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

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

 			if ( ! wp_verify_nonce( $nonce, 'clear-mc-transient-data' ) ) {

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

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

 			}

 

 			$this->delete_yikes_mailchimp_transients();

@@ -2885,10 +2885,10 @@ 
 			$referer = wp_get_referer();

 			if ( $referer && ( strpos( $referer, 'yikes-inc-easy-mailchimp-settings' ) > 0 ) ) {

 				wp_redirect( esc_url_raw( admin_url( 'admin.php?page=yikes-inc-easy-mailchimp-settings&section=api-cache-settings&transient-cleared=true' ) ) );

-			} elseif ( isset( $_REQUEST['page'] ) && $_REQUEST['page'] === 'yikes-mailchimp-edit-form' && isset( $_REQUEST['id'] ) && ! empty( $_REQUEST['id'] ) ) {

+			} elseif ( isset( $_REQUEST[ 'page' ] ) && $_REQUEST[ 'page' ] === 'yikes-mailchimp-edit-form' && isset( $_REQUEST[ 'id' ] ) && ! empty( $_REQUEST[ 'id' ] ) ) {

 

 				// else check if we were editing a form.

-				$id = filter_var( $_REQUEST['id'], FILTER_SANITIZE_NUMBER_INT );

+				$id = filter_var( $_REQUEST[ 'id' ], FILTER_SANITIZE_NUMBER_INT );

 				wp_redirect( esc_url_raw( admin_url( 'admin.php?page=yikes-mailchimp-edit-form&id=' . $id ) ) );

 			} else {

 				// else redirect to the manage forms page.

@@ -2932,7 +2932,7 @@ 
 		 */

 		public function yikes_mailchimp_load_helper_class() {

 			// check to see if it's already loaded up.

-			if ( !class_exists( 'Yikes_Inc_Easy_Mailchimp_Forms_Helper' ) ) {

+			if ( ! class_exists( 'Yikes_Inc_Easy_Mailchimp_Forms_Helper' ) ) {

 				// Include our main helper class file

 				include_once( YIKES_MC_PATH . 'admin/partials/helpers/init.php' );

 			}

admin/partials/menu/add-ons.php

Spacing +3 added lines, -3 removed lines

@@ -7,12 +7,12 @@
 <div class="wrap">
 
 	<!-- Freddie Logo -->
-	<img src="<?php echo esc_url( YIKES_MC_URL . 'includes/images/Mailchimp_Assets/Freddie_60px.png' ); ?>" alt="<?php esc_attr_e( 'Freddie - Mailchimp Mascot' , 'yikes-inc-easy-mailchimp-extender' ); ?>" class="yikes-mc-freddie-logo" />
+	<img src="<?php echo esc_url( YIKES_MC_URL . 'includes/images/Mailchimp_Assets/Freddie_60px.png' ); ?>" alt="<?php esc_attr_e( 'Freddie - Mailchimp Mascot', 'yikes-inc-easy-mailchimp-extender' ); ?>" class="yikes-mc-freddie-logo" />
 
-	<h1>Easy Forms for Mailchimp | <?php echo esc_attr__( 'Add-Ons' , 'yikes-inc-easy-mailchimp-extender' ); ?> &nbsp; <a href="https://yikesplugins.com/plugins/?plugins=Mailchimp" target="_blank" class="button-primary coming-soon-button" title="<?php esc_attr_e( 'View All Add-Ons' , 'yikes-inc-easy-mailchimp-extender' ); ?>"><?php esc_attr_e( 'View All Add-Ons' , 'yikes-inc-easy-mailchimp-extender' ); ?> <span class="dashicons dashicons-external"></span></a></h1>
+	<h1>Easy Forms for Mailchimp | <?php echo esc_attr__( 'Add-Ons', 'yikes-inc-easy-mailchimp-extender' ); ?> &nbsp; <a href="https://yikesplugins.com/plugins/?plugins=Mailchimp" target="_blank" class="button-primary coming-soon-button" title="<?php esc_attr_e( 'View All Add-Ons', 'yikes-inc-easy-mailchimp-extender' ); ?>"><?php esc_attr_e( 'View All Add-Ons', 'yikes-inc-easy-mailchimp-extender' ); ?> <span class="dashicons dashicons-external"></span></a></h1>
 
 	<!-- Addons Page Description -->
-	<p class="yikes-easy-mc-about-text about-text"><?php esc_attr_e( "Below you'll find all free and paid add-ons available for Easy Forms for Mailchimp. Each add-on extends the functionality of the free plugin." , 'yikes-inc-easy-mailchimp-extender' ); ?></p>
+	<p class="yikes-easy-mc-about-text about-text"><?php esc_attr_e( "Below you'll find all free and paid add-ons available for Easy Forms for Mailchimp. Each add-on extends the functionality of the free plugin.", 'yikes-inc-easy-mailchimp-extender' ); ?></p>
 
 	<!-- Add-On Container -->
 	<section id="add-ons">

admin/partials/menu/support.php

Spacing +9 added lines, -9 removed lines

@@ -9,21 +9,21 @@
 <div class="wrap yikes-easy-mc-support-wrap"> 
 
 	<!-- Freddie Logo -->
-	<img src="<?php echo YIKES_MC_URL . 'includes/images/Mailchimp_Assets/Freddie_60px.png'; ?>" alt="<?php _e( '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 _e( 'Freddie - Mailchimp Mascot', 'yikes-inc-easy-mailchimp-extender' ); ?>" class="yikes-mc-freddie-logo" />
 
-	<h1>Easy Forms for Mailchimp | <?php _e( 'Support' , 'yikes-inc-easy-mailchimp-extender' ); ?></h1>
+	<h1>Easy Forms for Mailchimp | <?php _e( 'Support', 'yikes-inc-easy-mailchimp-extender' ); ?></h1>
 		<!-- Support Page Description -->
-	<p class="yikes-easy-mc-about-text about-text"><?php _e( 'If you have questions, we have answers!' , 'yikes-inc-easy-mailchimp-extender' ); ?></p>
+	<p class="yikes-easy-mc-about-text about-text"><?php _e( 'If you have questions, we have answers!', 'yikes-inc-easy-mailchimp-extender' ); ?></p>
 
-	<?php if( get_option( 'yikes-easy-mc-active-addons' , array() ) == array() ) { ?>
-		<p><?php _e( 'Users of the free version of Easy Forms for Mailchimp can post questions to our support forum on the WordPress Plugin Directory. We aim to respond to support requests for the free version of the plugin within a week.' , 'yikes-inc-easy-mailchimp-extender' ); ?></p>
-		<p><?php printf( __( 'Purchasers of our paid add-ons qualify for premium support. <a href="%s" target="_blank" title="' . __( 'Check out our paid add-ons', 'yikes-inc-easy-mailchimp-extender' ) . '">' . __( 'Check out our paid add-ons', 'yikes-inc-easy-mailchimp-extender' ) . '</a>!' , 'yikes-inc-easy-mailchimp-extender' ), esc_url( 'https://yikesplugins.com/' ) ); ?></p>
+	<?php if ( get_option( 'yikes-easy-mc-active-addons', array() ) == array() ) { ?>
+		<p><?php _e( 'Users of the free version of Easy Forms for Mailchimp can post questions to our support forum on the WordPress Plugin Directory. We aim to respond to support requests for the free version of the plugin within a week.', 'yikes-inc-easy-mailchimp-extender' ); ?></p>
+		<p><?php printf( __( 'Purchasers of our paid add-ons qualify for premium support. <a href="%s" target="_blank" title="' . __( 'Check out our paid add-ons', 'yikes-inc-easy-mailchimp-extender' ) . '">' . __( 'Check out our paid add-ons', 'yikes-inc-easy-mailchimp-extender' ) . '</a>!', 'yikes-inc-easy-mailchimp-extender' ), esc_url( 'https://yikesplugins.com/' ) ); ?></p>
 	<?php } else { ?>
-		<p><?php _e( "It looks like you are one of our premium users! Fill out the form below to submit a priority support request." , 'yikes-inc-easy-mailchimp-extender' ); ?></p>
-		<p><?php _e( "If you have any problems with the form, send an email to <a href='mailto:support@yikesinc.com'>support@yikesinc.com</a> and a ticket will be created." , 'yikes-inc-easy-mailchimp-extender' ); ?></p>
+		<p><?php _e( "It looks like you are one of our premium users! Fill out the form below to submit a priority support request.", 'yikes-inc-easy-mailchimp-extender' ); ?></p>
+		<p><?php _e( "If you have any problems with the form, send an email to <a href='mailto:support@yikesinc.com'>support@yikesinc.com</a> and a ticket will be created.", 'yikes-inc-easy-mailchimp-extender' ); ?></p>
 	<?php } ?>
 
-		<p><?php printf( __( 'Before submitting a support request, please visit our %s.' , 'yikes-inc-easy-mailchimp-extender' ), '<a target="_blank" href="' . esc_url( 'https://yikesplugins.com/support/knowledge-base/product/easy-forms-for-mailchimp/' ) . '" title="' . __( 'Knowledge Base', 'yikes-inc-easy-mailchimp-extender' ) . '">' . __( 'knowledge base', 'yikes-inc-easy-mailchimp-extender' ) . '</a> where we have step-by-step guides and troubleshooting help' ); ?></p>
+		<p><?php printf( __( 'Before submitting a support request, please visit our %s.', 'yikes-inc-easy-mailchimp-extender' ), '<a target="_blank" href="' . esc_url( 'https://yikesplugins.com/support/knowledge-base/product/easy-forms-for-mailchimp/' ) . '" title="' . __( 'Knowledge Base', 'yikes-inc-easy-mailchimp-extender' ) . '">' . __( 'knowledge base', 'yikes-inc-easy-mailchimp-extender' ) . '</a> where we have step-by-step guides and troubleshooting help' ); ?></p>
 
 	<hr />
 	

admin/partials/menu/manage-forms.php

Spacing +50 added lines, -50 removed lines

@@ -6,13 +6,13 @@ 
 $all_forms = $form_interface->get_all_forms();
 
 /* Store Data if User is Authorized */
-if( $this->is_user_mc_api_valid_form( false ) == 'valid' ) {
+if ( $this->is_user_mc_api_valid_form( false ) == 'valid' ) {
 	$list_data = yikes_get_mc_api_manager()->get_list_handler()->get_lists();
 	if ( is_wp_error( $list_data ) ) {
 		$error_logging = new Yikes_Inc_Easy_Mailchimp_Error_Logging();
 		$error_logging->maybe_write_to_log(
 			$list_data->get_error_code(),
-			__( "Get Account Lists" , 'yikes-inc-easy-mailchimp-extender' ),
+			__( "Get Account Lists", 'yikes-inc-easy-mailchimp-extender' ),
 			"Manage Forms Page"
 		);
 		$list_data = array();
@@ -23,24 +23,24 @@ 
 ?>
 <div class="wrap">
 	<!-- Freddie Logo -->
-	<img src="<?php echo YIKES_MC_URL . 'includes/images/Mailchimp_Assets/Freddie_60px.png'; ?>" alt="<?php _e( '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 _e( 'Freddie - Mailchimp Mascot', 'yikes-inc-easy-mailchimp-extender' ); ?>" class="yikes-mc-freddie-logo" />
 
-	<h1>Easy Forms for Mailchimp | <?php _e( 'Manage Forms' , 'yikes-inc-easy-mailchimp-extender' ) ?></h1>
+	<h1>Easy Forms for Mailchimp | <?php _e( 'Manage Forms', 'yikes-inc-easy-mailchimp-extender' ) ?></h1>
 
 	<!-- Settings Page Description -->
-	<p class="yikes-easy-mc-about-text about-text"><?php _e( 'Create and manage your Mailchimp forms.' , 'yikes-inc-easy-mailchimp-extender' ); ?></p>
+	<p class="yikes-easy-mc-about-text about-text"><?php _e( 'Create and manage your Mailchimp forms.', 'yikes-inc-easy-mailchimp-extender' ); ?></p>
 
 	<!-- Action Notices -->
 	<?php
 
 	/* If the user hasn't authenticated yet, lets kill off */
-	if( get_option( 'yikes-mc-api-validation' , 'invalid_api_key' ) != 'valid_api_key' ) {
-		wp_die( '<div class="error"><p>' . sprintf( __( 'You need to connect to Mailchimp before you can start creating forms. Head over to the <a href="%s" title="Settings Page">Settings Page</a> and enter your API key.' , 'yikes-inc-easy-mailchimp-extender' ), esc_url_raw( admin_url( 'admin.php?page=yikes-inc-easy-mailchimp-settings' ) ) ) . '</p></div>' , 500 );
+	if ( get_option( 'yikes-mc-api-validation', 'invalid_api_key' ) != 'valid_api_key' ) {
+		wp_die( '<div class="error"><p>' . sprintf( __( 'You need to connect to Mailchimp before you can start creating forms. Head over to the <a href="%s" title="Settings Page">Settings Page</a> and enter your API key.', 'yikes-inc-easy-mailchimp-extender' ), esc_url_raw( admin_url( 'admin.php?page=yikes-inc-easy-mailchimp-settings' ) ) ) . '</p></div>', 500 );
 	}
 
 	/* Display our admin notices here */
 	// delete form success
-	if( isset( $_REQUEST['deleted-form'] ) && $_REQUEST['deleted-form'] == 'true' ) {
+	if ( isset( $_REQUEST[ 'deleted-form' ] ) && $_REQUEST[ 'deleted-form' ] == 'true' ) {
 		?>
 		<div class="updated manage-form-admin-notice">
 			<p><?php _e( 'Opt-in form successfully deleted.', 'yikes-inc-easy-mailchimp-extender' ); ?></p>
@@ -48,7 +48,7 @@ 
 		<?php
 	}
 	// duplicate form success
-	if( isset( $_REQUEST['duplicated-form'] ) && $_REQUEST['duplicated-form'] == 'true' ) {
+	if ( isset( $_REQUEST[ 'duplicated-form' ] ) && $_REQUEST[ 'duplicated-form' ] == 'true' ) {
 		?>
 		<div class="updated manage-form-admin-notice">
 			<p><?php _e( 'Mailchimp Form successfully cloned.', 'yikes-inc-easy-mailchimp-extender' ); ?></p>
@@ -56,7 +56,7 @@ 
 		<?php
 	}
 	// duplicate form error
-	if( isset( $_REQUEST['duplicated-form'] ) && $_REQUEST['duplicated-form'] == 'false' ) {
+	if ( isset( $_REQUEST[ 'duplicated-form' ] ) && $_REQUEST[ 'duplicated-form' ] == 'false' ) {
 		?>
 		<div class="error manage-form-admin-notice">
 			<p><?php _e( 'There was an error trying to clone your form. Please try again. If this error persists, please contact the YIKES Inc. support team.', 'yikes-inc-easy-mailchimp-extender' ); ?></p>
@@ -64,7 +64,7 @@ 
 		<?php
 	}
 	// reset form submission stats success
-	if( isset( $_REQUEST['reset-stats'] ) && $_REQUEST['reset-stats'] == 'true' ) {
+	if ( isset( $_REQUEST[ 'reset-stats' ] ) && $_REQUEST[ 'reset-stats' ] == 'true' ) {
 		?>
 		<div class="updated manage-form-admin-notice">
 			<p><?php _e( 'Form submission stats/rates successfully reset.', 'yikes-inc-easy-mailchimp-extender' ); ?></p>
@@ -72,7 +72,7 @@ 
 		<?php
 	}
 	// reset form submission stats error
-	if( isset( $_REQUEST['reset-stats'] ) && $_REQUEST['reset-stats'] == 'false' ) {
+	if ( isset( $_REQUEST[ 'reset-stats' ] ) && $_REQUEST[ 'reset-stats' ] == 'false' ) {
 		?>
 		<div class="error manage-form-admin-notice">
 			<p><?php _e( 'There was an error trying to reset the form submission stats/rates. Please try again. If this error persists, please contact the YIKES Inc. support team.', 'yikes-inc-easy-mailchimp-extender' ); ?></p>
@@ -99,13 +99,13 @@ 
 								<thead>
 									<tr>
 										<th id="cb" class="manage-column column-cb check-column num" scope="col"><input type="checkbox" /></th>
-										<th id="columnname" class="manage-column column-columnname num yikes-form-id-number" scope="col"><?php _e( 'ID' , 'yikes-inc-easy-mailchimp-extender' ); ?></th>
-										<th id="columnname" class="manage-column column-columnname" scope="col"><?php _e( 'Form Name' , 'yikes-inc-easy-mailchimp-extender' ); ?></th>
-										<th id="columnname" class="manage-column column-columnname" scope="col"><?php _e( 'Form Description' , 'yikes-inc-easy-mailchimp-extender' ); ?></th>
-										<th id="columnname" class="manage-column column-columnname" scope="col"><?php _e( 'List' , 'yikes-inc-easy-mailchimp-extender' ); ?></th>
-										<th id="columnname" class="manage-column column-columnname num" scope="col"><?php _e( 'Impressions' , 'yikes-inc-easy-mailchimp-extender' ); ?></th>
-										<th id="columnname" class="manage-column column-columnname num" scope="col" ><?php _e( 'Submissions' , 'yikes-inc-easy-mailchimp-extender' ); ?></th>
-										<th id="columnname" class="manage-column column-columnname num" scope="col"><?php _e( 'Conversion Rate' , 'yikes-inc-easy-mailchimp-extender' ); ?></th>
+										<th id="columnname" class="manage-column column-columnname num yikes-form-id-number" scope="col"><?php _e( 'ID', 'yikes-inc-easy-mailchimp-extender' ); ?></th>
+										<th id="columnname" class="manage-column column-columnname" scope="col"><?php _e( 'Form Name', 'yikes-inc-easy-mailchimp-extender' ); ?></th>
+										<th id="columnname" class="manage-column column-columnname" scope="col"><?php _e( 'Form Description', 'yikes-inc-easy-mailchimp-extender' ); ?></th>
+										<th id="columnname" class="manage-column column-columnname" scope="col"><?php _e( 'List', 'yikes-inc-easy-mailchimp-extender' ); ?></th>
+										<th id="columnname" class="manage-column column-columnname num" scope="col"><?php _e( 'Impressions', 'yikes-inc-easy-mailchimp-extender' ); ?></th>
+										<th id="columnname" class="manage-column column-columnname num" scope="col" ><?php _e( 'Submissions', 'yikes-inc-easy-mailchimp-extender' ); ?></th>
+										<th id="columnname" class="manage-column column-columnname num" scope="col"><?php _e( 'Conversion Rate', 'yikes-inc-easy-mailchimp-extender' ); ?></th>
 									</tr>
 								</thead>
 								<!-- end header -->
@@ -114,13 +114,13 @@ 
 								<tfoot>
 									<tr>
 										<th class="manage-column column-cb check-column num" scope="col"><input type="checkbox" /></th>
-										<th id="columnname" class="manage-column column-columnname num yikes-form-id-number" scope="col"><?php _e( 'ID' , 'yikes-inc-easy-mailchimp-extender' ); ?></th>
-										<th id="columnname" class="manage-column column-columnname" scope="col"><?php _e( 'Form Name' , 'yikes-inc-easy-mailchimp-extender' ); ?></th>
-										<th id="columnname" class="manage-column column-columnname" scope="col"><?php _e( 'Form Description' , 'yikes-inc-easy-mailchimp-extender' ); ?></th>
-										<th class="manage-column column-columnname" scope="col"><?php _e( 'List' , 'yikes-inc-easy-mailchimp-extender' ); ?></th>
-										<th id="columnname" class="manage-column column-columnname num" scope="col"><?php _e( 'Impressions' , 'yikes-inc-easy-mailchimp-extender' ); ?></th>
-										<th id="columnname" class="manage-column column-columnname num" scope="col"><?php _e( 'Submissions' , 'yikes-inc-easy-mailchimp-extender' ); ?></th>
-										<th id="columnname" class="manage-column column-columnname num" scope="col"><?php _e( 'Conversion Rate' , 'yikes-inc-easy-mailchimp-extender' ); ?></th>
+										<th id="columnname" class="manage-column column-columnname num yikes-form-id-number" scope="col"><?php _e( 'ID', 'yikes-inc-easy-mailchimp-extender' ); ?></th>
+										<th id="columnname" class="manage-column column-columnname" scope="col"><?php _e( 'Form Name', 'yikes-inc-easy-mailchimp-extender' ); ?></th>
+										<th id="columnname" class="manage-column column-columnname" scope="col"><?php _e( 'Form Description', 'yikes-inc-easy-mailchimp-extender' ); ?></th>
+										<th class="manage-column column-columnname" scope="col"><?php _e( 'List', 'yikes-inc-easy-mailchimp-extender' ); ?></th>
+										<th id="columnname" class="manage-column column-columnname num" scope="col"><?php _e( 'Impressions', 'yikes-inc-easy-mailchimp-extender' ); ?></th>
+										<th id="columnname" class="manage-column column-columnname num" scope="col"><?php _e( 'Submissions', 'yikes-inc-easy-mailchimp-extender' ); ?></th>
+										<th id="columnname" class="manage-column column-columnname num" scope="col"><?php _e( 'Conversion Rate', 'yikes-inc-easy-mailchimp-extender' ); ?></th>
 									</tr>
 								</tfoot>
 								<!-- end footer -->
@@ -130,40 +130,40 @@ 
 									<?php
 									if ( count( $all_forms ) > 0 ) {
 										$i = 1;
-										foreach( $all_forms as $id => $form ) {
+										foreach ( $all_forms as $id => $form ) {
 										?>
-										<tr class="<?php if( $i % 2 == 0 ) { echo 'alternate'; } ?>">
+										<tr class="<?php if ( $i % 2 == 0 ) { echo 'alternate'; } ?>">
 											<th class="check-column num" scope="row"><input type="checkbox" /></th>
 											<td class="column-columnname num"><span class="form-id-container"><?php echo intval( $id ); ?></span></td>
 											<td class="column-columnname">
 												<!-- row title/link -->
-												<a href="<?php echo esc_url_raw( add_query_arg( array( 'id' => $id ) , admin_url( 'admin.php?page=yikes-mailchimp-edit-form' ) ) ); ?>" class="row-title">
-													<?php echo stripslashes( $form['form_name'] ); ?>
+												<a href="<?php echo esc_url_raw( add_query_arg( array( 'id' => $id ), admin_url( 'admin.php?page=yikes-mailchimp-edit-form' ) ) ); ?>" class="row-title">
+													<?php echo stripslashes( $form[ 'form_name' ] ); ?>
 												</a>
 												<div class="row-actions">
-													<span><a href="<?php echo esc_url_raw( add_query_arg( array( 'id' => $id ) , admin_url( 'admin.php?page=yikes-mailchimp-edit-form' ) ) ); ?>"><?php _e( "Edit" , 'yikes-inc-easy-mailchimp-extender' ); ?></a> |</span>
-													<span><a href="<?php echo esc_url_raw( add_query_arg( array( 'action' => 'yikes-easy-mc-duplicate-form', 'mailchimp-form' => $id , 'nonce' => wp_create_nonce( 'duplicate-mailchimp-form-'.$id ) ) , admin_url( 'admin.php?page=yikes-inc-easy-mailchimp' ) ) ); ?>"><?php _e( "Duplicate" , 'yikes-inc-easy-mailchimp-extender' ); ?></a> |</span>
-													<span><a href="<?php echo esc_url_raw( add_query_arg( array( 'action' => 'yikes-easy-mc-reset-stats', 'mailchimp-form' => $id , 'nonce' => wp_create_nonce( 'reset-stats-mailchimp-form-'.$id ) ) , admin_url( 'admin.php?page=yikes-inc-easy-mailchimp' ) ) ); ?>"><?php _e( "Reset Stats" , 'yikes-inc-easy-mailchimp-extender' ); ?></a> |</span>
-													<span><a href="#" class="view-yikes-mc-form-shortcode" data-alt-text="<?php _e( 'Stats' , 'yikes-inc-easy-mailchimp-extender' ); ?>"><?php _e( "Shortcode" , 'yikes-inc-easy-mailchimp-extender' ); ?></a> |</span>
+													<span><a href="<?php echo esc_url_raw( add_query_arg( array( 'id' => $id ), admin_url( 'admin.php?page=yikes-mailchimp-edit-form' ) ) ); ?>"><?php _e( "Edit", 'yikes-inc-easy-mailchimp-extender' ); ?></a> |</span>
+													<span><a href="<?php echo esc_url_raw( add_query_arg( array( 'action' => 'yikes-easy-mc-duplicate-form', 'mailchimp-form' => $id, 'nonce' => wp_create_nonce( 'duplicate-mailchimp-form-' . $id ) ), admin_url( 'admin.php?page=yikes-inc-easy-mailchimp' ) ) ); ?>"><?php _e( "Duplicate", 'yikes-inc-easy-mailchimp-extender' ); ?></a> |</span>
+													<span><a href="<?php echo esc_url_raw( add_query_arg( array( 'action' => 'yikes-easy-mc-reset-stats', 'mailchimp-form' => $id, 'nonce' => wp_create_nonce( 'reset-stats-mailchimp-form-' . $id ) ), admin_url( 'admin.php?page=yikes-inc-easy-mailchimp' ) ) ); ?>"><?php _e( "Reset Stats", 'yikes-inc-easy-mailchimp-extender' ); ?></a> |</span>
+													<span><a href="#" class="view-yikes-mc-form-shortcode" data-alt-text="<?php _e( 'Stats', 'yikes-inc-easy-mailchimp-extender' ); ?>"><?php _e( "Shortcode", 'yikes-inc-easy-mailchimp-extender' ); ?></a> |</span>
 													<?php
 														/*
 														*	Custom action to allow users to add additional action links
 														*	to each form. We use this in our add-ons.
 														*	- Delete should remain last
 														*/
-														do_action( 'yikes-mailchimp-custom-form-actions' , $id );
+														do_action( 'yikes-mailchimp-custom-form-actions', $id );
 													?>
-													<span><a href="<?php echo esc_url_raw( add_query_arg( array( 'action' => 'yikes-easy-mc-delete-form', 'mailchimp-form' => $id , 'nonce' => wp_create_nonce( 'delete-mailchimp-form-'.$id ) ) , admin_url( 'admin.php?page=yikes-inc-easy-mailchimp' ) ) ); ?>" class="yikes-delete-mailchimp-form" onclick="return confirm('<?php printf( __( 'Are you sure you want to delete the %s form? This cannot be undone.' , 'yikes-inc-easy-mailchimp-extender' ), stripslashes( $form['form_name'] ) ); ?>');"><?php _e( "Delete" , 'yikes-inc-easy-mailchimp-extender' ); ?></a></span>
+													<span><a href="<?php echo esc_url_raw( add_query_arg( array( 'action' => 'yikes-easy-mc-delete-form', 'mailchimp-form' => $id, 'nonce' => wp_create_nonce( 'delete-mailchimp-form-' . $id ) ), admin_url( 'admin.php?page=yikes-inc-easy-mailchimp' ) ) ); ?>" class="yikes-delete-mailchimp-form" onclick="return confirm('<?php printf( __( 'Are you sure you want to delete the %s form? This cannot be undone.', 'yikes-inc-easy-mailchimp-extender' ), stripslashes( $form[ 'form_name' ] ) ); ?>');"><?php _e( "Delete", 'yikes-inc-easy-mailchimp-extender' ); ?></a></span>
 												</div>
 											</td>
 
-											<td class="column-columnname"><?php echo isset( $form['form_description'] ) ? str_replace( '[yikes-mailchimp-subscriber-count]', do_shortcode( '[yikes-mailchimp-subscriber-count form="' . $id . '"]' ), $form['form_description'] ) : ''; ?></td>
+											<td class="column-columnname"><?php echo isset( $form[ 'form_description' ] ) ? str_replace( '[yikes-mailchimp-subscriber-count]', do_shortcode( '[yikes-mailchimp-subscriber-count form="' . $id . '"]' ), $form[ 'form_description' ] ) : ''; ?></td>
 											<td class="column-columnname">
 												<?php
 												if ( $list_data && count( $list_data ) > 0 ) {
 													$parsed = wp_list_pluck( $list_data, 'name', 'id' );
-													if ( isset( $parsed[ $form['list_id'] ] ) ) {
-														echo esc_textarea( $parsed[ $form['list_id'] ] );
+													if ( isset( $parsed[ $form[ 'list_id' ] ] ) ) {
+														echo esc_textarea( $parsed[ $form[ 'list_id' ] ] );
 													} else {
 														echo '<strong>' . __( 'List Not Found', 'yikes-inc-easy-mailchimp-extender' ) . '</strong>';
 													}
@@ -172,25 +172,25 @@ 
 
 											<td class="column-columnname num stat-container">
 												<?php
-													$impressions = number_format( $form['impressions'] );
-													echo '<span title="' . __( 'Impressions' , 'yikes-inc-easy-mailchimp-extender' ) . '">' . $impressions . '</span>';
+													$impressions = number_format( $form[ 'impressions' ] );
+													echo '<span title="' . __( 'Impressions', 'yikes-inc-easy-mailchimp-extender' ) . '">' . $impressions . '</span>';
 												?>
 											</td>
 											<td class="column-columnname num stat-container">
 												<?php
-													$submissions = number_format( $form['submissions'] );
-													echo '<span title="' . __( 'Submissions' , 'yikes-inc-easy-mailchimp-extender' ) . '">' . $submissions . '</span>';
+													$submissions = number_format( $form[ 'submissions' ] );
+													echo '<span title="' . __( 'Submissions', 'yikes-inc-easy-mailchimp-extender' ) . '">' . $submissions . '</span>';
 												?>
 											</td>
 											<td class="column-columnname num stat-container">
 												<?php
-													if( $impressions != 0 ) {
-														$conversion_rate = ( round( 100 * $form['submissions'] / $form['impressions'] , 3 ) );
-														if( $conversion_rate >= '15' ) {
+													if ( $impressions != 0 ) {
+														$conversion_rate = ( round( 100 * $form[ 'submissions' ] / $form[ 'impressions' ], 3 ) );
+														if ( $conversion_rate >= '15' ) {
 															$conversion_color = '#00cc00'; // green (unicorn!)
-														} else if( $conversion_rate < '15' && $conversion_rate >= '10' ) {
+														} else if ( $conversion_rate < '15' && $conversion_rate >= '10' ) {
 															$conversion_color = '#0080FF'; // light blue (good)
-														} else if( $conversion_rate < '10' && $conversion_rate >= '5' ) {
+														} else if ( $conversion_rate < '10' && $conversion_rate >= '5' ) {
 															$conversion_color = '#FFFF32'; // yellow (ok)
 														} else {
 															$conversion_color = '#FF0000'; // red (no bueno)
@@ -199,7 +199,7 @@ 
 														$conversion_rate = '0';
 														$conversion_color = '#333333';
 													}
-													echo '<span style="color:' . esc_attr( $conversion_color ) . ';" title="' . esc_attr__( 'Conversion Rate' , 'yikes-inc-easy-mailchimp-extender' ) . '">' . $conversion_rate . '%</span>';
+													echo '<span style="color:' . esc_attr( $conversion_color ) . ';" title="' . esc_attr__( 'Conversion Rate', 'yikes-inc-easy-mailchimp-extender' ) . '">' . $conversion_rate . '%</span>';
 												?>
 											</td>
 											<!-- shortcode -->
@@ -212,7 +212,7 @@ 
 											}
 										} else { ?>
 										<tr class="no-items">
-											<td class="colspanchange no-mailchimp-forms-found" colspan="8"><em><?php _e( 'No Mailchimp forms found. Use the form to the right to create a new one.' , 'yikes-inc-easy-mailchimp-extender' ); ?></em></td>
+											<td class="colspanchange no-mailchimp-forms-found" colspan="8"><em><?php _e( 'No Mailchimp forms found. Use the form to the right to create a new one.', 'yikes-inc-easy-mailchimp-extender' ); ?></em></td>
 										</tr>
 									<?php } ?>
 								</tbody>