Completed
Push — staging ( 54e9b2...a43fe0 )
by Evan
20:01
created
public/partials/shortcodes/process_form_shortcode.php 1 patch
Spacing   +304 added lines, -304 removed lines patch added patch discarded remove patch
@@ -21,7 +21,7 @@  discard block
 block discarded – undo
21 21
 			'recaptcha_data_callback' => '', // set a custom js callback function to run after a successful recaptcha response - default none
22 22
 			'recaptcha_expired_callback' => '', // set a custom js callback function to run after the recaptcha has expired - default none
23 23
 			'inline' => '0',
24
-		), $atts , 'yikes-mailchimp' )
24
+		), $atts, 'yikes-mailchimp' )
25 25
 	);
26 26
 
27 27
 	// set globals
@@ -31,12 +31,12 @@  discard block
 block discarded – undo
31 31
 	$form_submitted = isset( $form_submitted ) ? $form_submitted : 0;
32 32
 
33 33
 	/* If the user hasn't authenticated yet, lets kill off */
34
-	if( get_option( 'yikes-mc-api-validation' , 'invalid_api_key' ) != 'valid_api_key' ) {
35
-		return '<div class="invalid-api-key-error"><p>' . __( "Whoops, you're not connected to MailChimp. You need to enter a valid MailChimp API key." , 'yikes-inc-easy-mailchimp-extender' ) . '</p></div>';
34
+	if ( get_option( 'yikes-mc-api-validation', 'invalid_api_key' ) != 'valid_api_key' ) {
35
+		return '<div class="invalid-api-key-error"><p>' . __( "Whoops, you're not connected to MailChimp. You need to enter a valid MailChimp API key.", 'yikes-inc-easy-mailchimp-extender' ) . '</p></div>';
36 36
 	}
37 37
 
38 38
 	// if the user forgot to specify a form ID, lets kill of and warn them.
39
-	if( ! $form ) {
39
+	if ( ! $form ) {
40 40
 		return __( 'Whoops, it looks like you forgot to specify a form to display.', 'yikes-inc-easy-mailchimp-extender' );
41 41
 	}
42 42
 
@@ -45,39 +45,39 @@  discard block
 block discarded – undo
45 45
 	$form_results = $wpdb->get_results( 'SELECT * FROM ' . $wpdb->prefix . 'yikes_easy_mc_forms WHERE id = ' . $form . '', ARRAY_A );
46 46
 
47 47
 	// confirm we have some results, or return an error
48
-	if( !$form_results ) {
49
-		return __( "Oh no...This form doesn't exist. Head back to the manage forms page and select a different form." , 'yikes-inc-easy-mailchimp-extender' );
48
+	if ( ! $form_results ) {
49
+		return __( "Oh no...This form doesn't exist. Head back to the manage forms page and select a different form.", 'yikes-inc-easy-mailchimp-extender' );
50 50
 	}
51 51
 
52 52
 	/*
53 53
 	*	Check if the user wants to use reCAPTCHA Spam Prevention
54 54
 	*/
55
-	if( get_option( 'yikes-mc-recaptcha-status' , '' ) == '1' ) {
55
+	if ( get_option( 'yikes-mc-recaptcha-status', '' ) == '1' ) {
56 56
 		// allow users to manually set recaptcha (instead of globally - recaptcha="1"/recaptcha="0" - but still needs to be globally enabled on the settings page)
57
-		if( ! isset( $atts['recaptcha'] ) || ( isset( $atts['recaptcha'] ) && $atts['recaptcha'] == '1' ) ) {
57
+		if ( ! isset( $atts[ 'recaptcha' ] ) || ( isset( $atts[ 'recaptcha' ] ) && $atts[ 'recaptcha' ] == '1' ) ) {
58 58
 			// if either of the Private the Secret key is left blank, we should display an error back to the user
59
-			if( get_option( 'yikes-mc-recaptcha-site-key' , '' ) == '' ) {
60
-				return __( "Whoops! It looks like you enabled reCAPTCHA but forgot to enter the reCAPTCHA site key!" , 'yikes-inc-easy-mailchimp-extender' ) . '<span class="edit-link yikes-easy-mc-edit-link"><a class="post-edit-link" href="' . esc_url( admin_url( 'admin.php?page=yikes-inc-easy-mailchimp-settings&section=recaptcha-settings' ) ) . '" title="' . __( 'ReCaptcha Settings' , 'yikes-inc-easy-mailchimp-extender' ) . '">' . __( 'Edit ReCaptcha Settings' , 'yikes-inc-easy-mailchimp-extender' ) . '</a></span>';
59
+			if ( get_option( 'yikes-mc-recaptcha-site-key', '' ) == '' ) {
60
+				return __( "Whoops! It looks like you enabled reCAPTCHA but forgot to enter the reCAPTCHA site key!", 'yikes-inc-easy-mailchimp-extender' ) . '<span class="edit-link yikes-easy-mc-edit-link"><a class="post-edit-link" href="' . esc_url( admin_url( 'admin.php?page=yikes-inc-easy-mailchimp-settings&section=recaptcha-settings' ) ) . '" title="' . __( 'ReCaptcha Settings', 'yikes-inc-easy-mailchimp-extender' ) . '">' . __( 'Edit ReCaptcha Settings', 'yikes-inc-easy-mailchimp-extender' ) . '</a></span>';
61 61
 			}
62
-			if( get_option( 'yikes-mc-recaptcha-secret-key' , '' ) == '' ) {
63
-				return __( "Whoops! It looks like you enabled reCAPTCHA but forgot to enter the reCAPTCHA secret key!" , 'yikes-inc-easy-mailchimp-extender' ) . '<span class="edit-link yikes-easy-mc-edit-link"><a class="post-edit-link" href="' . esc_url( admin_url( 'admin.php?page=yikes-inc-easy-mailchimp-settings&section=recaptcha-settings' ) ) . '" title="' . __( 'ReCaptcha Settings' , 'yikes-inc-easy-mailchimp-extender' ) . '">' . __( 'Edit ReCaptcha Settings' , 'yikes-inc-easy-mailchimp-extender' ) . '</a></span>';
62
+			if ( get_option( 'yikes-mc-recaptcha-secret-key', '' ) == '' ) {
63
+				return __( "Whoops! It looks like you enabled reCAPTCHA but forgot to enter the reCAPTCHA secret key!", 'yikes-inc-easy-mailchimp-extender' ) . '<span class="edit-link yikes-easy-mc-edit-link"><a class="post-edit-link" href="' . esc_url( admin_url( 'admin.php?page=yikes-inc-easy-mailchimp-settings&section=recaptcha-settings' ) ) . '" title="' . __( 'ReCaptcha Settings', 'yikes-inc-easy-mailchimp-extender' ) . '">' . __( 'Edit ReCaptcha Settings', 'yikes-inc-easy-mailchimp-extender' ) . '</a></span>';
64 64
 			}
65 65
 
66
-			if( ! empty( $atts['recaptcha_type'] ) ) {
67
-				echo $atts['recaptcha_type'];
66
+			if ( ! empty( $atts[ 'recaptcha_type' ] ) ) {
67
+				echo $atts[ 'recaptcha_type' ];
68 68
 			}
69 69
 
70 70
 			// Store the site language (to load recaptcha in a specific language)
71 71
 			$locale = get_locale();
72 72
 			$locale_split = explode( '_', $locale );
73 73
 			// Setup reCAPTCHA parameters
74
-			$lang = ( isset( $locale_split ) ? $locale_split[0] : $locale );
75
-			$lang = ( isset( $atts['recaptcha_lang'] ) ) ? $atts['recaptcha_lang'] : $locale_split[0];
76
-			$type = ( isset( $atts['recaptcha_type'] ) ) ? strtolower( $atts['recaptcha_type'] ) : 'image'; // setup recaptcha type
77
-			$theme= ( isset( $atts['recaptcha_theme'] ) ) ? strtolower( $atts['recaptcha_theme'] ) : 'light'; // setup recaptcha theme
78
-			$size = ( isset( $atts['recaptcha_size'] ) ) ? strtolower( $atts['recaptcha_size'] ) : 'normal'; // setup recaptcha size
79
-			$data_callback = ( isset( $atts['recaptcha_data_callback'] ) ) ? $atts['recaptcha_data_callback'] : false; // setup recaptcha size
80
-			$expired_callback = ( isset( $atts['recaptcha_expired_callback'] ) ) ? $atts['recaptcha_expired_callback'] : false; // setup recaptcha size
74
+			$lang = ( isset( $locale_split ) ? $locale_split[ 0 ] : $locale );
75
+			$lang = ( isset( $atts[ 'recaptcha_lang' ] ) ) ? $atts[ 'recaptcha_lang' ] : $locale_split[ 0 ];
76
+			$type = ( isset( $atts[ 'recaptcha_type' ] ) ) ? strtolower( $atts[ 'recaptcha_type' ] ) : 'image'; // setup recaptcha type
77
+			$theme = ( isset( $atts[ 'recaptcha_theme' ] ) ) ? strtolower( $atts[ 'recaptcha_theme' ] ) : 'light'; // setup recaptcha theme
78
+			$size = ( isset( $atts[ 'recaptcha_size' ] ) ) ? strtolower( $atts[ 'recaptcha_size' ] ) : 'normal'; // setup recaptcha size
79
+			$data_callback = ( isset( $atts[ 'recaptcha_data_callback' ] ) ) ? $atts[ 'recaptcha_data_callback' ] : false; // setup recaptcha size
80
+			$expired_callback = ( isset( $atts[ 'recaptcha_expired_callback' ] ) ) ? $atts[ 'recaptcha_expired_callback' ] : false; // setup recaptcha size
81 81
 			// Pass the shortcode parameters through a filter
82 82
 			$recaptcha_shortcode_params = apply_filters( 'yikes-mailchimp-recaptcha-parameters', array(
83 83
 				'language' => $lang,
@@ -88,10 +88,10 @@  discard block
 block discarded – undo
88 88
 				'expired_callback' => $expired_callback,
89 89
 			), $form );
90 90
 			// enqueue Google recaptcha JS
91
-			wp_register_script( 'google-recaptcha-js' , 'https://www.google.com/recaptcha/api.js?hl=' . $recaptcha_shortcode_params['language'] . '&onload=renderReCaptchaCallback&render=explicit', array( 'jquery' ) , 'all' );
91
+			wp_register_script( 'google-recaptcha-js', 'https://www.google.com/recaptcha/api.js?hl=' . $recaptcha_shortcode_params[ 'language' ] . '&onload=renderReCaptchaCallback&render=explicit', array( 'jquery' ), 'all' );
92 92
 			wp_enqueue_script( 'google-recaptcha-js' );
93
-			$recaptcha_site_key = get_option( 'yikes-mc-recaptcha-site-key' , '' );
94
-			$recaptcha_box = '<div name="g-recaptcha" class="g-recaptcha" data-sitekey="' . $recaptcha_site_key . '" data-theme="' . $recaptcha_shortcode_params['theme'] . '" data-type="' . $recaptcha_shortcode_params['type'] . '" data-size="' . $recaptcha_shortcode_params['size'] . '" data-callback="' . $recaptcha_shortcode_params['success_callback'] . '" data-expired-callback="' . $recaptcha_shortcode_params['expired_callback'] . '"></div>';
93
+			$recaptcha_site_key = get_option( 'yikes-mc-recaptcha-site-key', '' );
94
+			$recaptcha_box = '<div name="g-recaptcha" class="g-recaptcha" data-sitekey="' . $recaptcha_site_key . '" data-theme="' . $recaptcha_shortcode_params[ 'theme' ] . '" data-type="' . $recaptcha_shortcode_params[ 'type' ] . '" data-size="' . $recaptcha_shortcode_params[ 'size' ] . '" data-callback="' . $recaptcha_shortcode_params[ 'success_callback' ] . '" data-expired-callback="' . $recaptcha_shortcode_params[ 'expired_callback' ] . '"></div>';
95 95
 			?>
96 96
 			<script type="text/javascript">
97 97
 				/* Script Callback to init. multiple recaptchas on a single page */
@@ -118,10 +118,10 @@  discard block
 block discarded – undo
118 118
 	}
119 119
 
120 120
 	// place our results into a seperate variable for easy looping
121
-	$form_data = $form_results[0];
121
+	$form_data = $form_results[ 0 ];
122 122
 
123 123
 	// store our variables
124
-	$form_id = (int) $form_data['id']; // form id (the id of the form in the database)
124
+	$form_id = (int) $form_data[ 'id' ]; // form id (the id of the form in the database)
125 125
 
126 126
 	/*
127 127
 	*	Get the stored form settings
@@ -130,32 +130,32 @@  discard block
 block discarded – undo
130 130
 	*/
131 131
 	$form_settings = Yikes_Inc_Easy_Mailchimp_Extender_Public::yikes_retrieve_form_settings( $form_id );
132 132
 
133
-	$additional_form_settings = ( isset( $form_data['form_settings'] ) ) ? json_decode( $form_data['form_settings'], true ) : false;
133
+	$additional_form_settings = ( isset( $form_data[ 'form_settings' ] ) ) ? json_decode( $form_data[ 'form_settings' ], true ) : false;
134 134
 	// store our options from the additional form settings array
135
-	$form_classes = ( $additional_form_settings ) ? $additional_form_settings['yikes-easy-mc-form-class-names'] : '';
136
-	$inline_form = ( $additional_form_settings ) ? $additional_form_settings['yikes-easy-mc-inline-form'] : '';
137
-	$submit_button_type = ( $additional_form_settings ) ? $additional_form_settings['yikes-easy-mc-submit-button-type'] : 'text';
138
-	$submit_button_text = ( $additional_form_settings && $additional_form_settings['yikes-easy-mc-submit-button-text'] != '' ) ? esc_attr( $additional_form_settings['yikes-easy-mc-submit-button-text'] ) : __( 'Submit', 'yikes-inc-easy-mailchimp-extender' );
139
-	$submit_button_image = ( $additional_form_settings ) ? esc_url( $additional_form_settings['yikes-easy-mc-submit-button-image'] ) : '';
140
-	$submit_button_classes = ( $additional_form_settings ) ? ' ' . esc_attr( $additional_form_settings['yikes-easy-mc-submit-button-classes'] ) : '';
135
+	$form_classes = ( $additional_form_settings ) ? $additional_form_settings[ 'yikes-easy-mc-form-class-names' ] : '';
136
+	$inline_form = ( $additional_form_settings ) ? $additional_form_settings[ 'yikes-easy-mc-inline-form' ] : '';
137
+	$submit_button_type = ( $additional_form_settings ) ? $additional_form_settings[ 'yikes-easy-mc-submit-button-type' ] : 'text';
138
+	$submit_button_text = ( $additional_form_settings && $additional_form_settings[ 'yikes-easy-mc-submit-button-text' ] != '' ) ? esc_attr( $additional_form_settings[ 'yikes-easy-mc-submit-button-text' ] ) : __( 'Submit', 'yikes-inc-easy-mailchimp-extender' );
139
+	$submit_button_image = ( $additional_form_settings ) ? esc_url( $additional_form_settings[ 'yikes-easy-mc-submit-button-image' ] ) : '';
140
+	$submit_button_classes = ( $additional_form_settings ) ? ' ' . esc_attr( $additional_form_settings[ 'yikes-easy-mc-submit-button-classes' ] ) : '';
141 141
 	// scheuldes
142
-	$form_schedule_state = ( $additional_form_settings ) ? $additional_form_settings['yikes-easy-mc-form-schedule'] : false;
143
-	$form_schedule_start = ( $additional_form_settings ) ? $additional_form_settings['yikes-easy-mc-form-restriction-start'] : '';;
144
-	$form_schedule_end = ( $additional_form_settings ) ? $additional_form_settings['yikes-easy-mc-form-restriction-end'] : '';
145
-	$form_pending_message = ( $additional_form_settings ) ? $additional_form_settings['yikes-easy-mc-form-restriction-pending-message'] : '';
146
-	$form_expired_message = ( $additional_form_settings ) ? $additional_form_settings['yikes-easy-mc-form-restriction-expired-message'] : '';
142
+	$form_schedule_state = ( $additional_form_settings ) ? $additional_form_settings[ 'yikes-easy-mc-form-schedule' ] : false;
143
+	$form_schedule_start = ( $additional_form_settings ) ? $additional_form_settings[ 'yikes-easy-mc-form-restriction-start' ] : ''; ;
144
+	$form_schedule_end = ( $additional_form_settings ) ? $additional_form_settings[ 'yikes-easy-mc-form-restriction-end' ] : '';
145
+	$form_pending_message = ( $additional_form_settings ) ? $additional_form_settings[ 'yikes-easy-mc-form-restriction-pending-message' ] : '';
146
+	$form_expired_message = ( $additional_form_settings ) ? $additional_form_settings[ 'yikes-easy-mc-form-restriction-expired-message' ] : '';
147 147
 	// register required
148
-	$form_login_required = ( $additional_form_settings ) ? $additional_form_settings['yikes-easy-mc-form-login-required'] : false;
149
-	$form_login_message = ( $additional_form_settings ) ? $additional_form_settings['yikes-easy-mc-form-restriction-login-message'] : '';
148
+	$form_login_required = ( $additional_form_settings ) ? $additional_form_settings[ 'yikes-easy-mc-form-login-required' ] : false;
149
+	$form_login_message = ( $additional_form_settings ) ? $additional_form_settings[ 'yikes-easy-mc-form-restriction-login-message' ] : '';
150 150
 	// store number of fields
151
-	$field_count = (int) count( $form_settings['fields'] );
151
+	$field_count = (int) count( $form_settings[ 'fields' ] );
152 152
 
153 153
 	// confirm we actually have fields, before looping
154
-	if( isset( $form_data['fields'] ) && ! empty( $form_data['fields'] ) ) {
154
+	if ( isset( $form_data[ 'fields' ] ) && ! empty( $form_data[ 'fields' ] ) ) {
155 155
 		// loop over each field, if it's set to hidden -- subtract it from the field count
156 156
 		// this throws off the layout for inline forms setup below
157
-		foreach( json_decode( $form_data['fields'] ) as $form_field ) {
158
-			if( isset( $form_field->hide ) && $form_field->hide == 1 ) {
157
+		foreach ( json_decode( $form_data[ 'fields' ] ) as $form_field ) {
158
+			if ( isset( $form_field->hide ) && $form_field->hide == 1 ) {
159 159
 				$field_count--;
160 160
 			}
161 161
 		}
@@ -165,8 +165,8 @@  discard block
 block discarded – undo
165 165
 	*	If login is required, abort
166 166
 	*	@since 6.0.3.8
167 167
 	*/
168
-	if( $form_login_required ) {
169
-		if( apply_filters( 'yikes-mailchimp-required-login-requirement', ! is_user_logged_in() ) ) {
168
+	if ( $form_login_required ) {
169
+		if ( apply_filters( 'yikes-mailchimp-required-login-requirement', ! is_user_logged_in() ) ) {
170 170
 			ob_start();
171 171
 				?>
172 172
 					<div class="yikes-mailchimp-login-required yikes-mailchimp-form-<?php echo $form_id; ?>-login-required">
@@ -182,19 +182,19 @@  discard block
 block discarded – undo
182 182
 	*	Check if schedule is set for this form
183 183
 	*	@since 6.0.3.8
184 184
 	*/
185
-	if( $form_schedule_state ) {
185
+	if ( $form_schedule_state ) {
186 186
 		// store current date
187 187
 		$current_date = strtotime( current_time( 'm/d/Y g:iA' ) );
188 188
 
189 189
 		// the the current date is less than the form scheduled start date
190
-		if( $current_date < $form_schedule_start ) {
190
+		if ( $current_date < $form_schedule_start ) {
191 191
 			echo apply_filters( 'yikes-mailchimp-frontend-content', $form_pending_message );
192 192
 			return;
193 193
 			// abort
194 194
 		}
195 195
 
196 196
 		// The current date is past or equal to the end date, aka form has now expired
197
-		if( $current_date >= $form_schedule_end ) {
197
+		if ( $current_date >= $form_schedule_end ) {
198 198
 			echo apply_filters( 'yikes-mailchimp-frontend-content', $form_expired_message );
199 199
 			return;
200 200
 			// abort
@@ -203,8 +203,8 @@  discard block
 block discarded – undo
203 203
 
204 204
 	// setup the submit button text
205 205
 	// shortcode parameter takes precedence over option
206
-	if( isset( $atts['submit'] ) ) {
207
-		$submit = $atts['submit'];
206
+	if ( isset( $atts[ 'submit' ] ) ) {
207
+		$submit = $atts[ 'submit' ];
208 208
 	} else {
209 209
 		$submit = $submit_button_text;
210 210
 	}
@@ -214,7 +214,7 @@  discard block
 block discarded – undo
214 214
 	$page_data = $post;
215 215
 
216 216
 	// Remove the post_password from this for security
217
-	if( isset( $page_data->post_password ) ) {
217
+	if ( isset( $page_data->post_password ) ) {
218 218
 		unset( $page_data->post_password );
219 219
 	}
220 220
 
@@ -228,7 +228,7 @@  discard block
 block discarded – undo
228 228
 	*	to exclude styles from loading, add `define( 'YIKES_MAILCHIMP_EXCLUDE_STYLES', true );` to functions.php
229 229
 	*	@since 6.0.3.8
230 230
 	*/
231
-	if( ! defined( 'YIKES_MAILCHIMP_EXCLUDE_STYLES' ) ) {
231
+	if ( ! defined( 'YIKES_MAILCHIMP_EXCLUDE_STYLES' ) ) {
232 232
 		// enqueue the form styles
233 233
 		wp_enqueue_style( 'yikes-inc-easy-mailchimp-public-styles', YIKES_MC_URL . 'public/css/yikes-inc-easy-mailchimp-extender-public.min.css', array( $last_key ) );
234 234
 	}
@@ -236,12 +236,12 @@  discard block
 block discarded – undo
236 236
 	/**
237 237
 	*	Check for form inline parameter
238 238
 	*/
239
-	$form_inline = ( isset( $atts['inline'] ) && ( $atts['inline'] == 1 || $atts['inline'] == 'true' ) ) ? true : false;
239
+	$form_inline = ( isset( $atts[ 'inline' ] ) && ( $atts[ 'inline' ] == 1 || $atts[ 'inline' ] == 'true' ) ) ? true : false;
240 240
 	// recheck from our form options
241
-	if( ! $form_inline ) {
242
-		$form_inline = ( isset( $additional_form_settings['yikes-easy-mc-inline-form'] ) && $additional_form_settings['yikes-easy-mc-inline-form'] == 1 ) ? true : false;
241
+	if ( ! $form_inline ) {
242
+		$form_inline = ( isset( $additional_form_settings[ 'yikes-easy-mc-inline-form' ] ) && $additional_form_settings[ 'yikes-easy-mc-inline-form' ] == 1 ) ? true : false;
243 243
 	}
244
-	if( $form_inline ) {
244
+	if ( $form_inline ) {
245 245
 		$field_width = (float) ( 100 / $field_count );
246 246
 		$submit_button_width = (float) ( 20 / $field_count );
247 247
 		/*
@@ -270,12 +270,12 @@  discard block
 block discarded – undo
270 270
 	<?php
271 271
 
272 272
 		/* If the current user is logged in, and an admin...lets display our 'Edit Form' link */
273
-		if( is_user_logged_in() ) {
274
-			if( current_user_can( apply_filters( 'yikes-mailchimp-user-role-access' , 'manage_options' ) ) ) {
273
+		if ( is_user_logged_in() ) {
274
+			if ( current_user_can( apply_filters( 'yikes-mailchimp-user-role-access', 'manage_options' ) ) ) {
275 275
 				$edit_form_link = '<span class="edit-link">';
276
-					$edit_form_link .= '<a class="post-edit-link" href="' . esc_url( admin_url( 'admin.php?page=yikes-mailchimp-edit-form&id=' . $form ) ) . '" title="' . __( 'Edit' , 'yikes-inc-easy-mailchimp-extender' ) . ' ' . ucwords( $form_settings['form_name'] ) . '">' . __( 'Edit Form' , 'yikes-inc-easy-mailchimp-extender' ) . '</a>';
276
+					$edit_form_link .= '<a class="post-edit-link" href="' . esc_url( admin_url( 'admin.php?page=yikes-mailchimp-edit-form&id=' . $form ) ) . '" title="' . __( 'Edit', 'yikes-inc-easy-mailchimp-extender' ) . ' ' . ucwords( $form_settings[ 'form_name' ] ) . '">' . __( 'Edit Form', 'yikes-inc-easy-mailchimp-extender' ) . '</a>';
277 277
 				$edit_form_link .= '</span>';
278
-				$edit_form_link = apply_filters( 'yikes-mailchimp-front-end-form-action-links', $edit_form_link, $form, ucwords( $form_settings['form_name'] ) );
278
+				$edit_form_link = apply_filters( 'yikes-mailchimp-front-end-form-action-links', $edit_form_link, $form, ucwords( $form_settings[ 'form_name' ] ) );
279 279
 			} else {
280 280
 				$edit_form_link = '';
281 281
 			}
@@ -284,16 +284,16 @@  discard block
 block discarded – undo
284 284
 		// ensure there is an 'email' field the user can fill out
285 285
 		// or else MailChimp throws errors at you
286 286
 			// extract our array keys
287
-			if( isset( $form_settings['fields'] ) && ! empty( $form_settings['fields'] ) ) {
288
-				$array_keys = array_keys( $form_settings['fields'] );
287
+			if ( isset( $form_settings[ 'fields' ] ) && ! empty( $form_settings[ 'fields' ] ) ) {
288
+				$array_keys = array_keys( $form_settings[ 'fields' ] );
289 289
 				// check for EMAIL in that array
290
-				if( !in_array( 'EMAIL', $array_keys ) && !in_array( 'email', $array_keys ) ) {
291
-					return '<p>' . __( "An email field is required for all MailChimp forms. Please add an email field to this form." , 'yikes-inc-easy-mailchimp-extender' ) . '</p><p>' . $edit_form_link . '</p>';
290
+				if ( ! in_array( 'EMAIL', $array_keys ) && ! in_array( 'email', $array_keys ) ) {
291
+					return '<p>' . __( "An email field is required for all MailChimp forms. Please add an email field to this form.", 'yikes-inc-easy-mailchimp-extender' ) . '</p><p>' . $edit_form_link . '</p>';
292 292
 				}
293 293
 			} else {
294
-				$error = '<p>' . __( "Whoops, it looks like you forgot to assign fields to this form." , 'yikes-inc-easy-mailchimp-extender' ) . '</p>';
295
-				if( is_user_logged_in() ) {
296
-					if( current_user_can( apply_filters( 'yikes-mailchimp-user-role-access' , 'manage_options' ) ) ) {
294
+				$error = '<p>' . __( "Whoops, it looks like you forgot to assign fields to this form.", 'yikes-inc-easy-mailchimp-extender' ) . '</p>';
295
+				if ( is_user_logged_in() ) {
296
+					if ( current_user_can( apply_filters( 'yikes-mailchimp-user-role-access', 'manage_options' ) ) ) {
297 297
 						return $error . $edit_form_link;
298 298
 					}
299 299
 				} else {
@@ -311,13 +311,13 @@  discard block
 block discarded – undo
311 311
 		*	Set a custom title using custom_title="lorem ipsum" parameter in the shortcode
312 312
 		*	- This takes precedence over the title set
313 313
 		*/
314
-		if( ! empty( $title ) && $title == 1 && isset( $atts['custom_title'] ) ) {
315
-			echo '<h3 class="yikes-mailchimp-form-title yikes-mailchimp-form-title-'.$form_id.'">' . apply_filters( 'yikes-mailchimp-form-title', apply_filters( 'the_title', $atts['custom_title'] ), $form_id ) . '</h3>';
314
+		if ( ! empty( $title ) && $title == 1 && isset( $atts[ 'custom_title' ] ) ) {
315
+			echo '<h3 class="yikes-mailchimp-form-title yikes-mailchimp-form-title-' . $form_id . '">' . apply_filters( 'yikes-mailchimp-form-title', apply_filters( 'the_title', $atts[ 'custom_title' ] ), $form_id ) . '</h3>';
316 316
 		} else {
317 317
 			// display the form description if the user
318 318
 			// has specified to do so
319
-			if( ! empty( $title ) && $title == 1 ) {
320
-				echo '<h3 class="yikes-mailchimp-form-title yikes-mailchimp-form-title-'.$form_id.'">' . apply_filters( 'yikes-mailchimp-form-title', apply_filters( 'the_title', $form_settings['form_name'] ), $form_id ) . '</h3>';
319
+			if ( ! empty( $title ) && $title == 1 ) {
320
+				echo '<h3 class="yikes-mailchimp-form-title yikes-mailchimp-form-title-' . $form_id . '">' . apply_filters( 'yikes-mailchimp-form-title', apply_filters( 'the_title', $form_settings[ 'form_name' ] ), $form_id ) . '</h3>';
321 321
 			}
322 322
 		}
323 323
 
@@ -325,21 +325,21 @@  discard block
 block discarded – undo
325 325
 		*	Allow users to specify a custom description for this form, no html support
326 326
 		*	@since 6.0.3.8
327 327
 		*/
328
-		if( ! empty( $description ) && $description == 1 && isset( $atts['custom_description'] ) ) {
329
-			echo '<section class="yikes-mailchimp-form-description yikes-mailchimp-form-description-'.$form_id.'">' . apply_filters( 'yikes-mailchimp-frontend-content', apply_filters( 'yikes-mailchimp-form-description', $atts['custom_description'], $form_id ) ) . '</section>';
328
+		if ( ! empty( $description ) && $description == 1 && isset( $atts[ 'custom_description' ] ) ) {
329
+			echo '<section class="yikes-mailchimp-form-description yikes-mailchimp-form-description-' . $form_id . '">' . apply_filters( 'yikes-mailchimp-frontend-content', apply_filters( 'yikes-mailchimp-form-description', $atts[ 'custom_description' ], $form_id ) ) . '</section>';
330 330
 		} else {
331 331
 			// display the form description if the user
332 332
 			// has specified to do so
333
-			if( ! empty( $description ) && $description == 1 ) {
334
-				echo '<section class="yikes-mailchimp-form-description yikes-mailchimp-form-description-'.$form_id.'">' . apply_filters( 'yikes-mailchimp-frontend-content', apply_filters( 'yikes-mailchimp-form-description', $form_settings['form_description'], $form_id ) ) . '</section>';
333
+			if ( ! empty( $description ) && $description == 1 ) {
334
+				echo '<section class="yikes-mailchimp-form-description yikes-mailchimp-form-description-' . $form_id . '">' . apply_filters( 'yikes-mailchimp-frontend-content', apply_filters( 'yikes-mailchimp-form-description', $form_settings[ 'form_description' ], $form_id ) ) . '</section>';
335 335
 			}
336 336
 		}
337 337
 
338 338
 		// Check for AJAX
339
-		if( ( ! empty( $atts['ajax'] ) && $atts['ajax'] == 1 ) || $form_settings['submission_settings']['ajax'] == 1 ) {
339
+		if ( ( ! empty( $atts[ 'ajax' ] ) && $atts[ 'ajax' ] == 1 ) || $form_settings[ 'submission_settings' ][ 'ajax' ] == 1 ) {
340 340
 			// enqueue our ajax script
341
-			wp_register_script( 'yikes-easy-mc-ajax' , YIKES_MC_URL . 'public/js/yikes-mc-ajax-forms.min.js' , array( 'jquery' ) , 'yikes-inc-easy-mailchimp-extender', false );
342
-			wp_localize_script( 'yikes-easy-mc-ajax' , 'object' , array(
341
+			wp_register_script( 'yikes-easy-mc-ajax', YIKES_MC_URL . 'public/js/yikes-mc-ajax-forms.min.js', array( 'jquery' ), 'yikes-inc-easy-mailchimp-extender', false );
342
+			wp_localize_script( 'yikes-easy-mc-ajax', 'object', array(
343 343
 				'ajax_url' => esc_url( admin_url( 'admin-ajax.php' ) ),
344 344
 				'page_data' => $page_data,
345 345
 				'interest_group_checkbox_error' => apply_filters( 'yikes-mailchimp-interest-group-checkbox-error', __( 'This field is required.', 'yikes-inc-easy-mailchimp-extender' ), $form_id ),
@@ -357,63 +357,63 @@  discard block
 block discarded – undo
357 357
 
358 358
 		// render the form!
359 359
 		?>
360
-			<form id="<?php echo sanitize_title( $form_settings['form_name'] ); ?>-<?php echo $form_id; ?>" class="yikes-easy-mc-form yikes-easy-mc-form-<?php echo $form_id . ' '; if ( $form_inline )  { echo 'yikes-mailchimp-form-inline '; } echo ' ' . apply_filters( 'yikes-mailchimp-form-class', $form_classes, $form_id ); if( !empty( $_POST ) && $form_submitted == 1 && $form_settings['submission_settings']['hide_form_post_signup'] == 1 ) { echo ' yikes-easy-mc-display-none'; } ?>" action="" method="POST" data-attr-form-id="<?php echo $form_id; ?>">
360
+			<form id="<?php echo sanitize_title( $form_settings[ 'form_name' ] ); ?>-<?php echo $form_id; ?>" class="yikes-easy-mc-form yikes-easy-mc-form-<?php echo $form_id . ' '; if ( $form_inline ) { echo 'yikes-mailchimp-form-inline '; } echo ' ' . apply_filters( 'yikes-mailchimp-form-class', $form_classes, $form_id ); if ( ! empty( $_POST ) && $form_submitted == 1 && $form_settings[ 'submission_settings' ][ 'hide_form_post_signup' ] == 1 ) { echo ' yikes-easy-mc-display-none'; } ?>" action="" method="POST" data-attr-form-id="<?php echo $form_id; ?>">
361 361
 
362 362
 				<?php
363
-				foreach( $form_settings['fields'] as $field ) {
363
+				foreach ( $form_settings[ 'fields' ] as $field ) {
364 364
 						// input array
365 365
 						$field_array = array();
366 366
 						// label array
367 367
 						$label_array = array();
368 368
 						// label classes array
369 369
 						$label_class_array = array();
370
-						if( $field['additional-classes'] != '' ) {
370
+						if ( $field[ 'additional-classes' ] != '' ) {
371 371
 							// split custom classes at spaces
372
-							$custom_classes = explode( ' ' , $field['additional-classes'] );
372
+							$custom_classes = explode( ' ', $field[ 'additional-classes' ] );
373 373
 							// check our custom class array for field-left/field-right
374 374
 							// if it's set we need to assign it to our label and remove it from the field classes
375 375
 							 // input half left
376
-							if( in_array( 'field-left-half' , $custom_classes ) ) {
376
+							if ( in_array( 'field-left-half', $custom_classes ) ) {
377 377
 								// $label_array['class'] = 'class="field-left-half"';
378
-								$label_class_array[] = 'field-left-half';
379
-								$key = array_search( 'field-left-half' , $custom_classes );
380
-								unset( $custom_classes[$key] );
378
+								$label_class_array[ ] = 'field-left-half';
379
+								$key = array_search( 'field-left-half', $custom_classes );
380
+								unset( $custom_classes[ $key ] );
381 381
 							} // input half right
382
-							if( in_array( 'field-right-half' , $custom_classes ) ) {
382
+							if ( in_array( 'field-right-half', $custom_classes ) ) {
383 383
 								// $label_array['class'] = 'class="field-right-half"';
384
-								$label_class_array[] = 'field-right-half';
385
-								$key = array_search( 'field-right-half' , $custom_classes );
386
-								unset( $custom_classes[$key] );
384
+								$label_class_array[ ] = 'field-right-half';
385
+								$key = array_search( 'field-right-half', $custom_classes );
386
+								unset( $custom_classes[ $key ] );
387 387
 							} // input thirds (1/3 width, floated left)
388
-							if( in_array( 'field-third' , $custom_classes ) ) {
388
+							if ( in_array( 'field-third', $custom_classes ) ) {
389 389
 								// $label_array['class'] = 'class="field-third"';
390
-								$label_class_array[] = 'field-third';
391
-								$key = array_search( 'field-third' , $custom_classes );
392
-								unset( $custom_classes[$key] );
390
+								$label_class_array[ ] = 'field-third';
391
+								$key = array_search( 'field-third', $custom_classes );
392
+								unset( $custom_classes[ $key ] );
393 393
 							} // 2 column radio
394
-							if( in_array( 'option-2-col' , $custom_classes ) ) {
394
+							if ( in_array( 'option-2-col', $custom_classes ) ) {
395 395
 								// $label_array['class'] = 'class="option-2-col"';
396
-								$label_class_array[] = 'option-2-col';
397
-								$key = array_search( 'option-2-col' , $custom_classes );
398
-								unset( $custom_classes[$key] );
396
+								$label_class_array[ ] = 'option-2-col';
397
+								$key = array_search( 'option-2-col', $custom_classes );
398
+								unset( $custom_classes[ $key ] );
399 399
 							} // 3 column radio
400
-							if( in_array( 'option-3-col' , $custom_classes ) ) {
400
+							if ( in_array( 'option-3-col', $custom_classes ) ) {
401 401
 								// $label_array['class'] = 'class="option-3-col"';
402
-								$label_class_array[] = 'option-3-col';
403
-								$key = array_search( 'option-3-col' , $custom_classes );
404
-								unset( $custom_classes[$key] );
402
+								$label_class_array[ ] = 'option-3-col';
403
+								$key = array_search( 'option-3-col', $custom_classes );
404
+								unset( $custom_classes[ $key ] );
405 405
 							} // 4 column radio
406
-							if( in_array( 'option-4-col' , $custom_classes ) ) {
406
+							if ( in_array( 'option-4-col', $custom_classes ) ) {
407 407
 								// $label_array['class'] = 'class="option-4-col"';
408
-								$label_class_array[] = 'option-4-col';
409
-								$key = array_search( 'option-4-col' , $custom_classes );
410
-								unset( $custom_classes[$key] );
408
+								$label_class_array[ ] = 'option-4-col';
409
+								$key = array_search( 'option-4-col', $custom_classes );
410
+								unset( $custom_classes[ $key ] );
411 411
 							} // inline radio & checkboxes etc
412
-							if( in_array( 'option-inline' , $custom_classes ) ) {
412
+							if ( in_array( 'option-inline', $custom_classes ) ) {
413 413
 								// $label_array['class'] = 'class="option-inline"';
414
-								$label_class_array[] = 'option-inline';
415
-								$key = array_search( 'option-inline' , $custom_classes );
416
-								unset( $custom_classes[$key] );
414
+								$label_class_array[ ] = 'option-inline';
415
+								$key = array_search( 'option-inline', $custom_classes );
416
+								unset( $custom_classes[ $key ] );
417 417
 							}
418 418
 						} else {
419 419
 							$custom_classes = array();
@@ -421,67 +421,67 @@  discard block
 block discarded – undo
421 421
 
422 422
 						// if the form is set to inline, add the inline class to our labels
423 423
 						// since @6.0.3.8
424
-						if( $form_inline ) {
425
-							$label_class_array[] = 'label-inline';
424
+						if ( $form_inline ) {
425
+							$label_class_array[ ] = 'label-inline';
426 426
 						}
427 427
 
428
-						if( isset( $field['hide-label'] ) ) {
429
-							if( $field['hide-label'] == 1 ) {
430
-								$custom_classes[] = 'field-no-label';
428
+						if ( isset( $field[ 'hide-label' ] ) ) {
429
+							if ( $field[ 'hide-label' ] == 1 ) {
430
+								$custom_classes[ ] = 'field-no-label';
431 431
 							}
432 432
 						}
433 433
 
434 434
 					/* Store tag variable based on field type */
435
-					if( isset( $field['merge'] ) ) {
435
+					if ( isset( $field[ 'merge' ] ) ) {
436 436
 						$tag = 'merge';
437 437
 					} else {
438 438
 						$tag = 'group_id';
439 439
 					}
440 440
 
441 441
 					// build up our array
442
-					$field_array['id'] = 'id="yikes-easy-mc-form-' . $form_id . '-' . esc_attr( $field[$tag] ) . '" ';
443
-					$field_array['name'] = 'name="' . esc_attr( $field[$tag] ) . '" ';
444
-					$field_array['placeholder'] = isset( $field['placeholder'] ) ? 'placeholder="' . esc_attr( stripslashes( $field['placeholder'] ) ) . '" ' : '';
445
-					$field_array['classes'] = 'class="yikes-easy-mc-'.$field['type'] . ' ' .  esc_attr( trim( implode( ' ' , $custom_classes ) ) ) . '" ';
442
+					$field_array[ 'id' ] = 'id="yikes-easy-mc-form-' . $form_id . '-' . esc_attr( $field[ $tag ] ) . '" ';
443
+					$field_array[ 'name' ] = 'name="' . esc_attr( $field[ $tag ] ) . '" ';
444
+					$field_array[ 'placeholder' ] = isset( $field[ 'placeholder' ] ) ? 'placeholder="' . esc_attr( stripslashes( $field[ 'placeholder' ] ) ) . '" ' : '';
445
+					$field_array[ 'classes' ] = 'class="yikes-easy-mc-' . $field[ 'type' ] . ' ' . esc_attr( trim( implode( ' ', $custom_classes ) ) ) . '" ';
446 446
 
447 447
 					// email must always be required and visible
448
-					if( $field['type'] == 'email' ) {
449
-						$field_array['required'] = 'required="required"';
450
-						$label_array['visible'] = '';
448
+					if ( $field[ 'type' ] == 'email' ) {
449
+						$field_array[ 'required' ] = 'required="required"';
450
+						$label_array[ 'visible' ] = '';
451 451
 						// $label_array['required'] = 'class="' . $field['merge'] . '-label yikes-mailchimp-field-required"';
452
-						$label_class_array[] = $field['merge'] . '-label';
453
-						$label_class_array[] = 'yikes-mailchimp-field-required';
452
+						$label_class_array[ ] = $field[ 'merge' ] . '-label';
453
+						$label_class_array[ ] = 'yikes-mailchimp-field-required';
454 454
 					} else {
455
-						if( $tag == 'merge' ) {
456
-							$field_array['required'] = isset( $field['require'] ) ? 'required="required"' : '';
457
-							$label_array['visible'] = isset( $field['hide'] ) ? 'style="display:none;"' : '';
455
+						if ( $tag == 'merge' ) {
456
+							$field_array[ 'required' ] = isset( $field[ 'require' ] ) ? 'required="required"' : '';
457
+							$label_array[ 'visible' ] = isset( $field[ 'hide' ] ) ? 'style="display:none;"' : '';
458 458
 							// $label_array['required'] = isset( $field['require'] ) ? 'class="' . $field['merge'] . '-label yikes-mailchimp-field-required"' : 'class="' . $field['merge'] . '-label"';
459
-							$label_class_array[] = isset( $field['require'] ) ? $field['merge'] . '-label yikes-mailchimp-field-required' : $field['merge'] . '-label';
459
+							$label_class_array[ ] = isset( $field[ 'require' ] ) ? $field[ 'merge' ] . '-label yikes-mailchimp-field-required' : $field[ 'merge' ] . '-label';
460 460
 						} else {
461
-							$field_array['required'] = isset( $field['require'] ) ? 'required="required"' : '';
462
-							$label_array['visible'] = isset( $field['hide'] ) ? 'style="display:none;"' : '';
461
+							$field_array[ 'required' ] = isset( $field[ 'require' ] ) ? 'required="required"' : '';
462
+							$label_array[ 'visible' ] = isset( $field[ 'hide' ] ) ? 'style="display:none;"' : '';
463 463
 							// $label_array['required'] = isset( $field['require'] ) ? 'class="' . $field['group_id'] . '-label yikes-mailchimp-field-required"' : 'class="' . $field['group_id'] . '-label"';
464
-							$label_class_array[] = isset( $field['require'] ) ? $field['group_id'] . '-label yikes-mailchimp-field-required' : $field['group_id'] . '-label';
464
+							$label_class_array[ ] = isset( $field[ 'require' ] ) ? $field[ 'group_id' ] . '-label yikes-mailchimp-field-required' : $field[ 'group_id' ] . '-label';
465 465
 						}
466 466
 					}
467 467
 
468 468
 					// if both hide label and hide field are checked, we gotta hide the field!
469
-					if( isset( $field['hide' ] ) && $field['hide'] == 1 ) {
470
-						if( isset( $field['hide-label' ] ) && $field['hide-label'] == 1 ) {
471
-							$field_array['visible'] = 'style="display:none;"';
469
+					if ( isset( $field[ 'hide' ] ) && $field[ 'hide' ] == 1 ) {
470
+						if ( isset( $field[ 'hide-label' ] ) && $field[ 'hide-label' ] == 1 ) {
471
+							$field_array[ 'visible' ] = 'style="display:none;"';
472 472
 						}
473 473
 					}
474 474
 
475
-					$label_array['classes'] = 'class="' . implode( ' ', $label_class_array ) . '"';
475
+					$label_array[ 'classes' ] = 'class="' . implode( ' ', $label_class_array ) . '"';
476 476
 
477 477
 					// filter the field array data
478 478
 					$field_array = apply_filters( 'yikes-mailchimp-field-data', $field_array, $field, $form_id );
479 479
 
480 480
 					/* Loop Over Standard Fields (aka merge variables) */
481
-					if( isset( $field['merge'] ) ) {
481
+					if ( isset( $field[ 'merge' ] ) ) {
482 482
 
483 483
 						// loop over our fields by Type
484
-						switch ( $field['type'] ) {
484
+						switch ( $field[ 'type' ] ) {
485 485
 
486 486
 							default:
487 487
 							case 'email':
@@ -489,25 +489,25 @@  discard block
 block discarded – undo
489 489
 							case 'number':
490 490
 
491 491
 								// pass our default value through our filter to parse dynamic data by tag (used solely for 'text' type)
492
-								$default_value = ( isset( $field['default'] ) ? esc_attr( $field['default'] ) : '' );
492
+								$default_value = ( isset( $field[ 'default' ] ) ? esc_attr( $field[ 'default' ] ) : '' );
493 493
 								$default_value = apply_filters( 'yikes-mailchimp-process-default-tag', $default_value );
494 494
 									?>
495
-									<label for="<?php echo $field['merge']; ?>" <?php echo implode( ' ' , $label_array ); ?>>
495
+									<label for="<?php echo $field[ 'merge' ]; ?>" <?php echo implode( ' ', $label_array ); ?>>
496 496
 
497 497
 										<!-- dictate label visibility -->
498
-										<?php if( !isset( $field['hide-label'] ) ) { ?>
499
-											<span class="<?php echo esc_attr( $field['merge'] ) . '-label'; ?>">
500
-												<?php if( ! isset( $field['hide-label'] ) ) { echo apply_filters( 'yikes-mailchimp-'.$field['merge'].'-label' , esc_attr( stripslashes( $field['label'] ) ), $form_id ); } ?>
498
+										<?php if ( ! isset( $field[ 'hide-label' ] ) ) { ?>
499
+											<span class="<?php echo esc_attr( $field[ 'merge' ] ) . '-label'; ?>">
500
+												<?php if ( ! isset( $field[ 'hide-label' ] ) ) { echo apply_filters( 'yikes-mailchimp-' . $field[ 'merge' ] . '-label', esc_attr( stripslashes( $field[ 'label' ] ) ), $form_id ); } ?>
501 501
 											</span>
502 502
 										<?php } ?>
503 503
 
504
-										<input <?php echo implode( ' ' , $field_array ); if( $field['type'] != 'email' && $field['type'] != 'number' ) { ?> type="text" <?php } else if( $field['type'] == 'email' ) { ?> type="email" <?php } else { ?> type="number" <?php } ?> value="<?php if( isset( $_POST[$field['merge']] ) && $form_submitted != 1 ) { echo $_POST[$field['merge']]; } else { echo esc_attr( $default_value ); } ?>">
504
+										<input <?php echo implode( ' ', $field_array ); if ( $field[ 'type' ] != 'email' && $field[ 'type' ] != 'number' ) { ?> type="text" <?php } else if ( $field[ 'type' ] == 'email' ) { ?> type="email" <?php } else { ?> type="number" <?php } ?> value="<?php if ( isset( $_POST[ $field[ 'merge' ] ] ) && $form_submitted != 1 ) { echo $_POST[ $field[ 'merge' ] ]; } else { echo esc_attr( $default_value ); } ?>">
505 505
 
506 506
 										<!-- description -->
507
-										<?php if( isset( $field['description'] ) && trim( $field['description'] ) != '' ) { ?>
507
+										<?php if ( isset( $field[ 'description' ] ) && trim( $field[ 'description' ] ) != '' ) { ?>
508 508
 											<p class="form-field-description">
509 509
 												<small>
510
-													<?php echo apply_filters( 'yikes-mailchimp-' . $field['merge'] . '-description', esc_attr( stripslashes( $field['description'] ) ), $form_id ); ?>
510
+													<?php echo apply_filters( 'yikes-mailchimp-' . $field[ 'merge' ] . '-description', esc_attr( stripslashes( $field[ 'description' ] ) ), $form_id ); ?>
511 511
 												</small>
512 512
 											</p>
513 513
 										<?php } ?>
@@ -519,7 +519,7 @@  discard block
 block discarded – undo
519 519
 
520 520
 							case 'url':
521 521
 							case 'imageurl':
522
-								$default_value = ( isset( $field['default'] ) ) ? $field['default'] : '';
522
+								$default_value = ( isset( $field[ 'default' ] ) ) ? $field[ 'default' ] : '';
523 523
 									?>
524 524
 
525 525
 									<script type="text/javascript">
@@ -531,22 +531,22 @@  discard block
 block discarded – undo
531 531
 										}
532 532
 									</script>
533 533
 
534
-									<label for="<?php echo $field['merge']; ?>" <?php echo implode( ' ' , $label_array ); ?>>
534
+									<label for="<?php echo $field[ 'merge' ]; ?>" <?php echo implode( ' ', $label_array ); ?>>
535 535
 
536 536
 										<!-- dictate label visibility -->
537
-										<?php if( !isset( $field['hide-label'] ) ) { ?>
538
-											<span class="<?php echo esc_attr( $field['merge'] ) . '-label'; ?>">
539
-												<?php echo apply_filters( 'yikes-mailchimp-'.$field['merge'].'-label' , esc_attr( stripslashes( $field['label'] ) ) ); ?>
537
+										<?php if ( ! isset( $field[ 'hide-label' ] ) ) { ?>
538
+											<span class="<?php echo esc_attr( $field[ 'merge' ] ) . '-label'; ?>">
539
+												<?php echo apply_filters( 'yikes-mailchimp-' . $field[ 'merge' ] . '-label', esc_attr( stripslashes( $field[ 'label' ] ) ) ); ?>
540 540
 											</span>
541 541
 										<?php } ?>
542 542
 
543
-										<input <?php echo implode( ' ' , $field_array ); ?> type="url" <?php if( $field['type'] == 'url' ) { ?> title="<?php _e( 'Please enter a valid URL to the website.' , 'yikes-inc-easy-mailchimp-extender' ); ?>" <?php } else { ?> title="<?php _e( 'Please enter a valid URL to the image.' , 'yikes-inc-easy-mailchimp-extender' ); ?>" <?php } ?> value="<?php if( isset( $_POST[$field['merge']] ) && $form_submitted != 1 ) { echo $_POST[$field['merge']]; } else { echo esc_attr( $default_value ); } ?>" onblur="properlyFormatURLField(this);return false;">
543
+										<input <?php echo implode( ' ', $field_array ); ?> type="url" <?php if ( $field[ 'type' ] == 'url' ) { ?> title="<?php _e( 'Please enter a valid URL to the website.', 'yikes-inc-easy-mailchimp-extender' ); ?>" <?php } else { ?> title="<?php _e( 'Please enter a valid URL to the image.', 'yikes-inc-easy-mailchimp-extender' ); ?>" <?php } ?> value="<?php if ( isset( $_POST[ $field[ 'merge' ] ] ) && $form_submitted != 1 ) { echo $_POST[ $field[ 'merge' ] ]; } else { echo esc_attr( $default_value ); } ?>" onblur="properlyFormatURLField(this);return false;">
544 544
 
545 545
 										<!-- description -->
546
-										<?php if( isset( $field['description'] ) && trim( $field['description'] ) != '' ) { ?>
546
+										<?php if ( isset( $field[ 'description' ] ) && trim( $field[ 'description' ] ) != '' ) { ?>
547 547
 											<p class="form-field-description">
548 548
 												<small>
549
-													<?php echo apply_filters( 'yikes-mailchimp-' . $field['merge'] . '-description', esc_attr( stripslashes( $field['description'] ) ), $form_id ); ?>
549
+													<?php echo apply_filters( 'yikes-mailchimp-' . $field[ 'merge' ] . '-description', esc_attr( stripslashes( $field[ 'description' ] ) ), $form_id ); ?>
550 550
 												</small>
551 551
 											</p>
552 552
 										<?php } ?>
@@ -557,8 +557,8 @@  discard block
 block discarded – undo
557 557
 							break;
558 558
 
559 559
 							case 'phone':
560
-								$default_value = ( isset( $field['default'] ) ? esc_attr( $field['default'] ) : '' );
561
-								$phone_format = $field['phone_format'];
560
+								$default_value = ( isset( $field[ 'default' ] ) ? esc_attr( $field[ 'default' ] ) : '' );
561
+								$phone_format = $field[ 'phone_format' ];
562 562
 								?>
563 563
 									<script type="text/javascript">
564 564
 										/* Replace incorrect values and format it correctly for MailChimp API */
@@ -571,22 +571,22 @@  discard block
 block discarded – undo
571 571
 										}
572 572
 									</script>
573 573
 
574
-									<label for="<?php echo $field['merge']; ?>" <?php echo implode( ' ' , $label_array ); ?>>
574
+									<label for="<?php echo $field[ 'merge' ]; ?>" <?php echo implode( ' ', $label_array ); ?>>
575 575
 
576 576
 										<!-- dictate label visibility -->
577
-										<?php if( !isset( $field['hide-label'] ) ) { ?>
578
-											<span class="<?php echo esc_attr( $field['merge'] ) . '-label'; ?>">
579
-												<?php echo apply_filters( 'yikes-mailchimp-'.$field['merge'].'-label' , esc_attr( stripslashes( $field['label'] ) ) ); ?>
577
+										<?php if ( ! isset( $field[ 'hide-label' ] ) ) { ?>
578
+											<span class="<?php echo esc_attr( $field[ 'merge' ] ) . '-label'; ?>">
579
+												<?php echo apply_filters( 'yikes-mailchimp-' . $field[ 'merge' ] . '-label', esc_attr( stripslashes( $field[ 'label' ] ) ) ); ?>
580 580
 											</span>
581 581
 										<?php } ?>
582 582
 
583
-										<input <?php echo implode( ' ' , $field_array ); ?> type="text" <?php if( $phone_format != 'US' ) { ?>  title="<?php _e( 'International Phone Number' , 'yikes-inc-easy-mailchimp-extender' ); ?>" pattern="<?php echo apply_filters( 'yikes-mailchimp-international-phone-pattern' , '[0-9,-]{1,}' ); ?>" <?php } else { ?> title="<?php _e( 'US Phone Number (###) ### - ####' , 'yikes-inc-easy-mailchimp-extender' ); ?>" pattern="<?php echo apply_filters( 'yikes-mailchimp-us-phone-pattern' , '^(\([0-9]{3}\)|[0-9]{3}-)[0-9]{3}-[0-9]{4}$' ); ?>" onblur="formatUSPhoneNumber(this);"<?php } ?> value="<?php if( isset( $_POST[$field['merge']] ) && $form_submitted != 1 ) { echo $_POST[$field['merge']]; } else { echo esc_attr( $default_value ); } ?>">
583
+										<input <?php echo implode( ' ', $field_array ); ?> type="text" <?php if ( $phone_format != 'US' ) { ?>  title="<?php _e( 'International Phone Number', 'yikes-inc-easy-mailchimp-extender' ); ?>" pattern="<?php echo apply_filters( 'yikes-mailchimp-international-phone-pattern', '[0-9,-]{1,}' ); ?>" <?php } else { ?> title="<?php _e( 'US Phone Number (###) ### - ####', 'yikes-inc-easy-mailchimp-extender' ); ?>" pattern="<?php echo apply_filters( 'yikes-mailchimp-us-phone-pattern', '^(\([0-9]{3}\)|[0-9]{3}-)[0-9]{3}-[0-9]{4}$' ); ?>" onblur="formatUSPhoneNumber(this);"<?php } ?> value="<?php if ( isset( $_POST[ $field[ 'merge' ] ] ) && $form_submitted != 1 ) { echo $_POST[ $field[ 'merge' ] ]; } else { echo esc_attr( $default_value ); } ?>">
584 584
 
585 585
 										<!-- description -->
586
-										<?php if( isset( $field['description'] ) && trim( $field['description'] ) != '' ) { ?>
586
+										<?php if ( isset( $field[ 'description' ] ) && trim( $field[ 'description' ] ) != '' ) { ?>
587 587
 											<p class="form-field-description">
588 588
 												<small>
589
-													<?php echo apply_filters( 'yikes-mailchimp-' . $field['merge'] . '-description', stripslashes( $field['description'] ), $form_id ); ?>
589
+													<?php echo apply_filters( 'yikes-mailchimp-' . $field[ 'merge' ] . '-description', stripslashes( $field[ 'description' ] ), $form_id ); ?>
590 590
 												</small>
591 591
 											</p>
592 592
 										<?php } ?>
@@ -596,25 +596,25 @@  discard block
 block discarded – undo
596 596
 							break;
597 597
 
598 598
 							case 'zip':
599
-								$default_value = ( isset( $field['default'] ) ? esc_attr( $field['default'] ) : '' );
599
+								$default_value = ( isset( $field[ 'default' ] ) ? esc_attr( $field[ 'default' ] ) : '' );
600 600
 
601 601
 									?>
602
-									<label for="<?php echo $field['merge']; ?>" <?php echo implode( ' ' , $label_array ); ?>>
602
+									<label for="<?php echo $field[ 'merge' ]; ?>" <?php echo implode( ' ', $label_array ); ?>>
603 603
 
604 604
 									<!-- dictate label visibility -->
605
-									<?php if( ! isset( $field['hide-label'] ) ) { ?>
606
-										<span class="<?php echo esc_attr( $field['merge'] ) . '-label'; ?>">
607
-											<?php echo apply_filters( 'yikes-mailchimp-'.$field['merge'].'-label' , esc_attr( stripslashes( $field['label'] ) ) ); ?>
605
+									<?php if ( ! isset( $field[ 'hide-label' ] ) ) { ?>
606
+										<span class="<?php echo esc_attr( $field[ 'merge' ] ) . '-label'; ?>">
607
+											<?php echo apply_filters( 'yikes-mailchimp-' . $field[ 'merge' ] . '-label', esc_attr( stripslashes( $field[ 'label' ] ) ) ); ?>
608 608
 										</span>
609 609
 									<?php } ?>
610 610
 
611
-									<input <?php echo implode( ' ' , $field_array ); ?> type="text" pattern="\d{5,5}(-\d{4,4})?" title="<?php _e( '5 digit zip code, numbers only' , 'yikes-inc-easy-mailchimp-extender' ); ?>" value="<?php if( isset( $_POST[$field['merge']] ) && $form_submitted != 1 ) { echo $_POST[$field['merge']]; } else { echo esc_attr( $default_value ); } ?>">
611
+									<input <?php echo implode( ' ', $field_array ); ?> type="text" pattern="\d{5,5}(-\d{4,4})?" title="<?php _e( '5 digit zip code, numbers only', 'yikes-inc-easy-mailchimp-extender' ); ?>" value="<?php if ( isset( $_POST[ $field[ 'merge' ] ] ) && $form_submitted != 1 ) { echo $_POST[ $field[ 'merge' ] ]; } else { echo esc_attr( $default_value ); } ?>">
612 612
 
613 613
 									<!-- description -->
614
-									<?php if( isset( $field['description'] ) ) { ?>
614
+									<?php if ( isset( $field[ 'description' ] ) ) { ?>
615 615
 										<p class="form-field-description">
616 616
 											<small>
617
-												<?php echo apply_filters( 'yikes-mailchimp-' . $field['merge'] . '-description', esc_attr( stripslashes( $field['description'] ) ), $form_id ); ?>
617
+												<?php echo apply_filters( 'yikes-mailchimp-' . $field[ 'merge' ] . '-description', esc_attr( stripslashes( $field[ 'description' ] ) ), $form_id ); ?>
618 618
 											</small>
619 619
 										</p>
620 620
 									<?php } ?>
@@ -626,28 +626,28 @@  discard block
 block discarded – undo
626 626
 
627 627
 							case 'address':
628 628
 								// required fields
629
-								$required_fields = array( 'addr1' => 'address' , 'addr2' => 'address 2', 'city' => 'city', 'state' =>'state', 'zip' =>'zip' , 'country' => 'country' );
629
+								$required_fields = array( 'addr1' => 'address', 'addr2' => 'address 2', 'city' => 'city', 'state' =>'state', 'zip' =>'zip', 'country' => 'country' );
630 630
 
631 631
 								// setup the default country value
632 632
 								$default_country = apply_filters( 'yikes-mailchimp-default-country-value', 'US' );
633 633
 
634 634
 								// store number for looping
635 635
 								$x = 1;
636
-								foreach( $required_fields as $type => $label ) {
636
+								foreach ( $required_fields as $type => $label ) {
637 637
 
638 638
 									// set the field names for the addrress fields
639
-									$field_array['name'] = 'name="'.$field[$tag].'['.$type.']'.'"';
639
+									$field_array[ 'name' ] = 'name="' . $field[ $tag ] . '[' . $type . ']' . '"';
640 640
 
641 641
 									// reset the label classes for left-half/right-half for addresses
642
-									if( isset( $label_array['class'] ) ) {
642
+									if ( isset( $label_array[ 'class' ] ) ) {
643 643
 										if ( $x % 2 == 0 ) {
644
-											$label_array['class'] = str_replace( 'field-left-half', 'field-right-half', $label_array['class'] );
644
+											$label_array[ 'class' ] = str_replace( 'field-left-half', 'field-right-half', $label_array[ 'class' ] );
645 645
 										} else {
646
-											$label_array['class'] = str_replace( 'field-right-half', 'field-left-half', $label_array['class'] );
646
+											$label_array[ 'class' ] = str_replace( 'field-right-half', 'field-left-half', $label_array[ 'class' ] );
647 647
 										}
648 648
 									}
649 649
 
650
-									switch( $type ) {
650
+									switch ( $type ) {
651 651
 
652 652
 										default:
653 653
 										case 'addr1':
@@ -656,17 +656,17 @@  discard block
 block discarded – undo
656 656
 
657 657
 
658 658
 											?>
659
-											<label for="<?php echo $field['merge']; ?>" <?php echo implode( ' ' , $label_array ); ?>>
659
+											<label for="<?php echo $field[ 'merge' ]; ?>" <?php echo implode( ' ', $label_array ); ?>>
660 660
 
661 661
 												<!-- dictate label visibility -->
662
-												<?php if( ! isset( $field['hide-label'] ) ) { ?>
663
-													<span class="<?php echo esc_attr( $field['merge'] ) . '-label'; ?>">
664
-														<?php echo ucwords( apply_filters( 'yikes-mailchimp-address-'.$type.'-label' , esc_attr( $label ) ) ); ?>
662
+												<?php if ( ! isset( $field[ 'hide-label' ] ) ) { ?>
663
+													<span class="<?php echo esc_attr( $field[ 'merge' ] ) . '-label'; ?>">
664
+														<?php echo ucwords( apply_filters( 'yikes-mailchimp-address-' . $type . '-label', esc_attr( $label ) ) ); ?>
665 665
 													</span>
666 666
 												<?php } ?>
667 667
 
668 668
 
669
-												<input <?php echo implode( ' ' , $field_array ); ?> type="text"  value="<?php if( isset( $_POST[$field['merge']] ) && $form_submitted != 1 ) { echo $_POST[$field['merge']]; } ?>">
669
+												<input <?php echo implode( ' ', $field_array ); ?> type="text"  value="<?php if ( isset( $_POST[ $field[ 'merge' ] ] ) && $form_submitted != 1 ) { echo $_POST[ $field[ 'merge' ] ]; } ?>">
670 670
 
671 671
 											</label>
672 672
 											<?php
@@ -676,16 +676,16 @@  discard block
 block discarded – undo
676 676
 										case 'state':
677 677
 
678 678
 											?>
679
-											<label for="<?php echo $field['merge']; ?>" <?php echo implode( ' ' , $label_array ); ?> data-attr-name="state-dropdown"<?php if( ! in_array( $default_country, array( 'US' ) ) ) { ?> style="display: none;"<?php } ?>>
679
+											<label for="<?php echo $field[ 'merge' ]; ?>" <?php echo implode( ' ', $label_array ); ?> data-attr-name="state-dropdown"<?php if ( ! in_array( $default_country, array( 'US' ) ) ) { ?> style="display: none;"<?php } ?>>
680 680
 
681 681
 												<!-- dictate label visibility -->
682
-												<?php if( ! isset( $field['hide-label'] ) ) { ?>
683
-													<span class="<?php echo esc_attr( $field['merge'] ) . '-label'; ?>">
684
-														<?php echo ucwords( apply_filters( 'yikes-mailchimp-address-'.$type.'-label' , esc_attr( $label ) ) ); ?>
682
+												<?php if ( ! isset( $field[ 'hide-label' ] ) ) { ?>
683
+													<span class="<?php echo esc_attr( $field[ 'merge' ] ) . '-label'; ?>">
684
+														<?php echo ucwords( apply_filters( 'yikes-mailchimp-address-' . $type . '-label', esc_attr( $label ) ) ); ?>
685 685
 													</span>
686 686
 												<?php } ?>
687 687
 
688
-												<select <?php echo implode( ' ' , $field_array ); ?>>
688
+												<select <?php echo implode( ' ', $field_array ); ?>>
689 689
 													<?php include( YIKES_MC_PATH . 'public/partials/shortcodes/templates/state-dropdown.php' ); ?>
690 690
 												</select>
691 691
 
@@ -698,15 +698,15 @@  discard block
 block discarded – undo
698 698
 										case 'zip':
699 699
 
700 700
 											?>
701
-											<label for="<?php echo $field['merge']; ?>" <?php echo implode( ' ' , $label_array ); ?> data-attr-name="zip-input"<?php if( ! in_array( $default_country, array( 'US', 'GB' ) ) ) { ?> style="display: none;"<?php } ?>>
701
+											<label for="<?php echo $field[ 'merge' ]; ?>" <?php echo implode( ' ', $label_array ); ?> data-attr-name="zip-input"<?php if ( ! in_array( $default_country, array( 'US', 'GB' ) ) ) { ?> style="display: none;"<?php } ?>>
702 702
 
703
-												<?php if( ! isset( $field['hide-label'] ) ) { ?>
704
-													<span class="<?php echo esc_attr( $field['merge'] ) . '-label'; ?>">
705
-														<?php echo ucwords( apply_filters( 'yikes-mailchimp-address-'.$type.'-label' , esc_attr( $label ) ) ); ?>
703
+												<?php if ( ! isset( $field[ 'hide-label' ] ) ) { ?>
704
+													<span class="<?php echo esc_attr( $field[ 'merge' ] ) . '-label'; ?>">
705
+														<?php echo ucwords( apply_filters( 'yikes-mailchimp-address-' . $type . '-label', esc_attr( $label ) ) ); ?>
706 706
 													</span>
707 707
 												<?php } ?>
708 708
 
709
-												<input <?php echo implode( ' ' , $field_array ); ?> type="text" pattern="<?php echo apply_filters( 'yikes-mailchimp-zip-pattern', '\d{5,5}(-\d{4,4})?' ); ?>" title="<?php _e( '5 digit zip code, numbers only' , 'yikes-inc-easy-mailchimp-extender' ); ?>" value="<?php if( isset( $_POST[$field['merge']] ) && $form_submitted != 1 ) { echo $_POST[$field['merge']]; } else { echo esc_attr( $default_value ); } ?>">
709
+												<input <?php echo implode( ' ', $field_array ); ?> type="text" pattern="<?php echo apply_filters( 'yikes-mailchimp-zip-pattern', '\d{5,5}(-\d{4,4})?' ); ?>" title="<?php _e( '5 digit zip code, numbers only', 'yikes-inc-easy-mailchimp-extender' ); ?>" value="<?php if ( isset( $_POST[ $field[ 'merge' ] ] ) && $form_submitted != 1 ) { echo $_POST[ $field[ 'merge' ] ]; } else { echo esc_attr( $default_value ); } ?>">
710 710
 
711 711
 											</label>
712 712
 											<?php
@@ -744,16 +744,16 @@  discard block
 block discarded – undo
744 744
 												$default_country = apply_filters( 'yikes-mailchimp-default-country-value', 'US' );
745 745
 											?>
746 746
 
747
-											<label for="<?php echo $field['merge']; ?>" <?php echo implode( ' ' , $label_array ); ?>>
747
+											<label for="<?php echo $field[ 'merge' ]; ?>" <?php echo implode( ' ', $label_array ); ?>>
748 748
 
749 749
 												<!-- dictate label visibility -->
750
-												<?php if( !isset( $field['hide-label'] ) ) { ?>
751
-													<span class="<?php echo esc_attr( $field['merge'] ) . '-label'; ?>">
752
-														<?php echo ucwords( apply_filters( 'yikes-mailchimp-address-'.$type.'-label' , esc_attr( $label ) ) ); ?>
750
+												<?php if ( ! isset( $field[ 'hide-label' ] ) ) { ?>
751
+													<span class="<?php echo esc_attr( $field[ 'merge' ] ) . '-label'; ?>">
752
+														<?php echo ucwords( apply_filters( 'yikes-mailchimp-address-' . $type . '-label', esc_attr( $label ) ) ); ?>
753 753
 													</span>
754 754
 												<?php } ?>
755 755
 
756
-												<select <?php echo implode( ' ' , $field_array ); ?> onchange="checkCountry(this);return false;">
756
+												<select <?php echo implode( ' ', $field_array ); ?> onchange="checkCountry(this);return false;">
757 757
 													<?php include( YIKES_MC_PATH . 'public/partials/shortcodes/templates/country-dropdown.php' ); ?>
758 758
 												</select>
759 759
 											</label>
@@ -764,10 +764,10 @@  discard block
 block discarded – undo
764 764
 								}
765 765
 
766 766
 								// description
767
-								if( isset( $field['description'] ) && trim( $field['description'] ) != '' ) { ?>
767
+								if ( isset( $field[ 'description' ] ) && trim( $field[ 'description' ] ) != '' ) { ?>
768 768
 									<p class="form-field-description">
769 769
 										<small>
770
-											<?php echo apply_filters( 'yikes-mailchimp-' . $field['merge'] . '-description', esc_attr( trim( stripslashes( $field['description'] ) ) ), $form_id ); ?>
770
+											<?php echo apply_filters( 'yikes-mailchimp-' . $field[ 'merge' ] . '-description', esc_attr( trim( stripslashes( $field[ 'description' ] ) ) ), $form_id ); ?>
771 771
 										</small>
772 772
 									</p>
773 773
 									<?php }
@@ -777,19 +777,19 @@  discard block
 block discarded – undo
777 777
 							case 'birthday':
778 778
 
779 779
 								// bootstrap datepicker requirements
780
-								wp_enqueue_script( 'bootstrap-hover-dropdown' , YIKES_MC_URL . 'public/js/bootstrap-hover-dropdown.min.js' , array( 'jquery' ) );
781
-								wp_enqueue_script( 'bootstrap-datepicker-script' , YIKES_MC_URL . 'public/js/bootstrap-datepicker.min.js' , array( 'jquery' , 'bootstrap-hover-dropdown' ) );
782
-								wp_enqueue_style( 'bootstrap-datepicker-styles' , YIKES_MC_URL . 'public/css/bootstrap-datepicker3.standalone.min.css' );
783
-								wp_enqueue_style( 'override-datepicker-styles' , YIKES_MC_URL . 'public/css/yikes-inc-easy-mailchimp-datepicker-styles.css' , array( 'bootstrap-datepicker-styles' ) );
780
+								wp_enqueue_script( 'bootstrap-hover-dropdown', YIKES_MC_URL . 'public/js/bootstrap-hover-dropdown.min.js', array( 'jquery' ) );
781
+								wp_enqueue_script( 'bootstrap-datepicker-script', YIKES_MC_URL . 'public/js/bootstrap-datepicker.min.js', array( 'jquery', 'bootstrap-hover-dropdown' ) );
782
+								wp_enqueue_style( 'bootstrap-datepicker-styles', YIKES_MC_URL . 'public/css/bootstrap-datepicker3.standalone.min.css' );
783
+								wp_enqueue_style( 'override-datepicker-styles', YIKES_MC_URL . 'public/css/yikes-inc-easy-mailchimp-datepicker-styles.css', array( 'bootstrap-datepicker-styles' ) );
784 784
 
785
-								switch ( $field['type'] ) {
785
+								switch ( $field[ 'type' ] ) {
786 786
 									default:
787 787
 									case 'date':
788
-										$date_format = ( isset( $field['date_format'] ) ) ? $field['date_format'] : 'mm/dd/yy';
788
+										$date_format = ( isset( $field[ 'date_format' ] ) ) ? $field[ 'date_format' ] : 'mm/dd/yy';
789 789
 										break;
790 790
 
791 791
 									case 'birthday':
792
-										$date_format = ( isset( $field['date_format'] ) ) ? $field['date_format'] : 'mm/dd';
792
+										$date_format = ( isset( $field[ 'date_format' ] ) ) ? $field[ 'date_format' ] : 'mm/dd';
793 793
 										break;
794 794
 								}
795 795
 								// initialize the datepicker
@@ -800,7 +800,7 @@  discard block
 block discarded – undo
800 800
 											padding: .85em .5em !important;
801 801
 										}
802 802
 										<?php
803
-											if( wp_is_mobile() ) {
803
+											if ( wp_is_mobile() ) {
804 804
 												?>
805 805
 												.datepicker-dropdown {
806 806
 													margin-top: 0px;
@@ -836,10 +836,10 @@  discard block
 block discarded – undo
836 836
 												numberOfMonths: 1,
837 837
 												today: '<?php _e( 'Today', 'yikes-inc-easy-mailchimp-extender' ); ?>'
838 838
 											};
839
-											jQuery('input[data-attr-type="<?php echo $field['type']; ?>"]').datepicker().on( 'show', function( e ) {
840
-												var date_picker_height = jQuery('input[data-attr-type="<?php echo $field['type']; ?>"]').css( 'height' );
839
+											jQuery('input[data-attr-type="<?php echo $field[ 'type' ]; ?>"]').datepicker().on( 'show', function( e ) {
840
+												var date_picker_height = jQuery('input[data-attr-type="<?php echo $field[ 'type' ]; ?>"]').css( 'height' );
841 841
 												date_picker_height = parseInt( date_picker_height.replace( 'px', '' ) ) + parseInt( 15 ) + 'px';
842
-												var date_picker_width = jQuery('input[data-attr-type="<?php echo $field['type']; ?>"]').css( 'width' ).replace( 'px', '' );
842
+												var date_picker_width = jQuery('input[data-attr-type="<?php echo $field[ 'type' ]; ?>"]').css( 'width' ).replace( 'px', '' );
843 843
 												if( date_picker_width > 500 ) {
844 844
 													date_picker_width = 500;
845 845
 												}
@@ -849,27 +849,27 @@  discard block
 block discarded – undo
849 849
 									</script>
850 850
 								<?php
851 851
 
852
-								$default_value = ( isset( $field['default'] ) ? esc_attr( $field['default'] ) : '' );
852
+								$default_value = ( isset( $field[ 'default' ] ) ? esc_attr( $field[ 'default' ] ) : '' );
853 853
 								// store empty number for looping
854 854
 								$x = 0;
855 855
 
856 856
 								?>
857
-									<label for="<?php echo esc_attr( $field['merge'] ); ?>" <?php echo implode( ' ' , $label_array ); ?>>
857
+									<label for="<?php echo esc_attr( $field[ 'merge' ] ); ?>" <?php echo implode( ' ', $label_array ); ?>>
858 858
 
859 859
 										<!-- dictate label visibility -->
860
-										<?php if( !isset( $field['hide-label'] ) ) { ?>
861
-											<span class="<?php echo esc_attr( $field['merge'] ) . '-label'; ?>">
862
-												<?php echo apply_filters( 'yikes-mailchimp-'.$field['merge'].'-label' , esc_attr( stripslashes( $field['label'] ) ) ); ?>
860
+										<?php if ( ! isset( $field[ 'hide-label' ] ) ) { ?>
861
+											<span class="<?php echo esc_attr( $field[ 'merge' ] ) . '-label'; ?>">
862
+												<?php echo apply_filters( 'yikes-mailchimp-' . $field[ 'merge' ] . '-label', esc_attr( stripslashes( $field[ 'label' ] ) ) ); ?>
863 863
 											</span>
864 864
 										<?php } ?>
865 865
 
866
-										<input <?php echo implode( ' ' , $field_array ); ?> type="text" <?php if( $field['type'] == 'date' ) { ?> data-attr-type="date" <?php } else { ?> data-attr-type="birthday" <?php } ?> placeholder="<?php echo esc_attr( $field['placeholder'] ); ?>" value="<?php if( isset( $_POST[$field['merge']] ) && $form_submitted != 1 ) { echo $_POST[$field['merge']]; } else { echo esc_attr( $default_value ); } ?>">
866
+										<input <?php echo implode( ' ', $field_array ); ?> type="text" <?php if ( $field[ 'type' ] == 'date' ) { ?> data-attr-type="date" <?php } else { ?> data-attr-type="birthday" <?php } ?> placeholder="<?php echo esc_attr( $field[ 'placeholder' ] ); ?>" value="<?php if ( isset( $_POST[ $field[ 'merge' ] ] ) && $form_submitted != 1 ) { echo $_POST[ $field[ 'merge' ] ]; } else { echo esc_attr( $default_value ); } ?>">
867 867
 
868 868
 										<!-- description -->
869
-										<?php if( isset( $field['description'] ) && trim( $field['description'] ) != '' ) { ?>
869
+										<?php if ( isset( $field[ 'description' ] ) && trim( $field[ 'description' ] ) != '' ) { ?>
870 870
 											<p class="form-field-description">
871 871
 												<small>
872
-													<?php echo apply_filters( 'yikes-mailchimp-' . $field['merge'] . '-description', esc_attr( trim( stripslashes( $field['description'] ) ) ), $form_id ); ?>
872
+													<?php echo apply_filters( 'yikes-mailchimp-' . $field[ 'merge' ] . '-description', esc_attr( trim( stripslashes( $field[ 'description' ] ) ) ), $form_id ); ?>
873 873
 												</small>
874 874
 											</p>
875 875
 										<?php } ?>
@@ -880,36 +880,36 @@  discard block
 block discarded – undo
880 880
 							break;
881 881
 
882 882
 							case 'dropdown':
883
-								$default_value = $field['default_choice'];
883
+								$default_value = $field[ 'default_choice' ];
884 884
 								// store empty number for looping
885 885
 								$x = 0;
886 886
 								// hidden labels
887 887
 
888 888
 									?>
889
-									<label for="<?php echo esc_attr( $field['merge'] ); ?>" <?php echo implode( ' ' , $label_array ); ?>>
889
+									<label for="<?php echo esc_attr( $field[ 'merge' ] ); ?>" <?php echo implode( ' ', $label_array ); ?>>
890 890
 										<!-- dictate label visibility -->
891
-										<?php if( ! isset( $field['hide-label'] ) ) { ?>
892
-											<span class="<?php echo esc_attr( $field['merge'] ) . '-label'; ?>">
893
-												<?php echo apply_filters( 'yikes-mailchimp-'.$field['merge'].'-label' , esc_attr( stripslashes( $field['label'] ) ) ); ?>
891
+										<?php if ( ! isset( $field[ 'hide-label' ] ) ) { ?>
892
+											<span class="<?php echo esc_attr( $field[ 'merge' ] ) . '-label'; ?>">
893
+												<?php echo apply_filters( 'yikes-mailchimp-' . $field[ 'merge' ] . '-label', esc_attr( stripslashes( $field[ 'label' ] ) ) ); ?>
894 894
 											</span>
895 895
 										<?php } ?>
896 896
 
897
-										<select <?php echo implode( ' ' , $field_array ); ?>>
897
+										<select <?php echo implode( ' ', $field_array ); ?>>
898 898
 											<?php
899 899
 												// decode for looping
900
-												$choices = json_decode( $field['choices'], true );
901
-												foreach( $choices as $choice ) {
902
-													?><option value="<?php echo $choice; ?>" <?php selected( $default_value , $x ); ?>><?php echo esc_attr( stripslashes( $choice ) ); ?></option><?php
900
+												$choices = json_decode( $field[ 'choices' ], true );
901
+												foreach ( $choices as $choice ) {
902
+													?><option value="<?php echo $choice; ?>" <?php selected( $default_value, $x ); ?>><?php echo esc_attr( stripslashes( $choice ) ); ?></option><?php
903 903
 													$x++;
904 904
 												}
905 905
 											?>
906 906
 										</select>
907 907
 
908 908
 										<!-- description -->
909
-										<?php if( isset( $field['description'] ) && trim( $field['description'] ) != '' ) { ?>
909
+										<?php if ( isset( $field[ 'description' ] ) && trim( $field[ 'description' ] ) != '' ) { ?>
910 910
 											<p class="form-field-description">
911 911
 												<small>
912
-													<?php echo apply_filters( 'yikes-mailchimp-' . $field['merge'] . '-description', esc_attr( trim( stripslashes( $field['description'] ) ) ), $form_id ); ?>
912
+													<?php echo apply_filters( 'yikes-mailchimp-' . $field[ 'merge' ] . '-description', esc_attr( trim( stripslashes( $field[ 'description' ] ) ) ), $form_id ); ?>
913 913
 												</small>
914 914
 											</p>
915 915
 										<?php } ?>
@@ -923,13 +923,13 @@  discard block
 block discarded – undo
923 923
 							case 'radio':
924 924
 							case 'checkbox':
925 925
 								// remove the ID (as to not assign the same ID to every radio button)
926
-								unset( $field_array['id'] );
927
-								$choices = json_decode( $field['choices'], true );
926
+								unset( $field_array[ 'id' ] );
927
+								$choices = json_decode( $field[ 'choices' ], true );
928 928
 								// assign a default choice
929
-								$default_value = ( isset( $field['default_choice'] ) && $field['default_choice'] != '' ) ? $field['default_choice'] : $choices[0];
929
+								$default_value = ( isset( $field[ 'default_choice' ] ) && $field[ 'default_choice' ] != '' ) ? $field[ 'default_choice' ] : $choices[ 0 ];
930 930
 								// if the form was submit, but failed, let's reset the post data
931
-								if( isset( $_POST[$field['merge']] ) && $form_submitted != 1 ) {
932
-									$default_value = $_POST[$field['merge']];
931
+								if ( isset( $_POST[ $field[ 'merge' ] ] ) && $form_submitted != 1 ) {
932
+									$default_value = $_POST[ $field[ 'merge' ] ];
933 933
 								}
934 934
 								$count = count( $choices );
935 935
 								$i = 1;
@@ -938,20 +938,20 @@  discard block
 block discarded – undo
938 938
 								// hidden labels
939 939
 
940 940
 									?>
941
-									<label for="<?php echo esc_attr( $field['merge'] ); ?>" <?php echo implode( ' ' , $label_array ); ?>>
941
+									<label for="<?php echo esc_attr( $field[ 'merge' ] ); ?>" <?php echo implode( ' ', $label_array ); ?>>
942 942
 
943 943
 										<!-- dictate label visibility -->
944
-										<?php if( ! isset( $field['hide-label'] ) ) { ?>
945
-											<span class="<?php echo esc_attr( $field['merge'] ). '-label'; ?> checkbox-parent-label">
946
-												<?php echo apply_filters( 'yikes-mailchimp-'.$field['merge'].'-label' , esc_attr( stripslashes( $field['label'] ) ) ); ?>
944
+										<?php if ( ! isset( $field[ 'hide-label' ] ) ) { ?>
945
+											<span class="<?php echo esc_attr( $field[ 'merge' ] ) . '-label'; ?> checkbox-parent-label">
946
+												<?php echo apply_filters( 'yikes-mailchimp-' . $field[ 'merge' ] . '-label', esc_attr( stripslashes( $field[ 'label' ] ) ) ); ?>
947 947
 											</span>
948 948
 										<?php }
949 949
 
950
-										foreach( $choices as $choice ) {
950
+										foreach ( $choices as $choice ) {
951 951
 											?>
952
-											<label for="<?php echo esc_attr( $field['merge'] ) . '-' . $i; ?>" class="yikes-easy-mc-checkbox-label <?php echo implode( ' ' , $custom_classes ); if( $i === $count ) { ?> last-selection<?php } ?>" <?php if( $i == 1 ) { echo $field_array['required']; } ?>>
953
-												<input type="<?php echo esc_attr( $field['type'] ); ?>" name="<?php echo $field['merge']; ?>" id="<?php echo $field['merge'] . '-' . $i; ?>" <?php checked( $default_value , $x ); ?> value="<?php echo esc_attr( $choice ); ?>">
954
-												<span class="<?php echo esc_attr( $field['merge'] ). '-label'; ?>"><?php echo stripslashes( $choice ); ?></span>
952
+											<label for="<?php echo esc_attr( $field[ 'merge' ] ) . '-' . $i; ?>" class="yikes-easy-mc-checkbox-label <?php echo implode( ' ', $custom_classes ); if ( $i === $count ) { ?> last-selection<?php } ?>" <?php if ( $i == 1 ) { echo $field_array[ 'required' ]; } ?>>
953
+												<input type="<?php echo esc_attr( $field[ 'type' ] ); ?>" name="<?php echo $field[ 'merge' ]; ?>" id="<?php echo $field[ 'merge' ] . '-' . $i; ?>" <?php checked( $default_value, $x ); ?> value="<?php echo esc_attr( $choice ); ?>">
954
+												<span class="<?php echo esc_attr( $field[ 'merge' ] ) . '-label'; ?>"><?php echo stripslashes( $choice ); ?></span>
955 955
 											</label>
956 956
 											<?php
957 957
 											$i++;
@@ -959,10 +959,10 @@  discard block
 block discarded – undo
959 959
 										}
960 960
 
961 961
 										// description
962
-										if( isset( $field['description'] ) && trim( $field['description'] ) != '' ) { ?>
962
+										if ( isset( $field[ 'description' ] ) && trim( $field[ 'description' ] ) != '' ) { ?>
963 963
 											<p class="form-field-description">
964 964
 												<small>
965
-													<?php echo apply_filters( 'yikes-mailchimp-' . $field['merge'] . '-description', esc_attr( trim( stripslashes( $field['description'] ) ) ), $form_id ); ?>
965
+													<?php echo apply_filters( 'yikes-mailchimp-' . $field[ 'merge' ] . '-description', esc_attr( trim( stripslashes( $field[ 'description' ] ) ) ), $form_id ); ?>
966 966
 												</small>
967 967
 											</p>
968 968
 										<?php } ?>
@@ -978,26 +978,26 @@  discard block
 block discarded – undo
978 978
 
979 979
 
980 980
 						// store default choice
981
-						$default_choice = ( isset( $field['default_choice'] ) && ! empty( $field['default_choice'] ) ) ? ( is_array( $field['default_choice'] ) ? $field['default_choice'] : $field['default_choice'] ) : ( isset( $field['default_choice'] ) ? $field['default_choice'] : '' );
981
+						$default_choice = ( isset( $field[ 'default_choice' ] ) && ! empty( $field[ 'default_choice' ] ) ) ? ( is_array( $field[ 'default_choice' ] ) ? $field[ 'default_choice' ] : $field[ 'default_choice' ] ) : ( isset( $field[ 'default_choice' ] ) ? $field[ 'default_choice' ] : '' );
982 982
 
983 983
 						// if the form was submit, but failed, let's reset the post data
984
-						if( isset( $_POST[$field['group_id']] ) && $form_submitted != 1 ) {
985
-							$default_choice = $_POST[$field['group_id']];
984
+						if ( isset( $_POST[ $field[ 'group_id' ] ] ) && $form_submitted != 1 ) {
985
+							$default_choice = $_POST[ $field[ 'group_id' ] ];
986 986
 						}
987 987
 
988 988
 						// get our groups
989
-						$groups = ( isset( $field['groups'] ) && ! empty( $field['groups'] ) ) ? json_decode( $field['groups'], true ) : array();
989
+						$groups = ( isset( $field[ 'groups' ] ) && ! empty( $field[ 'groups' ] ) ) ? json_decode( $field[ 'groups' ], true ) : array();
990 990
 
991 991
 						$count = count( $groups );
992 992
 
993
-						if( $field['type'] == 'checkboxes' ) {
993
+						if ( $field[ 'type' ] == 'checkboxes' ) {
994 994
 							$type = 'checkbox';
995
-						} else if( $field['type'] == 'radio' ) {
995
+						} else if ( $field[ 'type' ] == 'radio' ) {
996 996
 							$type = 'radio';
997 997
 						}
998 998
 
999 999
 						// loop over the interest group field types
1000
-						switch ( $field['type'] ) {
1000
+						switch ( $field[ 'type' ] ) {
1001 1001
 
1002 1002
 							case 'checkboxes':
1003 1003
 							case 'radio':
@@ -1005,18 +1005,18 @@  discard block
 block discarded – undo
1005 1005
 								$x = 1; // used to find the last item of our array
1006 1006
 
1007 1007
 									?>
1008
-									<label for="<?php echo esc_attr( $field['group_id'] ); ?>" <?php echo implode( ' ' , $label_array ); ?>>
1009
-										<?php if( ! isset( $field['hide-label'] ) ) { ?>
1008
+									<label for="<?php echo esc_attr( $field[ 'group_id' ] ); ?>" <?php echo implode( ' ', $label_array ); ?>>
1009
+										<?php if ( ! isset( $field[ 'hide-label' ] ) ) { ?>
1010 1010
 											<!-- dictate label visibility -->
1011
-											<span class="<?php echo esc_attr( $field['group_id'] ) . '-label'; ?> checkbox-parent-label">
1012
-												<?php echo apply_filters( 'yikes-mailchimp-'.$field['group_id'].'-label' , esc_attr( $field['label'] ) ); ?>
1011
+											<span class="<?php echo esc_attr( $field[ 'group_id' ] ) . '-label'; ?> checkbox-parent-label">
1012
+												<?php echo apply_filters( 'yikes-mailchimp-' . $field[ 'group_id' ] . '-label', esc_attr( $field[ 'label' ] ) ); ?>
1013 1013
 											</span>
1014 1014
 									<?php
1015 1015
 										}
1016 1016
 
1017 1017
 										// Display Submission Errors
1018
-										if( ! empty( $missing_required_checkbox_interest_groups ) ) {
1019
-											if( in_array( $field['group_id'], $missing_required_checkbox_interest_groups ) ) {
1018
+										if ( ! empty( $missing_required_checkbox_interest_groups ) ) {
1019
+											if ( in_array( $field[ 'group_id' ], $missing_required_checkbox_interest_groups ) ) {
1020 1020
 												?>
1021 1021
 													<p class="yikes-mailchimp-required-interest-group-error">
1022 1022
 														<?php echo apply_filters( 'yikes-mailchimp-interest-group-checkbox-error', __( 'This field is required.', 'yikes-inc-easy-mailchimp-extender' ), $form_id ); ?>
@@ -1027,19 +1027,19 @@  discard block
 block discarded – undo
1027 1027
 
1028 1028
 
1029 1029
 
1030
-										foreach( $groups as $group ) {
1031
-											if( $field['type'] == 'checkboxes' ) {
1030
+										foreach ( $groups as $group ) {
1031
+											if ( $field[ 'type' ] == 'checkboxes' ) {
1032 1032
 												/* Setup the defaults for this field - varies if the field was previously submitted */
1033
-												if( isset( $_POST[$field['group_id']] ) && $form_submitted != 1 ) {
1034
-													$default_choice = $_POST[$field['group_id']];
1035
-												} elseif( ( ! isset( $_POST['yikes-mailchimp-honeypot'] ) && $form_submitted != 1 ) || ( isset( $_POST['yikes-mailchimp-honeypot'] ) && $form_submitted == 1 ) ) {
1036
-													$default_choice = ( isset( $field['default_choice'] ) && ! empty( $field['default_choice'] ) ) ? ( is_array( $field['default_choice'] ) ? $field['default_choice'] : $field['default_choice'] ) : array();
1033
+												if ( isset( $_POST[ $field[ 'group_id' ] ] ) && $form_submitted != 1 ) {
1034
+													$default_choice = $_POST[ $field[ 'group_id' ] ];
1035
+												} elseif ( ( ! isset( $_POST[ 'yikes-mailchimp-honeypot' ] ) && $form_submitted != 1 ) || ( isset( $_POST[ 'yikes-mailchimp-honeypot' ] ) && $form_submitted == 1 ) ) {
1036
+													$default_choice = ( isset( $field[ 'default_choice' ] ) && ! empty( $field[ 'default_choice' ] ) ) ? ( is_array( $field[ 'default_choice' ] ) ? $field[ 'default_choice' ] : $field[ 'default_choice' ] ) : array();
1037 1037
 												}
1038 1038
 											}
1039 1039
 											?>
1040
-											<label for="<?php echo $field['group_id'] . '-' . $i; ?>" class="yikes-easy-mc-checkbox-label <?php echo implode( ' ' , $custom_classes ); if( $x === $count ) { ?> last-selection<?php } ?>">
1041
-												<input <?php if( isset( $field['require'] ) && $field['require'] == 1 ) { ?> class="yikes-interest-group-required" <?php } ?> type="<?php echo $type; ?>" name="<?php echo $field['group_id']; ?>[]" id="<?php echo $field['group_id'] . '-' . $i; ?>" <?php if( $field['type'] == 'checkboxes' ) { if( ( ( isset( $_POST['yikes-mailchimp-honeypot' ] ) && $form_submitted == 1 && in_array( $i , $default_choice )) || ! isset( $_POST['yikes-mailchimp-honeypot' ] ) && $form_submitted != 1 && in_array( $i , $default_choice ) ) || ( ( $form_submitted != 1 && isset( $_POST[$field['group_id']] ) ) && in_array( esc_attr( $group['name'] ), $default_choice ) ) ) { echo 'checked="checked"'; } } else { checked( ( isset( $default_choice ) && is_array( $default_choice ) ) ? $default_choice[0] : $default_choice , $i ); } ?> value="<?php echo esc_attr( $group['name'] ); ?>">
1042
-												<?php echo $group['name']; ?>
1040
+											<label for="<?php echo $field[ 'group_id' ] . '-' . $i; ?>" class="yikes-easy-mc-checkbox-label <?php echo implode( ' ', $custom_classes ); if ( $x === $count ) { ?> last-selection<?php } ?>">
1041
+												<input <?php if ( isset( $field[ 'require' ] ) && $field[ 'require' ] == 1 ) { ?> class="yikes-interest-group-required" <?php } ?> type="<?php echo $type; ?>" name="<?php echo $field[ 'group_id' ]; ?>[]" id="<?php echo $field[ 'group_id' ] . '-' . $i; ?>" <?php if ( $field[ 'type' ] == 'checkboxes' ) { if ( ( ( isset( $_POST[ 'yikes-mailchimp-honeypot' ] ) && $form_submitted == 1 && in_array( $i, $default_choice ) ) || ! isset( $_POST[ 'yikes-mailchimp-honeypot' ] ) && $form_submitted != 1 && in_array( $i, $default_choice ) ) || ( ( $form_submitted != 1 && isset( $_POST[ $field[ 'group_id' ] ] ) ) && in_array( esc_attr( $group[ 'name' ] ), $default_choice ) ) ) { echo 'checked="checked"'; } } else { checked( ( isset( $default_choice ) && is_array( $default_choice ) ) ? $default_choice[ 0 ] : $default_choice, $i ); } ?> value="<?php echo esc_attr( $group[ 'name' ] ); ?>">
1042
+												<?php echo $group[ 'name' ]; ?>
1043 1043
 											</label>
1044 1044
 											<?php
1045 1045
 											$i++;
@@ -1047,10 +1047,10 @@  discard block
 block discarded – undo
1047 1047
 										}
1048 1048
 
1049 1049
 										// description
1050
-										if( isset( $field['description'] ) && trim( $field['description'] ) != '' ) { ?>
1050
+										if ( isset( $field[ 'description' ] ) && trim( $field[ 'description' ] ) != '' ) { ?>
1051 1051
 											<p class="form-field-description">
1052 1052
 												<small>
1053
-													<?php echo apply_filters( 'yikes-mailchimp-' . $field['group_id'] . '-description', esc_attr( trim( $field['description'] ) ), $form_id ); ?>
1053
+													<?php echo apply_filters( 'yikes-mailchimp-' . $field[ 'group_id' ] . '-description', esc_attr( trim( $field[ 'description' ] ) ), $form_id ); ?>
1054 1054
 												</small>
1055 1055
 											</p>
1056 1056
 										<?php } ?>
@@ -1064,28 +1064,28 @@  discard block
 block discarded – undo
1064 1064
 
1065 1065
 									?>
1066 1066
 
1067
-									<label for="<?php echo esc_attr( $field['group_id'] ); ?>" <?php echo implode( ' ' , $label_array ); ?>>
1067
+									<label for="<?php echo esc_attr( $field[ 'group_id' ] ); ?>" <?php echo implode( ' ', $label_array ); ?>>
1068 1068
 										<!-- dictate label visibility -->
1069
-										<?php if( ! isset( $field['hide-label'] ) ) { ?>
1070
-											<span class="<?php echo esc_attr( $field['group_id'] ) . '-label'; ?>">
1071
-												<?php echo apply_filters( 'yikes-mailchimp-'.$field['group_id'].'-label' , esc_attr( $field['label'] ) ); ?>
1069
+										<?php if ( ! isset( $field[ 'hide-label' ] ) ) { ?>
1070
+											<span class="<?php echo esc_attr( $field[ 'group_id' ] ) . '-label'; ?>">
1071
+												<?php echo apply_filters( 'yikes-mailchimp-' . $field[ 'group_id' ] . '-label', esc_attr( $field[ 'label' ] ) ); ?>
1072 1072
 											</span>
1073 1073
 										<?php } ?>
1074 1074
 
1075
-										<select <?php echo implode( ' ' , $field_array ); ?>>
1075
+										<select <?php echo implode( ' ', $field_array ); ?>>
1076 1076
 											<?php
1077 1077
 												$i = 0;
1078
-												foreach( $groups as $group ) {
1079
-													?><option <?php selected( $i , $default_choice ); ?> value="<?php echo $group['name']; ?>"><?php echo esc_attr( $group['name'] ); ?></option><?php
1078
+												foreach ( $groups as $group ) {
1079
+													?><option <?php selected( $i, $default_choice ); ?> value="<?php echo $group[ 'name' ]; ?>"><?php echo esc_attr( $group[ 'name' ] ); ?></option><?php
1080 1080
 													$i++;
1081 1081
 												}
1082 1082
 											?>
1083 1083
 										</select>
1084 1084
 
1085
-										<?php if( isset( $field['description'] ) && trim( $field['description'] ) != '' ) { ?>
1085
+										<?php if ( isset( $field[ 'description' ] ) && trim( $field[ 'description' ] ) != '' ) { ?>
1086 1086
 											<p class="form-field-description">
1087 1087
 												<small>
1088
-													<?php echo apply_filters( 'yikes-mailchimp-' . $field['group_id'] . '-description', esc_attr( trim( $field['description'] ) ), $form_id ); ?>
1088
+													<?php echo apply_filters( 'yikes-mailchimp-' . $field[ 'group_id' ] . '-description', esc_attr( trim( $field[ 'description' ] ) ), $form_id ); ?>
1089 1089
 												</small>
1090 1090
 											</p>
1091 1091
 										<?php } ?>
@@ -1102,21 +1102,21 @@  discard block
 block discarded – undo
1102 1102
 
1103 1103
 									?>
1104 1104
 
1105
-									<label for="<?php echo esc_attr( $field['group_id'] ); ?>" <?php echo implode( ' ' , $label_array ); ?>>
1105
+									<label for="<?php echo esc_attr( $field[ 'group_id' ] ); ?>" <?php echo implode( ' ', $label_array ); ?>>
1106 1106
 
1107 1107
 										<!-- dictate label visibility -->
1108
-										<?php if( ! isset( $field['hide-label'] ) ) { ?>
1109
-											<span class="<?php echo esc_attr( $field['group_id'] ) . '-label'; ?> checkbox-parent-label" style="display:none;">
1110
-												<?php echo apply_filters( 'yikes-mailchimp-'.$field['group_id'].'-label' , esc_attr( stripslashes( $field['label'] ) ) ); ?>
1108
+										<?php if ( ! isset( $field[ 'hide-label' ] ) ) { ?>
1109
+											<span class="<?php echo esc_attr( $field[ 'group_id' ] ) . '-label'; ?> checkbox-parent-label" style="display:none;">
1110
+												<?php echo apply_filters( 'yikes-mailchimp-' . $field[ 'group_id' ] . '-label', esc_attr( stripslashes( $field[ 'label' ] ) ) ); ?>
1111 1111
 											</span>
1112 1112
 										<?php }
1113 1113
 
1114 1114
 
1115
-										foreach( $groups as $group ) {
1115
+										foreach ( $groups as $group ) {
1116 1116
 											?>
1117
-											<label for="<?php echo $field['group_id'] . '-' . $i; ?>" class="yikes-easy-mc-checkbox-label <?php echo implode( ' ' , $custom_classes ); if( $x === $count ) { ?> last-selection<?php } ?>" style="display:none;">
1118
-												<input type="radio" name="<?php echo $field['group_id']; ?>[]" id="<?php echo $field['group_id'] . '-' . $i; ?>" <?php if( $field['type'] == 'checkboxes' ) { if( in_array( $i , $default_choice ) ) { echo 'checked="checked"'; } } else { checked( ( isset( $default_choice ) && is_array( $default_choice ) ) ? $default_choice[0] : $default_choice , $i ); } ?> value="<?php echo esc_attr( $group['name'] ); ?>">
1119
-												<?php echo esc_attr( stripslashes( str_replace( '' , '\'', $group['name'] ) ) ); ?>
1117
+											<label for="<?php echo $field[ 'group_id' ] . '-' . $i; ?>" class="yikes-easy-mc-checkbox-label <?php echo implode( ' ', $custom_classes ); if ( $x === $count ) { ?> last-selection<?php } ?>" style="display:none;">
1118
+												<input type="radio" name="<?php echo $field[ 'group_id' ]; ?>[]" id="<?php echo $field[ 'group_id' ] . '-' . $i; ?>" <?php if ( $field[ 'type' ] == 'checkboxes' ) { if ( in_array( $i, $default_choice ) ) { echo 'checked="checked"'; } } else { checked( ( isset( $default_choice ) && is_array( $default_choice ) ) ? $default_choice[ 0 ] : $default_choice, $i ); } ?> value="<?php echo esc_attr( $group[ 'name' ] ); ?>">
1119
+												<?php echo esc_attr( stripslashes( str_replace( '', '\'', $group[ 'name' ] ) ) ); ?>
1120 1120
 											</label>
1121 1121
 											<?php
1122 1122
 											$i++;
@@ -1124,10 +1124,10 @@  discard block
 block discarded – undo
1124 1124
 										}
1125 1125
 
1126 1126
 										// description
1127
-										if( isset( $field['description'] ) && trim( $field['description'] ) != '' ) { ?>
1127
+										if ( isset( $field[ 'description' ] ) && trim( $field[ 'description' ] ) != '' ) { ?>
1128 1128
 											<p class="form-field-description">
1129 1129
 												<small>
1130
-													<?php echo apply_filters( 'yikes-mailchimp-' . $field['group_id'] . '-description', esc_attr( trim( stripslashes( $field['description'] ) ) ), $form_id ); ?>
1130
+													<?php echo apply_filters( 'yikes-mailchimp-' . $field[ 'group_id' ] . '-description', esc_attr( trim( stripslashes( $field[ 'description' ] ) ) ), $form_id ); ?>
1131 1131
 												</small>
1132 1132
 											</p>
1133 1133
 										<?php }
@@ -1144,11 +1144,11 @@  discard block
 block discarded – undo
1144 1144
 				do_action( 'yikes-mailchimp-additional-form-fields', $form_data );
1145 1145
 
1146 1146
 				/* if we've enabled reCAPTCHA protection */
1147
-				if( isset( $recaptcha_box ) ) {
1147
+				if ( isset( $recaptcha_box ) ) {
1148 1148
 					echo $recaptcha_box;
1149 1149
 				}
1150
-				if( is_user_logged_in() ) {
1151
-					$admin_class = ( current_user_can( apply_filters( 'yikes-mailchimp-user-role-access' , 'manage_options' ) ) ) ? ' admin-logged-in' : '';
1150
+				if ( is_user_logged_in() ) {
1151
+					$admin_class = ( current_user_can( apply_filters( 'yikes-mailchimp-user-role-access', 'manage_options' ) ) ) ? ' admin-logged-in' : '';
1152 1152
 				} else {
1153 1153
 					$admin_class = '';
1154 1154
 				}
@@ -1158,23 +1158,23 @@  discard block
 block discarded – undo
1158 1158
 				<input type="hidden" name="yikes-mailchimp-honeypot" id="yikes-mailchimp-honeypot" value="">
1159 1159
 
1160 1160
 				<!-- List ID -->
1161
-				<input type="hidden" name="yikes-mailchimp-associated-list-id" id="yikes-mailchimp-associated-list-id" value="<?php echo $form_settings['list_id']; ?>">
1161
+				<input type="hidden" name="yikes-mailchimp-associated-list-id" id="yikes-mailchimp-associated-list-id" value="<?php echo $form_settings[ 'list_id' ]; ?>">
1162 1162
 
1163 1163
 				<!-- Form that is being submitted! Used to display error/success messages above the correct form -->
1164 1164
 				<input type="hidden" name="yikes-mailchimp-submitted-form" id="yikes-mailchimp-submitted-form" value="<?php echo $form_id; ?>">
1165 1165
 
1166 1166
 				<!-- Submit Button -->
1167 1167
 				<?php
1168
-					if( $form_inline ) {
1168
+					if ( $form_inline ) {
1169 1169
 						echo '<label class="empty-form-inline-label submit-button-inline-label"><span class="empty-label">&nbsp;</span>';
1170 1170
 					}
1171 1171
 					// display the image or text based button
1172
-					if( $submit_button_type == 'text' ) {
1173
-						echo apply_filters( 'yikes-mailchimp-form-submit-button', '<button type="submit" class="' . apply_filters( 'yikes-mailchimp-form-submit-button-classes', 'yikes-easy-mc-submit-button yikes-easy-mc-submit-button-' . esc_attr( $form_data['id'] ) . ' btn btn-primary' . $submit_button_classes . $admin_class, $form_data['id'] ) . '">' .  apply_filters( 'yikes-mailchimp-form-submit-button-text', esc_attr( stripslashes( $submit ) ), $form_data['id'] ) . '</button>', $form_data['id'] );
1172
+					if ( $submit_button_type == 'text' ) {
1173
+						echo apply_filters( 'yikes-mailchimp-form-submit-button', '<button type="submit" class="' . apply_filters( 'yikes-mailchimp-form-submit-button-classes', 'yikes-easy-mc-submit-button yikes-easy-mc-submit-button-' . esc_attr( $form_data[ 'id' ] ) . ' btn btn-primary' . $submit_button_classes . $admin_class, $form_data[ 'id' ] ) . '">' . apply_filters( 'yikes-mailchimp-form-submit-button-text', esc_attr( stripslashes( $submit ) ), $form_data[ 'id' ] ) . '</button>', $form_data[ 'id' ] );
1174 1174
 					} else {
1175
-						echo apply_filters( 'yikes-mailchimp-form-submit-button', '<input type="image" alt="' . apply_filters( 'yikes-mailchimp-form-submit-button-text', esc_attr( stripslashes( $submit ) ), $form_data['id'] ) . '" src="' . $submit_button_image . '" class="' . apply_filters( 'yikes-mailchimp-form-submit-button-classes', 'yikes-easy-mc-submit-button yikes-easy-mc-submit-button-image yikes-easy-mc-submit-button-' . esc_attr( $form_data['id'] ) . ' btn btn-primary' . $submit_button_classes . $admin_class, $form_data['id'] ) . '">', $form_data['id'] );
1175
+						echo apply_filters( 'yikes-mailchimp-form-submit-button', '<input type="image" alt="' . apply_filters( 'yikes-mailchimp-form-submit-button-text', esc_attr( stripslashes( $submit ) ), $form_data[ 'id' ] ) . '" src="' . $submit_button_image . '" class="' . apply_filters( 'yikes-mailchimp-form-submit-button-classes', 'yikes-easy-mc-submit-button yikes-easy-mc-submit-button-image yikes-easy-mc-submit-button-' . esc_attr( $form_data[ 'id' ] ) . ' btn btn-primary' . $submit_button_classes . $admin_class, $form_data[ 'id' ] ) . '">', $form_data[ 'id' ] );
1176 1176
 					}
1177
-					if( $form_inline ) {
1177
+					if ( $form_inline ) {
1178 1178
 						echo '</label>';
1179 1179
 					}
1180 1180
 				?>
@@ -1186,8 +1186,8 @@  discard block
 block discarded – undo
1186 1186
 
1187 1187
 		<?php
1188 1188
 			/* If the current user is logged in, and an admin...lets display our 'Edit Form' link */
1189
-			if( is_user_logged_in() ) {
1190
-				if( current_user_can( apply_filters( 'yikes-mailchimp-user-role-access' , 'manage_options' ) ) ) {
1189
+			if ( is_user_logged_in() ) {
1190
+				if ( current_user_can( apply_filters( 'yikes-mailchimp-user-role-access', 'manage_options' ) ) ) {
1191 1191
 					echo $edit_form_link;
1192 1192
 				}
1193 1193
 			}
@@ -1202,16 +1202,16 @@  discard block
 block discarded – undo
1202 1202
 		*	Update the impressions count
1203 1203
 		*	for non-admins
1204 1204
 		*/
1205
-		if( !current_user_can( 'manage_options' ) ) {
1206
-			$form_data['impressions']++;
1205
+		if ( ! current_user_can( 'manage_options' ) ) {
1206
+			$form_data[ 'impressions' ]++;
1207 1207
 			$wpdb->update(
1208 1208
 				$wpdb->prefix . 'yikes_easy_mc_forms',
1209 1209
 					array(
1210
-						'impressions' => $form_data['impressions'],
1210
+						'impressions' => $form_data[ 'impressions' ],
1211 1211
 					),
1212 1212
 					array( 'ID' => $form ),
1213 1213
 					array(
1214
-						'%d',	// send welcome email
1214
+						'%d', // send welcome email
1215 1215
 					),
1216 1216
 					array( '%d' )
1217 1217
 				);
Please login to merge, or discard this patch.