Completed
Pull Request — master (#811)
by
unknown
09:59 queued 07:34
created
yikes-inc-easy-mailchimp-extender.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -43,7 +43,7 @@
 block discarded – undo
43 43
  * 	@since 6.1.3
44 44
  */
45 45
 if ( ! defined( 'YIKES_MC_VERSION' ) ) {
46
-	define( 'YIKES_MC_VERSION' , '6.5.1' );
46
+	define( 'YIKES_MC_VERSION', '6.5.1' );
47 47
 }
48 48
 
49 49
 /**
Please login to merge, or discard this patch.
public/partials/shortcodes/process_form_shortcode.php 1 patch
Spacing   +284 added lines, -284 removed lines patch added patch discarded remove patch
@@ -30,39 +30,39 @@  discard block
 block discarded – undo
30 30
 	$form_submitted = isset( $form_submitted ) ? $form_submitted : 0;
31 31
 
32 32
 	/* If the user hasn't authenticated yet, lets kill off */
33
-	if ( get_option( 'yikes-mc-api-validation' , 'invalid_api_key' ) != 'valid_api_key' ) {
34
-		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>';
33
+	if ( get_option( 'yikes-mc-api-validation', 'invalid_api_key' ) != 'valid_api_key' ) {
34
+		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>';
35 35
 	}
36 36
 
37 37
 	// if the user forgot to specify a form ID, lets kill of and warn them.
38
-	if( ! $atts['form'] ) {
38
+	if ( ! $atts[ 'form' ] ) {
39 39
 		return __( 'Whoops, it looks like you forgot to specify a form to display.', 'yikes-inc-easy-mailchimp-extender' );
40 40
 	}
41 41
 
42 42
 	// store our variables
43
-	$form_id   = (int) $atts['form']; // form id (the id of the form in the database)
43
+	$form_id   = (int) $atts[ 'form' ]; // form id (the id of the form in the database)
44 44
 	$interface = yikes_easy_mailchimp_extender_get_form_interface();
45 45
 	$form_data = $interface->get_form( $form_id );
46 46
 
47 47
 	// confirm we have some results, or return an error
48 48
 	if ( empty( $form_data ) ) {
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' );
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
 
57 57
 		// Allow users to manually set recaptcha (instead of globally - recaptcha="1"/recaptcha="0" - but still needs to be globally enabled on the settings page).
58
-		if ( $atts['recaptcha'] != '0' ) {
58
+		if ( $atts[ 'recaptcha' ] != '0' ) {
59 59
 
60 60
 			// If either of the Private the Secret key is left blank, we should display an error back to the user.
61
-			if ( get_option( 'yikes-mc-recaptcha-site-key' , '' ) == '' ) {
62
-				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
+			if ( get_option( 'yikes-mc-recaptcha-site-key', '' ) == '' ) {
62
+				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>';
63 63
 			}
64
-			if ( get_option( 'yikes-mc-recaptcha-secret-key' , '' ) == '' ) {
65
-				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
+			if ( get_option( 'yikes-mc-recaptcha-secret-key', '' ) == '' ) {
65
+				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>';
66 66
 			}
67 67
 
68 68
 			$has_recaptcha = true;
@@ -72,13 +72,13 @@  discard block
 block discarded – undo
72 72
 			$locale_split = explode( '_', $locale );
73 73
 
74 74
 			// Setup reCAPTCHA parameters.
75
-			$lang       = ! empty( $locale_split ) ? $locale_split[0] : $locale;
76
-			$lang       = ! empty( $atts['recaptcha_lang'] ) ? $atts['recaptcha_lang'] : $lang;
77
-			$type       = ! empty( $atts['recaptcha_type'] ) ? strtolower( $atts['recaptcha_type'] ) : 'image'; // setup recaptcha type
78
-			$theme      = ! empty( $atts['recaptcha_theme'] ) ? strtolower( $atts['recaptcha_theme'] ) : 'light'; // setup recaptcha theme
79
-			$size       = ! empty( $atts['recaptcha_size'] ) ? strtolower( $atts['recaptcha_size'] ) : 'normal'; // setup recaptcha size
80
-			$data_cb    = ! empty( $atts['recaptcha_data_callback'] ) ? $atts['recaptcha_data_callback'] : false; // setup recaptcha size
81
-			$expired_cb = ! empty( $atts['recaptcha_expired_callback'] ) ? $atts['recaptcha_expired_callback'] : false; // setup recaptcha size
75
+			$lang       = ! empty( $locale_split ) ? $locale_split[ 0 ] : $locale;
76
+			$lang       = ! empty( $atts[ 'recaptcha_lang' ] ) ? $atts[ 'recaptcha_lang' ] : $lang;
77
+			$type       = ! empty( $atts[ 'recaptcha_type' ] ) ? strtolower( $atts[ 'recaptcha_type' ] ) : 'image'; // setup recaptcha type
78
+			$theme      = ! empty( $atts[ 'recaptcha_theme' ] ) ? strtolower( $atts[ 'recaptcha_theme' ] ) : 'light'; // setup recaptcha theme
79
+			$size       = ! empty( $atts[ 'recaptcha_size' ] ) ? strtolower( $atts[ 'recaptcha_size' ] ) : 'normal'; // setup recaptcha size
80
+			$data_cb    = ! empty( $atts[ 'recaptcha_data_callback' ] ) ? $atts[ 'recaptcha_data_callback' ] : false; // setup recaptcha size
81
+			$expired_cb = ! empty( $atts[ 'recaptcha_expired_callback' ] ) ? $atts[ 'recaptcha_expired_callback' ] : false; // setup recaptcha size
82 82
 
83 83
 			// Pass the shortcode parameters through a filter.
84 84
 			$recaptcha_shortcode_params = apply_filters( 'yikes-mailchimp-recaptcha-parameters', array(
@@ -88,49 +88,49 @@  discard block
 block discarded – undo
88 88
 				'size'             => $size,
89 89
 				'success_callback' => $data_cb,
90 90
 				'expired_callback' => $expired_cb,
91
-			), $atts['form'] );
91
+			), $atts[ 'form' ] );
92 92
 
93 93
 			// Enqueue Google recaptcha JS.
94
-			wp_register_script( 'google-recaptcha-js' , 'https://www.google.com/recaptcha/api.js?hl=' . $recaptcha_shortcode_params['language'] . '&onload=renderReCaptchaCallback&render=explicit', array( 'jquery', 'form-submission-helpers' ) , 'all' );
94
+			wp_register_script( 'google-recaptcha-js', 'https://www.google.com/recaptcha/api.js?hl=' . $recaptcha_shortcode_params[ 'language' ] . '&onload=renderReCaptchaCallback&render=explicit', array( 'jquery', 'form-submission-helpers' ), 'all' );
95 95
 			wp_enqueue_script( 'google-recaptcha-js' );
96 96
 
97
-			$recaptcha_site_key = get_option( 'yikes-mc-recaptcha-site-key' , '' );
98
-			$recaptcha_box      = '<div class="g-recaptcha" data-sitekey="' . esc_attr( $recaptcha_site_key ) . '" data-theme="' . esc_attr( $recaptcha_shortcode_params['theme'] ) . '" data-type="' . esc_attr( $recaptcha_shortcode_params['type'] ) . '" data-size="' . esc_attr( $recaptcha_shortcode_params['size'] ) . '" data-callback="' . esc_attr( $recaptcha_shortcode_params['success_callback'] ) . '" data-expired-callback="' . esc_attr( $recaptcha_shortcode_params['expired_callback'] ) . '"></div>';
97
+			$recaptcha_site_key = get_option( 'yikes-mc-recaptcha-site-key', '' );
98
+			$recaptcha_box      = '<div class="g-recaptcha" data-sitekey="' . esc_attr( $recaptcha_site_key ) . '" data-theme="' . esc_attr( $recaptcha_shortcode_params[ 'theme' ] ) . '" data-type="' . esc_attr( $recaptcha_shortcode_params[ 'type' ] ) . '" data-size="' . esc_attr( $recaptcha_shortcode_params[ 'size' ] ) . '" data-callback="' . esc_attr( $recaptcha_shortcode_params[ 'success_callback' ] ) . '" data-expired-callback="' . esc_attr( $recaptcha_shortcode_params[ 'expired_callback' ] ) . '"></div>';
99 99
 		}
100 100
 	}
101 101
 
102 102
 	// place our results into a separate variable for easy looping
103
-	$additional_form_settings = ( isset( $form_data['form_settings'] ) ) ? $form_data['form_settings'] : false;
103
+	$additional_form_settings = ( isset( $form_data[ 'form_settings' ] ) ) ? $form_data[ 'form_settings' ] : false;
104 104
 	
105 105
 	// store our options from the additional form settings array
106
-	$form_classes = ( $additional_form_settings ) ? $additional_form_settings['yikes-easy-mc-form-class-names'] : '';
107
-	$inline_form = ( $additional_form_settings ) ? $additional_form_settings['yikes-easy-mc-inline-form'] : '';
108
-	$submit_button_type = ( $additional_form_settings ) ? $additional_form_settings['yikes-easy-mc-submit-button-type'] : 'text';
109
-	$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' );
110
-	$submit_button_image = ( $additional_form_settings ) ? esc_url( $additional_form_settings['yikes-easy-mc-submit-button-image'] ) : '';
111
-	$submit_button_classes = ( $additional_form_settings ) ? ' ' . esc_attr( $additional_form_settings['yikes-easy-mc-submit-button-classes'] ) : '';
106
+	$form_classes = ( $additional_form_settings ) ? $additional_form_settings[ 'yikes-easy-mc-form-class-names' ] : '';
107
+	$inline_form = ( $additional_form_settings ) ? $additional_form_settings[ 'yikes-easy-mc-inline-form' ] : '';
108
+	$submit_button_type = ( $additional_form_settings ) ? $additional_form_settings[ 'yikes-easy-mc-submit-button-type' ] : 'text';
109
+	$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' );
110
+	$submit_button_image = ( $additional_form_settings ) ? esc_url( $additional_form_settings[ 'yikes-easy-mc-submit-button-image' ] ) : '';
111
+	$submit_button_classes = ( $additional_form_settings ) ? ' ' . esc_attr( $additional_form_settings[ 'yikes-easy-mc-submit-button-classes' ] ) : '';
112 112
 
113 113
 	// scheuldes
114
-	$form_schedule_state = ( $additional_form_settings ) ? $additional_form_settings['yikes-easy-mc-form-schedule'] : false;
115
-	$form_schedule_start = ( $additional_form_settings ) ? $additional_form_settings['yikes-easy-mc-form-restriction-start'] : '';;
116
-	$form_schedule_end = ( $additional_form_settings ) ? $additional_form_settings['yikes-easy-mc-form-restriction-end'] : '';
117
-	$form_pending_message = ( $additional_form_settings ) ? $additional_form_settings['yikes-easy-mc-form-restriction-pending-message'] : '';
118
-	$form_expired_message = ( $additional_form_settings ) ? $additional_form_settings['yikes-easy-mc-form-restriction-expired-message'] : '';
114
+	$form_schedule_state = ( $additional_form_settings ) ? $additional_form_settings[ 'yikes-easy-mc-form-schedule' ] : false;
115
+	$form_schedule_start = ( $additional_form_settings ) ? $additional_form_settings[ 'yikes-easy-mc-form-restriction-start' ] : ''; ;
116
+	$form_schedule_end = ( $additional_form_settings ) ? $additional_form_settings[ 'yikes-easy-mc-form-restriction-end' ] : '';
117
+	$form_pending_message = ( $additional_form_settings ) ? $additional_form_settings[ 'yikes-easy-mc-form-restriction-pending-message' ] : '';
118
+	$form_expired_message = ( $additional_form_settings ) ? $additional_form_settings[ 'yikes-easy-mc-form-restriction-expired-message' ] : '';
119 119
 
120 120
 	// register required
121
-	$form_login_required = ( $additional_form_settings ) ? $additional_form_settings['yikes-easy-mc-form-login-required'] : false;
122
-	$form_login_message = ( $additional_form_settings ) ? $additional_form_settings['yikes-easy-mc-form-restriction-login-message'] : '';
121
+	$form_login_required = ( $additional_form_settings ) ? $additional_form_settings[ 'yikes-easy-mc-form-login-required' ] : false;
122
+	$form_login_message = ( $additional_form_settings ) ? $additional_form_settings[ 'yikes-easy-mc-form-restriction-login-message' ] : '';
123 123
 
124 124
 	// store number of fields
125
-	$field_count = (int) count( $form_data['fields'] );
125
+	$field_count = (int) count( $form_data[ 'fields' ] );
126 126
 
127 127
 	// confirm we actually have fields, before looping
128
-	if ( isset( $form_data['fields'] ) && ! empty( $form_data['fields'] ) ) {
128
+	if ( isset( $form_data[ 'fields' ] ) && ! empty( $form_data[ 'fields' ] ) ) {
129 129
 		// loop over each field, if it's set to hidden -- subtract it from the field count
130 130
 		// this throws off the layout for inline forms setup below
131
-		foreach ( $form_data['fields'] as $form_field ) {
132
-			if ( isset( $form_field['hide'] ) && (string) $form_field['hide'] === '1' ) {
133
-				$field_count --;
131
+		foreach ( $form_data[ 'fields' ] as $form_field ) {
132
+			if ( isset( $form_field[ 'hide' ] ) && (string) $form_field[ 'hide' ] === '1' ) {
133
+				$field_count--;
134 134
 			}
135 135
 		}
136 136
 	}
@@ -139,8 +139,8 @@  discard block
 block discarded – undo
139 139
 	*	If login is required, abort
140 140
 	*	@since 6.0.3.8
141 141
 	*/
142
-	if( $form_login_required ) {
143
-		if( apply_filters( 'yikes-mailchimp-required-login-requirement', ! is_user_logged_in() ) ) {
142
+	if ( $form_login_required ) {
143
+		if ( apply_filters( 'yikes-mailchimp-required-login-requirement', ! is_user_logged_in() ) ) {
144 144
 			ob_start();
145 145
 				?>
146 146
 					<div class="yikes-mailchimp-login-required yikes-mailchimp-form-<?php echo $form_id; ?>-login-required">
@@ -156,19 +156,19 @@  discard block
 block discarded – undo
156 156
 	*	Check if schedule is set for this form
157 157
 	*	@since 6.0.3.8
158 158
 	*/
159
-	if( $form_schedule_state ) {
159
+	if ( $form_schedule_state ) {
160 160
 		// store current date
161 161
 		$current_date = strtotime( current_time( 'm/d/Y g:iA' ) );
162 162
 
163 163
 		// the the current date is less than the form scheduled start date
164
-		if( $current_date < $form_schedule_start ) {
164
+		if ( $current_date < $form_schedule_start ) {
165 165
 			echo apply_filters( 'yikes-mailchimp-frontend-content', $form_pending_message, $form_id, $form_schedule_start );
166 166
 			return;
167 167
 			// abort
168 168
 		}
169 169
 
170 170
 		// The current date is past or equal to the end date, aka form has now expired
171
-		if( $current_date >= $form_schedule_end ) {
171
+		if ( $current_date >= $form_schedule_end ) {
172 172
 			echo apply_filters( 'yikes-mailchimp-frontend-content', $form_expired_message, $form_id, $form_schedule_end );
173 173
 			return;
174 174
 			// abort
@@ -177,14 +177,14 @@  discard block
 block discarded – undo
177 177
 
178 178
 	// setup the submit button text
179 179
 	// shortcode parameter takes precedence over option
180
-	$submit = ( ! empty( $atts['submit'] ) ) ? $atts['submit'] : $submit_button_text;
180
+	$submit = ( ! empty( $atts[ 'submit' ] ) ) ? $atts[ 'submit' ] : $submit_button_text;
181 181
 
182 182
 	/*
183 183
 	*	Check for the constant to prevent styles from loading
184 184
 	*	to exclude styles from loading, add `define( 'YIKES_MAILCHIMP_EXCLUDE_STYLES', true );` to functions.php
185 185
 	*	@since 6.0.3.8
186 186
 	*/
187
-	if( ! defined( 'YIKES_MAILCHIMP_EXCLUDE_STYLES' ) ) {
187
+	if ( ! defined( 'YIKES_MAILCHIMP_EXCLUDE_STYLES' ) ) {
188 188
 		// enqueue the form styles
189 189
 		wp_enqueue_style( 'yikes-inc-easy-mailchimp-public-styles', YIKES_MC_URL . 'public/css/yikes-inc-easy-mailchimp-extender-public.min.css' );
190 190
 	}
@@ -192,19 +192,19 @@  discard block
 block discarded – undo
192 192
 	/**
193 193
 	*	Check for form inline parameter
194 194
 	*/
195
-	$form_inline = ( $atts['inline'] == 1 || $atts['inline'] == 'true' || get_theme_mod( 'form-inline-' . $form_id, '' ) === true ); // form-inline-{$form_id} comes from customizer extension
195
+	$form_inline = ( $atts[ 'inline' ] == 1 || $atts[ 'inline' ] == 'true' || get_theme_mod( 'form-inline-' . $form_id, '' ) === true ); // form-inline-{$form_id} comes from customizer extension
196 196
 	// recheck from our form options
197 197
 	if ( ! $form_inline ) {
198
-		$form_inline = (bool) $additional_form_settings['yikes-easy-mc-inline-form'];
198
+		$form_inline = (bool) $additional_form_settings[ 'yikes-easy-mc-inline-form' ];
199 199
 	}
200 200
 
201 201
 	/* If the current user is logged in, and an admin...lets display our 'Edit Form' link */
202
-	if( is_user_logged_in() ) {
203
-		if( current_user_can( apply_filters( 'yikes-mailchimp-user-role-access' , 'manage_options' ) ) ) {
202
+	if ( is_user_logged_in() ) {
203
+		if ( current_user_can( apply_filters( 'yikes-mailchimp-user-role-access', 'manage_options' ) ) ) {
204 204
 			$edit_form_link = '<span class="edit-link">';
205
-			$edit_form_link .= '<a class="post-edit-link" href="' . esc_url( admin_url( 'admin.php?page=yikes-mailchimp-edit-form&id=' . $atts['form'] ) ) . '" title="' . __( 'Edit' , 'yikes-inc-easy-mailchimp-extender' ) . ' ' . ucwords( $form_data['form_name'] ) . '">' . __( 'Edit Form' , 'yikes-inc-easy-mailchimp-extender' ) . '</a>';
205
+			$edit_form_link .= '<a class="post-edit-link" href="' . esc_url( admin_url( 'admin.php?page=yikes-mailchimp-edit-form&id=' . $atts[ 'form' ] ) ) . '" title="' . __( 'Edit', 'yikes-inc-easy-mailchimp-extender' ) . ' ' . ucwords( $form_data[ 'form_name' ] ) . '">' . __( 'Edit Form', 'yikes-inc-easy-mailchimp-extender' ) . '</a>';
206 206
 			$edit_form_link .= '</span>';
207
-			$edit_form_link = apply_filters( 'yikes-mailchimp-front-end-form-action-links', $edit_form_link, $atts['form'], ucwords( $form_data['form_name'] ) );
207
+			$edit_form_link = apply_filters( 'yikes-mailchimp-front-end-form-action-links', $edit_form_link, $atts[ 'form' ], ucwords( $form_data[ 'form_name' ] ) );
208 208
 		} else {
209 209
 			$edit_form_link = '';
210 210
 		}
@@ -214,16 +214,16 @@  discard block
 block discarded – undo
214 214
 	// or else MailChimp throws errors at you
215 215
 	// extract our array keys
216 216
 	// @todo Remove array_keys() and in_array() usage here.
217
-	if( isset( $form_data['fields'] ) && ! empty( $form_data['fields'] ) ) {
218
-		$array_keys = array_keys( $form_data['fields'] );
217
+	if ( isset( $form_data[ 'fields' ] ) && ! empty( $form_data[ 'fields' ] ) ) {
218
+		$array_keys = array_keys( $form_data[ 'fields' ] );
219 219
 		// check for EMAIL in that array
220
-		if( !in_array( 'EMAIL', $array_keys ) && !in_array( 'email', $array_keys ) ) {
221
-			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>';
220
+		if ( ! in_array( 'EMAIL', $array_keys ) && ! in_array( 'email', $array_keys ) ) {
221
+			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>';
222 222
 		}
223 223
 	} else {
224
-		$error = '<p>' . __( "Whoops, it looks like you forgot to assign fields to this form." , 'yikes-inc-easy-mailchimp-extender' ) . '</p>';
225
-		if( is_user_logged_in() ) {
226
-			if( current_user_can( apply_filters( 'yikes-mailchimp-user-role-access' , 'manage_options' ) ) ) {
224
+		$error = '<p>' . __( "Whoops, it looks like you forgot to assign fields to this form.", 'yikes-inc-easy-mailchimp-extender' ) . '</p>';
225
+		if ( is_user_logged_in() ) {
226
+			if ( current_user_can( apply_filters( 'yikes-mailchimp-user-role-access', 'manage_options' ) ) ) {
227 227
 				return $error . $edit_form_link;
228 228
 			}
229 229
 		} else {
@@ -325,17 +325,17 @@  discard block
 block discarded – undo
325 325
 		*	Set a custom title using custom_title="lorem ipsum" parameter in the shortcode
326 326
 		*	- This takes precedence over the title set
327 327
 		*/
328
-		if ( $atts['title'] ) {
329
-			if ( ! empty( $atts['custom_title'] ) ) {
328
+		if ( $atts[ 'title' ] ) {
329
+			if ( ! empty( $atts[ 'custom_title' ] ) ) {
330 330
 				/**
331 331
 				 * Filter the title that is displayed through the shortcode.
332 332
 				 *
333 333
 				 * @param string $title   The title to display.
334 334
 				 * @param int    $form_id The form ID.
335 335
 				 */
336
-				$title = apply_filters( 'yikes-mailchimp-form-title', apply_filters( 'the_title', $atts['custom_title'] ), $form_id );
336
+				$title = apply_filters( 'yikes-mailchimp-form-title', apply_filters( 'the_title', $atts[ 'custom_title' ] ), $form_id );
337 337
 			} else {
338
-				$title = apply_filters( 'yikes-mailchimp-form-title', apply_filters( 'the_title', $form_data['form_name'] ), $form_id );
338
+				$title = apply_filters( 'yikes-mailchimp-form-title', apply_filters( 'the_title', $form_data[ 'form_name' ] ), $form_id );
339 339
 			}
340 340
 
341 341
 			echo sprintf( '<h3 class="yikes-mailchimp-form-title yikes-mailchimp-form-title-%1$s">%2$s</h3>', $form_id, $title );
@@ -345,17 +345,17 @@  discard block
 block discarded – undo
345 345
 		*	Allow users to specify a custom description for this form, no html support
346 346
 		*	@since 6.0.3.8
347 347
 		*/
348
-		if ( $atts['description'] ) {
349
-			if ( ! empty( $atts['custom_description'] ) ) {
348
+		if ( $atts[ 'description' ] ) {
349
+			if ( ! empty( $atts[ 'custom_description' ] ) ) {
350 350
 				/**
351 351
 				 * Filter the description that is displayed through the shortcode.
352 352
 				 *
353 353
 				 * @param string $title   The title to display.
354 354
 				 * @param int    $form_id The form ID.
355 355
 				 */
356
-				$description = apply_filters( 'yikes-mailchimp-form-description', $atts['custom_description'], $form_id );
356
+				$description = apply_filters( 'yikes-mailchimp-form-description', $atts[ 'custom_description' ], $form_id );
357 357
 			} else {
358
-				$description = apply_filters( 'yikes-mailchimp-form-description', $form_data['form_description'], $form_id );
358
+				$description = apply_filters( 'yikes-mailchimp-form-description', $form_data[ 'form_description' ], $form_id );
359 359
 			}
360 360
 
361 361
 			echo sprintf( '<section class="yikes-mailchimp-form-description yikes-mailchimp-form-description-%1$s">%2$s</section>', $form_id, $description );
@@ -370,10 +370,10 @@  discard block
 block discarded – undo
370 370
 		$min = defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ? '' : '.min';
371 371
 
372 372
 		// Check for AJAX
373
-		if( ( ! empty( $atts['ajax'] ) && $atts['ajax'] == 1 ) || $form_data['submission_settings']['ajax'] == 1 ) {
373
+		if ( ( ! empty( $atts[ 'ajax' ] ) && $atts[ 'ajax' ] == 1 ) || $form_data[ 'submission_settings' ][ 'ajax' ] == 1 ) {
374 374
 
375 375
 			// Enqueue our ajax script
376
-			wp_enqueue_script( 'yikes-easy-mc-ajax' , YIKES_MC_URL . "public/js/yikes-mc-ajax-forms{$min}.js" , array( 'jquery' ), YIKES_MC_VERSION, false );
376
+			wp_enqueue_script( 'yikes-easy-mc-ajax', YIKES_MC_URL . "public/js/yikes-mc-ajax-forms{$min}.js", array( 'jquery' ), YIKES_MC_VERSION, false );
377 377
 			wp_localize_script( 'yikes-easy-mc-ajax', 'yikes_mailchimp_ajax', array(
378 378
 				'ajax_url'                      => esc_url( admin_url( 'admin-ajax.php' ) ),
379 379
 				'page_data'                     => $page_data,
@@ -404,67 +404,67 @@  discard block
 block discarded – undo
404 404
 
405 405
 		// render the form!
406 406
 		?>
407
-			<form id="<?php echo sanitize_title( $form_data['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_data['submission_settings']['hide_form_post_signup'] == 1 ) { echo ' yikes-easy-mc-display-none'; } ?>" method="POST" data-attr-form-id="<?php echo esc_attr( $form_id ); ?>">
407
+			<form id="<?php echo sanitize_title( $form_data[ '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_data[ 'submission_settings' ][ 'hide_form_post_signup' ] == 1 ) { echo ' yikes-easy-mc-display-none'; } ?>" method="POST" data-attr-form-id="<?php echo esc_attr( $form_id ); ?>">
408 408
 
409 409
 				<?php
410 410
 				// Set a default constant for hidden fields
411 411
 				$hidden_label_count = 0;
412 412
 
413 413
 				// Loop over our form fields
414
-				foreach( $form_data['fields'] as $field ) {
414
+				foreach ( $form_data[ 'fields' ] as $field ) {
415 415
 						// input array
416 416
 						$field_array = array();
417 417
 						// label array
418 418
 						$label_array = array();
419 419
 						// label classes array
420 420
 						$label_class_array = array();
421
-						if( $field['additional-classes'] != '' ) {
421
+						if ( $field[ 'additional-classes' ] != '' ) {
422 422
 							// split custom classes at spaces
423
-							$custom_classes = explode( ' ' , $field['additional-classes'] );
423
+							$custom_classes = explode( ' ', $field[ 'additional-classes' ] );
424 424
 							// check our custom class array for field-left/field-right
425 425
 							// if it's set we need to assign it to our label and remove it from the field classes
426 426
 							 // input half left
427
-							if( in_array( 'field-left-half' , $custom_classes ) ) {
427
+							if ( in_array( 'field-left-half', $custom_classes ) ) {
428 428
 								// $label_array['class'] = 'class="field-left-half"';
429
-								$label_class_array[] = 'field-left-half';
430
-								$key = array_search( 'field-left-half' , $custom_classes );
431
-								unset( $custom_classes[$key] );
429
+								$label_class_array[ ] = 'field-left-half';
430
+								$key = array_search( 'field-left-half', $custom_classes );
431
+								unset( $custom_classes[ $key ] );
432 432
 							} // input half right
433
-							if( in_array( 'field-right-half' , $custom_classes ) ) {
433
+							if ( in_array( 'field-right-half', $custom_classes ) ) {
434 434
 								// $label_array['class'] = 'class="field-right-half"';
435
-								$label_class_array[] = 'field-right-half';
436
-								$key = array_search( 'field-right-half' , $custom_classes );
437
-								unset( $custom_classes[$key] );
435
+								$label_class_array[ ] = 'field-right-half';
436
+								$key = array_search( 'field-right-half', $custom_classes );
437
+								unset( $custom_classes[ $key ] );
438 438
 							} // input thirds (1/3 width, floated left)
439
-							if( in_array( 'field-third' , $custom_classes ) ) {
439
+							if ( in_array( 'field-third', $custom_classes ) ) {
440 440
 								// $label_array['class'] = 'class="field-third"';
441
-								$label_class_array[] = 'field-third';
442
-								$key = array_search( 'field-third' , $custom_classes );
443
-								unset( $custom_classes[$key] );
441
+								$label_class_array[ ] = 'field-third';
442
+								$key = array_search( 'field-third', $custom_classes );
443
+								unset( $custom_classes[ $key ] );
444 444
 							} // 2 column radio
445
-							if( in_array( 'option-2-col' , $custom_classes ) ) {
445
+							if ( in_array( 'option-2-col', $custom_classes ) ) {
446 446
 								// $label_array['class'] = 'class="option-2-col"';
447
-								$label_class_array[] = 'option-2-col';
448
-								$key = array_search( 'option-2-col' , $custom_classes );
449
-								unset( $custom_classes[$key] );
447
+								$label_class_array[ ] = 'option-2-col';
448
+								$key = array_search( 'option-2-col', $custom_classes );
449
+								unset( $custom_classes[ $key ] );
450 450
 							} // 3 column radio
451
-							if( in_array( 'option-3-col' , $custom_classes ) ) {
451
+							if ( in_array( 'option-3-col', $custom_classes ) ) {
452 452
 								// $label_array['class'] = 'class="option-3-col"';
453
-								$label_class_array[] = 'option-3-col';
454
-								$key = array_search( 'option-3-col' , $custom_classes );
455
-								unset( $custom_classes[$key] );
453
+								$label_class_array[ ] = 'option-3-col';
454
+								$key = array_search( 'option-3-col', $custom_classes );
455
+								unset( $custom_classes[ $key ] );
456 456
 							} // 4 column radio
457
-							if( in_array( 'option-4-col' , $custom_classes ) ) {
457
+							if ( in_array( 'option-4-col', $custom_classes ) ) {
458 458
 								// $label_array['class'] = 'class="option-4-col"';
459
-								$label_class_array[] = 'option-4-col';
460
-								$key = array_search( 'option-4-col' , $custom_classes );
461
-								unset( $custom_classes[$key] );
459
+								$label_class_array[ ] = 'option-4-col';
460
+								$key = array_search( 'option-4-col', $custom_classes );
461
+								unset( $custom_classes[ $key ] );
462 462
 							} // inline radio & checkboxes etc
463
-							if( in_array( 'option-inline' , $custom_classes ) ) {
463
+							if ( in_array( 'option-inline', $custom_classes ) ) {
464 464
 								// $label_array['class'] = 'class="option-inline"';
465
-								$label_class_array[] = 'option-inline';
466
-								$key = array_search( 'option-inline' , $custom_classes );
467
-								unset( $custom_classes[$key] );
465
+								$label_class_array[ ] = 'option-inline';
466
+								$key = array_search( 'option-inline', $custom_classes );
467
+								unset( $custom_classes[ $key ] );
468 468
 							}
469 469
 						} else {
470 470
 							$custom_classes = array();
@@ -472,19 +472,19 @@  discard block
 block discarded – undo
472 472
 
473 473
 						// if the form is set to inline, add the inline class to our labels
474 474
 						// since @6.0.3.8
475
-						if( $form_inline ) {
476
-							$label_class_array[] = 'label-inline';
475
+						if ( $form_inline ) {
476
+							$label_class_array[ ] = 'label-inline';
477 477
 						}
478 478
 
479
-						if( isset( $field['hide-label'] ) ) {
480
-							if( absint( $field['hide-label'] ) === 1 ) {
479
+						if ( isset( $field[ 'hide-label' ] ) ) {
480
+							if ( absint( $field[ 'hide-label' ] ) === 1 ) {
481 481
 								$hidden_label_count++;
482
-								$custom_classes[] = 'field-no-label';
482
+								$custom_classes[ ] = 'field-no-label';
483 483
 							}
484 484
 						}
485 485
 
486 486
 					/* Store tag variable based on field type */
487
-					if( isset( $field['merge'] ) ) {
487
+					if ( isset( $field[ 'merge' ] ) ) {
488 488
 						$group = '';
489 489
 						$tag = 'merge';
490 490
 					} else {
@@ -494,28 +494,28 @@  discard block
 block discarded – undo
494 494
 
495 495
 					// build up our array
496 496
 					$field_id_string   = 'yikes-easy-mc-form-' . $form_id . '-' . $field[ $tag ];
497
-					$field_array['id'] = 'id="' . esc_attr( $field_id_string ) . '" ';
498
-					$field_array['name'] = 'name="' . $group . esc_attr( $field[ $tag ] ) . '" ';
499
-					$field_array['placeholder'] = isset( $field['placeholder'] ) ? 'placeholder="' . esc_attr( stripslashes( $field['placeholder'] ) ) . '" ' : '';
500
-					$field_array['classes'] = 'class="yikes-easy-mc-'.$field['type'] . ' ' .  esc_attr( trim( implode( ' ' , $custom_classes ) ) ) . '" ';
497
+					$field_array[ 'id' ] = 'id="' . esc_attr( $field_id_string ) . '" ';
498
+					$field_array[ 'name' ] = 'name="' . $group . esc_attr( $field[ $tag ] ) . '" ';
499
+					$field_array[ 'placeholder' ] = isset( $field[ 'placeholder' ] ) ? 'placeholder="' . esc_attr( stripslashes( $field[ 'placeholder' ] ) ) . '" ' : '';
500
+					$field_array[ 'classes' ] = 'class="yikes-easy-mc-' . $field[ 'type' ] . ' ' . esc_attr( trim( implode( ' ', $custom_classes ) ) ) . '" ';
501 501
 
502 502
 					// email must always be required and visible
503
-					if( $field['type'] == 'email' ) {
504
-						$field_array['required'] = 'required="required"';
505
-						$label_array['visible'] = '';
506
-						$label_class_array[] = $field['merge'] . '-label';
507
-						$label_class_array[] = 'yikes-mailchimp-field-required';
503
+					if ( $field[ 'type' ] == 'email' ) {
504
+						$field_array[ 'required' ] = 'required="required"';
505
+						$label_array[ 'visible' ] = '';
506
+						$label_class_array[ ] = $field[ 'merge' ] . '-label';
507
+						$label_class_array[ ] = 'yikes-mailchimp-field-required';
508 508
 					} else {
509
-						$field_array['required'] = isset( $field['require'] ) ? 'required="required"' : '';
510
-						$label_array['visible'] = isset( $field['hide'] ) ? 'style="display:none;"' : '';
511
-						$label_class_array[] = ( $tag === 'merge' ) ? $field['merge'] . '-label' : $field['group_id'] . '-label';
512
-						if ( isset( $field['require'] ) ) $label_class_array[] = 'yikes-mailchimp-field-required';
509
+						$field_array[ 'required' ] = isset( $field[ 'require' ] ) ? 'required="required"' : '';
510
+						$label_array[ 'visible' ] = isset( $field[ 'hide' ] ) ? 'style="display:none;"' : '';
511
+						$label_class_array[ ] = ( $tag === 'merge' ) ? $field[ 'merge' ] . '-label' : $field[ 'group_id' ] . '-label';
512
+						if ( isset( $field[ 'require' ] ) ) $label_class_array[ ] = 'yikes-mailchimp-field-required';
513 513
 					}
514 514
 
515 515
 					// if both hide label and hide field are checked, we gotta hide the field!
516
-					if( isset( $field['hide' ] ) && $field['hide'] == 1 ) {
517
-						if( isset( $field['hide-label' ] ) && $field['hide-label'] == 1 ) {
518
-							$field_array['visible'] = 'style="display:none;"';
516
+					if ( isset( $field[ 'hide' ] ) && $field[ 'hide' ] == 1 ) {
517
+						if ( isset( $field[ 'hide-label' ] ) && $field[ 'hide-label' ] == 1 ) {
518
+							$field_array[ 'visible' ] = 'style="display:none;"';
519 519
 						}
520 520
 					}
521 521
 
@@ -523,20 +523,20 @@  discard block
 block discarded – undo
523 523
 					$label_class_array = function_exists( 'sanitize_html_class' ) ? array_map( 'sanitize_html_class', $label_class_array ) : $label_class_array;
524 524
 
525 525
 					// Turn the clases into a string
526
-					$label_array['classes'] = 'class="' . implode( ' ', $label_class_array ) . ' "';
526
+					$label_array[ 'classes' ] = 'class="' . implode( ' ', $label_class_array ) . ' "';
527 527
 
528 528
 					// Filter the field array data
529 529
 					$field_array = apply_filters( 'yikes-mailchimp-field-data', $field_array, $field, $form_id );
530 530
 
531 531
 					/* Loop Over Standard Fields (aka merge variables) */
532
-					if( isset( $field['merge'] ) ) {
532
+					if ( isset( $field[ 'merge' ] ) ) {
533 533
 
534 534
 						// Handle the Description logic in one spot, here:
535
-						$show_description = isset( $field['description'] ) && trim( $field['description'] ) !== '' ? true : false;
536
-						$description_above = isset( $field['description_above'] ) && $field['description_above'] === '1' ? true : false;
535
+						$show_description = isset( $field[ 'description' ] ) && trim( $field[ 'description' ] ) !== '' ? true : false;
536
+						$description_above = isset( $field[ 'description_above' ] ) && $field[ 'description_above' ] === '1' ? true : false;
537 537
 						if ( $show_description === true ) {
538
-							$description = '<p class="form-field-description" id="form-field-description-' . $field['merge'] . '">';
539
-							$description .= apply_filters( 'yikes-mailchimp-' . $field['merge'] . '-description', esc_attr( stripslashes( $field['description'] ) ), $form_id );
538
+							$description = '<p class="form-field-description" id="form-field-description-' . $field[ 'merge' ] . '">';
539
+							$description .= apply_filters( 'yikes-mailchimp-' . $field[ 'merge' ] . '-description', esc_attr( stripslashes( $field[ 'description' ] ) ), $form_id );
540 540
 							$description .= '</p>';
541 541
 
542 542
 							/**
@@ -548,11 +548,11 @@  discard block
 block discarded – undo
548 548
 							*	@param string | $field['description']	| The field's description text
549 549
 							*	@param int	  | $form_id
550 550
 							*/
551
-							$description = apply_filters( 'yikes-mailchimp-' . $field['merge'] . '-description-html', $description, esc_attr( stripslashes( $field['description'] ) ), $form_id );
551
+							$description = apply_filters( 'yikes-mailchimp-' . $field[ 'merge' ] . '-description-html', $description, esc_attr( stripslashes( $field[ 'description' ] ) ), $form_id );
552 552
 						}
553 553
 
554 554
 						// loop over our fields by Type
555
-						switch ( $field['type'] ) {
555
+						switch ( $field[ 'type' ] ) {
556 556
 
557 557
 							default:
558 558
 							case 'email':
@@ -560,24 +560,24 @@  discard block
 block discarded – undo
560 560
 							case 'number':
561 561
 
562 562
 								// pass our default value through our filter to parse dynamic data by tag (used solely for 'text' type)
563
-								$default_value = ( isset( $field['default'] ) ? esc_attr( $field['default'] ) : '' );
563
+								$default_value = ( isset( $field[ 'default' ] ) ? esc_attr( $field[ 'default' ] ) : '' );
564 564
 								$default_value = apply_filters( 'yikes-mailchimp-process-default-tag', $default_value );
565
-								$default_value = apply_filters( 'yikes-mailchimp-' . $field['merge'] . '-default-value', $default_value, $field, $form_id );
565
+								$default_value = apply_filters( 'yikes-mailchimp-' . $field[ 'merge' ] . '-default-value', $default_value, $field, $form_id );
566 566
 
567 567
 									?>
568
-									<label for="<?php echo esc_attr( $field_id_string ); ?>" <?php echo implode( ' ' , $label_array ); ?>>
568
+									<label for="<?php echo esc_attr( $field_id_string ); ?>" <?php echo implode( ' ', $label_array ); ?>>
569 569
 
570 570
 										<!-- dictate label visibility -->
571
-										<?php if( !isset( $field['hide-label'] ) ) { ?>
572
-											<span class="<?php echo esc_attr( $field['merge'] ) . '-label'; ?>">
573
-												<?php if( ! isset( $field['hide-label'] ) ) { echo apply_filters( 'yikes-mailchimp-'.$field['merge'].'-label' , esc_attr( stripslashes( $field['label'] ) ), $form_id ); } ?>
571
+										<?php if ( ! isset( $field[ 'hide-label' ] ) ) { ?>
572
+											<span class="<?php echo esc_attr( $field[ 'merge' ] ) . '-label'; ?>">
573
+												<?php if ( ! isset( $field[ 'hide-label' ] ) ) { echo apply_filters( 'yikes-mailchimp-' . $field[ 'merge' ] . '-label', esc_attr( stripslashes( $field[ 'label' ] ) ), $form_id ); } ?>
574 574
 											</span>
575 575
 										<?php } ?>
576 576
 
577 577
 										<!-- Description Above -->
578 578
 										<?php if ( $show_description === true && $description_above === true ) { echo $description; } ?>
579 579
 
580
-										<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 esc_attr( $_POST[$field['merge']] ); } else { echo esc_attr( $default_value ); } ?>">
580
+										<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 esc_attr( $_POST[ $field[ 'merge' ] ] ); } else { echo esc_attr( $default_value ); } ?>">
581 581
 
582 582
 										<!-- Description Below -->
583 583
 										<?php if ( $show_description === true && $description_above === false ) { echo $description; } ?>
@@ -589,23 +589,23 @@  discard block
 block discarded – undo
589 589
 
590 590
 							case 'url':
591 591
 							case 'imageurl':
592
-								$default_value = ( isset( $field['default'] ) ) ? $field['default'] : '';
593
-								$default_value = apply_filters( 'yikes-mailchimp-' . $field['merge'] . '-default-value', $default_value, $field, $form_id );
592
+								$default_value = ( isset( $field[ 'default' ] ) ) ? $field[ 'default' ] : '';
593
+								$default_value = apply_filters( 'yikes-mailchimp-' . $field[ 'merge' ] . '-default-value', $default_value, $field, $form_id );
594 594
 									?>
595 595
 
596
-									<label for="<?php echo esc_attr( $field_id_string ); ?>" <?php echo implode( ' ' , $label_array ); ?>>
596
+									<label for="<?php echo esc_attr( $field_id_string ); ?>" <?php echo implode( ' ', $label_array ); ?>>
597 597
 
598 598
 										<!-- dictate label visibility -->
599
-										<?php if( !isset( $field['hide-label'] ) ) { ?>
600
-											<span class="<?php echo esc_attr( $field['merge'] ) . '-label'; ?>">
601
-												<?php echo apply_filters( 'yikes-mailchimp-' . $field['merge'] . '-label' , esc_attr( stripslashes( $field['label'] ) ) ); ?>
599
+										<?php if ( ! isset( $field[ 'hide-label' ] ) ) { ?>
600
+											<span class="<?php echo esc_attr( $field[ 'merge' ] ) . '-label'; ?>">
601
+												<?php echo apply_filters( 'yikes-mailchimp-' . $field[ 'merge' ] . '-label', esc_attr( stripslashes( $field[ 'label' ] ) ) ); ?>
602 602
 											</span>
603 603
 										<?php } ?>
604 604
 
605 605
 										<!-- Description Above -->
606 606
 										<?php if ( $show_description === true && $description_above === true ) { echo $description; } ?>
607 607
 
608
-										<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 esc_attr( $_POST[$field['merge']] ); } else { echo esc_attr( $default_value ); } ?>" >
608
+										<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 esc_attr( $_POST[ $field[ 'merge' ] ] ); } else { echo esc_attr( $default_value ); } ?>" >
609 609
 
610 610
 										<!-- Description Below -->
611 611
 										<?php if ( $show_description === true && $description_above === false ) { echo $description; } ?>
@@ -616,24 +616,24 @@  discard block
 block discarded – undo
616 616
 							break;
617 617
 
618 618
 							case 'phone':
619
-								$default_value = ( isset( $field['default'] ) ? esc_attr( $field['default'] ) : '' );
620
-								$default_value = apply_filters( 'yikes-mailchimp-' . $field['merge'] . '-default-value', $default_value, $field, $form_id );
621
-								$phone_format = $field['phone_format'];
619
+								$default_value = ( isset( $field[ 'default' ] ) ? esc_attr( $field[ 'default' ] ) : '' );
620
+								$default_value = apply_filters( 'yikes-mailchimp-' . $field[ 'merge' ] . '-default-value', $default_value, $field, $form_id );
621
+								$phone_format = $field[ 'phone_format' ];
622 622
 								?>
623 623
 
624
-									<label for="<?php echo esc_attr( $field_id_string ) ?>" <?php echo implode( ' ' , $label_array ); ?>>
624
+									<label for="<?php echo esc_attr( $field_id_string ) ?>" <?php echo implode( ' ', $label_array ); ?>>
625 625
 
626 626
 										<!-- dictate label visibility -->
627
-										<?php if( !isset( $field['hide-label'] ) ) { ?>
628
-											<span class="<?php echo esc_attr( $field['merge'] ) . '-label'; ?>">
629
-												<?php echo apply_filters( 'yikes-mailchimp-' . $field['merge'] . '-label' , esc_attr( stripslashes( $field['label'] ) ) ); ?>
627
+										<?php if ( ! isset( $field[ 'hide-label' ] ) ) { ?>
628
+											<span class="<?php echo esc_attr( $field[ 'merge' ] ) . '-label'; ?>">
629
+												<?php echo apply_filters( 'yikes-mailchimp-' . $field[ 'merge' ] . '-label', esc_attr( stripslashes( $field[ 'label' ] ) ) ); ?>
630 630
 											</span>
631 631
 										<?php } ?>
632 632
 
633 633
 										<!-- Description Above -->
634 634
 										<?php if ( $show_description === true && $description_above === true ) { echo $description; } ?>
635 635
 
636
-										<input <?php echo implode( ' ' , $field_array ); ?> type="text" <?php if( $phone_format != 'US' ) { ?> data-phone-type="international" 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' ); ?>" data-phone-type="us" pattern="<?php echo apply_filters( 'yikes-mailchimp-us-phone-pattern' , '^(\([0-9]{3}\)|[0-9]{3}-)[0-9]{3}-[0-9]{4}$' ); ?>" <?php } ?> value="<?php if( isset( $_POST[$field['merge']] ) && $form_submitted != 1 ) { echo esc_attr( $_POST[$field['merge']] ); } else { echo esc_attr( $default_value ); } ?>">
636
+										<input <?php echo implode( ' ', $field_array ); ?> type="text" <?php if ( $phone_format != 'US' ) { ?> data-phone-type="international" 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' ); ?>" data-phone-type="us" pattern="<?php echo apply_filters( 'yikes-mailchimp-us-phone-pattern', '^(\([0-9]{3}\)|[0-9]{3}-)[0-9]{3}-[0-9]{4}$' ); ?>" <?php } ?> value="<?php if ( isset( $_POST[ $field[ 'merge' ] ] ) && $form_submitted != 1 ) { echo esc_attr( $_POST[ $field[ 'merge' ] ] ); } else { echo esc_attr( $default_value ); } ?>">
637 637
 
638 638
 										<!-- Description Below -->
639 639
 										<?php if ( $show_description === true && $description_above === false ) { echo $description; } ?>
@@ -643,23 +643,23 @@  discard block
 block discarded – undo
643 643
 							break;
644 644
 
645 645
 							case 'zip':
646
-								$default_value = ( isset( $field['default'] ) ? esc_attr( $field['default'] ) : '' );
647
-								$default_value = apply_filters( 'yikes-mailchimp-' . $field['merge'] . '-default-value', $default_value, $field, $form_id );
646
+								$default_value = ( isset( $field[ 'default' ] ) ? esc_attr( $field[ 'default' ] ) : '' );
647
+								$default_value = apply_filters( 'yikes-mailchimp-' . $field[ 'merge' ] . '-default-value', $default_value, $field, $form_id );
648 648
 
649 649
 									?>
650
-									<label for="<?php echo esc_attr( $field_id_string ); ?>" <?php echo implode( ' ' , $label_array ); ?>>
650
+									<label for="<?php echo esc_attr( $field_id_string ); ?>" <?php echo implode( ' ', $label_array ); ?>>
651 651
 
652 652
 									<!-- dictate label visibility -->
653
-									<?php if( ! isset( $field['hide-label'] ) ) { ?>
654
-										<span class="<?php echo esc_attr( $field['merge'] ) . '-label'; ?>">
655
-											<?php echo apply_filters( 'yikes-mailchimp-' . $field['merge'] . '-label' , esc_attr( stripslashes( $field['label'] ) ) ); ?>
653
+									<?php if ( ! isset( $field[ 'hide-label' ] ) ) { ?>
654
+										<span class="<?php echo esc_attr( $field[ 'merge' ] ) . '-label'; ?>">
655
+											<?php echo apply_filters( 'yikes-mailchimp-' . $field[ 'merge' ] . '-label', esc_attr( stripslashes( $field[ 'label' ] ) ) ); ?>
656 656
 										</span>
657 657
 									<?php } ?>
658 658
 
659 659
 									<!-- Description Above -->
660 660
 									<?php if ( $show_description === true && $description_above === true ) { echo $description; } ?>
661 661
 
662
-									<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 esc_attr( $_POST[$field['merge']] ); } else { echo esc_attr( $default_value ); } ?>">
662
+									<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 esc_attr( $_POST[ $field[ 'merge' ] ] ); } else { echo esc_attr( $default_value ); } ?>">
663 663
 
664 664
 									<!-- Description Below -->
665 665
 									<?php if ( $show_description === true && $description_above === false ) { echo $description; } ?>
@@ -672,7 +672,7 @@  discard block
 block discarded – undo
672 672
 							case 'address':
673 673
 
674 674
 								// required fields
675
-								$required_fields = array( 'addr1' => 'address' , 'addr2' => 'address 2', 'city' => 'city', 'state' =>'state', 'zip' =>'zip' , 'country' => 'country' );
675
+								$required_fields = array( 'addr1' => 'address', 'addr2' => 'address 2', 'city' => 'city', 'state' =>'state', 'zip' =>'zip', 'country' => 'country' );
676 676
 
677 677
 								/**
678 678
 								* Filter to control the default country (the option pre-selected in the country dropdown).
@@ -688,55 +688,55 @@  discard block
 block discarded – undo
688 688
 								if ( $show_description === true && $description_above === true ) { echo $description; }
689 689
 
690 690
 								// Placeholder logic
691
-								if ( ! empty( $field_array['placeholder'] ) ) {
691
+								if ( ! empty( $field_array[ 'placeholder' ] ) ) {
692 692
 									
693 693
 									$use_address_placeholder = true;
694 694
 
695 695
 									// Don't use the address field's array placeholder - use the custom placeholder
696
-									unset( $field_array['placeholder'] );
696
+									unset( $field_array[ 'placeholder' ] );
697 697
 								}
698 698
 
699 699
 								// store number for looping
700 700
 								$x = 1;
701
-								foreach( $required_fields as $type => $label ) {
701
+								foreach ( $required_fields as $type => $label ) {
702 702
 
703 703
 									// set the field names for the address fields
704
-									$field_array['name'] = 'name="' . $field[$tag] . '[' . $type . ']' . '"';
704
+									$field_array[ 'name' ] = 'name="' . $field[ $tag ] . '[' . $type . ']' . '"';
705 705
 
706 706
 									// Set the placeholder value if we need to
707 707
 									$placeholder = isset( $use_address_placeholder ) ? apply_filters( 'yikes-mailchimp-address-' . $type . '-placeholder', ucwords( $label ) ) : '';
708 708
 
709 709
 									// reset the label classes for left-half/right-half for addresses
710
-									if( isset( $label_array['class'] ) ) {
710
+									if ( isset( $label_array[ 'class' ] ) ) {
711 711
 										if ( $x % 2 == 0 ) {
712
-											$label_array['class'] = str_replace( 'field-left-half', 'field-right-half', $label_array['class'] );
712
+											$label_array[ 'class' ] = str_replace( 'field-left-half', 'field-right-half', $label_array[ 'class' ] );
713 713
 										} else {
714
-											$label_array['class'] = str_replace( 'field-right-half', 'field-left-half', $label_array['class'] );
714
+											$label_array[ 'class' ] = str_replace( 'field-right-half', 'field-left-half', $label_array[ 'class' ] );
715 715
 										}
716 716
 									}
717 717
 
718 718
 									// Never force addr2 to be required
719 719
 									if ( $type === 'addr2' ) {
720
-										$field_array['required'] = apply_filters( 'yikes-mailchimp-address-2-required', '', $form_id );
720
+										$field_array[ 'required' ] = apply_filters( 'yikes-mailchimp-address-2-required', '', $form_id );
721 721
 									}
722 722
 
723
-									switch( $type ) {
723
+									switch ( $type ) {
724 724
 
725 725
 										default:
726 726
 										case 'addr1':
727 727
 										case 'addr2':
728 728
 										case 'city':
729 729
 											?>
730
-											<label for="<?php echo esc_attr( $field['merge'] ); ?>" data-attr-name="<?php echo esc_attr( $type ); ?>-field" <?php echo implode( ' ' , $label_array ); ?>>
730
+											<label for="<?php echo esc_attr( $field[ 'merge' ] ); ?>" data-attr-name="<?php echo esc_attr( $type ); ?>-field" <?php echo implode( ' ', $label_array ); ?>>
731 731
 
732 732
 												<!-- dictate label visibility -->
733
-												<?php if( ! isset( $field['hide-label'] ) ) { ?>
734
-													<span class="<?php echo esc_attr( $field['merge'] ) . '-label'; ?>">
735
-														<?php echo ucwords( apply_filters( 'yikes-mailchimp-address-' . $type . '-label' , esc_attr( $label ), $form_id ) ); ?>
733
+												<?php if ( ! isset( $field[ 'hide-label' ] ) ) { ?>
734
+													<span class="<?php echo esc_attr( $field[ 'merge' ] ) . '-label'; ?>">
735
+														<?php echo ucwords( apply_filters( 'yikes-mailchimp-address-' . $type . '-label', esc_attr( $label ), $form_id ) ); ?>
736 736
 													</span>
737 737
 												<?php } ?>
738 738
 												
739
-												<input <?php echo implode( ' ' , $field_array ); ?> placeholder="<?php echo $placeholder; ?>" type="text" value="<?php if( isset( $_POST[$field['merge']][$type] ) && $form_submitted != 1 ) { echo esc_attr( $_POST[$field['merge']][$type] ); } ?>">
739
+												<input <?php echo implode( ' ', $field_array ); ?> placeholder="<?php echo $placeholder; ?>" type="text" value="<?php if ( isset( $_POST[ $field[ 'merge' ] ][ $type ] ) && $form_submitted != 1 ) { echo esc_attr( $_POST[ $field[ 'merge' ] ][ $type ] ); } ?>">
740 740
 
741 741
 											</label>
742 742
 											<?php
@@ -745,16 +745,16 @@  discard block
 block discarded – undo
745 745
 
746 746
 										case 'state':
747 747
 											?>
748
-											<label for="<?php echo esc_attr( $field['merge'] ); ?>" <?php echo implode( ' ' , $label_array ); ?> data-attr-name="state-dropdown">
748
+											<label for="<?php echo esc_attr( $field[ 'merge' ] ); ?>" <?php echo implode( ' ', $label_array ); ?> data-attr-name="state-dropdown">
749 749
 
750 750
 												<!-- dictate label visibility -->
751
-												<?php if( ! isset( $field['hide-label'] ) ) { ?>
752
-													<span class="<?php echo esc_attr( $field['merge'] ) . '-label'; ?>">
753
-														<?php echo ucwords( apply_filters( 'yikes-mailchimp-address-' . $type . '-label' , esc_attr( $label ), $form_id ) ); ?>
751
+												<?php if ( ! isset( $field[ 'hide-label' ] ) ) { ?>
752
+													<span class="<?php echo esc_attr( $field[ 'merge' ] ) . '-label'; ?>">
753
+														<?php echo ucwords( apply_filters( 'yikes-mailchimp-address-' . $type . '-label', esc_attr( $label ), $form_id ) ); ?>
754 754
 													</span>
755 755
 												<?php } ?>
756 756
 
757
-													<select <?php echo implode( ' ' , $field_array ); ?>>
757
+													<select <?php echo implode( ' ', $field_array ); ?>>
758 758
 														<?php
759 759
 															$state_and_province_list = file_get_contents( YIKES_MC_PATH . 'public/partials/shortcodes/templates/state-and-province-dropdown.php' ); 
760 760
 															/**
@@ -780,21 +780,21 @@  discard block
 block discarded – undo
780 780
 										case 'zip':
781 781
 
782 782
 											?>
783
-											<label for="<?php echo esc_attr( $field['merge'] ); ?>"  placeholder="<?php echo $placeholder; ?>" <?php echo implode( ' ' , $label_array ); ?> data-attr-name="zip-input"<?php if ( ! isset( $countries_with_zip_code_field[ $default_country ] ) ) { ?> style="display: none;"<?php } ?>>
783
+											<label for="<?php echo esc_attr( $field[ 'merge' ] ); ?>"  placeholder="<?php echo $placeholder; ?>" <?php echo implode( ' ', $label_array ); ?> data-attr-name="zip-input"<?php if ( ! isset( $countries_with_zip_code_field[ $default_country ] ) ) { ?> style="display: none;"<?php } ?>>
784 784
 
785
-												<?php if( ! isset( $field['hide-label'] ) ) { ?>
786
-													<span class="<?php echo esc_attr( $field['merge'] ) . '-label'; ?>">
787
-														<?php echo ucwords( apply_filters( 'yikes-mailchimp-address-' . $type . '-label' , esc_attr( $label ), $form_id ) ); ?>
785
+												<?php if ( ! isset( $field[ 'hide-label' ] ) ) { ?>
786
+													<span class="<?php echo esc_attr( $field[ 'merge' ] ) . '-label'; ?>">
787
+														<?php echo ucwords( apply_filters( 'yikes-mailchimp-address-' . $type . '-label', esc_attr( $label ), $form_id ) ); ?>
788 788
 													</span>
789 789
 												<?php } ?>
790 790
 
791 791
 												<?php 
792 792
 													// If zip lookup plugin is installed, the ZIP field comes back as an array and we need to handle it differently...
793
-													if( isset( $_POST[$field['merge']] ) && $form_submitted != 1 ) {
794
-														if ( is_array( $_POST[$field['merge']] ) && isset( $_POST[$field['merge']]['zip'] ) ) {
795
-															$zip_value = $_POST[$field['merge']]['zip'];
793
+													if ( isset( $_POST[ $field[ 'merge' ] ] ) && $form_submitted != 1 ) {
794
+														if ( is_array( $_POST[ $field[ 'merge' ] ] ) && isset( $_POST[ $field[ 'merge' ] ][ 'zip' ] ) ) {
795
+															$zip_value = $_POST[ $field[ 'merge' ] ][ 'zip' ];
796 796
 														} else {
797
-															$zip_value = $_POST[$field['merge']]; 
797
+															$zip_value = $_POST[ $field[ 'merge' ] ]; 
798 798
 														}
799 799
 													} else { 
800 800
 
@@ -814,7 +814,7 @@  discard block
 block discarded – undo
814 814
 													}
815 815
 												?>
816 816
 
817
-												<input <?php echo implode( ' ' , $field_array ); ?>  placeholder="<?php echo $placeholder; ?>" type="text" pattern="<?php echo apply_filters( 'yikes-mailchimp-zip-pattern', '\d{5,5}(-\d{4,4})?', $form_id ); ?>" title="<?php _e( '5 digit zip code, numbers only' , 'yikes-inc-easy-mailchimp-extender' ); ?>" value="<?php echo esc_attr( $zip_value ); ?>">
817
+												<input <?php echo implode( ' ', $field_array ); ?>  placeholder="<?php echo $placeholder; ?>" type="text" pattern="<?php echo apply_filters( 'yikes-mailchimp-zip-pattern', '\d{5,5}(-\d{4,4})?', $form_id ); ?>" title="<?php _e( '5 digit zip code, numbers only', 'yikes-inc-easy-mailchimp-extender' ); ?>" value="<?php echo esc_attr( $zip_value ); ?>">
818 818
 
819 819
 											</label>
820 820
 											<?php
@@ -824,16 +824,16 @@  discard block
 block discarded – undo
824 824
 										case 'country':
825 825
 											?>
826 826
 
827
-											<label for="<?php echo esc_attr( $field['merge'] ); ?>" data-attr-name="<?php echo esc_attr( $type ); ?>-field" <?php echo implode( ' ' , $label_array ); ?>>
827
+											<label for="<?php echo esc_attr( $field[ 'merge' ] ); ?>" data-attr-name="<?php echo esc_attr( $type ); ?>-field" <?php echo implode( ' ', $label_array ); ?>>
828 828
 
829 829
 												<!-- dictate label visibility -->
830
-												<?php if( !isset( $field['hide-label'] ) ) { ?>
831
-													<span class="<?php echo esc_attr( $field['merge'] ) . '-label'; ?>">
832
-														<?php echo ucwords( apply_filters( 'yikes-mailchimp-address-' . $type . '-label' , esc_attr( $label ), $form_id ) ); ?>
830
+												<?php if ( ! isset( $field[ 'hide-label' ] ) ) { ?>
831
+													<span class="<?php echo esc_attr( $field[ 'merge' ] ) . '-label'; ?>">
832
+														<?php echo ucwords( apply_filters( 'yikes-mailchimp-address-' . $type . '-label', esc_attr( $label ), $form_id ) ); ?>
833 833
 													</span>
834 834
 												<?php } ?>
835 835
 
836
-												<select <?php echo implode( ' ' , $field_array ); ?> data-country="true">
836
+												<select <?php echo implode( ' ', $field_array ); ?> data-country="true">
837 837
 													<?php include( YIKES_MC_PATH . 'public/partials/shortcodes/templates/country-dropdown.php' ); ?>
838 838
 												</select>
839 839
 											</label>
@@ -879,40 +879,40 @@  discard block
 block discarded – undo
879 879
 								wp_register_script( 'yikes-datepicker-scripts', YIKES_MC_URL . "public/js/yikes-datepicker-scripts{$min}.js", array( 'jquery-ui-datepicker' ), YIKES_MC_VERSION, false );
880 880
 								wp_localize_script( 'yikes-datepicker-scripts', 'datepicker_settings', $datepicker_options );
881 881
 								wp_enqueue_script( 'yikes-datepicker-scripts' );
882
-								wp_enqueue_style( 'jquery-datepicker-styles' , YIKES_MC_URL . 'public/css/jquery-ui.min.css' );
883
-								wp_enqueue_style( 'yikes-datepicker-styles' , YIKES_MC_URL . 'public/css/yikes-datepicker-styles.min.css' );
882
+								wp_enqueue_style( 'jquery-datepicker-styles', YIKES_MC_URL . 'public/css/jquery-ui.min.css' );
883
+								wp_enqueue_style( 'yikes-datepicker-styles', YIKES_MC_URL . 'public/css/yikes-datepicker-styles.min.css' );
884 884
 
885
-								switch ( $field['type'] ) {
885
+								switch ( $field[ 'type' ] ) {
886 886
 									default:
887 887
 									case 'date':
888
-										$date_format = ( isset( $field['date_format'] ) ) ? $field['date_format'] : 'mm/dd/yyyy';
888
+										$date_format = ( isset( $field[ 'date_format' ] ) ) ? $field[ 'date_format' ] : 'mm/dd/yyyy';
889 889
 										break;
890 890
 
891 891
 									case 'birthday':
892
-										$date_format = ( isset( $field['date_format'] ) ) ? strtolower( $field['date_format'] ) : 'mm/dd';
892
+										$date_format = ( isset( $field[ 'date_format' ] ) ) ? strtolower( $field[ 'date_format' ] ) : 'mm/dd';
893 893
 										break;
894 894
 								}
895 895
 
896
-								$default_value = ( isset( $field['default'] ) ? esc_attr( $field['default'] ) : '' );
897
-								$default_value = apply_filters( 'yikes-mailchimp-' . $field['merge'] . '-default-value', $default_value, $field, $form_id );
896
+								$default_value = ( isset( $field[ 'default' ] ) ? esc_attr( $field[ 'default' ] ) : '' );
897
+								$default_value = apply_filters( 'yikes-mailchimp-' . $field[ 'merge' ] . '-default-value', $default_value, $field, $form_id );
898 898
 								
899 899
 								// store empty number for looping
900 900
 								$x = 0;
901 901
 
902 902
 								?>
903
-									<label for="<?php echo esc_attr( $field_id_string ); ?>" <?php echo implode( ' ' , $label_array ); ?>>
903
+									<label for="<?php echo esc_attr( $field_id_string ); ?>" <?php echo implode( ' ', $label_array ); ?>>
904 904
 
905 905
 										<!-- dictate label visibility -->
906
-										<?php if( !isset( $field['hide-label'] ) ) { ?>
907
-											<span class="<?php echo esc_attr( $field['merge'] ) . '-label'; ?>">
908
-												<?php echo apply_filters( 'yikes-mailchimp-' . $field['merge'] . '-label' , esc_attr( stripslashes( $field['label'] ) ) ); ?>
906
+										<?php if ( ! isset( $field[ 'hide-label' ] ) ) { ?>
907
+											<span class="<?php echo esc_attr( $field[ 'merge' ] ) . '-label'; ?>">
908
+												<?php echo apply_filters( 'yikes-mailchimp-' . $field[ 'merge' ] . '-label', esc_attr( stripslashes( $field[ 'label' ] ) ) ); ?>
909 909
 											</span>
910 910
 										<?php } ?>
911 911
 
912 912
 										<!-- Description Above -->
913 913
 										<?php if ( $show_description === true && $description_above === true ) { echo $description; } ?>
914 914
 
915
-										<input <?php echo implode( ' ' , $field_array ); ?> type="text" <?php if( $field['type'] == 'date' ) { ?> data-attr-type="date" <?php } else { ?> data-attr-type="birthday" <?php } ?> value="<?php if( isset( $_POST[$field['merge']] ) && $form_submitted != 1 ) { echo esc_attr( $_POST[$field['merge']] ); } else { echo esc_attr( $default_value ); } ?>" data-date-format="<?php echo esc_attr( strtolower( $date_format ) ); ?>">
915
+										<input <?php echo implode( ' ', $field_array ); ?> type="text" <?php if ( $field[ 'type' ] == 'date' ) { ?> data-attr-type="date" <?php } else { ?> data-attr-type="birthday" <?php } ?> value="<?php if ( isset( $_POST[ $field[ 'merge' ] ] ) && $form_submitted != 1 ) { echo esc_attr( $_POST[ $field[ 'merge' ] ] ); } else { echo esc_attr( $default_value ); } ?>" data-date-format="<?php echo esc_attr( strtolower( $date_format ) ); ?>">
916 916
 
917 917
 										<!-- Description Below -->
918 918
 										<?php if ( $show_description === true && $description_above === false ) { echo $description; } ?>
@@ -923,26 +923,26 @@  discard block
 block discarded – undo
923 923
 							break;
924 924
 
925 925
 							case 'dropdown':
926
-								$no_default     = $field['default_choice'] === 'no-default' || isset( $field['default_choice'][0] ) && $field['default_choice'][0] === 'no-default';
927
-								$default_choice = is_array( $field['default_choice'] ) ? $field['default_choice'] : array( $field['default_choice'] );
926
+								$no_default     = $field[ 'default_choice' ] === 'no-default' || isset( $field[ 'default_choice' ][ 0 ] ) && $field[ 'default_choice' ][ 0 ] === 'no-default';
927
+								$default_choice = is_array( $field[ 'default_choice' ] ) ? $field[ 'default_choice' ] : array( $field[ 'default_choice' ] );
928 928
 
929 929
 								// store empty number for looping
930 930
 								$x = 0;
931 931
 									?>
932
-									<label for="<?php echo esc_attr( $field_id_string ); ?>" <?php echo implode( ' ' , $label_array ); ?>>
932
+									<label for="<?php echo esc_attr( $field_id_string ); ?>" <?php echo implode( ' ', $label_array ); ?>>
933 933
 										<!-- dictate label visibility -->
934
-										<?php if( ! isset( $field['hide-label'] ) ) { ?>
935
-											<span class="<?php echo esc_attr( $field['merge'] ) . '-label'; ?>">
936
-												<?php echo apply_filters( 'yikes-mailchimp-' . $field['merge'] . '-label' , esc_attr( stripslashes( $field['label'] ) ) ); ?>
934
+										<?php if ( ! isset( $field[ 'hide-label' ] ) ) { ?>
935
+											<span class="<?php echo esc_attr( $field[ 'merge' ] ) . '-label'; ?>">
936
+												<?php echo apply_filters( 'yikes-mailchimp-' . $field[ 'merge' ] . '-label', esc_attr( stripslashes( $field[ 'label' ] ) ) ); ?>
937 937
 											</span>
938 938
 										<?php }
939 939
 
940 940
 											// decode for looping
941
-											$choices = json_decode( $field['choices'], true );
941
+											$choices = json_decode( $field[ 'choices' ], true );
942 942
 
943 943
 											// If the form was submitted, but failed, let's default to the chosen option
944
-											if( isset( $_POST[ $field['merge'] ] ) && $form_submitted === 0 ) {
945
-												$default_choice = is_array( $_POST[ $field['merge'] ] ) ? $_POST[ $field['merge'] ] : array( $_POST[ $field['merge'] ] );
944
+											if ( isset( $_POST[ $field[ 'merge' ] ] ) && $form_submitted === 0 ) {
945
+												$default_choice = is_array( $_POST[ $field[ 'merge' ] ] ) ? $_POST[ $field[ 'merge' ] ] : array( $_POST[ $field[ 'merge' ] ] );
946 946
 											}
947 947
 
948 948
 										?>
@@ -950,11 +950,11 @@  discard block
 block discarded – undo
950 950
 										<!-- Description Above -->
951 951
 										<?php if ( $show_description === true && $description_above === true ) { echo $description; } ?>
952 952
 
953
-										<select <?php echo implode( ' ' , $field_array ); ?>>
953
+										<select <?php echo implode( ' ', $field_array ); ?>>
954 954
 											<?php
955 955
 												$no_default_name = apply_filters( 'yikes-mailchimp-dropdown-field-no-default-option-name', __( 'Select...', 'yikes-inc-easy-mailchimp-extender' ), $form_id );
956 956
 												echo $no_default === true ? '<option value="">' . $no_default_name . '</option>' : '';
957
-												foreach( $choices as $choice ) { ?>
957
+												foreach ( $choices as $choice ) { ?>
958 958
 													<option 
959 959
 														value="<?php echo esc_attr( $choice ); ?>"
960 960
 														<?php if ( $no_default !== true && in_array( $x, $default_choice ) || in_array( $choice, $default_choice, true ) ) { echo 'selected="selected"'; } ?>>
@@ -977,17 +977,17 @@  discard block
 block discarded – undo
977 977
 							case 'radio':
978 978
 							case 'checkbox':
979 979
 								// remove the ID (as to not assign the same ID to every radio button)
980
-								unset( $field_array['id'] );
981
-								$choices = json_decode( $field['choices'], true );
980
+								unset( $field_array[ 'id' ] );
981
+								$choices = json_decode( $field[ 'choices' ], true );
982 982
 
983 983
 								// assign a default choice
984
-								$no_default     = $field['default_choice'] === 'no-default' || isset( $field['default_choice'][0] ) && $field['default_choice'][0] === 'no-default';
985
-								$default_choice = ( isset( $field['default_choice'] ) && ! empty( $field['default_choice'] ) ) ? $field['default_choice'] : $choices[0];
984
+								$no_default     = $field[ 'default_choice' ] === 'no-default' || isset( $field[ 'default_choice' ][ 0 ] ) && $field[ 'default_choice' ][ 0 ] === 'no-default';
985
+								$default_choice = ( isset( $field[ 'default_choice' ] ) && ! empty( $field[ 'default_choice' ] ) ) ? $field[ 'default_choice' ] : $choices[ 0 ];
986 986
 								$default_choice = ( is_array( $default_choice ) ) ? $default_choice : array( $default_choice );
987 987
 
988 988
 								// If the form was submitted, but failed, let's default to the chosen option
989
-								if( isset( $_POST[ $field['merge'] ] ) && $form_submitted === 0 ) {
990
-									$default_choice = is_array( $_POST[ $field['merge'] ] ) ? $_POST[ $field['merge'] ] : array( $_POST[ $field['merge'] ] );
989
+								if ( isset( $_POST[ $field[ 'merge' ] ] ) && $form_submitted === 0 ) {
990
+									$default_choice = is_array( $_POST[ $field[ 'merge' ] ] ) ? $_POST[ $field[ 'merge' ] ] : array( $_POST[ $field[ 'merge' ] ] );
991 991
 								}
992 992
 
993 993
 								$count = count( $choices );
@@ -995,29 +995,29 @@  discard block
 block discarded – undo
995 995
 								$x = 0;
996 996
 
997 997
 								?>
998
-								<label for="<?php echo esc_attr( $field_id_string ); ?>" <?php echo implode( ' ' , $label_array ); ?>>
998
+								<label for="<?php echo esc_attr( $field_id_string ); ?>" <?php echo implode( ' ', $label_array ); ?>>
999 999
 
1000 1000
 									<!-- dictate label visibility -->
1001
-									<?php if( ! isset( $field['hide-label'] ) ) { ?>
1002
-										<span class="<?php echo esc_attr( $field['merge'] ). '-label'; ?> checkbox-parent-label">
1003
-											<?php echo esc_attr( apply_filters( 'yikes-mailchimp-'.$field['merge'].'-label', stripslashes( $field['label'] ) ) ); ?>
1001
+									<?php if ( ! isset( $field[ 'hide-label' ] ) ) { ?>
1002
+										<span class="<?php echo esc_attr( $field[ 'merge' ] ) . '-label'; ?> checkbox-parent-label">
1003
+											<?php echo esc_attr( apply_filters( 'yikes-mailchimp-' . $field[ 'merge' ] . '-label', stripslashes( $field[ 'label' ] ) ) ); ?>
1004 1004
 										</span>
1005 1005
 									<?php }
1006 1006
 
1007 1007
 									// <!-- Description Above -->
1008 1008
 									if ( $show_description === true && $description_above === true ) { echo $description; }
1009 1009
 
1010
-									foreach( $choices as $choice ) {
1010
+									foreach ( $choices as $choice ) {
1011 1011
 										?>
1012
-										<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 } ?>">
1012
+										<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 } ?>">
1013 1013
 											<input 
1014
-												type="<?php echo esc_attr( $field['type'] ); ?>" 
1015
-												name="<?php echo esc_attr( $field['merge'] ); ?>" 
1016
-												id="<?php echo esc_attr( $field['merge'] . '-' . $i ); ?>" 
1014
+												type="<?php echo esc_attr( $field[ 'type' ] ); ?>" 
1015
+												name="<?php echo esc_attr( $field[ 'merge' ] ); ?>" 
1016
+												id="<?php echo esc_attr( $field[ 'merge' ] . '-' . $i ); ?>" 
1017 1017
 												<?php if ( $no_default !== true && in_array( $x, $default_choice ) || in_array( $choice, $default_choice, true ) ) { echo 'checked="checked"'; } ?>
1018
-												<?php echo $field_array['required']; ?>
1018
+												<?php echo $field_array[ 'required' ]; ?>
1019 1019
 												value="<?php echo esc_attr( $choice ); ?>">
1020
-											<span class="<?php echo esc_attr( $field['merge'] ). '-label'; ?>"><?php echo stripslashes( $choice ); ?></span>
1020
+											<span class="<?php echo esc_attr( $field[ 'merge' ] ) . '-label'; ?>"><?php echo stripslashes( $choice ); ?></span>
1021 1021
 										</label>
1022 1022
 										<?php
1023 1023
 										$i++;
@@ -1038,11 +1038,11 @@  discard block
 block discarded – undo
1038 1038
 						/**** Interest Groups ****/
1039 1039
 
1040 1040
 						// Handle the Description logic in one spot, here:
1041
-						$show_description = isset( $field['description'] ) && trim( $field['description'] ) !== '' ? true : false;
1042
-						$description_above = isset( $field['description_above'] ) && $field['description_above'] === '1' ? true : false;
1041
+						$show_description = isset( $field[ 'description' ] ) && trim( $field[ 'description' ] ) !== '' ? true : false;
1042
+						$description_above = isset( $field[ 'description_above' ] ) && $field[ 'description_above' ] === '1' ? true : false;
1043 1043
 						if ( $show_description === true ) {
1044
-							$description = '<p class="form-field-description" id="form-field-description-' . $field['group_id'] . '">';
1045
-							$description .= apply_filters( 'yikes-mailchimp-' . $field['group_id'] . '-description', esc_attr( stripslashes( $field['description'] ) ), $form_id );
1044
+							$description = '<p class="form-field-description" id="form-field-description-' . $field[ 'group_id' ] . '">';
1045
+							$description .= apply_filters( 'yikes-mailchimp-' . $field[ 'group_id' ] . '-description', esc_attr( stripslashes( $field[ 'description' ] ) ), $form_id );
1046 1046
 							$description .= '</p>';
1047 1047
 
1048 1048
 							/**
@@ -1054,27 +1054,27 @@  discard block
 block discarded – undo
1054 1054
 							*	@param string | $field['description']	| The field's description text
1055 1055
 							*	@param int	  | $form_id
1056 1056
 							*/
1057
-							$description = apply_filters( 'yikes-mailchimp-' . $field['group_id'] . '-description-html', $description, esc_attr( stripslashes( $field['description'] ) ), $form_id );
1057
+							$description = apply_filters( 'yikes-mailchimp-' . $field[ 'group_id' ] . '-description-html', $description, esc_attr( stripslashes( $field[ 'description' ] ) ), $form_id );
1058 1058
 						}
1059 1059
 
1060 1060
 						// Get our groups
1061
-						$groups = isset( $field['groups'] ) && ! empty( $field['groups'] ) ? json_decode( $field['groups'], true ) : array();
1061
+						$groups = isset( $field[ 'groups' ] ) && ! empty( $field[ 'groups' ] ) ? json_decode( $field[ 'groups' ], true ) : array();
1062 1062
 
1063 1063
 						// Get the default choice(s) from the field settings and turn them into an array if not already
1064
-						$default_choice = isset( $field['default_choice'] ) ? $field['default_choice'] : '';
1064
+						$default_choice = isset( $field[ 'default_choice' ] ) ? $field[ 'default_choice' ] : '';
1065 1065
 						$default_choice = is_array( $default_choice ) ? $default_choice : array( $default_choice );
1066
-						$default_choice = apply_filters( 'yikes-mailchimp-' . $field['group_id'] . '-default', $default_choice, $groups, $field, $form_id );
1066
+						$default_choice = apply_filters( 'yikes-mailchimp-' . $field[ 'group_id' ] . '-default', $default_choice, $groups, $field, $form_id );
1067 1067
 
1068 1068
 						$count = count( $groups );
1069 1069
 
1070
-						if( $field['type'] === 'checkboxes' ) {
1070
+						if ( $field[ 'type' ] === 'checkboxes' ) {
1071 1071
 							$type = 'checkbox';
1072
-						} else if( $field['type'] === 'radio' ) {
1072
+						} else if ( $field[ 'type' ] === 'radio' ) {
1073 1073
 							$type = 'radio';
1074 1074
 						}
1075 1075
 
1076 1076
 						// loop over the interest group field types
1077
-						switch ( $field['type'] ) {
1077
+						switch ( $field[ 'type' ] ) {
1078 1078
 
1079 1079
 							case 'checkboxes':
1080 1080
 							case 'radio':
@@ -1082,11 +1082,11 @@  discard block
 block discarded – undo
1082 1082
 								$x = 1; // used to find the last item of our array
1083 1083
 
1084 1084
 									?>
1085
-									<label for="<?php echo esc_attr( $field['group_id'] ); ?>" <?php echo implode( ' ' , $label_array ); ?>>
1086
-										<?php if( ! isset( $field['hide-label'] ) ) { ?>
1085
+									<label for="<?php echo esc_attr( $field[ 'group_id' ] ); ?>" <?php echo implode( ' ', $label_array ); ?>>
1086
+										<?php if ( ! isset( $field[ 'hide-label' ] ) ) { ?>
1087 1087
 											<!-- dictate label visibility -->
1088
-											<span class="<?php echo esc_attr( $field['group_id'] ) . '-label'; ?> checkbox-parent-label">
1089
-												<?php echo apply_filters( 'yikes-mailchimp-' . $field['group_id'] . '-label' , esc_attr( stripslashes( $field['label'] ) ) ); ?>
1088
+											<span class="<?php echo esc_attr( $field[ 'group_id' ] ) . '-label'; ?> checkbox-parent-label">
1089
+												<?php echo apply_filters( 'yikes-mailchimp-' . $field[ 'group_id' ] . '-label', esc_attr( stripslashes( $field[ 'label' ] ) ) ); ?>
1090 1090
 											</span>
1091 1091
 									<?php
1092 1092
 										}
@@ -1096,7 +1096,7 @@  discard block
 block discarded – undo
1096 1096
 
1097 1097
 										// Display Submission Errors
1098 1098
 										if ( ! empty( $missing_required_checkbox_interest_groups ) ) {
1099
-											if( in_array( $field['group_id'], $missing_required_checkbox_interest_groups ) ) {
1099
+											if ( in_array( $field[ 'group_id' ], $missing_required_checkbox_interest_groups ) ) {
1100 1100
 												?>
1101 1101
 													<p class="yikes-mailchimp-required-interest-group-error">
1102 1102
 														<?php echo apply_filters( 'yikes-mailchimp-interest-group-checkbox-error', __( 'This field is required.', 'yikes-inc-easy-mailchimp-extender' ), $form_id ); ?>
@@ -1108,20 +1108,20 @@  discard block
 block discarded – undo
1108 1108
 										foreach ( $groups as $group_id => $name ) {
1109 1109
 
1110 1110
 											// If the form was submitted and failed, set the submitted/chosen values as the default
1111
-											if ( isset( $_POST[ 'group-' . $field['group_id'] ] ) && $form_submitted === 0 ) {
1111
+											if ( isset( $_POST[ 'group-' . $field[ 'group_id' ] ] ) && $form_submitted === 0 ) {
1112 1112
 
1113 1113
 												// Format default choice as array
1114
-												$default_choice = ( is_array( $_POST[ 'group-' . $field['group_id'] ] ) ) ? $_POST[ 'group-' . $field['group_id'] ] : array( $_POST[ 'group-' . $field['group_id'] ] );
1114
+												$default_choice = ( is_array( $_POST[ 'group-' . $field[ 'group_id' ] ] ) ) ? $_POST[ 'group-' . $field[ 'group_id' ] ] : array( $_POST[ 'group-' . $field[ 'group_id' ] ] );
1115 1115
 											}
1116 1116
 
1117 1117
 											?>
1118
-											<label for="<?php echo esc_attr( $field['group_id'] ) . '-' . $i; ?>" class="yikes-easy-mc-checkbox-label <?php echo implode( ' ' , $custom_classes ); if( $x === $count ) { ?> last-selection<?php } ?>">
1118
+											<label for="<?php echo esc_attr( $field[ 'group_id' ] ) . '-' . $i; ?>" class="yikes-easy-mc-checkbox-label <?php echo implode( ' ', $custom_classes ); if ( $x === $count ) { ?> last-selection<?php } ?>">
1119 1119
 												<input 
1120
-													<?php if( isset( $field['require'] ) && $field['require'] == 1 ) { if ( $field['type'] !== 'checkboxes' ) { ?> required="required" <?php } ?> 
1120
+													<?php if ( isset( $field[ 'require' ] ) && $field[ 'require' ] == 1 ) { if ( $field[ 'type' ] !== 'checkboxes' ) { ?> required="required" <?php } ?> 
1121 1121
 													class="yikes-interest-group-required" <?php } ?> 
1122 1122
 													type="<?php echo esc_attr( $type ); ?>"
1123
-													name="group-<?php echo esc_attr( $field['group_id'] ); ?>[]" 
1124
-													id="<?php echo esc_attr( $field['group_id'] . '-' . $i ); ?>"
1123
+													name="group-<?php echo esc_attr( $field[ 'group_id' ] ); ?>[]" 
1124
+													id="<?php echo esc_attr( $field[ 'group_id' ] . '-' . $i ); ?>"
1125 1125
 													<?php if ( in_array( $group_id, $default_choice ) ) { echo 'checked="checked"'; } ?> 
1126 1126
 													value="<?php echo esc_attr( $group_id ); ?>">
1127 1127
 													<?php echo esc_attr( $name ); ?>
@@ -1143,32 +1143,32 @@  discard block
 block discarded – undo
1143 1143
 
1144 1144
 									?>
1145 1145
 
1146
-									<label for="<?php echo esc_attr( $field['group_id'] ); ?>" <?php echo implode( ' ' , $label_array ); ?>>
1146
+									<label for="<?php echo esc_attr( $field[ 'group_id' ] ); ?>" <?php echo implode( ' ', $label_array ); ?>>
1147 1147
 										<!-- dictate label visibility -->
1148
-										<?php if( ! isset( $field['hide-label'] ) ) { ?>
1149
-											<span class="<?php echo esc_attr( $field['group_id'] ) . '-label'; ?>">
1150
-												<?php echo apply_filters( 'yikes-mailchimp-' . $field['group_id'] . '-label' , esc_attr( stripslashes( $field['label'] ) ) ); ?>
1148
+										<?php if ( ! isset( $field[ 'hide-label' ] ) ) { ?>
1149
+											<span class="<?php echo esc_attr( $field[ 'group_id' ] ) . '-label'; ?>">
1150
+												<?php echo apply_filters( 'yikes-mailchimp-' . $field[ 'group_id' ] . '-label', esc_attr( stripslashes( $field[ 'label' ] ) ) ); ?>
1151 1151
 											</span>
1152 1152
 										<?php } ?>
1153 1153
 
1154 1154
 										<!-- Description Above -->
1155 1155
 										<?php if ( $show_description === true && $description_above === true ) { echo $description; } ?>
1156 1156
 
1157
-										<select <?php echo implode( ' ' , $field_array ); ?>>
1157
+										<select <?php echo implode( ' ', $field_array ); ?>>
1158 1158
 
1159 1159
 											<?php
1160
-												$no_default      = $field['default_choice'] === 'no-default' || isset( $field['default_choice'][0] ) && $field['default_choice'][0] === 'no-default';
1160
+												$no_default      = $field[ 'default_choice' ] === 'no-default' || isset( $field[ 'default_choice' ][ 0 ] ) && $field[ 'default_choice' ][ 0 ] === 'no-default';
1161 1161
 												$no_default_name = apply_filters( 'yikes-mailchimp-dropdown-ig-no-default-option-name', __( 'Select...', 'yikes-inc-easy-mailchimp-extender' ), $form_id );
1162 1162
 												echo $no_default === true ? '<option value="">' . $no_default_name . '</option>' : '';
1163 1163
 
1164 1164
 												$i = 0;
1165
-												foreach( $groups as $group_id => $name ) { 
1165
+												foreach ( $groups as $group_id => $name ) { 
1166 1166
 
1167 1167
 													// If the form was submitted and failed, set the submitted/chosen values as the default
1168
-													if( isset( $_POST[ 'group-' . $field['group_id'] ] ) && $form_submitted === 0 ) {
1168
+													if ( isset( $_POST[ 'group-' . $field[ 'group_id' ] ] ) && $form_submitted === 0 ) {
1169 1169
 
1170 1170
 														// Format default choice as array
1171
-														$default_choice = ( is_array( $_POST[ 'group-' . $field['group_id'] ] ) ) ? $_POST[ 'group-' . $field['group_id'] ] : array( $_POST[ 'group-' . $field['group_id'] ] );
1171
+														$default_choice = ( is_array( $_POST[ 'group-' . $field[ 'group_id' ] ] ) ) ? $_POST[ 'group-' . $field[ 'group_id' ] ] : array( $_POST[ 'group-' . $field[ 'group_id' ] ] );
1172 1172
 													}
1173 1173
 											?>
1174 1174
 													<option 
@@ -1196,12 +1196,12 @@  discard block
 block discarded – undo
1196 1196
 
1197 1197
 									?>
1198 1198
 
1199
-									<label for="<?php echo esc_attr( $field['group_id'] ); ?>" <?php echo implode( ' ' , $label_array ); ?>>
1199
+									<label for="<?php echo esc_attr( $field[ 'group_id' ] ); ?>" <?php echo implode( ' ', $label_array ); ?>>
1200 1200
 
1201 1201
 										<!-- dictate label visibility -->
1202
-										<?php if( ! isset( $field['hide-label'] ) ) { ?>
1203
-											<span class="<?php echo esc_attr( $field['group_id'] ) . '-label'; ?> checkbox-parent-label" style="display:none;">
1204
-												<?php echo apply_filters( 'yikes-mailchimp-'.$field['group_id'].'-label' , esc_attr( stripslashes( $field['label'] ) ) ); ?>
1202
+										<?php if ( ! isset( $field[ 'hide-label' ] ) ) { ?>
1203
+											<span class="<?php echo esc_attr( $field[ 'group_id' ] ) . '-label'; ?> checkbox-parent-label" style="display:none;">
1204
+												<?php echo apply_filters( 'yikes-mailchimp-' . $field[ 'group_id' ] . '-label', esc_attr( stripslashes( $field[ 'label' ] ) ) ); ?>
1205 1205
 											</span>
1206 1206
 										<?php }
1207 1207
 
@@ -1211,17 +1211,17 @@  discard block
 block discarded – undo
1211 1211
 										// Turn $default_choice into an array if it isn't already
1212 1212
 										$default_choice = ( isset( $default_choice ) && is_array( $default_choice ) ) ? $default_choice : array( $default_choice );
1213 1213
 
1214
-										foreach( $groups as $group_id => $name ) { 
1214
+										foreach ( $groups as $group_id => $name ) { 
1215 1215
 											?>
1216
-											<label for="<?php echo esc_attr( $field['group_id'] ) . '-' . $i; ?>" class="yikes-easy-mc-checkbox-label <?php echo implode( ' ' , $custom_classes ); if ( $x === $count ) { echo ' last-selection'; } ?>" style="display:none;">
1216
+											<label for="<?php echo esc_attr( $field[ 'group_id' ] ) . '-' . $i; ?>" class="yikes-easy-mc-checkbox-label <?php echo implode( ' ', $custom_classes ); if ( $x === $count ) { echo ' last-selection'; } ?>" style="display:none;">
1217 1217
 												<input 
1218 1218
 													type="checkbox" 
1219
-													name="group-<?php echo esc_attr( $field['group_id'] ); ?>[]" 
1220
-													id="<?php echo esc_attr( $field['group_id'] ) . '-' . $i; ?>"
1219
+													name="group-<?php echo esc_attr( $field[ 'group_id' ] ); ?>[]" 
1220
+													id="<?php echo esc_attr( $field[ 'group_id' ] ) . '-' . $i; ?>"
1221 1221
 													value="<?php echo esc_attr( $group_id ) ?>"
1222 1222
 													<?php if ( in_array( $group_id, $default_choice ) ) { echo 'checked="checked"'; } ?>
1223 1223
 												>
1224
-												<?php echo esc_attr( stripslashes( str_replace( '' , '\'', $name ) ) ); ?>
1224
+												<?php echo esc_attr( stripslashes( str_replace( '', '\'', $name ) ) ); ?>
1225 1225
 											</label>
1226 1226
 											<?php
1227 1227
 											$i++;
@@ -1246,14 +1246,14 @@  discard block
 block discarded – undo
1246 1246
 					echo $recaptcha_box;
1247 1247
 				}
1248 1248
 
1249
-				$admin_class = is_user_logged_in() && current_user_can( apply_filters( 'yikes-mailchimp-user-role-access' , 'manage_options' ) ) ? ' admin-logged-in' : '';
1249
+				$admin_class = is_user_logged_in() && current_user_can( apply_filters( 'yikes-mailchimp-user-role-access', 'manage_options' ) ) ? ' admin-logged-in' : '';
1250 1250
 				?>
1251 1251
 
1252 1252
 				<!-- Honeypot Trap -->
1253 1253
 				<input type="hidden" name="yikes-mailchimp-honeypot" id="yikes-mailchimp-honeypot-<?php echo esc_attr( $form_id ); ?>" value="">
1254 1254
 
1255 1255
 				<!-- List ID -->
1256
-				<input type="hidden" name="yikes-mailchimp-associated-list-id" id="yikes-mailchimp-associated-list-id-<?php echo esc_attr( $form_id ); ?>" value="<?php echo esc_attr( $form_data['list_id'] ); ?>">
1256
+				<input type="hidden" name="yikes-mailchimp-associated-list-id" id="yikes-mailchimp-associated-list-id-<?php echo esc_attr( $form_id ); ?>" value="<?php echo esc_attr( $form_data[ 'list_id' ] ); ?>">
1257 1257
 
1258 1258
 				<!-- The form that is being submitted! Used to display error/success messages above the correct form -->
1259 1259
 				<input type="hidden" name="yikes-mailchimp-submitted-form" id="yikes-mailchimp-submitted-form-<?php echo esc_attr( $form_id ); ?>" value="<?php echo esc_attr( $form_id ); ?>">
@@ -1267,15 +1267,15 @@  discard block
 block discarded – undo
1267 1267
 						// If the number of fields, is equal to the hidden label count, add our class
1268 1268
 						// eg: All field labels are set to hidden.
1269 1269
 						if ( absint( $field_count ) === absint( $hidden_label_count ) ) {
1270
-							$submit_button_label_classes[] = 'labels-hidden';
1270
+							$submit_button_label_classes[ ] = 'labels-hidden';
1271 1271
 						}
1272 1272
 						echo '<label class="empty-form-inline-label submit-button-inline-label"><span class="' . implode( ' ', $submit_button_label_classes ) . '">&nbsp;</span>';
1273 1273
 					}
1274 1274
 					// Display the image or text based button.
1275 1275
 					if ( $submit_button_type === 'text' ) {
1276
-						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'] ) . '"> <span class="yikes-mailchimp-submit-button-span-text">' .  apply_filters( 'yikes-mailchimp-form-submit-button-text', esc_attr( stripslashes( $submit ) ), $form_data['id'] ) . '</span></button>', $form_data['id'] );
1276
+						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' ] ) . '"> <span class="yikes-mailchimp-submit-button-span-text">' . apply_filters( 'yikes-mailchimp-form-submit-button-text', esc_attr( stripslashes( $submit ) ), $form_data[ 'id' ] ) . '</span></button>', $form_data[ 'id' ] );
1277 1277
 					} else {
1278
-						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'] );
1278
+						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' ] );
1279 1279
 					}
1280 1280
 					if ( $form_inline && ! $inline_form_override ) {
1281 1281
 						echo '</label>';
@@ -1290,8 +1290,8 @@  discard block
 block discarded – undo
1290 1290
 
1291 1291
 		<?php
1292 1292
 			/* If the current user is logged in, and an admin...lets display our 'Edit Form' link */
1293
-			if( is_user_logged_in() ) {
1294
-				if( current_user_can( apply_filters( 'yikes-mailchimp-user-role-access' , 'manage_options' ) ) ) {
1293
+			if ( is_user_logged_in() ) {
1294
+				if ( current_user_can( apply_filters( 'yikes-mailchimp-user-role-access', 'manage_options' ) ) ) {
1295 1295
 					echo $edit_form_link;
1296 1296
 				}
1297 1297
 			}
@@ -1307,7 +1307,7 @@  discard block
 block discarded – undo
1307 1307
 		*	for non-admins
1308 1308
 		*/
1309 1309
 		if ( ! current_user_can( 'manage_options' ) ) {
1310
-			$impressions = $form_data['impressions'] + 1;
1310
+			$impressions = $form_data[ 'impressions' ] + 1;
1311 1311
 			$interface->update_form_field( $form_id, 'impressions', $impressions );
1312 1312
 		}
1313 1313
 
Please login to merge, or discard this patch.
admin/partials/view-list.php 1 patch
Spacing   +71 added lines, -71 removed lines patch added patch discarded remove patch
@@ -1,9 +1,9 @@  discard block
 block discarded – undo
1 1
 <?php
2
-if ( ! isset( $_REQUEST['list-id'] ) ) {
2
+if ( ! isset( $_REQUEST[ 'list-id' ] ) ) {
3 3
 	wp_die( __( 'Oops, we can\'t determine what List to view. Please go back and try again.' ) );
4 4
 }
5 5
 
6
-$list_id       = sanitize_key( $_REQUEST['list-id'] );
6
+$list_id       = sanitize_key( $_REQUEST[ 'list-id' ] );
7 7
 $list_helper   = yikes_get_mc_api_manager()->get_list_handler();
8 8
 $api_key       = yikes_get_mc_api_key();
9 9
 $dash_position = strpos( $api_key, '-' );
@@ -60,10 +60,10 @@  discard block
 block discarded – undo
60 60
 }
61 61
 
62 62
 // setup pagination variables
63
-$paged			= isset( $_REQUEST['paged'] ) ? filter_var( $_REQUEST['paged'], FILTER_SANITIZE_NUMBER_INT ) : 0;
63
+$paged			= isset( $_REQUEST[ 'paged' ] ) ? filter_var( $_REQUEST[ 'paged' ], FILTER_SANITIZE_NUMBER_INT ) : 0;
64 64
 $limit			= apply_filters( 'yikes_admin_list_subscriber_limit', 20 );
65
-$page_offset	= (int) $paged * (int) $limit;
66
-$sort_dir		= isset( $_REQUEST['sort'] ) ? $_REQUEST['sort'] : 'DESC';
65
+$page_offset = (int) $paged * (int) $limit;
66
+$sort_dir = isset( $_REQUEST[ 'sort' ] ) ? $_REQUEST[ 'sort' ] : 'DESC';
67 67
 
68 68
 if ( $sort_dir === 'DESC' ) {
69 69
 	$opposite_sort_dir = 'ASC';
@@ -90,25 +90,25 @@  discard block
 block discarded – undo
90 90
 ?>
91 91
 <div class="wrap">
92 92
 	<!-- Freddie Logo -->
93
-	<img src="<?php echo YIKES_MC_URL . 'includes/images/MailChimp_Assets/Freddie_60px.png'; ?>" alt="<?php __( 'Freddie - Mailchimp Mascot' , 'yikes-inc-easy-mailchimp-extender' ); ?>" class="yikes-mc-freddie-logo" />
93
+	<img src="<?php echo YIKES_MC_URL . 'includes/images/MailChimp_Assets/Freddie_60px.png'; ?>" alt="<?php __( 'Freddie - Mailchimp Mascot', 'yikes-inc-easy-mailchimp-extender' ); ?>" class="yikes-mc-freddie-logo" />
94 94
 
95
-	<h1>YIKES Easy Forms for Mailchimp | <?php echo $list_data['name']; ?></h1>
95
+	<h1>YIKES Easy Forms for Mailchimp | <?php echo $list_data[ 'name' ]; ?></h1>
96 96
 
97 97
 	<!-- Settings Page Description -->
98
-	<p class="yikes-easy-mc-about-text about-text"><?php _e( 'View all subscribers below. View additional subscriber info, or add additional fields to this list.' , 'yikes-inc-easy-mailchimp-extender' ); ?></p>
99
-	<!-- <p class="add-new-subscriber-button"><a href="#" onclick="jQuery(this).parent().next().slideToggle();" class="add-new-h2"><?php _e( 'New Subscriber' , 'yikes-inc-easy-mailchimp-extender' ); ?></a></p> -->
98
+	<p class="yikes-easy-mc-about-text about-text"><?php _e( 'View all subscribers below. View additional subscriber info, or add additional fields to this list.', 'yikes-inc-easy-mailchimp-extender' ); ?></p>
99
+	<!-- <p class="add-new-subscriber-button"><a href="#" onclick="jQuery(this).parent().next().slideToggle();" class="add-new-h2"><?php _e( 'New Subscriber', 'yikes-inc-easy-mailchimp-extender' ); ?></a></p> -->
100 100
 
101 101
 	<?php
102 102
 		/* Display our admin notices here */
103 103
 		// Unsubscribe user confirmation message
104
-		if( isset( $_REQUEST['user-unsubscribed'] ) && $_REQUEST['user-unsubscribed'] == 'true' ) {
104
+		if ( isset( $_REQUEST[ 'user-unsubscribed' ] ) && $_REQUEST[ 'user-unsubscribed' ] == 'true' ) {
105 105
 			?>
106 106
 			<div class="updated manage-form-admin-notice">
107 107
 				<p><?php _e( 'User successfully unsubscribed.', 'yikes-inc-easy-mailchimp-extender' ); ?></p>
108 108
 			</div>
109 109
 			<?php
110 110
 		}
111
-		if( isset( $_REQUEST['user-unsubscribed'] ) && $_REQUEST['user-unsubscribed'] == 'false' ) {
111
+		if ( isset( $_REQUEST[ 'user-unsubscribed' ] ) && $_REQUEST[ 'user-unsubscribed' ] == 'false' ) {
112 112
 			?>
113 113
 			<div class="error manage-form-admin-notice">
114 114
 				<p><?php _e( "We've encountered an error trying to remove the subscriber. Please try again. If the error persists please get in contact with the YIKES Inc. support staff.", 'yikes-inc-easy-mailchimp-extender' ); ?></p>
@@ -118,9 +118,9 @@  discard block
 block discarded – undo
118 118
 	?>
119 119
 
120 120
 	<section class="add-new-subscriber-form-container">
121
-		<h4><?php _e( 'Add New Subscriber' , 'yikes-inc-easy-mailchimp-extender' ); ?></h4>
121
+		<h4><?php _e( 'Add New Subscriber', 'yikes-inc-easy-mailchimp-extender' ); ?></h4>
122 122
 		<form id="add-new-subcscriber">
123
-			<input type="text" class="regular-text" placeholder="<?php _e( 'User Email Address' , 'yikes-inc-easy-mailchimp-extender' ); ?>" /></p>
123
+			<input type="text" class="regular-text" placeholder="<?php _e( 'User Email Address', 'yikes-inc-easy-mailchimp-extender' ); ?>" /></p>
124 124
 			<p><?php submit_button( 'Add Subscriber' ); ?></p>
125 125
 		</form>
126 126
 	</section>
@@ -142,8 +142,8 @@  discard block
 block discarded – undo
142 142
 									<!-- TABLE HEAD -->
143 143
 									<thead>
144 144
 										<tr>
145
-											<th id="user-email columnname" class="manage-column column-columnname" scope="col"><a id="user-email-sort" href="<?php echo esc_url_raw( add_query_arg( array( 'column' => 'email' , 'sort' => $opposite_sort_dir ) ) ); ?>"><?php _e( 'User Email' , 'yikes-inc-easy-mailchimp-extender' ); echo $icon;?></a></th>
146
-											<th id="columnname" class="manage-column column-columnname num" scope="col"><?php _e( 'Email Client' , 'yikes-inc-easy-mailchimp-extender' ); ?></th>
145
+											<th id="user-email columnname" class="manage-column column-columnname" scope="col"><a id="user-email-sort" href="<?php echo esc_url_raw( add_query_arg( array( 'column' => 'email', 'sort' => $opposite_sort_dir ) ) ); ?>"><?php _e( 'User Email', 'yikes-inc-easy-mailchimp-extender' ); echo $icon; ?></a></th>
146
+											<th id="columnname" class="manage-column column-columnname num" scope="col"><?php _e( 'Email Client', 'yikes-inc-easy-mailchimp-extender' ); ?></th>
147 147
 										</tr>
148 148
 									</thead>
149 149
 									<!-- end header -->
@@ -151,8 +151,8 @@  discard block
 block discarded – undo
151 151
 									<!-- FOOTER -->
152 152
 									<tfoot>
153 153
 										<tr>
154
-											<th class="manage-column column-columnname" scope="col"><?php _e( 'User Email' , 'yikes-inc-easy-mailchimp-extender' ); ?></th>
155
-											<th class="manage-column column-columnname num" scope="col"><?php _e( 'Email Client' , 'yikes-inc-easy-mailchimp-extender' ); ?></th>
154
+											<th class="manage-column column-columnname" scope="col"><?php _e( 'User Email', 'yikes-inc-easy-mailchimp-extender' ); ?></th>
155
+											<th class="manage-column column-columnname num" scope="col"><?php _e( 'Email Client', 'yikes-inc-easy-mailchimp-extender' ); ?></th>
156 156
 										</tr>
157 157
 									</tfoot>
158 158
 									<!-- end footer -->
@@ -162,15 +162,15 @@  discard block
 block discarded – undo
162 162
 										<?php if ( count( $subscribers_list ) > 0 ) {
163 163
 											$i = 1;
164 164
 											foreach ( $subscribers_list as $subscriber ) {
165
-												$user_id           = $subscriber['id'];
165
+												$user_id           = $subscriber[ 'id' ];
166 166
 												$path              = YIKES_MC_URL . "includes/images/na.png";
167 167
 												$email_client_icon = "<img width='35' src='" . $path . "' alt='" . __( 'not set', 'yikes-inc-easy-mailchimp-extender' ) . "' title='" . __( 'not set', 'yikes-inc-easy-mailchimp-extender' ) . "'>";
168 168
 
169 169
 												?>
170 170
 												<tr class="<?php if ( $i % 2 == 0 ) { echo 'alternate'; } ?>">
171 171
 													<td class="column-columnname">
172
-														<a class="user-email row-title" href="mailto:<?php echo sanitize_email( $subscriber['email_address'] ); ?>">
173
-															<?php echo sanitize_email( $subscriber['email_address'] ); ?>
172
+														<a class="user-email row-title" href="mailto:<?php echo sanitize_email( $subscriber[ 'email_address' ] ); ?>">
173
+															<?php echo sanitize_email( $subscriber[ 'email_address' ] ); ?>
174 174
 														</a>
175 175
 														<div class="row-actions">
176 176
 															<?php $view_user_info_url = esc_url_raw( add_query_arg( array(
@@ -184,17 +184,17 @@  discard block
 block discarded – undo
184 184
 																'nonce'          => wp_create_nonce( 'unsubscribe-user-' . $user_id ),
185 185
 																'email_id'       => $user_id,
186 186
 															) ) ); ?>
187
-															<span><a href="<?php echo $url; ?>" onclick="return confirm('<?php printf( __( "Are you sure you want to unsubscribe %s from this mailing list?", 'yikes-inc-easy-mailchimp-extender' ), sanitize_email( $subscriber['email_address'] ) ); ?>');" class="yikes-delete-subscriber"><?php _e( "Unsubscribe", 'yikes-inc-easy-mailchimp-extender' ); ?></a>
187
+															<span><a href="<?php echo $url; ?>" onclick="return confirm('<?php printf( __( "Are you sure you want to unsubscribe %s from this mailing list?", 'yikes-inc-easy-mailchimp-extender' ), sanitize_email( $subscriber[ 'email_address' ] ) ); ?>');" class="yikes-delete-subscriber"><?php _e( "Unsubscribe", 'yikes-inc-easy-mailchimp-extender' ); ?></a>
188 188
 														</div>
189 189
 													</td>
190 190
 													<td class="column-columnname num"><?php echo $email_client_icon; ?></td>
191 191
 												</tr>
192 192
 												<?php
193
-												$i ++;
193
+												$i++;
194 194
 											}
195 195
 											} else { ?>
196 196
 											<tr class="no-items">
197
-												<td class="colspanchange no-current-subscriber-notice" colspan="2"><em><?php _e( 'No one is currently subscribed to this list.' , 'yikes-inc-easy-mailchimp-extender' ); ?></em></td>
197
+												<td class="colspanchange no-current-subscriber-notice" colspan="2"><em><?php _e( 'No one is currently subscribed to this list.', 'yikes-inc-easy-mailchimp-extender' ); ?></em></td>
198 198
 											</tr>
199 199
 										<?php } ?>
200 200
 									</tbody>
@@ -206,11 +206,11 @@  discard block
 block discarded – undo
206 206
 						<!-- pagination -->
207 207
 						<div class="tablenav">
208 208
 							<div class="tablenav-pages">
209
-								<a class='first-page <?php if( $paged == 0 ) { echo 'disabled'; } ?>' title='<?php _e( "Go to the first page" , 'yikes-inc-easy-mailchimp-extender' ); ?>' href='<?php echo esc_url_raw( add_query_arg( array( "paged" => 0 ) ) ); ?>'>&laquo;</a>
210
-								<a class='prev-page <?php if( $paged == 0 ) { echo 'disabled'; } ?>' title='<?php _e( "Go to the previous page" , 'yikes-inc-easy-mailchimp-extender' ); ?>' href='<?php echo esc_url_raw( add_query_arg( array( "paged" => intval( $paged - 1 ) ) ) ); ?>'>&lsaquo;</a>
211
-								<span class="paging-input"><input class='current-page' title='<?php _e( "Current page" , 'yikes-inc-easy-mailchimp-extender' ); ?>' type='text' name='paged' value='<?php if( $paged == 0 ) { echo '1'; } else { echo intval( $paged + 1 ); } ?>' size='1' /> <?php _e( 'of', 'yikes-inc-easy-mailchimp-extender' ); ?> <span class='total-pages'><?php echo $total_pages; ?></span></span>
212
-								<a class='next-page <?php if( $paged == intval( $total_pages - 1 ) ) { echo 'disabled'; } ?>' title='<?php _e( "Go to the next page" , 'yikes-inc-easy-mailchimp-extender' ); ?>' href='<?php echo esc_url_raw( add_query_arg( array( "paged" => intval( $paged + 1 ) ) ) ); ?>'>&rsaquo;</a>
213
-								<a class='last-page <?php if( $paged == intval( $total_pages - 1 ) ) { echo 'disabled'; } ?>' title='<?php _e( "Go to the last page" , 'yikes-inc-easy-mailchimp-extender' ); ?>' href='<?php echo esc_url_raw( add_query_arg( array( "paged" => intval( $total_pages - 1 ) ) ) ); ?>'>&raquo;</a>
209
+								<a class='first-page <?php if ( $paged == 0 ) { echo 'disabled'; } ?>' title='<?php _e( "Go to the first page", 'yikes-inc-easy-mailchimp-extender' ); ?>' href='<?php echo esc_url_raw( add_query_arg( array( "paged" => 0 ) ) ); ?>'>&laquo;</a>
210
+								<a class='prev-page <?php if ( $paged == 0 ) { echo 'disabled'; } ?>' title='<?php _e( "Go to the previous page", 'yikes-inc-easy-mailchimp-extender' ); ?>' href='<?php echo esc_url_raw( add_query_arg( array( "paged" => intval( $paged - 1 ) ) ) ); ?>'>&lsaquo;</a>
211
+								<span class="paging-input"><input class='current-page' title='<?php _e( "Current page", 'yikes-inc-easy-mailchimp-extender' ); ?>' type='text' name='paged' value='<?php if ( $paged == 0 ) { echo '1'; } else { echo intval( $paged + 1 ); } ?>' size='1' /> <?php _e( 'of', 'yikes-inc-easy-mailchimp-extender' ); ?> <span class='total-pages'><?php echo $total_pages; ?></span></span>
212
+								<a class='next-page <?php if ( $paged == intval( $total_pages - 1 ) ) { echo 'disabled'; } ?>' title='<?php _e( "Go to the next page", 'yikes-inc-easy-mailchimp-extender' ); ?>' href='<?php echo esc_url_raw( add_query_arg( array( "paged" => intval( $paged + 1 ) ) ) ); ?>'>&rsaquo;</a>
213
+								<a class='last-page <?php if ( $paged == intval( $total_pages - 1 ) ) { echo 'disabled'; } ?>' title='<?php _e( "Go to the last page", 'yikes-inc-easy-mailchimp-extender' ); ?>' href='<?php echo esc_url_raw( add_query_arg( array( "paged" => intval( $total_pages - 1 ) ) ) ); ?>'>&raquo;</a>
214 214
 							</div>
215 215
 						</div>
216 216
 
@@ -225,21 +225,21 @@  discard block
 block discarded – undo
225 225
 
226 226
 						<div class="postbox yikes-easy-mc-postbox">
227 227
 
228
-							<h3><?php _e( 'List Overview' , 'yikes-inc-easy-mailchimp-extender' ); ?></h3>
228
+							<h3><?php _e( 'List Overview', 'yikes-inc-easy-mailchimp-extender' ); ?></h3>
229 229
 
230 230
 							<?php
231 231
 								// store list rating
232
-								$list_rating = $list_data['list_rating'];
233
-								if( $list_rating > 0 ) {
234
-									$list_rating_explosion = explode( '.' , $list_rating );
232
+								$list_rating = $list_data[ 'list_rating' ];
233
+								if ( $list_rating > 0 ) {
234
+									$list_rating_explosion = explode( '.', $list_rating );
235 235
 									$star_array = array();
236 236
 									$x = 1;
237
-									while( $list_rating_explosion[0] >= $x ) {
238
-										$star_array[] = '<span class="dashicons dashicons-star-filled list-rating-star"></span>';
237
+									while ( $list_rating_explosion[ 0 ] >= $x ) {
238
+										$star_array[ ] = '<span class="dashicons dashicons-star-filled list-rating-star"></span>';
239 239
 										$x++;
240 240
 									}
241
-									if( $list_rating_explosion[1] == '5' ) {
242
-										$star_array[] = '<span class="dashicons dashicons-star-half list-rating-star"></span>';
241
+									if ( $list_rating_explosion[ 1 ] == '5' ) {
242
+										$star_array[ ] = '<span class="dashicons dashicons-star-half list-rating-star"></span>';
243 243
 									}
244 244
 								} else {
245 245
 									$star_array = array( 'n/a' );
@@ -247,40 +247,40 @@  discard block
 block discarded – undo
247 247
 							?>
248 248
 							<table class="form-table">
249 249
 								<tr valign="top">
250
-									<td scope="row"><label for="tablecell"><strong><?php  _e( 'List Rating' , 'yikes-inc-easy-mailchimp-extender' ); ?></strong></label></td>
251
-									<td><?php echo implode( ' ' , $star_array ); ?></td>
250
+									<td scope="row"><label for="tablecell"><strong><?php  _e( 'List Rating', 'yikes-inc-easy-mailchimp-extender' ); ?></strong></label></td>
251
+									<td><?php echo implode( ' ', $star_array ); ?></td>
252 252
 								</tr>
253 253
 								<tr valign="top">
254
-									<td scope="row"><label for="tablecell"><strong><?php  _e( 'Average Subscribers' , 'yikes-inc-easy-mailchimp-extender' ); ?></strong></label></td>
255
-									<td><?php echo $list_data['stats']['avg_sub_rate']; ?><small> / <?php  _e( 'month' , 'yikes-inc-easy-mailchimp-extender' ); ?></small></td>
254
+									<td scope="row"><label for="tablecell"><strong><?php  _e( 'Average Subscribers', 'yikes-inc-easy-mailchimp-extender' ); ?></strong></label></td>
255
+									<td><?php echo $list_data[ 'stats' ][ 'avg_sub_rate' ]; ?><small> / <?php  _e( 'month', 'yikes-inc-easy-mailchimp-extender' ); ?></small></td>
256 256
 								</tr>
257 257
 								<tr valign="top">
258
-									<td scope="row"><label for="tablecell"><strong><?php  _e( 'Subscriber Count' , 'yikes-inc-easy-mailchimp-extender' ); ?></strong></label></td>
259
-									<td><?php echo intval( $list_data['stats']['member_count'] ); ?></td>
258
+									<td scope="row"><label for="tablecell"><strong><?php  _e( 'Subscriber Count', 'yikes-inc-easy-mailchimp-extender' ); ?></strong></label></td>
259
+									<td><?php echo intval( $list_data[ 'stats' ][ 'member_count' ] ); ?></td>
260 260
 								</tr>
261 261
 								<tr valign="top">
262
-									<td scope="row"><label for="tablecell"><strong><?php  _e( 'New Since Last Campaign' , 'yikes-inc-easy-mailchimp-extender' ); ?></strong></label></td>
263
-									<td><?php echo intval( $list_data['stats']['member_count_since_send'] ); ?></td>
262
+									<td scope="row"><label for="tablecell"><strong><?php  _e( 'New Since Last Campaign', 'yikes-inc-easy-mailchimp-extender' ); ?></strong></label></td>
263
+									<td><?php echo intval( $list_data[ 'stats' ][ 'member_count_since_send' ] ); ?></td>
264 264
 								</tr>
265 265
 								<tr valign="top">
266
-									<td scope="row"><label for="tablecell"><strong><?php  _e( 'Created' , 'yikes-inc-easy-mailchimp-extender' ); ?></strong></label></td>
267
-									<td><?php echo date( get_option('date_format') , strtotime( $list_data['date_created'] ) ); ?></td>
266
+									<td scope="row"><label for="tablecell"><strong><?php  _e( 'Created', 'yikes-inc-easy-mailchimp-extender' ); ?></strong></label></td>
267
+									<td><?php echo date( get_option( 'date_format' ), strtotime( $list_data[ 'date_created' ] ) ); ?></td>
268 268
 								</tr>
269 269
 								<tr valign="top">
270
-									<td scope="row"><label for="tablecell"><strong><?php  _e( 'List Fields' , 'yikes-inc-easy-mailchimp-extender' ); ?></strong></label></td>
271
-									<td><?php echo intval( $list_data['stats']['merge_field_count'] + 1 ); // add 1 for our email field.. ?></td>
270
+									<td scope="row"><label for="tablecell"><strong><?php  _e( 'List Fields', 'yikes-inc-easy-mailchimp-extender' ); ?></strong></label></td>
271
+									<td><?php echo intval( $list_data[ 'stats' ][ 'merge_field_count' ] + 1 ); // add 1 for our email field.. ?></td>
272 272
 								</tr>
273 273
 								<tr valign="top">
274
-									<td scope="row"><label for="tablecell"><strong><?php  _e( 'Short Signup URL' , 'yikes-inc-easy-mailchimp-extender' ); ?></strong></label></td>
275
-									<td><input type="text" class="widefat view-list-sidebar-input" value="<?php echo esc_url_raw( $list_data['subscribe_url_short'] ); ?>" readonly onclick="jQuery(this).select();"></td>
274
+									<td scope="row"><label for="tablecell"><strong><?php  _e( 'Short Signup URL', 'yikes-inc-easy-mailchimp-extender' ); ?></strong></label></td>
275
+									<td><input type="text" class="widefat view-list-sidebar-input" value="<?php echo esc_url_raw( $list_data[ 'subscribe_url_short' ] ); ?>" readonly onclick="jQuery(this).select();"></td>
276 276
 								</tr>
277 277
 								<tr valign="top">
278
-									<td scope="row"><label for="tablecell"><strong><?php  _e( 'Default From Email' , 'yikes-inc-easy-mailchimp-extender' ); ?></strong></label></td>
279
-									<td><input type="text" class="widefat view-list-sidebar-input" value="<?php echo sanitize_email( $list_data['campaign_defaults']['from_email'] ); ?>" readonly onclick="jQuery(this).select();"></td>
278
+									<td scope="row"><label for="tablecell"><strong><?php  _e( 'Default From Email', 'yikes-inc-easy-mailchimp-extender' ); ?></strong></label></td>
279
+									<td><input type="text" class="widefat view-list-sidebar-input" value="<?php echo sanitize_email( $list_data[ 'campaign_defaults' ][ 'from_email' ] ); ?>" readonly onclick="jQuery(this).select();"></td>
280 280
 								</tr>
281 281
 								<tr valign="top">
282
-									<td scope="row"><label for="tablecell"><strong><?php  _e( 'Default From Name' , 'yikes-inc-easy-mailchimp-extender' ); ?></strong></label></td>
283
-									<td><?php echo $list_data['campaign_defaults']['from_name']; ?></td>
282
+									<td scope="row"><label for="tablecell"><strong><?php  _e( 'Default From Name', 'yikes-inc-easy-mailchimp-extender' ); ?></strong></label></td>
283
+									<td><?php echo $list_data[ 'campaign_defaults' ][ 'from_name' ]; ?></td>
284 284
 								</tr>
285 285
 							</table>
286 286
 
@@ -290,14 +290,14 @@  discard block
 block discarded – undo
290 290
 						<!-- Merge Field Info -->
291 291
 						<div class="postbox yikes-easy-mc-postbox">
292 292
 
293
-							<h3><?php _e( 'Form Fields' , 'yikes-inc-easy-mailchimp-extender' ); ?></h3>
293
+							<h3><?php _e( 'Form Fields', 'yikes-inc-easy-mailchimp-extender' ); ?></h3>
294 294
 							<?php
295
-								if( count( $merge_fields['merge_fields'] ) >= 1 ) {
295
+								if ( count( $merge_fields[ 'merge_fields' ] ) >= 1 ) {
296 296
 									?><ul class="merge-variable-ul"><?php
297
-										echo '<li class="interest-group-count">' . sprintf( _n( '%d Field', '%d Fields', intval( count( $merge_fields['merge_fields'] ) ), 'yikes-inc-easy-mailchimp-extender' ), intval( count( $merge_fields['merge_fields'] ) ) ) . '</li>';
298
-										foreach( $merge_fields['merge_fields'] as $merge_field ) {
297
+										echo '<li class="interest-group-count">' . sprintf( _n( '%d Field', '%d Fields', intval( count( $merge_fields[ 'merge_fields' ] ) ), 'yikes-inc-easy-mailchimp-extender' ), intval( count( $merge_fields[ 'merge_fields' ] ) ) ) . '</li>';
298
+										foreach ( $merge_fields[ 'merge_fields' ] as $merge_field ) {
299 299
 											// new action hook @since 6.0.3.8
300
-											echo '<li class="' . $merge_field['tag'] . '"><span class="dashicons dashicons-marker"></span>' . $merge_field['name'] . ' ' . do_action( 'yikes-mailchimp-list-field', $merge_field ) . '</li>';
300
+											echo '<li class="' . $merge_field[ 'tag' ] . '"><span class="dashicons dashicons-marker"></span>' . $merge_field[ 'name' ] . ' ' . do_action( 'yikes-mailchimp-list-field', $merge_field ) . '</li>';
301 301
 										}
302 302
 									?></ul><?php
303 303
 								}
@@ -314,7 +314,7 @@  discard block
 block discarded – undo
314 314
 						<div class="postbox yikes-easy-mc-postbox">
315 315
 
316 316
 
317
-							<h3><?php _e( 'Interest Groups Overview' , 'yikes-inc-easy-mailchimp-extender' ); ?></h3>
317
+							<h3><?php _e( 'Interest Groups Overview', 'yikes-inc-easy-mailchimp-extender' ); ?></h3>
318 318
 							<?php
319 319
 							if ( ! empty( $interest_groupings ) ) {
320 320
 								?>
@@ -322,8 +322,8 @@  discard block
 block discarded – undo
322 322
 								echo '<li class="interest-group-count">' . sprintf( _n( '%d Interest Group', '%d Interest Groups', intval( count( $interest_groupings ) ), 'yikes-inc-easy-mailchimp-extender' ), intval( count( $interest_groupings ) ) ) . '</li>';
323 323
 								foreach ( $interest_groupings as $interest_group ) {
324 324
 									// Build up the total subscribers
325
-									$count = array_sum( wp_list_pluck( $interest_group['items'], 'subscriber_count' ) );
326
-									echo '<li><span class="dashicons dashicons-marker"></span>' . $interest_group['title'] . '<span class="interest-group-title"></span><small title="' . $count . ' ' . __( "subscribers assigned to this group", 'yikes-inc-easy-mailchimp-extender' ) . '">(' . $count . ')</small></li>';
325
+									$count = array_sum( wp_list_pluck( $interest_group[ 'items' ], 'subscriber_count' ) );
326
+									echo '<li><span class="dashicons dashicons-marker"></span>' . $interest_group[ 'title' ] . '<span class="interest-group-title"></span><small title="' . $count . ' ' . __( "subscribers assigned to this group", 'yikes-inc-easy-mailchimp-extender' ) . '">(' . $count . ')</small></li>';
327 327
 								}
328 328
 								?></ul><?php
329 329
 							} else {
@@ -347,17 +347,17 @@  discard block
 block discarded – undo
347 347
 						<div class="postbox yikes-easy-mc-postbox">
348 348
 
349 349
 
350
-							<h3><?php _e( 'Segments Overview' , 'yikes-inc-easy-mailchimp-extender' ); ?></h3>
350
+							<h3><?php _e( 'Segments Overview', 'yikes-inc-easy-mailchimp-extender' ); ?></h3>
351 351
 							<?php
352
-								if( isset( $segments['saved'] ) && count( $segments['saved'] ) >= 1 ) {
352
+								if ( isset( $segments[ 'saved' ] ) && count( $segments[ 'saved' ] ) >= 1 ) {
353 353
 									$i = 1;
354 354
 									?><ul class="segment-ul"><?php
355
-										echo '<li class="segment-group-count">' . sprintf( _n( '%d Segment', '%d Segments', intval( count( $segments['saved'] ) ), 'yikes-inc-easy-mailchimp-extender' ), intval( count( $segments['saved'] ) ) ) . '</li>';
356
-									foreach( $segments['saved'] as $segment ) {
357
-										echo '<li><span class="dashicons dashicons-arrow-right"></span>' . $segment['name'] . ' <small><a href="#" onclick="jQuery(this).parent().parent().next().slideToggle();jQuery(this).toggleText();return false;" data-alt-text="' . __( 'hide conditions' , 'yikes-inc-easy-mailchimp-extender' ) . '">' . __( "view conditions" , 'yikes-inc-easy-mailchimp-extender' ) . '</a></small></li>';
355
+										echo '<li class="segment-group-count">' . sprintf( _n( '%d Segment', '%d Segments', intval( count( $segments[ 'saved' ] ) ), 'yikes-inc-easy-mailchimp-extender' ), intval( count( $segments[ 'saved' ] ) ) ) . '</li>';
356
+									foreach ( $segments[ 'saved' ] as $segment ) {
357
+										echo '<li><span class="dashicons dashicons-arrow-right"></span>' . $segment[ 'name' ] . ' <small><a href="#" onclick="jQuery(this).parent().parent().next().slideToggle();jQuery(this).toggleText();return false;" data-alt-text="' . __( 'hide conditions', 'yikes-inc-easy-mailchimp-extender' ) . '">' . __( "view conditions", 'yikes-inc-easy-mailchimp-extender' ) . '</a></small></li>';
358 358
 										?><div class="conditionals yikes-easy-mc-hidden"><?php
359
-										foreach( $segment['segment_opts']['conditions'] as $condition ) {
360
-											echo '<li><small>' . sprintf( __( 'condition #%s : If %s %s %s', 'yikes-inc-easy-mailchimp-extender' ), intval( $i ), $condition['field'],  $condition['op'], $condition['value'] ) . '</small></li>';
359
+										foreach ( $segment[ 'segment_opts' ][ 'conditions' ] as $condition ) {
360
+											echo '<li><small>' . sprintf( __( 'condition #%s : If %s %s %s', 'yikes-inc-easy-mailchimp-extender' ), intval( $i ), $condition[ 'field' ], $condition[ 'op' ], $condition[ 'value' ] ) . '</small></li>';
361 361
 											$i++;
362 362
 										}
363 363
 										?></div><?php
@@ -372,9 +372,9 @@  discard block
 block discarded – undo
372 372
 								}
373 373
 							?>
374 374
 							<!--
375
-								<a class="edit-segments-button" href="#" onclick="return false;" class="button-primary"><?php _e( 'Edit Segments' , 'yikes-inc-easy-mailchimp-extender' ); ?></a>
375
+								<a class="edit-segments-button" href="#" onclick="return false;" class="button-primary"><?php _e( 'Edit Segments', 'yikes-inc-easy-mailchimp-extender' ); ?></a>
376 376
 							-->
377
-							<p class="description edit-segment-description"><?php _e( 'To edit this lists segments, head over to' , 'yikes-inc-easy-mailchimp-extender' ); ?> <a href="http://www.Mailchimp.com" target="_blank">Mailchimp</a></p>
377
+							<p class="description edit-segment-description"><?php _e( 'To edit this lists segments, head over to', 'yikes-inc-easy-mailchimp-extender' ); ?> <a href="http://www.Mailchimp.com" target="_blank">Mailchimp</a></p>
378 378
 
379 379
 						</div>
380 380
 
Please login to merge, or discard this patch.
admin/partials/ajax/add_field_to_form.php 1 patch
Spacing   +83 added lines, -83 removed lines patch added patch discarded remove patch
@@ -1,15 +1,15 @@  discard block
 block discarded – undo
1 1
 <?php
2 2
 $form_data = array(
3
-	'field_name' => $_POST['field_name'],
4
-	'merge_tag'  => $_POST['merge_tag'],
5
-	'field_type' => $_POST['field_type'],
6
-	'list_id'    => $_POST['list_id'],
3
+	'field_name' => $_POST[ 'field_name' ],
4
+	'merge_tag'  => $_POST[ 'merge_tag' ],
5
+	'field_type' => $_POST[ 'field_type' ],
6
+	'list_id'    => $_POST[ 'list_id' ],
7 7
 );
8 8
 
9 9
 // Grab our list handler.
10 10
 $list_handler = yikes_get_mc_api_manager()->get_list_handler();
11 11
 
12
-$available_merge_variables = $list_handler->get_merge_fields( $form_data['list_id'] );
12
+$available_merge_variables = $list_handler->get_merge_fields( $form_data[ 'list_id' ] );
13 13
 if ( is_wp_error( $available_merge_variables ) ) {
14 14
 	$error_logging = new Yikes_Inc_Easy_Mailchimp_Error_Logging();
15 15
 	$error_logging->maybe_write_to_log(
@@ -28,17 +28,17 @@  discard block
 block discarded – undo
28 28
 }
29 29
 
30 30
 // find and return the location of this merge field in the array
31
-$index = $this->findMCListIndex( $form_data['merge_tag'], $available_merge_variables['merge_fields'], 'tag' );
31
+$index = $this->findMCListIndex( $form_data[ 'merge_tag' ], $available_merge_variables[ 'merge_fields' ], 'tag' );
32 32
 
33 33
 // store it and use it to pre-populate field data (only on initial add to form)
34
-$merge_field_data = $available_merge_variables['merge_fields'][ $index ];
34
+$merge_field_data = $available_merge_variables[ 'merge_fields' ][ $index ];
35 35
 ?>
36
-<section class="draggable" id="<?php echo $form_data['field_name']; ?>">
36
+<section class="draggable" id="<?php echo $form_data[ 'field_name' ]; ?>">
37 37
 	<!-- top -->
38 38
 	<a href="#" class="expansion-section-title settings-sidebar">
39
-		<span class="dashicons dashicons-plus yikes-mc-expansion-toggle" title="<?php _e( 'Expand Field' , 'yikes-inc-easy-mailchimp-extender' ); ?>"></span>
40
-		<?php echo stripslashes( $form_data['field_name'] ); ?>
41
-		<span class="field-type-text"><small><?php echo __( 'type' , 'yikes-inc-easy-mailchimp-extender' ) . ' : ' . $form_data['field_type']; ?></small></span>
39
+		<span class="dashicons dashicons-plus yikes-mc-expansion-toggle" title="<?php _e( 'Expand Field', 'yikes-inc-easy-mailchimp-extender' ); ?>"></span>
40
+		<?php echo stripslashes( $form_data[ 'field_name' ] ); ?>
41
+		<span class="field-type-text"><small><?php echo __( 'type', 'yikes-inc-easy-mailchimp-extender' ) . ' : ' . $form_data[ 'field_type' ]; ?></small></span>
42 42
 	</a>
43 43
 	<!-- expansion section -->
44 44
 	<div class="yikes-mc-settings-expansion-section">
@@ -46,14 +46,14 @@  discard block
 block discarded – undo
46 46
 		<!-- Single or Double Opt-in -->
47 47
 		<p class="type-container form-field-container"><!-- necessary to prevent skipping on slideToggle(); -->
48 48
 			<!-- store the label -->
49
-			<input type="hidden" name="field[<?php echo $merge_field_data['tag']; ?>][label]" value="<?php echo htmlspecialchars( $form_data['field_name'] ); ?>" />
50
-			<input type="hidden" name="field[<?php echo $merge_field_data['tag']; ?>][type]" value="<?php echo $form_data['field_type']; ?>" />
51
-			<input type="hidden" name="field[<?php echo $merge_field_data['tag']; ?>][merge]" value="<?php echo $merge_field_data['tag']; ?>" />
52
-			<input type="hidden" class="field-<?php echo $merge_field_data['tag']; ?>-position position-input" name="field[<?php echo $merge_field_data['tag']; ?>][position]" value="" />
49
+			<input type="hidden" name="field[<?php echo $merge_field_data[ 'tag' ]; ?>][label]" value="<?php echo htmlspecialchars( $form_data[ 'field_name' ] ); ?>" />
50
+			<input type="hidden" name="field[<?php echo $merge_field_data[ 'tag' ]; ?>][type]" value="<?php echo $form_data[ 'field_type' ]; ?>" />
51
+			<input type="hidden" name="field[<?php echo $merge_field_data[ 'tag' ]; ?>][merge]" value="<?php echo $merge_field_data[ 'tag' ]; ?>" />
52
+			<input type="hidden" class="field-<?php echo $merge_field_data[ 'tag' ]; ?>-position position-input" name="field[<?php echo $merge_field_data[ 'tag' ]; ?>][position]" value="" />
53 53
 
54
-			<?php if ( $form_data['field_type'] == 'radio' || $form_data['field_type'] == 'dropdown' ) { ?>
55
-				<?php $choices = ( isset( $merge_field_data['options']['choices'] ) ) ? esc_attr( json_encode( $merge_field_data['options']['choices'] ) ) : ''; ?>
56
-				<input type="hidden" name="field[<?php echo $merge_field_data['tag']; ?>][choices]" value='<?php echo $choices; ?>' />
54
+			<?php if ( $form_data[ 'field_type' ] == 'radio' || $form_data[ 'field_type' ] == 'dropdown' ) { ?>
55
+				<?php $choices = ( isset( $merge_field_data[ 'options' ][ 'choices' ] ) ) ? esc_attr( json_encode( $merge_field_data[ 'options' ][ 'choices' ] ) ) : ''; ?>
56
+				<input type="hidden" name="field[<?php echo $merge_field_data[ 'tag' ]; ?>][choices]" value='<?php echo $choices; ?>' />
57 57
 			<?php } ?>
58 58
 
59 59
 			<table class="form-table form-field-container">
@@ -62,15 +62,15 @@  discard block
 block discarded – undo
62 62
 					<tr valign="top">
63 63
 						<td scope="row">
64 64
 							<label for="merge-tag">
65
-								<?php _e( 'Merge Tag' , 'yikes-inc-easy-mailchimp-extender' ); ?>
65
+								<?php _e( 'Merge Tag', 'yikes-inc-easy-mailchimp-extender' ); ?>
66 66
 							</label>
67 67
 						</td>
68 68
 						<td>
69
-							<input class="widefat merge-tag-text" type="text" readonly value="<?php echo $merge_field_data['tag']; ?>">
69
+							<input class="widefat merge-tag-text" type="text" readonly value="<?php echo $merge_field_data[ 'tag' ]; ?>">
70 70
 						</td>
71 71
 					</tr>
72 72
 
73
-			<?php switch( $form_data['field_type'] ) {
73
+			<?php switch ( $form_data[ 'field_type' ] ) {
74 74
 
75 75
 					default:
76 76
 						break;
@@ -87,12 +87,12 @@  discard block
 block discarded – undo
87 87
 					<tr valign="top">
88 88
 						<td scope="row">
89 89
 							<label for="placeholder">
90
-								<?php _e( 'Placeholder' , 'yikes-inc-easy-mailchimp-extender' ); ?>
90
+								<?php _e( 'Placeholder', 'yikes-inc-easy-mailchimp-extender' ); ?>
91 91
 							</label>
92 92
 						</td>
93 93
 						<td>
94
-						<input type="text" class="widefat" name="field[<?php echo $merge_field_data['tag']; ?>][placeholder]" value="<?php echo isset( $merge_field_data['placeholder'] ) ? stripslashes( wp_strip_all_tags( $merge_field_data['placeholder'] ) ): '' ; ?>" />
95
-							<p class="description"><small><?php _e( "Assign a placeholder value to this field.", 'yikes-inc-easy-mailchimp-extender' );?></small></p>
94
+						<input type="text" class="widefat" name="field[<?php echo $merge_field_data[ 'tag' ]; ?>][placeholder]" value="<?php echo isset( $merge_field_data[ 'placeholder' ] ) ? stripslashes( wp_strip_all_tags( $merge_field_data[ 'placeholder' ] ) ) : ''; ?>" />
95
+							<p class="description"><small><?php _e( "Assign a placeholder value to this field.", 'yikes-inc-easy-mailchimp-extender' ); ?></small></p>
96 96
 						</td>
97 97
 					</tr>
98 98
 
@@ -101,27 +101,27 @@  discard block
 block discarded – undo
101 101
 					*	Loop over field types and store necessary formats
102 102
 					*	( date, birthday - dateformat ; phone - phoneformat )
103 103
 					*/
104
-					switch( $form_data['field_type'] ) {
104
+					switch ( $form_data[ 'field_type' ] ) {
105 105
 
106 106
 						/* Store the date format, for properly rendering dates on the front end */
107 107
 						case 'date':
108
-							$date_format = isset( $merge_field_data['options']['dateformat'] ) ? $merge_field_data['options']['dateformat'] : 'MM/DD/YYYY';
108
+							$date_format = isset( $merge_field_data[ 'options' ][ 'dateformat' ] ) ? $merge_field_data[ 'options' ][ 'dateformat' ] : 'MM/DD/YYYY';
109 109
 							?>
110
-							<input type="hidden" name="field[<?php echo $merge_field_data['tag']; ?>][date_format]" value="<?php echo strtolower( $date_format ); ?>" />
110
+							<input type="hidden" name="field[<?php echo $merge_field_data[ 'tag' ]; ?>][date_format]" value="<?php echo strtolower( $date_format ); ?>" />
111 111
 							<?php
112 112
 						break;
113 113
 
114 114
 						case 'birthday':
115
-							$date_format = isset( $merge_field_data['options']['dateformat'] ) ? $merge_field_data['options']['dateformat'] : 'MM/DD';
115
+							$date_format = isset( $merge_field_data[ 'options' ][ 'dateformat' ] ) ? $merge_field_data[ 'options' ][ 'dateformat' ] : 'MM/DD';
116 116
 							?>
117
-							<input type="hidden" name="field[<?php echo $merge_field_data['tag']; ?>][date_format]" value="<?php echo strtolower( $date_format ); ?>" />
117
+							<input type="hidden" name="field[<?php echo $merge_field_data[ 'tag' ]; ?>][date_format]" value="<?php echo strtolower( $date_format ); ?>" />
118 118
 							<?php
119 119
 						break;
120 120
 
121 121
 						/* Store the phone format, for properly regex pattern */
122 122
 						case 'phone':
123 123
 							?>
124
-							<input type="hidden" name="field[<?php echo $merge_field_data['tag']; ?>][phone_format]" value="<?php echo $merge_field_data['options']['phone_format']; ?>" />
124
+							<input type="hidden" name="field[<?php echo $merge_field_data[ 'tag' ]; ?>][phone_format]" value="<?php echo $merge_field_data[ 'options' ][ 'phone_format' ]; ?>" />
125 125
 							<?php
126 126
 						break;
127 127
 					}
@@ -132,13 +132,13 @@  discard block
 block discarded – undo
132 132
 						?>
133 133
 							<tr valign="top">
134 134
 								<td scope="row">
135
-									<label for="placeholder_<?php echo esc_attr( $field['merge'] ); ?>">
136
-										<?php _e( 'Placeholder' , 'yikes-inc-easy-mailchimp-extender' ); ?>
135
+									<label for="placeholder_<?php echo esc_attr( $field[ 'merge' ] ); ?>">
136
+										<?php _e( 'Placeholder', 'yikes-inc-easy-mailchimp-extender' ); ?>
137 137
 									</label>
138 138
 								</td>
139 139
 								<td>
140
-									<input type="checkbox" class="widefat" name="field[<?php echo $merge_field_data['tag']; ?>][placeholder]" value="1" />
141
-									<span class="description"><small><?php _e( "Use placeholders for this field (these will be automatically filled in with field names).", 'yikes-inc-easy-mailchimp-extender' );?></small></span>
140
+									<input type="checkbox" class="widefat" name="field[<?php echo $merge_field_data[ 'tag' ]; ?>][placeholder]" value="1" />
141
+									<span class="description"><small><?php _e( "Use placeholders for this field (these will be automatically filled in with field names).", 'yikes-inc-easy-mailchimp-extender' ); ?></small></span>
142 142
 								</td>
143 143
 							</tr>
144 144
 						<?php
@@ -148,7 +148,7 @@  discard block
 block discarded – undo
148 148
 			?>
149 149
 
150 150
 				<!-- Default Value -->
151
-				<?php switch( $form_data['field_type'] ) {
151
+				<?php switch ( $form_data[ 'field_type' ] ) {
152 152
 
153 153
 					default:
154 154
 					case 'text':
@@ -156,17 +156,17 @@  discard block
 block discarded – undo
156 156
 						<tr valign="top">
157 157
 							<td scope="row">
158 158
 								<label for="placeholder">
159
-									<?php _e( 'Default Value' , 'yikes-inc-easy-mailchimp-extender' ); ?>
159
+									<?php _e( 'Default Value', 'yikes-inc-easy-mailchimp-extender' ); ?>
160 160
 								</label>
161 161
 							</td>
162 162
 							<td>
163
-								<input type="text" class="widefat" name="field[<?php echo $merge_field_data['tag']; ?>][default]" <?php if( $form_data['field_type'] != 'url' ) { ?> value="<?php echo isset( $merge_field_data['default_value'] ) ? stripslashes( wp_strip_all_tags( $merge_field_data['default_value'] ) ) : ''; ?>" <?php } else { ?> value="<?php echo isset( $merge_field_data['default_value'] ) ? stripslashes( wp_strip_all_tags( esc_url_raw( $merge_field_data['default_value'] ) ) ) : ''; } ?>" />
164
-								<p class="description"><small><?php _e( "Assign a default value to populate this field with on initial page load.", 'yikes-inc-easy-mailchimp-extender' );?></small></p>
163
+								<input type="text" class="widefat" name="field[<?php echo $merge_field_data[ 'tag' ]; ?>][default]" <?php if ( $form_data[ 'field_type' ] != 'url' ) { ?> value="<?php echo isset( $merge_field_data[ 'default_value' ] ) ? stripslashes( wp_strip_all_tags( $merge_field_data[ 'default_value' ] ) ) : ''; ?>" <?php } else { ?> value="<?php echo isset( $merge_field_data[ 'default_value' ] ) ? stripslashes( wp_strip_all_tags( esc_url_raw( $merge_field_data[ 'default_value' ] ) ) ) : ''; } ?>" />
164
+								<p class="description"><small><?php _e( "Assign a default value to populate this field with on initial page load.", 'yikes-inc-easy-mailchimp-extender' ); ?></small></p>
165 165
 								<?php
166
-								switch ( $form_data['field_type'] ) {
166
+								switch ( $form_data[ 'field_type' ] ) {
167 167
 									case 'text':
168 168
 										?>
169
-										<p><small class="pre-defined-tag-link"><a href="#TB_inline?width=600&height=550&inlineId=pre-defined-tag-container" class="thickbox" onclick="storeGlobalClicked( jQuery( this ) );"><?php _e( 'View Pre-Defined Tags' , 'yikes-inc-easy-mailchimp-extender' ); ?></a></small></p>
169
+										<p><small class="pre-defined-tag-link"><a href="#TB_inline?width=600&height=550&inlineId=pre-defined-tag-container" class="thickbox" onclick="storeGlobalClicked( jQuery( this ) );"><?php _e( 'View Pre-Defined Tags', 'yikes-inc-easy-mailchimp-extender' ); ?></a></small></p>
170 170
 										<?php
171 171
 									break;
172 172
 								} ?>
@@ -180,28 +180,28 @@  discard block
 block discarded – undo
180 180
 							<tr valign="top">
181 181
 								<td scope="row">
182 182
 									<label for="placeholder">
183
-										<?php _e( 'Default Selection' , 'yikes-inc-easy-mailchimp-extender' ); ?>
183
+										<?php _e( 'Default Selection', 'yikes-inc-easy-mailchimp-extender' ); ?>
184 184
 									</label>
185 185
 								</td>
186 186
 								<td>
187
-									<?php $pre_selected = ! empty( $merge_field_data['default_choice'] ) ? $merge_field_data['default_choice'] : 'no-default'; ?>
188
-									<label for="<?php echo $merge_field_data['tag'] . '-no-default'; ?>">
189
-										<input id="<?php echo $merge_field_data['tag'] . '-no-default'; ?>"
187
+									<?php $pre_selected = ! empty( $merge_field_data[ 'default_choice' ] ) ? $merge_field_data[ 'default_choice' ] : 'no-default'; ?>
188
+									<label for="<?php echo $merge_field_data[ 'tag' ] . '-no-default'; ?>">
189
+										<input id="<?php echo $merge_field_data[ 'tag' ] . '-no-default'; ?>"
190 190
 										       type="radio"
191
-										       name="field[<?php echo $merge_field_data['tag']; ?>][default_choice]"
191
+										       name="field[<?php echo $merge_field_data[ 'tag' ]; ?>][default_choice]"
192 192
 										       value="no-default" <?php checked( $pre_selected, 'no-default' ); ?>
193 193
 										>
194 194
 										No Default&nbsp;
195 195
 									</label>
196 196
 									<?php
197 197
 									$x = 0;
198
-									foreach ( $merge_field_data['options']['choices'] as $choice => $value ) { ?>
198
+									foreach ( $merge_field_data[ 'options' ][ 'choices' ] as $choice => $value ) { ?>
199 199
 										<label>
200
-											<input type="radio" name="field[<?php echo $merge_field_data['tag']; ?>][default_choice]" value="<?php echo $x; ?>" <?php checked( $pre_selected, $choice ); ?>><?php echo $value; ?>
200
+											<input type="radio" name="field[<?php echo $merge_field_data[ 'tag' ]; ?>][default_choice]" value="<?php echo $x; ?>" <?php checked( $pre_selected, $choice ); ?>><?php echo $value; ?>
201 201
 										</label>
202 202
 										<?php $x++;
203 203
 									} ?>
204
-									<p class="description"><small><?php _e( "Select the option that should be selected by default.", 'yikes-inc-easy-mailchimp-extender' );?></small></p>
204
+									<p class="description"><small><?php _e( "Select the option that should be selected by default.", 'yikes-inc-easy-mailchimp-extender' ); ?></small></p>
205 205
 								</td>
206 206
 							</tr>
207 207
 
@@ -213,18 +213,18 @@  discard block
 block discarded – undo
213 213
 							<tr valign="top">
214 214
 								<td scope="row">
215 215
 									<label for="placeholder">
216
-										<?php _e( 'Default Selection' , 'yikes-inc-easy-mailchimp-extender' ); ?>
216
+										<?php _e( 'Default Selection', 'yikes-inc-easy-mailchimp-extender' ); ?>
217 217
 									</label>
218 218
 								</td>
219 219
 								<td>
220
-									<select type="default" name="field[<?php echo $merge_field_data['tag']; ?>][default_choice]">
221
-										<?php $pre_selected = ! empty( $merge_field_data['default_choice'] ) ? $merge_field_data['default_choice'] : 'no-default'; ?>
220
+									<select type="default" name="field[<?php echo $merge_field_data[ 'tag' ]; ?>][default_choice]">
221
+										<?php $pre_selected = ! empty( $merge_field_data[ 'default_choice' ] ) ? $merge_field_data[ 'default_choice' ] : 'no-default'; ?>
222 222
 										<option value="no-default" <?php selected( $pre_selected, $choice ); ?>>No Default</option>
223
-										<?php foreach ( $merge_field_data['options']['choices'] as $choice => $value ) { ?>
223
+										<?php foreach ( $merge_field_data[ 'options' ][ 'choices' ] as $choice => $value ) { ?>
224 224
 											<option value="<?php echo $choice; ?>" <?php selected( $pre_selected, $choice ); ?>><?php echo stripslashes( $value ); ?></option>
225 225
 										<?php } ?>
226 226
 									</select>
227
-									<p class="description"><small><?php _e( "Which option should be selected by default?", 'yikes-inc-easy-mailchimp-extender' );?></small></p>
227
+									<p class="description"><small><?php _e( "Which option should be selected by default?", 'yikes-inc-easy-mailchimp-extender' ); ?></small></p>
228 228
 								</td>
229 229
 							</tr>
230 230
 
@@ -237,77 +237,77 @@  discard block
 block discarded – undo
237 237
 				<tr valign="top">
238 238
 					<td scope="row">
239 239
 						<label for="placeholder">
240
-							<?php _e( 'Description' , 'yikes-inc-easy-mailchimp-extender' ); ?>
240
+							<?php _e( 'Description', 'yikes-inc-easy-mailchimp-extender' ); ?>
241 241
 						</label>
242 242
 					</td>
243 243
 					<td>
244
-						<textarea class="widefat field-description-input" name="field[<?php echo $merge_field_data['tag']; ?>][description]"></textarea>
245
-						<p class="description"><small><?php _e( "Enter the description for the form field. This will be displayed to the user and provide some direction on how the field should be filled out or selected.", 'yikes-inc-easy-mailchimp-extender' );?></small></p>
244
+						<textarea class="widefat field-description-input" name="field[<?php echo $merge_field_data[ 'tag' ]; ?>][description]"></textarea>
245
+						<p class="description"><small><?php _e( "Enter the description for the form field. This will be displayed to the user and provide some direction on how the field should be filled out or selected.", 'yikes-inc-easy-mailchimp-extender' ); ?></small></p>
246 246
 					</td>
247 247
 				</tr>
248 248
 				<!-- Description Above Field -->
249 249
 				<tr valign="top" class="yikes-checkbox-container">
250 250
 					<td scope="row">
251
-						<label for="description_above_<?php echo esc_attr( $merge_field_data['tag'] ); ?>">
252
-							<?php _e( 'Description Above Field' , 'yikes-inc-easy-mailchimp-extender' ); ?>
251
+						<label for="description_above_<?php echo esc_attr( $merge_field_data[ 'tag' ] ); ?>">
252
+							<?php _e( 'Description Above Field', 'yikes-inc-easy-mailchimp-extender' ); ?>
253 253
 						</label>
254 254
 					</td>
255 255
 					<td>
256
-						<input type="checkbox" id="description_above_<?php echo esc_attr( $merge_field_data['tag'] ); ?>" class="widefat field-description-input" name="field[<?php echo $merge_field_data['tag']; ?>][description_above]" value="1" />
257
-						<p class="description"><small><?php _e( "By default the description will appear undearneath the field. Check this box if you'd like the description to appear above the field.", 'yikes-inc-easy-mailchimp-extender' );?></small></p>
256
+						<input type="checkbox" id="description_above_<?php echo esc_attr( $merge_field_data[ 'tag' ] ); ?>" class="widefat field-description-input" name="field[<?php echo $merge_field_data[ 'tag' ]; ?>][description_above]" value="1" />
257
+						<p class="description"><small><?php _e( "By default the description will appear undearneath the field. Check this box if you'd like the description to appear above the field.", 'yikes-inc-easy-mailchimp-extender' ); ?></small></p>
258 258
 					</td>
259 259
 				</tr>
260 260
 				<!-- Additional Classes -->
261 261
 				<tr valign="top">
262 262
 					<td scope="row">
263 263
 						<label for="placeholder">
264
-							<?php _e( 'Additional Classes' , 'yikes-inc-easy-mailchimp-extender' ); ?>
264
+							<?php _e( 'Additional Classes', 'yikes-inc-easy-mailchimp-extender' ); ?>
265 265
 						</label>
266 266
 					</td>
267 267
 					<td>
268
-						<input type="text" class="widefat" name="field[<?php echo $merge_field_data['tag']; ?>][additional-classes]" value="<?php echo isset( $form_data['classes'] ) ? stripslashes( wp_strip_all_tags( $form_data['classes'] ) ) : '' ; ?>" />
269
-						<p class="description"><small><?php printf( __( "Assign additional classes to this field. %s.", 'yikes-inc-easy-mailchimp-extender' ), '<a target="_blank" href="' . esc_url( 'https://yikesplugins.com/support/knowledge-base/bundled-css-classes/' ) . '">' . __( 'View bundled classes', 'yikes-inc-easy-mailchimp-extender' ) . '</a>' );?></small></p>
268
+						<input type="text" class="widefat" name="field[<?php echo $merge_field_data[ 'tag' ]; ?>][additional-classes]" value="<?php echo isset( $form_data[ 'classes' ] ) ? stripslashes( wp_strip_all_tags( $form_data[ 'classes' ] ) ) : ''; ?>" />
269
+						<p class="description"><small><?php printf( __( "Assign additional classes to this field. %s.", 'yikes-inc-easy-mailchimp-extender' ), '<a target="_blank" href="' . esc_url( 'https://yikesplugins.com/support/knowledge-base/bundled-css-classes/' ) . '">' . __( 'View bundled classes', 'yikes-inc-easy-mailchimp-extender' ) . '</a>' ); ?></small></p>
270 270
 					</td>
271 271
 				</tr>
272 272
 					<!-- Required Toggle -->
273 273
 					<tr valign="top" class="yikes-checkbox-container">
274 274
 						<td scope="row">
275 275
 							<label for="field-required">
276
-								<?php _e( 'Field Required?' , 'yikes-inc-easy-mailchimp-extender' ); ?>
276
+								<?php _e( 'Field Required?', 'yikes-inc-easy-mailchimp-extender' ); ?>
277 277
 							</label>
278 278
 						</td>
279 279
 						<td>
280
-							<input type="checkbox" class="widefat" value="1" name="field[<?php echo $merge_field_data['tag']; ?>][require]" <?php checked( $merge_field_data['required'], 1 ); ?> <?php if( $merge_field_data['tag'] == 'EMAIL' ) {  ?> disabled="disabled" checked="checked" title="<?php echo __( 'Email is a required field.' , 'yikes-inc-easy-mailchimp-extender' ); } ?>">
281
-							<p class="description"><small><?php _e( "Require this field to be filled in before the form can be submitted.", 'yikes-inc-easy-mailchimp-extender' );?></small></p>
280
+							<input type="checkbox" class="widefat" value="1" name="field[<?php echo $merge_field_data[ 'tag' ]; ?>][require]" <?php checked( $merge_field_data[ 'required' ], 1 ); ?> <?php if ( $merge_field_data[ 'tag' ] == 'EMAIL' ) {  ?> disabled="disabled" checked="checked" title="<?php echo __( 'Email is a required field.', 'yikes-inc-easy-mailchimp-extender' ); } ?>">
281
+							<p class="description"><small><?php _e( "Require this field to be filled in before the form can be submitted.", 'yikes-inc-easy-mailchimp-extender' ); ?></small></p>
282 282
 						</td>
283 283
 					</tr>
284 284
 					<!-- Visible Toggle -->
285 285
 					<tr valign="top" class="yikes-checkbox-container">
286 286
 						<td scope="row">
287 287
 							<label for="hide-field">
288
-								<?php _e( 'Hide Field' , 'yikes-inc-easy-mailchimp-extender' ); ?>
288
+								<?php _e( 'Hide Field', 'yikes-inc-easy-mailchimp-extender' ); ?>
289 289
 							</label>
290 290
 						</td>
291 291
 						<td>
292
-							<input type="checkbox" class="widefat" value="1" name="field[<?php echo $merge_field_data['tag']; ?>][hide]" <?php checked( $merge_field_data['public'], '' ); ?> <?php if( $merge_field_data['tag'] == 'EMAIL' ) {  ?> disabled="disabled" title="<?php echo __( 'Cannot toggle email field visibility.' , 'yikes-inc-easy-mailchimp-extender' ); } ?>">
293
-							<p class="description"><small><?php _e( "Hide this field from being displayed on the front end.", 'yikes-inc-easy-mailchimp-extender' );?></small></p>
292
+							<input type="checkbox" class="widefat" value="1" name="field[<?php echo $merge_field_data[ 'tag' ]; ?>][hide]" <?php checked( $merge_field_data[ 'public' ], '' ); ?> <?php if ( $merge_field_data[ 'tag' ] == 'EMAIL' ) {  ?> disabled="disabled" title="<?php echo __( 'Cannot toggle email field visibility.', 'yikes-inc-easy-mailchimp-extender' ); } ?>">
293
+							<p class="description"><small><?php _e( "Hide this field from being displayed on the front end.", 'yikes-inc-easy-mailchimp-extender' ); ?></small></p>
294 294
 						</td>
295 295
 					</tr>
296 296
 					<!-- Toggle Field Label Visibility -->
297 297
 					<tr valign="top" class="yikes-checkbox-container">
298 298
 						<td scope="row">
299 299
 							<label for="placeholder">
300
-								<?php _e( 'Hide Label' , 'yikes-inc-easy-mailchimp-extender' ); ?>
300
+								<?php _e( 'Hide Label', 'yikes-inc-easy-mailchimp-extender' ); ?>
301 301
 							</label>
302 302
 						</td>
303 303
 						<td>
304
-							<input type="checkbox" name="field[<?php echo $merge_field_data['tag']; ?>][hide-label]" value="1" />
305
-							<p class="description"><small><?php _e( "Toggle field label visibility.", 'yikes-inc-easy-mailchimp-extender' );?></small></p>
304
+							<input type="checkbox" name="field[<?php echo $merge_field_data[ 'tag' ]; ?>][hide-label]" value="1" />
305
+							<p class="description"><small><?php _e( "Toggle field label visibility.", 'yikes-inc-easy-mailchimp-extender' ); ?></small></p>
306 306
 						</td>
307 307
 					</tr>
308 308
 					<!-- Display Phone/Date Formats back to the user -->
309 309
 					<?php
310
-						switch( $form_data['field_type'] ) {
310
+						switch ( $form_data[ 'field_type' ] ) {
311 311
 
312 312
 							/* Store the phone format, for properly regex pattern */
313 313
 							case 'phone':
@@ -318,23 +318,23 @@  discard block
 block discarded – undo
318 318
 									<td scope="row">
319 319
 										<label for="placeholder">
320 320
 										<?php
321
-											switch( $form_data['field_type'] ) {
321
+											switch ( $form_data[ 'field_type' ] ) {
322 322
 												default:
323 323
 												case 'birthday':
324
-													$type = __( 'Date Format' , 'yikes-inc-easy-mailchimp-extender' );
325
-													$format = $merge_field_data['options']['date_format'];
324
+													$type = __( 'Date Format', 'yikes-inc-easy-mailchimp-extender' );
325
+													$format = $merge_field_data[ 'options' ][ 'date_format' ];
326 326
 													$format_name = 'date_format';
327 327
 													break;
328 328
 
329 329
 												case 'date':
330
-													$type = __( 'Date Format' , 'yikes-inc-easy-mailchimp-extender' );
331
-													$format = $merge_field_data['options']['date_format'];
330
+													$type = __( 'Date Format', 'yikes-inc-easy-mailchimp-extender' );
331
+													$format = $merge_field_data[ 'options' ][ 'date_format' ];
332 332
 													$format_name = 'date_format';
333 333
 													break;
334 334
 
335 335
 												case 'phone':
336
-													$type = __( 'Phone Format' , 'yikes-inc-easy-mailchimp-extender' );
337
-													$format = ( ( $merge_field_data['options']['phone_format'] == 'none' ) ? __( 'International', 'yikes-inc-easy-mailchimp-extender' ) : $merge_field_data['options']['phone_format'] );
336
+													$type = __( 'Phone Format', 'yikes-inc-easy-mailchimp-extender' );
337
+													$format = ( ( $merge_field_data[ 'options' ][ 'phone_format' ] == 'none' ) ? __( 'International', 'yikes-inc-easy-mailchimp-extender' ) : $merge_field_data[ 'options' ][ 'phone_format' ] );
338 338
 													$format_name = 'phone_format';
339 339
 													break;
340 340
 											}
@@ -344,7 +344,7 @@  discard block
 block discarded – undo
344 344
 									</td>
345 345
 									<td>
346 346
 										<strong><?php echo $format; ?></strong>
347
-										<input type="hidden" name="field[<?php echo $merge_field_data['tag']; ?>][<?php echo $format_name; ?>]" value="<?php echo $format; ?>" />
347
+										<input type="hidden" name="field[<?php echo $merge_field_data[ 'tag' ]; ?>][<?php echo $format_name; ?>]" value="<?php echo $format; ?>" />
348 348
 										<p class="description"><small>
349 349
 											<?php printf( __( 'To change the %s please head over to <a href="%s" title="Mailchimp" target="_blank">Mailchimp</a>. If you alter the format, you should re-import this field.', 'yikes-inc-easy-mailchimp-extender' ), strtolower( $type ), esc_url( 'http://www.mailchimp.com' ) ); ?>
350 350
 										</small></p>
@@ -365,8 +365,8 @@  discard block
 block discarded – undo
365 365
 						</td>
366 366
 						<td>
367 367
 							<span class="toggle-container">
368
-								<a href="#" class="hide-field"><?php _e( "Close" , 'yikes-inc-easy-mailchimp-extender' ); ?></a> |
369
-								<a href="#" class="remove-field" alt="<?php echo $merge_field_data['tag']; ?>"><?php _e( "Remove Field" , 'yikes-inc-easy-mailchimp-extender' ); ?></a>
368
+								<a href="#" class="hide-field"><?php _e( "Close", 'yikes-inc-easy-mailchimp-extender' ); ?></a> |
369
+								<a href="#" class="remove-field" alt="<?php echo $merge_field_data[ 'tag' ]; ?>"><?php _e( "Remove Field", 'yikes-inc-easy-mailchimp-extender' ); ?></a>
370 370
 							</span>
371 371
 						</td>
372 372
 					</tr>
Please login to merge, or discard this patch.
admin/partials/menu/manage-forms.php 1 patch
Spacing   +50 added lines, -50 removed lines patch added patch discarded remove patch
@@ -6,13 +6,13 @@  discard block
 block discarded – undo
6 6
 $all_forms = $form_interface->get_all_forms();
7 7
 
8 8
 /* Store Data if User is Authorized */
9
-if( $this->is_user_mc_api_valid_form( false ) == 'valid' ) {
9
+if ( $this->is_user_mc_api_valid_form( false ) == 'valid' ) {
10 10
 	$list_data = yikes_get_mc_api_manager()->get_list_handler()->get_lists();
11 11
 	if ( is_wp_error( $list_data ) ) {
12 12
 		$error_logging = new Yikes_Inc_Easy_Mailchimp_Error_Logging();
13 13
 		$error_logging->maybe_write_to_log(
14 14
 			$list_data->get_error_code(),
15
-			__( "Get Account Lists" , 'yikes-inc-easy-mailchimp-extender' ),
15
+			__( "Get Account Lists", 'yikes-inc-easy-mailchimp-extender' ),
16 16
 			"Manage Forms Page"
17 17
 		);
18 18
 		$list_data = array();
@@ -23,24 +23,24 @@  discard block
 block discarded – undo
23 23
 ?>
24 24
 <div class="wrap">
25 25
 	<!-- Freddie Logo -->
26
-	<img src="<?php echo YIKES_MC_URL . 'includes/images/MailChimp_Assets/Freddie_60px.png'; ?>" alt="<?php _e( 'Freddie - Mailchimp Mascot' , 'yikes-inc-easy-mailchimp-extender' ); ?>" class="yikes-mc-freddie-logo" />
26
+	<img src="<?php echo YIKES_MC_URL . 'includes/images/MailChimp_Assets/Freddie_60px.png'; ?>" alt="<?php _e( 'Freddie - Mailchimp Mascot', 'yikes-inc-easy-mailchimp-extender' ); ?>" class="yikes-mc-freddie-logo" />
27 27
 
28
-	<h1>Easy Forms for Mailchimp | <?php _e( 'Manage Forms' , 'yikes-inc-easy-mailchimp-extender' ) ?></h1>
28
+	<h1>Easy Forms for Mailchimp | <?php _e( 'Manage Forms', 'yikes-inc-easy-mailchimp-extender' ) ?></h1>
29 29
 
30 30
 	<!-- Settings Page Description -->
31
-	<p class="yikes-easy-mc-about-text about-text"><?php _e( 'Create and manage your Mailchimp forms.' , 'yikes-inc-easy-mailchimp-extender' ); ?></p>
31
+	<p class="yikes-easy-mc-about-text about-text"><?php _e( 'Create and manage your Mailchimp forms.', 'yikes-inc-easy-mailchimp-extender' ); ?></p>
32 32
 
33 33
 	<!-- Action Notices -->
34 34
 	<?php
35 35
 
36 36
 	/* If the user hasn't authenticated yet, lets kill off */
37
-	if( get_option( 'yikes-mc-api-validation' , 'invalid_api_key' ) != 'valid_api_key' ) {
38
-		wp_die( '<div class="error"><p>' . sprintf( __( 'You need to connect to Mailchimp before you can start creating forms. Head over to the <a href="%s" title="Settings Page">Settings Page</a> and enter your API key.' , 'yikes-inc-easy-mailchimp-extender' ), esc_url_raw( admin_url( 'admin.php?page=yikes-inc-easy-mailchimp-settings' ) ) ) . '</p></div>' , 500 );
37
+	if ( get_option( 'yikes-mc-api-validation', 'invalid_api_key' ) != 'valid_api_key' ) {
38
+		wp_die( '<div class="error"><p>' . sprintf( __( 'You need to connect to Mailchimp before you can start creating forms. Head over to the <a href="%s" title="Settings Page">Settings Page</a> and enter your API key.', 'yikes-inc-easy-mailchimp-extender' ), esc_url_raw( admin_url( 'admin.php?page=yikes-inc-easy-mailchimp-settings' ) ) ) . '</p></div>', 500 );
39 39
 	}
40 40
 
41 41
 	/* Display our admin notices here */
42 42
 	// delete form success
43
-	if( isset( $_REQUEST['deleted-form'] ) && $_REQUEST['deleted-form'] == 'true' ) {
43
+	if ( isset( $_REQUEST[ 'deleted-form' ] ) && $_REQUEST[ 'deleted-form' ] == 'true' ) {
44 44
 		?>
45 45
 		<div class="updated manage-form-admin-notice">
46 46
 			<p><?php _e( 'Opt-in form successfully deleted.', 'yikes-inc-easy-mailchimp-extender' ); ?></p>
@@ -48,7 +48,7 @@  discard block
 block discarded – undo
48 48
 		<?php
49 49
 	}
50 50
 	// duplicate form success
51
-	if( isset( $_REQUEST['duplicated-form'] ) && $_REQUEST['duplicated-form'] == 'true' ) {
51
+	if ( isset( $_REQUEST[ 'duplicated-form' ] ) && $_REQUEST[ 'duplicated-form' ] == 'true' ) {
52 52
 		?>
53 53
 		<div class="updated manage-form-admin-notice">
54 54
 			<p><?php _e( 'Mailchimp Form successfully cloned.', 'yikes-inc-easy-mailchimp-extender' ); ?></p>
@@ -56,7 +56,7 @@  discard block
 block discarded – undo
56 56
 		<?php
57 57
 	}
58 58
 	// duplicate form error
59
-	if( isset( $_REQUEST['duplicated-form'] ) && $_REQUEST['duplicated-form'] == 'false' ) {
59
+	if ( isset( $_REQUEST[ 'duplicated-form' ] ) && $_REQUEST[ 'duplicated-form' ] == 'false' ) {
60 60
 		?>
61 61
 		<div class="error manage-form-admin-notice">
62 62
 			<p><?php _e( 'There was an error trying to clone your form. Please try again. If this error persists, please contact the YIKES Inc. support team.', 'yikes-inc-easy-mailchimp-extender' ); ?></p>
@@ -64,7 +64,7 @@  discard block
 block discarded – undo
64 64
 		<?php
65 65
 	}
66 66
 	// reset form submission stats success
67
-	if( isset( $_REQUEST['reset-stats'] ) && $_REQUEST['reset-stats'] == 'true' ) {
67
+	if ( isset( $_REQUEST[ 'reset-stats' ] ) && $_REQUEST[ 'reset-stats' ] == 'true' ) {
68 68
 		?>
69 69
 		<div class="updated manage-form-admin-notice">
70 70
 			<p><?php _e( 'Form submission stats/rates successfully reset.', 'yikes-inc-easy-mailchimp-extender' ); ?></p>
@@ -72,7 +72,7 @@  discard block
 block discarded – undo
72 72
 		<?php
73 73
 	}
74 74
 	// reset form submission stats error
75
-	if( isset( $_REQUEST['reset-stats'] ) && $_REQUEST['reset-stats'] == 'false' ) {
75
+	if ( isset( $_REQUEST[ 'reset-stats' ] ) && $_REQUEST[ 'reset-stats' ] == 'false' ) {
76 76
 		?>
77 77
 		<div class="error manage-form-admin-notice">
78 78
 			<p><?php _e( 'There was an error trying to reset the form submission stats/rates. Please try again. If this error persists, please contact the YIKES Inc. support team.', 'yikes-inc-easy-mailchimp-extender' ); ?></p>
@@ -99,13 +99,13 @@  discard block
 block discarded – undo
99 99
 								<thead>
100 100
 									<tr>
101 101
 										<th id="cb" class="manage-column column-cb check-column num" scope="col"><input type="checkbox" /></th>
102
-										<th id="columnname" class="manage-column column-columnname num yikes-form-id-number" scope="col"><?php _e( 'ID' , 'yikes-inc-easy-mailchimp-extender' ); ?></th>
103
-										<th id="columnname" class="manage-column column-columnname" scope="col"><?php _e( 'Form Name' , 'yikes-inc-easy-mailchimp-extender' ); ?></th>
104
-										<th id="columnname" class="manage-column column-columnname" scope="col"><?php _e( 'Form Description' , 'yikes-inc-easy-mailchimp-extender' ); ?></th>
105
-										<th id="columnname" class="manage-column column-columnname" scope="col"><?php _e( 'List' , 'yikes-inc-easy-mailchimp-extender' ); ?></th>
106
-										<th id="columnname" class="manage-column column-columnname num" scope="col"><?php _e( 'Impressions' , 'yikes-inc-easy-mailchimp-extender' ); ?></th>
107
-										<th id="columnname" class="manage-column column-columnname num" scope="col" ><?php _e( 'Submissions' , 'yikes-inc-easy-mailchimp-extender' ); ?></th>
108
-										<th id="columnname" class="manage-column column-columnname num" scope="col"><?php _e( 'Conversion Rate' , 'yikes-inc-easy-mailchimp-extender' ); ?></th>
102
+										<th id="columnname" class="manage-column column-columnname num yikes-form-id-number" scope="col"><?php _e( 'ID', 'yikes-inc-easy-mailchimp-extender' ); ?></th>
103
+										<th id="columnname" class="manage-column column-columnname" scope="col"><?php _e( 'Form Name', 'yikes-inc-easy-mailchimp-extender' ); ?></th>
104
+										<th id="columnname" class="manage-column column-columnname" scope="col"><?php _e( 'Form Description', 'yikes-inc-easy-mailchimp-extender' ); ?></th>
105
+										<th id="columnname" class="manage-column column-columnname" scope="col"><?php _e( 'List', 'yikes-inc-easy-mailchimp-extender' ); ?></th>
106
+										<th id="columnname" class="manage-column column-columnname num" scope="col"><?php _e( 'Impressions', 'yikes-inc-easy-mailchimp-extender' ); ?></th>
107
+										<th id="columnname" class="manage-column column-columnname num" scope="col" ><?php _e( 'Submissions', 'yikes-inc-easy-mailchimp-extender' ); ?></th>
108
+										<th id="columnname" class="manage-column column-columnname num" scope="col"><?php _e( 'Conversion Rate', 'yikes-inc-easy-mailchimp-extender' ); ?></th>
109 109
 									</tr>
110 110
 								</thead>
111 111
 								<!-- end header -->
@@ -114,13 +114,13 @@  discard block
 block discarded – undo
114 114
 								<tfoot>
115 115
 									<tr>
116 116
 										<th class="manage-column column-cb check-column num" scope="col"><input type="checkbox" /></th>
117
-										<th id="columnname" class="manage-column column-columnname num yikes-form-id-number" scope="col"><?php _e( 'ID' , 'yikes-inc-easy-mailchimp-extender' ); ?></th>
118
-										<th id="columnname" class="manage-column column-columnname" scope="col"><?php _e( 'Form Name' , 'yikes-inc-easy-mailchimp-extender' ); ?></th>
119
-										<th id="columnname" class="manage-column column-columnname" scope="col"><?php _e( 'Form Description' , 'yikes-inc-easy-mailchimp-extender' ); ?></th>
120
-										<th class="manage-column column-columnname" scope="col"><?php _e( 'List' , 'yikes-inc-easy-mailchimp-extender' ); ?></th>
121
-										<th id="columnname" class="manage-column column-columnname num" scope="col"><?php _e( 'Impressions' , 'yikes-inc-easy-mailchimp-extender' ); ?></th>
122
-										<th id="columnname" class="manage-column column-columnname num" scope="col"><?php _e( 'Submissions' , 'yikes-inc-easy-mailchimp-extender' ); ?></th>
123
-										<th id="columnname" class="manage-column column-columnname num" scope="col"><?php _e( 'Conversion Rate' , 'yikes-inc-easy-mailchimp-extender' ); ?></th>
117
+										<th id="columnname" class="manage-column column-columnname num yikes-form-id-number" scope="col"><?php _e( 'ID', 'yikes-inc-easy-mailchimp-extender' ); ?></th>
118
+										<th id="columnname" class="manage-column column-columnname" scope="col"><?php _e( 'Form Name', 'yikes-inc-easy-mailchimp-extender' ); ?></th>
119
+										<th id="columnname" class="manage-column column-columnname" scope="col"><?php _e( 'Form Description', 'yikes-inc-easy-mailchimp-extender' ); ?></th>
120
+										<th class="manage-column column-columnname" scope="col"><?php _e( 'List', 'yikes-inc-easy-mailchimp-extender' ); ?></th>
121
+										<th id="columnname" class="manage-column column-columnname num" scope="col"><?php _e( 'Impressions', 'yikes-inc-easy-mailchimp-extender' ); ?></th>
122
+										<th id="columnname" class="manage-column column-columnname num" scope="col"><?php _e( 'Submissions', 'yikes-inc-easy-mailchimp-extender' ); ?></th>
123
+										<th id="columnname" class="manage-column column-columnname num" scope="col"><?php _e( 'Conversion Rate', 'yikes-inc-easy-mailchimp-extender' ); ?></th>
124 124
 									</tr>
125 125
 								</tfoot>
126 126
 								<!-- end footer -->
@@ -130,40 +130,40 @@  discard block
 block discarded – undo
130 130
 									<?php
131 131
 									if ( count( $all_forms ) > 0 ) {
132 132
 										$i = 1;
133
-										foreach( $all_forms as $id => $form ) {
133
+										foreach ( $all_forms as $id => $form ) {
134 134
 										?>
135
-										<tr class="<?php if( $i % 2 == 0 ) { echo 'alternate'; } ?>">
135
+										<tr class="<?php if ( $i % 2 == 0 ) { echo 'alternate'; } ?>">
136 136
 											<th class="check-column num" scope="row"><input type="checkbox" /></th>
137 137
 											<td class="column-columnname num"><span class="form-id-container"><?php echo intval( $id ); ?></span></td>
138 138
 											<td class="column-columnname">
139 139
 												<!-- row title/link -->
140
-												<a href="<?php echo esc_url_raw( add_query_arg( array( 'id' => $id ) , admin_url( 'admin.php?page=yikes-mailchimp-edit-form' ) ) ); ?>" class="row-title">
141
-													<?php echo stripslashes( $form['form_name'] ); ?>
140
+												<a href="<?php echo esc_url_raw( add_query_arg( array( 'id' => $id ), admin_url( 'admin.php?page=yikes-mailchimp-edit-form' ) ) ); ?>" class="row-title">
141
+													<?php echo stripslashes( $form[ 'form_name' ] ); ?>
142 142
 												</a>
143 143
 												<div class="row-actions">
144
-													<span><a href="<?php echo esc_url_raw( add_query_arg( array( 'id' => $id ) , admin_url( 'admin.php?page=yikes-mailchimp-edit-form' ) ) ); ?>"><?php _e( "Edit" , 'yikes-inc-easy-mailchimp-extender' ); ?></a> |</span>
145
-													<span><a href="<?php echo esc_url_raw( add_query_arg( array( 'action' => 'yikes-easy-mc-duplicate-form', 'mailchimp-form' => $id , 'nonce' => wp_create_nonce( 'duplicate-mailchimp-form-'.$id ) ) , admin_url( 'admin.php?page=yikes-inc-easy-mailchimp' ) ) ); ?>"><?php _e( "Duplicate" , 'yikes-inc-easy-mailchimp-extender' ); ?></a> |</span>
146
-													<span><a href="<?php echo esc_url_raw( add_query_arg( array( 'action' => 'yikes-easy-mc-reset-stats', 'mailchimp-form' => $id , 'nonce' => wp_create_nonce( 'reset-stats-mailchimp-form-'.$id ) ) , admin_url( 'admin.php?page=yikes-inc-easy-mailchimp' ) ) ); ?>"><?php _e( "Reset Stats" , 'yikes-inc-easy-mailchimp-extender' ); ?></a> |</span>
147
-													<span><a href="#" class="view-yikes-mc-form-shortcode" data-alt-text="<?php _e( 'Stats' , 'yikes-inc-easy-mailchimp-extender' ); ?>"><?php _e( "Shortcode" , 'yikes-inc-easy-mailchimp-extender' ); ?></a> |</span>
144
+													<span><a href="<?php echo esc_url_raw( add_query_arg( array( 'id' => $id ), admin_url( 'admin.php?page=yikes-mailchimp-edit-form' ) ) ); ?>"><?php _e( "Edit", 'yikes-inc-easy-mailchimp-extender' ); ?></a> |</span>
145
+													<span><a href="<?php echo esc_url_raw( add_query_arg( array( 'action' => 'yikes-easy-mc-duplicate-form', 'mailchimp-form' => $id, 'nonce' => wp_create_nonce( 'duplicate-mailchimp-form-' . $id ) ), admin_url( 'admin.php?page=yikes-inc-easy-mailchimp' ) ) ); ?>"><?php _e( "Duplicate", 'yikes-inc-easy-mailchimp-extender' ); ?></a> |</span>
146
+													<span><a href="<?php echo esc_url_raw( add_query_arg( array( 'action' => 'yikes-easy-mc-reset-stats', 'mailchimp-form' => $id, 'nonce' => wp_create_nonce( 'reset-stats-mailchimp-form-' . $id ) ), admin_url( 'admin.php?page=yikes-inc-easy-mailchimp' ) ) ); ?>"><?php _e( "Reset Stats", 'yikes-inc-easy-mailchimp-extender' ); ?></a> |</span>
147
+													<span><a href="#" class="view-yikes-mc-form-shortcode" data-alt-text="<?php _e( 'Stats', 'yikes-inc-easy-mailchimp-extender' ); ?>"><?php _e( "Shortcode", 'yikes-inc-easy-mailchimp-extender' ); ?></a> |</span>
148 148
 													<?php
149 149
 														/*
150 150
 														*	Custom action to allow users to add additional action links
151 151
 														*	to each form. We use this in our add-ons.
152 152
 														*	- Delete should remain last
153 153
 														*/
154
-														do_action( 'yikes-mailchimp-custom-form-actions' , $id );
154
+														do_action( 'yikes-mailchimp-custom-form-actions', $id );
155 155
 													?>
156
-													<span><a href="<?php echo esc_url_raw( add_query_arg( array( 'action' => 'yikes-easy-mc-delete-form', 'mailchimp-form' => $id , 'nonce' => wp_create_nonce( 'delete-mailchimp-form-'.$id ) ) , admin_url( 'admin.php?page=yikes-inc-easy-mailchimp' ) ) ); ?>" class="yikes-delete-mailchimp-form" onclick="return confirm('<?php printf( __( 'Are you sure you want to delete the %s form? This cannot be undone.' , 'yikes-inc-easy-mailchimp-extender' ), stripslashes( $form['form_name'] ) ); ?>');"><?php _e( "Delete" , 'yikes-inc-easy-mailchimp-extender' ); ?></a></span>
156
+													<span><a href="<?php echo esc_url_raw( add_query_arg( array( 'action' => 'yikes-easy-mc-delete-form', 'mailchimp-form' => $id, 'nonce' => wp_create_nonce( 'delete-mailchimp-form-' . $id ) ), admin_url( 'admin.php?page=yikes-inc-easy-mailchimp' ) ) ); ?>" class="yikes-delete-mailchimp-form" onclick="return confirm('<?php printf( __( 'Are you sure you want to delete the %s form? This cannot be undone.', 'yikes-inc-easy-mailchimp-extender' ), stripslashes( $form[ 'form_name' ] ) ); ?>');"><?php _e( "Delete", 'yikes-inc-easy-mailchimp-extender' ); ?></a></span>
157 157
 												</div>
158 158
 											</td>
159 159
 
160
-											<td class="column-columnname"><?php echo isset( $form['form_description'] ) ? str_replace( '[yikes-mailchimp-subscriber-count]', do_shortcode( '[yikes-mailchimp-subscriber-count form="' . $id . '"]' ), $form['form_description'] ) : ''; ?></td>
160
+											<td class="column-columnname"><?php echo isset( $form[ 'form_description' ] ) ? str_replace( '[yikes-mailchimp-subscriber-count]', do_shortcode( '[yikes-mailchimp-subscriber-count form="' . $id . '"]' ), $form[ 'form_description' ] ) : ''; ?></td>
161 161
 											<td class="column-columnname">
162 162
 												<?php
163 163
 												if ( $list_data && count( $list_data ) > 0 ) {
164 164
 													$parsed = wp_list_pluck( $list_data, 'name', 'id' );
165
-													if ( isset( $parsed[ $form['list_id'] ] ) ) {
166
-														echo esc_textarea( $parsed[ $form['list_id'] ] );
165
+													if ( isset( $parsed[ $form[ 'list_id' ] ] ) ) {
166
+														echo esc_textarea( $parsed[ $form[ 'list_id' ] ] );
167 167
 													} else {
168 168
 														echo '<strong>' . __( 'List Not Found', 'yikes-inc-easy-mailchimp-extender' ) . '</strong>';
169 169
 													}
@@ -172,25 +172,25 @@  discard block
 block discarded – undo
172 172
 
173 173
 											<td class="column-columnname num stat-container">
174 174
 												<?php
175
-													$impressions = number_format( $form['impressions'] );
176
-													echo '<span title="' . __( 'Impressions' , 'yikes-inc-easy-mailchimp-extender' ) . '">' . $impressions . '</span>';
175
+													$impressions = number_format( $form[ 'impressions' ] );
176
+													echo '<span title="' . __( 'Impressions', 'yikes-inc-easy-mailchimp-extender' ) . '">' . $impressions . '</span>';
177 177
 												?>
178 178
 											</td>
179 179
 											<td class="column-columnname num stat-container">
180 180
 												<?php
181
-													$submissions = number_format( $form['submissions'] );
182
-													echo '<span title="' . __( 'Submissions' , 'yikes-inc-easy-mailchimp-extender' ) . '">' . $submissions . '</span>';
181
+													$submissions = number_format( $form[ 'submissions' ] );
182
+													echo '<span title="' . __( 'Submissions', 'yikes-inc-easy-mailchimp-extender' ) . '">' . $submissions . '</span>';
183 183
 												?>
184 184
 											</td>
185 185
 											<td class="column-columnname num stat-container">
186 186
 												<?php
187
-													if( $impressions != 0 ) {
188
-														$conversion_rate = ( round( 100 * $form['submissions'] / $form['impressions'] , 3 ) );
189
-														if( $conversion_rate >= '15' ) {
187
+													if ( $impressions != 0 ) {
188
+														$conversion_rate = ( round( 100 * $form[ 'submissions' ] / $form[ 'impressions' ], 3 ) );
189
+														if ( $conversion_rate >= '15' ) {
190 190
 															$conversion_color = '#00cc00'; // green (unicorn!)
191
-														} else if( $conversion_rate < '15' && $conversion_rate >= '10' ) {
191
+														} else if ( $conversion_rate < '15' && $conversion_rate >= '10' ) {
192 192
 															$conversion_color = '#0080FF'; // light blue (good)
193
-														} else if( $conversion_rate < '10' && $conversion_rate >= '5' ) {
193
+														} else if ( $conversion_rate < '10' && $conversion_rate >= '5' ) {
194 194
 															$conversion_color = '#FFFF32'; // yellow (ok)
195 195
 														} else {
196 196
 															$conversion_color = '#FF0000'; // red (no bueno)
@@ -199,7 +199,7 @@  discard block
 block discarded – undo
199 199
 														$conversion_rate = '0';
200 200
 														$conversion_color = '#333333';
201 201
 													}
202
-													echo '<span style="color:' . esc_attr( $conversion_color ) . ';" title="' . esc_attr__( 'Conversion Rate' , 'yikes-inc-easy-mailchimp-extender' ) . '">' . $conversion_rate . '%</span>';
202
+													echo '<span style="color:' . esc_attr( $conversion_color ) . ';" title="' . esc_attr__( 'Conversion Rate', 'yikes-inc-easy-mailchimp-extender' ) . '">' . $conversion_rate . '%</span>';
203 203
 												?>
204 204
 											</td>
205 205
 											<!-- shortcode -->
@@ -212,7 +212,7 @@  discard block
 block discarded – undo
212 212
 											}
213 213
 										} else { ?>
214 214
 										<tr class="no-items">
215
-											<td class="colspanchange no-mailchimp-forms-found" colspan="8"><em><?php _e( 'No Mailchimp forms found. Use the form to the right to create a new one.' , 'yikes-inc-easy-mailchimp-extender' ); ?></em></td>
215
+											<td class="colspanchange no-mailchimp-forms-found" colspan="8"><em><?php _e( 'No Mailchimp forms found. Use the form to the right to create a new one.', 'yikes-inc-easy-mailchimp-extender' ); ?></em></td>
216 216
 										</tr>
217 217
 									<?php } ?>
218 218
 								</tbody>
Please login to merge, or discard this patch.
admin/partials/menu/options-sections/api-cache-settings.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -3,18 +3,18 @@
 block discarded – undo
3 3
 	-	Clear MailChimp transient data such as forms, form fields, list data, subscribers etc.
4 4
 		*	transient cache is stored for 60 minutes.
5 5
 -->
6
-<h3><span><?php _e( 'API Cache Settings' , 'yikes-inc-easy-mailchimp-extender' ); ?></span></h3>
6
+<h3><span><?php _e( 'API Cache Settings', 'yikes-inc-easy-mailchimp-extender' ); ?></span></h3>
7 7
 <div class="inside">
8 8
 									
9 9
 	<!-- Settings Form -->
10
-	<form action="<?php echo esc_url_raw( add_query_arg( array( 'action' => 'yikes-easy-mc-clear-transient-data' , 'nonce' => wp_create_nonce( 'clear-mc-transient-data' ) ) ) ); ?>" method="post">							
10
+	<form action="<?php echo esc_url_raw( add_query_arg( array( 'action' => 'yikes-easy-mc-clear-transient-data', 'nonce' => wp_create_nonce( 'clear-mc-transient-data' ) ) ) ); ?>" method="post">							
11 11
 									
12
-		<p><?php _e( "Delete all Mailchimp data stored in your sites cache. Most data is stored in the cache for 1 hour." , 'yikes-inc-easy-mailchimp-extender' ); ?></p>
12
+		<p><?php _e( "Delete all Mailchimp data stored in your sites cache. Most data is stored in the cache for 1 hour.", 'yikes-inc-easy-mailchimp-extender' ); ?></p>
13 13
 			<!-- check if any of our transients contain data -->							
14 14
 			<?php if ( false === get_transient( 'yikes-easy-mailchimp-list-data' ) && false === get_transient( 'yikes-easy-mailchimp-profile-data' ) && false === get_transient( 'yikes-easy-mailchimp-account-data' ) && false === get_transient( 'yikesinc_eme_list_ids' ) && false === get_transient( 'yikes_eme_lists' ) ) { ?>
15
-				<p><a href="#" class="button-secondary" disabled="disabled" title="<?php _e( 'No Mailchimp data found in temporary cache storage.' , 'yikes-inc-easy-mailchimp-extender' ); ?>"><?php _e( 'Clear Mailchimp API Cache' , 'yikes-inc-easy-mailchimp-extender' ); ?></a></p>
15
+				<p><a href="#" class="button-secondary" disabled="disabled" title="<?php _e( 'No Mailchimp data found in temporary cache storage.', 'yikes-inc-easy-mailchimp-extender' ); ?>"><?php _e( 'Clear Mailchimp API Cache', 'yikes-inc-easy-mailchimp-extender' ); ?></a></p>
16 16
 			<?php } else { ?>
17
-				<p><input type="submit" class="button-primary" value="<?php _e( 'Clear Mailchimp API Cache' , 'yikes-inc-easy-mailchimp-extender' ); ?>" /></p>
17
+				<p><input type="submit" class="button-primary" value="<?php _e( 'Clear Mailchimp API Cache', 'yikes-inc-easy-mailchimp-extender' ); ?>" /></p>
18 18
 			<?php } ?>
19 19
 									
20 20
 	</form>
Please login to merge, or discard this patch.
admin/partials/menu/options-sections/integration-settings.php 1 patch
Braces   +14 added lines, -14 removed lines patch added patch discarded remove patch
@@ -53,23 +53,23 @@  discard block
 block discarded – undo
53 53
 	);
54 54
 
55 55
 	// Easy Digital Downloads.
56
-	if ( class_exists( 'Easy_Digital_Downloads' ) ) {
56
+	if ( class_exists( 'Easy_Digital_Downloads' ) ) {
57 57
 		$active_plugins['easy_digital_downloads_checkout_form'] = __( 'Easy Digital Downloads Checkout', 'yikes-inc-easy-mailchimp-extender' );
58 58
 	}
59 59
 	// WooCommerce.
60
-	if ( class_exists( 'WooCommerce' ) ) {
60
+	if ( class_exists( 'WooCommerce' ) ) {
61 61
 		$active_plugins['woocommerce_checkout_form'] = __( 'WooCommerce Checkout', 'yikes-inc-easy-mailchimp-extender' );
62 62
 	}
63 63
 	// BuddyPress.
64
-	if ( class_exists( 'BuddyPress' ) ) {
64
+	if ( class_exists( 'BuddyPress' ) ) {
65 65
 		$active_plugins['buddypress_form'] = __( 'BuddyPress Registration', 'yikes-inc-easy-mailchimp-extender' );
66 66
 	}
67 67
 	// bbPress.
68
-	if ( class_exists( 'bbPress' ) ) {
68
+	if ( class_exists( 'bbPress' ) ) {
69 69
 		$active_plugins['bbpress_forms'] = __( 'bbPress', 'yikes-inc-easy-mailchimp-extender' );
70 70
 	}
71 71
 	// Contact Form 7.
72
-	if ( is_plugin_active( 'contact-form-7/wp-contact-form-7.php' ) ) {
72
+	if ( is_plugin_active( 'contact-form-7/wp-contact-form-7.php' ) ) {
73 73
 		$active_plugins['contact_form_7'] = __( 'Contact Form 7', 'yikes-inc-easy-mailchimp-extender' );
74 74
 	}
75 75
 
@@ -81,9 +81,9 @@  discard block
 block discarded – undo
81 81
 
82 82
 	<?php
83 83
 	// lets confirm the user has a valid API key stored.
84
-	if ( $this->is_user_mc_api_valid_form( false ) == 'valid' ) {
84
+	if ( $this->is_user_mc_api_valid_form( false ) == 'valid' ) {
85 85
 		$list_data = yikes_get_mc_api_manager()->get_list_handler()->get_lists();
86
-		if ( is_wp_error( $list_data ) ) {
86
+		if ( is_wp_error( $list_data ) ) {
87 87
 			$error_logging = new Yikes_Inc_Easy_Mailchimp_Error_Logging();
88 88
 			$error_logging->maybe_write_to_log(
89 89
 				$list_data->get_error_code(),
@@ -91,7 +91,7 @@  discard block
 block discarded – undo
91 91
 				"Integration Settings Page"
92 92
 			);
93 93
 		}
94
-	} else {
94
+	} else {
95 95
 		?>
96 96
 		<div class="inside">
97 97
 			<?php
@@ -116,9 +116,9 @@  discard block
 block discarded – undo
116 116
 
117 117
 	<ul>
118 118
 		<?php
119
-			if ( ! empty( $active_plugins ) ) {
119
+			if ( ! empty( $active_plugins ) ) {
120 120
 
121
-				foreach( $active_plugins as $class => $value ) {
121
+				foreach( $active_plugins as $class => $value ) {
122 122
 
123 123
 					$checked              = isset( $options[$class]['value'] ) ? 'checked="checked"' : '';
124 124
 					$hidden               = ! isset( $options[$class]['value'] ) ? 'yikes-easy-mc-hidden' : '';
@@ -145,7 +145,7 @@  discard block
 block discarded – undo
145 145
 								<!-- Associated Lists -->
146 146
 								<div class="checkbox-lists"><strong><?php _e( 'Choose Lists: ', 'yikes-inc-easy-mailchimp-extender' ); ?></strong>
147 147
 									<?php
148
-									if ( count( $list_data ) > 0 ) {
148
+									if ( count( $list_data ) > 0 ) {
149 149
 									?>
150 150
 										<?php foreach( $list_data as $list ) { ?>
151 151
 
@@ -163,14 +163,14 @@  discard block
 block discarded – undo
163 163
 
164 164
 											<!-- If interest groups have been selected already, load them here -->
165 165
 											<?php
166
-											if ( in_array( $list['id'], $selected_list ) && $list_interest_groups ) {
166
+											if ( in_array( $list['id'], $selected_list ) && $list_interest_groups ) {
167 167
 												YIKES_Inc_Easy_MailChimp_Process_Ajax::check_list_for_interest_groups( $list['id'], $class, true );
168 168
 											}
169 169
 											?>
170 170
 
171 171
 										<?php } ?>
172 172
 									<?php
173
-								} else {
173
+								} else {
174 174
 									echo '<p class="description no-lists-setup-notice"><strong>' . __( 'You have not setup any lists. Head over to Mailchimp and setup your first list.', 'yikes-inc-easy-mailchimp-extender' ) . '</strong></p>';
175 175
 								}
176 176
 								?>
@@ -193,7 +193,7 @@  discard block
 block discarded – undo
193 193
 						</li>
194 194
 					<?php
195 195
 			}
196
-		} else {
196
+		} else {
197 197
 			?>
198 198
 				<li>
199 199
 					<?php _e( 'Nothing is active.', 'yikes-inc-easy-mailchimp-extender' ); ?>
Please login to merge, or discard this patch.
admin/partials/menu/options-sections/general-settings.php 1 patch
Spacing   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -8,7 +8,7 @@  discard block
 block discarded – undo
8 8
 $yikes_mc_api_constant = defined( 'YIKES_MC_API_KEY' );
9 9
 ?>
10 10
 
11
-<h3><span><?php _e( 'General Settings' , 'yikes-inc-easy-mailchimp-extender' ); ?></span><?php echo $api_connection; ?></h3>
11
+<h3><span><?php _e( 'General Settings', 'yikes-inc-easy-mailchimp-extender' ); ?></span><?php echo $api_connection; ?></h3>
12 12
 <div class="inside">
13 13
 
14 14
 	<!-- Settings Form -->
@@ -21,11 +21,11 @@  discard block
 block discarded – undo
21 21
 		<!-- MailChimp API Input Field -->
22 22
 		<label for="yks-mailchimp-api-key">
23 23
 
24
-			<p><?php _e( 'Enter your API key in the field below to connect your site to your Mailchimp account.' , 'yikes-inc-easy-mailchimp-extender' ); ?></p>
24
+			<p><?php _e( 'Enter your API key in the field below to connect your site to your Mailchimp account.', 'yikes-inc-easy-mailchimp-extender' ); ?></p>
25 25
 
26
-			<p><strong><?php _e( 'Mailchimp API Key' , 'yikes-inc-easy-mailchimp-extender' ); ?></strong></p>
26
+			<p><strong><?php _e( 'Mailchimp API Key', 'yikes-inc-easy-mailchimp-extender' ); ?></strong></p>
27 27
 
28
-			<input autocomplete="off" <?php if ( $yikes_mc_api_constant ) { echo 'readonly="readonly"'; } if( strlen( yikes_get_mc_api_key() ) > 0 ) { ?> type="password" <?php } else { ?> type="text" <?php } ?> value="<?php echo yikes_get_mc_api_key(); ?>" placeholder="<?php _e( 'Mailchimp API Key' , 'yikes-inc-easy-mailchimp-extender' ); ?>" name="yikes-mc-api-key" id="yikes-mc-api-key" class="settings-page-input" />
28
+			<input autocomplete="off" <?php if ( $yikes_mc_api_constant ) { echo 'readonly="readonly"'; } if ( strlen( yikes_get_mc_api_key() ) > 0 ) { ?> type="password" <?php } else { ?> type="text" <?php } ?> value="<?php echo yikes_get_mc_api_key(); ?>" placeholder="<?php _e( 'Mailchimp API Key', 'yikes-inc-easy-mailchimp-extender' ); ?>" name="yikes-mc-api-key" id="yikes-mc-api-key" class="settings-page-input" />
29 29
 
30 30
 			<?php if ( $yikes_mc_api_constant ) { ?>
31 31
 				<p class="description"><?php printf( __( "Your Mailchimp API key has been defined using the %s constant, in a PHP file.", "yikes-inc-easy-mailchimp-extender" ), '<code>YIKES_MC_API_KEY</code>' ); ?></p>
@@ -34,21 +34,21 @@  discard block
 block discarded – undo
34 34
 			<?php echo $api_error_response; ?>
35 35
 
36 36
 			<?php if ( ! $yikes_mc_api_constant ) { ?>
37
-				<p class="description"><small><a href="https://admin.mailchimp.com/account/api" target="_blank" title="<?php _e( 'Get your API key here' , 'yikes-inc-easy-mailchimp-extender' ); ?>"><?php _e( 'Get your API key here' , 'yikes-inc-easy-mailchimp-extender' ); ?></a></small></p>
37
+				<p class="description"><small><a href="https://admin.mailchimp.com/account/api" target="_blank" title="<?php _e( 'Get your API key here', 'yikes-inc-easy-mailchimp-extender' ); ?>"><?php _e( 'Get your API key here', 'yikes-inc-easy-mailchimp-extender' ); ?></a></small></p>
38 38
 			<?php } ?>
39 39
 
40 40
 			<p class="description">Warning: changing your API key will break your current forms.</p>
41 41
 		</label>
42 42
 
43 43
 		<!-- Use Nonce Validation Field -->		
44
-		<p><strong><?php _e( 'Enable nonce validation on this site?' , 'yikes-inc-easy-mailchimp-extender' ); ?></strong></p>
44
+		<p><strong><?php _e( 'Enable nonce validation on this site?', 'yikes-inc-easy-mailchimp-extender' ); ?></strong></p>
45 45
 		<label for="yikes-mailchimp-use-nonce-yes">
46 46
 			Yes
47
-			<input type="radio" name="yikes-mailchimp-use-nonce" id="yikes-mailchimp-use-nonce-yes" class="settings-page-input" value="1" <?php checked( get_option( 'yikes-mailchimp-use-nonce', '1' ) , '1' ); ?> />
47
+			<input type="radio" name="yikes-mailchimp-use-nonce" id="yikes-mailchimp-use-nonce-yes" class="settings-page-input" value="1" <?php checked( get_option( 'yikes-mailchimp-use-nonce', '1' ), '1' ); ?> />
48 48
 		</label>
49 49
 		<label for="yikes-mailchimp-use-nonce-no">
50 50
 			No
51
-			<input type="radio" name="yikes-mailchimp-use-nonce" id="yikes-mailchimp-use-nonce-no" class="settings-page-input" value="0" <?php checked( get_option( 'yikes-mailchimp-use-nonce', '1' ) , '0' ); ?> />
51
+			<input type="radio" name="yikes-mailchimp-use-nonce" id="yikes-mailchimp-use-nonce-no" class="settings-page-input" value="0" <?php checked( get_option( 'yikes-mailchimp-use-nonce', '1' ), '0' ); ?> />
52 52
 		</label>
53 53
 
54 54
 	<?php submit_button(); ?>
Please login to merge, or discard this patch.
admin/partials/menu/options-sections/import-export-forms.php 1 patch
Spacing   +17 added lines, -17 removed lines patch added patch discarded remove patch
@@ -3,15 +3,15 @@  discard block
 block discarded – undo
3 3
 $form_interface = yikes_easy_mailchimp_extender_get_form_interface();
4 4
 $all_forms = $form_interface->get_all_forms();
5 5
 ?>
6
-<h3><span><?php _e( 'Import/Export Forms & Settings' , 'yikes-inc-easy-mailchimp-extender' ); ?></span></h3>
6
+<h3><span><?php _e( 'Import/Export Forms & Settings', 'yikes-inc-easy-mailchimp-extender' ); ?></span></h3>
7 7
 
8 8
 <div class="inside">
9 9
 
10 10
 	<!-- Export Form -->
11
-	<form action="<?php echo esc_url_raw( add_query_arg( array( 'action' => 'yikes-easy-mc-export-forms' , 'nonce' => wp_create_nonce( 'export-forms' ) ) ) ); ?>" method="post">
12
-		<p><strong><?php _e( "Export Forms" , 'yikes-inc-easy-mailchimp-extender' ); ?></strong></p>
11
+	<form action="<?php echo esc_url_raw( add_query_arg( array( 'action' => 'yikes-easy-mc-export-forms', 'nonce' => wp_create_nonce( 'export-forms' ) ) ) ); ?>" method="post">
12
+		<p><strong><?php _e( "Export Forms", 'yikes-inc-easy-mailchimp-extender' ); ?></strong></p>
13 13
 		<p class="description">
14
-			<?php _e( "Select the forms you would like to export. When you click the download button below, Easy Forms for Mailchimp will create a CSV file for you to save to your computer. Once you've saved the download file, you can use the Import tool to import the forms to this or any other site." , "yikes-inc-easy-mailchimp-extender" ); ?>
14
+			<?php _e( "Select the forms you would like to export. When you click the download button below, Easy Forms for Mailchimp will create a CSV file for you to save to your computer. Once you've saved the download file, you can use the Import tool to import the forms to this or any other site.", "yikes-inc-easy-mailchimp-extender" ); ?>
15 15
 		</p>
16 16
 
17 17
 		<?php if ( empty( $all_forms ) ) { ?>
@@ -20,44 +20,44 @@  discard block
 block discarded – undo
20 20
 			</p>
21 21
 		<?php } else { ?>
22 22
 			<!-- custom list so users can export specific forms -->
23
-			<a class="toggle-custom-lists button-secondary" onclick="jQuery(this).next().slideToggle();return false;"><?php _e( 'Select Forms' , 'yikes-inc-easy-mailchimp-extender' ); ?></a>
23
+			<a class="toggle-custom-lists button-secondary" onclick="jQuery(this).next().slideToggle();return false;"><?php _e( 'Select Forms', 'yikes-inc-easy-mailchimp-extender' ); ?></a>
24 24
 			<ul class="export-custom-forms-list">
25
-				<p class="description"><?php _e( 'Select which forms to export. Leave all checkboxes unchecked to export all of your forms.' , 'yikes-inc-easy-mailchimp-extender' ); ?></p>
26
-				<?php foreach( $all_forms as $id => $form ) { ?>
27
-					<li><label><input type="checkbox" name="yikes_export_forms[]" value="<?php echo (int) $id; ?>"><?php echo esc_html( $form['form_name'] ); ?></label></li>
25
+				<p class="description"><?php _e( 'Select which forms to export. Leave all checkboxes unchecked to export all of your forms.', 'yikes-inc-easy-mailchimp-extender' ); ?></p>
26
+				<?php foreach ( $all_forms as $id => $form ) { ?>
27
+					<li><label><input type="checkbox" name="yikes_export_forms[]" value="<?php echo (int) $id; ?>"><?php echo esc_html( $form[ 'form_name' ] ); ?></label></li>
28 28
 				<?php } ?>
29 29
 			</ul>
30 30
 		<?php } ?>
31 31
 		<!-- check if any of our transients contain data -->
32
-		<p><input type="submit" class="button-primary" value="<?php _e( 'Export Opt-in Forms' , 'yikes-inc-easy-mailchimp-extender' ); ?>" /></p>
32
+		<p><input type="submit" class="button-primary" value="<?php _e( 'Export Opt-in Forms', 'yikes-inc-easy-mailchimp-extender' ); ?>" /></p>
33 33
 	</form>
34 34
 	
35 35
 	<hr />
36 36
 	
37 37
 	<!-- Export Form -->
38
-	<form action="<?php echo esc_url_raw( add_query_arg( array( 'action' => 'yikes-easy-mc-export-settings' , 'nonce' => wp_create_nonce( 'export-settings' ) ) ) ); ?>" method="post">
39
-		<p><strong><?php _e( "Export Settings" , 'yikes-inc-easy-mailchimp-extender' ); ?></strong></p>
38
+	<form action="<?php echo esc_url_raw( add_query_arg( array( 'action' => 'yikes-easy-mc-export-settings', 'nonce' => wp_create_nonce( 'export-settings' ) ) ) ); ?>" method="post">
39
+		<p><strong><?php _e( "Export Settings", 'yikes-inc-easy-mailchimp-extender' ); ?></strong></p>
40 40
 		<p class="description">
41
-			<?php _e( "Export YIKES Easy Forms for Mailchimp plugin settings." , 'yikes-inc-easy-mailchimp-extender' ); ?>
41
+			<?php _e( "Export YIKES Easy Forms for Mailchimp plugin settings.", 'yikes-inc-easy-mailchimp-extender' ); ?>
42 42
 		</p>
43 43
 
44 44
 		<!-- check if any of our transients contain data -->
45
-		<p><input type="submit" class="button-primary" value="<?php _e( 'Export Plugin Settings' , 'yikes-inc-easy-mailchimp-extender' ); ?>" /></p>
45
+		<p><input type="submit" class="button-primary" value="<?php _e( 'Export Plugin Settings', 'yikes-inc-easy-mailchimp-extender' ); ?>" /></p>
46 46
 	</form>
47 47
 	
48 48
 	<hr />
49 49
 	
50 50
 	<!-- Import Form -->
51
-	<form action="<?php echo esc_url_raw( add_query_arg( array( 'action' => 'yikes-easy-mc-import-forms' , 'nonce' => wp_create_nonce( 'import-forms' ) ) ) ); ?>" method="post" enctype="multipart/form-data">
52
-		<p><strong><?php _e( "Import" , 'yikes-inc-easy-mailchimp-extender' ); ?></strong></p>
51
+	<form action="<?php echo esc_url_raw( add_query_arg( array( 'action' => 'yikes-easy-mc-import-forms', 'nonce' => wp_create_nonce( 'import-forms' ) ) ) ); ?>" method="post" enctype="multipart/form-data">
52
+		<p><strong><?php _e( "Import", 'yikes-inc-easy-mailchimp-extender' ); ?></strong></p>
53 53
 		<p class="description">
54
-			<?php _e( "Select the Easy Forms for Mailchimp export file you would like to import. You can use this field to import your opt-in forms or settings. " , 'yikes-inc-easy-mailchimp-extender' ); ?>
54
+			<?php _e( "Select the Easy Forms for Mailchimp export file you would like to import. You can use this field to import your opt-in forms or settings. ", 'yikes-inc-easy-mailchimp-extender' ); ?>
55 55
 		</p>
56 56
 		<label>
57 57
 			<input type="file" name="csv" id="forms_to_import">
58 58
 		</label>
59 59
 		<!-- check if any of our transients contain data -->
60
-		<p><input type="submit" class="button-primary" value="<?php _e( 'Import' , 'yikes-inc-easy-mailchimp-extender' ); ?>" /></p>
60
+		<p><input type="submit" class="button-primary" value="<?php _e( 'Import', 'yikes-inc-easy-mailchimp-extender' ); ?>" /></p>
61 61
 	</form>
62 62
 	
63 63
 </div> <!-- .inside -->
Please login to merge, or discard this patch.