Completed
Push — staging ( 99a729...9693fc )
by
unknown
19:21
created
admin/partials/ajax/add_interest_group_to_form.php 1 patch
Spacing   +55 added lines, -55 removed lines patch added patch discarded remove patch
@@ -5,8 +5,8 @@  discard block
 block discarded – undo
5 5
 $error = 0;
6 6
 
7 7
 // Get our $_POST variables
8
-$list_id = isset( $_POST['list_id'] ) ? $_POST['list_id'] : '';
9
-$interest_groups = isset( $_POST['interest_groups'] ) ? $_POST['interest_groups'] : array();
8
+$list_id = isset( $_POST[ 'list_id' ] ) ? $_POST[ 'list_id' ] : '';
9
+$interest_groups = isset( $_POST[ 'interest_groups' ] ) ? $_POST[ 'interest_groups' ] : array();
10 10
 
11 11
 // Make sure our $_POST variables aren't empty
12 12
 if ( empty( $list_id ) ) {
@@ -49,20 +49,20 @@  discard block
 block discarded – undo
49 49
 
50 50
 
51 51
 // Loop through the interest groups data (group_id, field_name, field_type) and add the fields to the form
52
-foreach( $interest_groups as $group ) {
52
+foreach ( $interest_groups as $group ) {
53 53
 
54 54
 	// find and return the location of this merge field in the array
55
-	$index      = $this->findMCListIndex( $group['group_id'], $interest_groupings, 'id' );
55
+	$index      = $this->findMCListIndex( $group[ 'group_id' ], $interest_groupings, 'id' );
56 56
 	$field_data = $interest_groupings[ $index ];
57
-	$groups     = wp_list_pluck( $field_data['items'], 'name' );
57
+	$groups     = wp_list_pluck( $field_data[ 'items' ], 'name' );
58 58
 
59 59
 	?>
60
-	<section class="draggable" id="<?php echo $group['group_id']; ?>">
60
+	<section class="draggable" id="<?php echo $group[ 'group_id' ]; ?>">
61 61
 		<!-- top -->
62 62
 		<a href="#" class="expansion-section-title settings-sidebar">
63
-			<span class="dashicons dashicons-plus yikes-mc-expansion-toggle" title="<?php _e( 'Expand Field' , 'yikes-inc-easy-mailchimp-extender' ); ?>"></span>
64
-			<?php echo stripslashes( $group['field_name'] ); ?>
65
-			<span class="field-type-text"><small><?php echo __( 'type' , 'yikes-inc-easy-mailchimp-extender' ) . ' : ' . $group['field_type']; ?></small></span>
63
+			<span class="dashicons dashicons-plus yikes-mc-expansion-toggle" title="<?php _e( 'Expand Field', 'yikes-inc-easy-mailchimp-extender' ); ?>"></span>
64
+			<?php echo stripslashes( $group[ 'field_name' ] ); ?>
65
+			<span class="field-type-text"><small><?php echo __( 'type', 'yikes-inc-easy-mailchimp-extender' ) . ' : ' . $group[ 'field_type' ]; ?></small></span>
66 66
 		</a>
67 67
 		<!-- expansion section -->
68 68
 		<div class="yikes-mc-settings-expansion-section">
@@ -70,37 +70,37 @@  discard block
 block discarded – undo
70 70
 			<!-- Single or Double Opt-in -->
71 71
 			<p class="type-container"><!-- necessary to prevent skipping on slideToggle(); -->
72 72
 				<!-- store the label -->
73
-				<input type="hidden" name="field[<?php echo $group['group_id']; ?>][label]" value="<?php echo htmlspecialchars( $group['field_name'] ); ?>" />
74
-				<input type="hidden" name="field[<?php echo $group['group_id']; ?>][type]" value="<?php echo $group['field_type']; ?>" />
75
-				<input type="hidden" name="field[<?php echo $group['group_id']; ?>][group_id]" value="<?php echo $group['group_id']; ?>" />
76
-				<input type="hidden" name="field[<?php echo $group['group_id']; ?>][groups]" value='<?php echo esc_attr( json_encode( $groups, true ) ); ?>' />
73
+				<input type="hidden" name="field[<?php echo $group[ 'group_id' ]; ?>][label]" value="<?php echo htmlspecialchars( $group[ 'field_name' ] ); ?>" />
74
+				<input type="hidden" name="field[<?php echo $group[ 'group_id' ]; ?>][type]" value="<?php echo $group[ 'field_type' ]; ?>" />
75
+				<input type="hidden" name="field[<?php echo $group[ 'group_id' ]; ?>][group_id]" value="<?php echo $group[ 'group_id' ]; ?>" />
76
+				<input type="hidden" name="field[<?php echo $group[ 'group_id' ]; ?>][groups]" value='<?php echo esc_attr( json_encode( $groups, true ) ); ?>' />
77 77
 
78 78
 
79 79
 				<table class="form-table form-field-container">
80 80
 
81 81
 					<!-- Default Value -->
82
-					<?php switch( $group['field_type'] ) {
82
+					<?php switch ( $group[ 'field_type' ] ) {
83 83
 
84 84
 						case 'radio':
85 85
 						?>
86 86
 							<tr valign="top">
87 87
 								<td scope="row">
88 88
 									<label for="placeholder">
89
-										<?php _e( 'Default Selection' , 'yikes-inc-easy-mailchimp-extender' ); ?>
89
+										<?php _e( 'Default Selection', 'yikes-inc-easy-mailchimp-extender' ); ?>
90 90
 									</label>
91 91
 								</td>
92 92
 								<td>
93 93
 
94
-									<?php $pre_selected = ! empty( $field_data['default_choice'] ) ? $field_data['default_choice'] : 'no-default'; ?>
94
+									<?php $pre_selected = ! empty( $field_data[ 'default_choice' ] ) ? $field_data[ 'default_choice' ] : 'no-default'; ?>
95 95
 
96 96
 									<!-- No Default option for radio buttons -->
97
-									<input type="radio" name="field[<?php echo $group['group_id']; ?>][default_choice][]" value="no-default" <?php checked( $pre_selected, 'no-default' ); ?>>No Default
97
+									<input type="radio" name="field[<?php echo $group[ 'group_id' ]; ?>][default_choice][]" value="no-default" <?php checked( $pre_selected, 'no-default' ); ?>>No Default
98 98
 
99
-									<?php foreach ( $field_data['items'] as $id => $interest_group ) { ?>
100
-										<input type="radio" name="field[<?php echo $group['group_id']; ?>][default_choice][]" value="<?php echo esc_attr( $id ); ?>" <?php checked( $pre_selected, $id ); ?>><?php echo stripslashes( $interest_group['name'] );
99
+									<?php foreach ( $field_data[ 'items' ] as $id => $interest_group ) { ?>
100
+										<input type="radio" name="field[<?php echo $group[ 'group_id' ]; ?>][default_choice][]" value="<?php echo esc_attr( $id ); ?>" <?php checked( $pre_selected, $id ); ?>><?php echo stripslashes( $interest_group[ 'name' ] );
101 101
 									} ?>
102 102
 
103
-									<p class="description"><small><?php _e( "Select the option that should be selected by default.", 'yikes-inc-easy-mailchimp-extender' );?></small></p>
103
+									<p class="description"><small><?php _e( "Select the option that should be selected by default.", 'yikes-inc-easy-mailchimp-extender' ); ?></small></p>
104 104
 								</td>
105 105
 							</tr>
106 106
 
@@ -114,19 +114,19 @@  discard block
 block discarded – undo
114 114
 							<tr valign="top" class="yikes-checkbox-container">
115 115
 								<td scope="row">
116 116
 									<label for="placeholder">
117
-										<?php _e( 'Default Selection' , 'yikes-inc-easy-mailchimp-extender' ); ?>
117
+										<?php _e( 'Default Selection', 'yikes-inc-easy-mailchimp-extender' ); ?>
118 118
 									</label>
119 119
 								</td>
120 120
 								<td>
121 121
 									<?php
122
-									foreach ( $field_data['items'] as $id => $interest_group ) {
123
-										$pre_selected = ! empty( $field_data['default_choice'] ) ? $field_data['default_choice'] : '0';
122
+									foreach ( $field_data[ 'items' ] as $id => $interest_group ) {
123
+										$pre_selected = ! empty( $field_data[ 'default_choice' ] ) ? $field_data[ 'default_choice' ] : '0';
124 124
 										?>
125
-										<input type="checkbox" name="field[<?php echo $group['group_id']; ?>][default_choice][]" value="<?php echo $id; ?>" <?php checked( $pre_selected, $id ); ?>><?php echo stripslashes( $interest_group['name'] ); ?>
125
+										<input type="checkbox" name="field[<?php echo $group[ 'group_id' ]; ?>][default_choice][]" value="<?php echo $id; ?>" <?php checked( $pre_selected, $id ); ?>><?php echo stripslashes( $interest_group[ 'name' ] ); ?>
126 126
 										<?php
127 127
 									}
128 128
 									?>
129
-									<p class="description"><small><?php _e( "Select the option that should be selected by default.", 'yikes-inc-easy-mailchimp-extender' );?></small></p>
129
+									<p class="description"><small><?php _e( "Select the option that should be selected by default.", 'yikes-inc-easy-mailchimp-extender' ); ?></small></p>
130 130
 								</td>
131 131
 							</tr>
132 132
 
@@ -138,31 +138,31 @@  discard block
 block discarded – undo
138 138
 							<!-- Placeholder -->
139 139
 							<tr valign="top">
140 140
 								<td scope="row">
141
-									<label for="placeholder_<?php echo esc_attr( $field['merge'] ); ?>">
141
+									<label for="placeholder_<?php echo esc_attr( $field[ 'merge' ] ); ?>">
142 142
 										<?php _e( 'Placeholder', 'yikes-inc-easy-mailchimp-extender' ); ?>
143 143
 									</label>
144 144
 								</td>
145 145
 								<td>
146
-									<input type="text" id="placeholder_<?php echo esc_attr( $field['merge'] ); ?>" class="widefat" name="field[<?php echo $field['merge']; ?>][placeholder]" value="<?php echo isset( $field['placeholder'] ) ? $field['placeholder'] : '' ; ?>" />
147
-									<p class="description"><small><?php _e( "Assign a placeholder value for the select option.", 'yikes-inc-easy-mailchimp-extender' );?></small></p>
146
+									<input type="text" id="placeholder_<?php echo esc_attr( $field[ 'merge' ] ); ?>" class="widefat" name="field[<?php echo $field[ 'merge' ]; ?>][placeholder]" value="<?php echo isset( $field[ 'placeholder' ] ) ? $field[ 'placeholder' ] : ''; ?>" />
147
+									<p class="description"><small><?php _e( "Assign a placeholder value for the select option.", 'yikes-inc-easy-mailchimp-extender' ); ?></small></p>
148 148
 								</td>
149 149
 							</tr>
150 150
 
151 151
 							<tr valign="top">
152 152
 								<td scope="row">
153 153
 									<label for="placeholder">
154
-										<?php _e( 'Default Selection' , 'yikes-inc-easy-mailchimp-extender' ); ?>
154
+										<?php _e( 'Default Selection', 'yikes-inc-easy-mailchimp-extender' ); ?>
155 155
 									</label>
156 156
 								</td>
157 157
 								<td>
158
-									<select type="default" name="field[<?php echo $group['group_id']; ?>][default_choice]">
159
-										<?php $pre_selected = ! empty( $field_data['default_choice'] ) ? $field_data['default_choice'] : 'no-default'; ?>
158
+									<select type="default" name="field[<?php echo $group[ 'group_id' ]; ?>][default_choice]">
159
+										<?php $pre_selected = ! empty( $field_data[ 'default_choice' ] ) ? $field_data[ 'default_choice' ] : 'no-default'; ?>
160 160
 										<option value="no-default">No Default</option>
161
-										<?php foreach ( $field_data['items'] as $id => $interest_group ) { ?>
162
-											<option value="<?php echo $id; ?>" <?php selected( $pre_selected, $id ); ?>><?php echo $interest_group['name']; ?></option>
161
+										<?php foreach ( $field_data[ 'items' ] as $id => $interest_group ) { ?>
162
+											<option value="<?php echo $id; ?>" <?php selected( $pre_selected, $id ); ?>><?php echo $interest_group[ 'name' ]; ?></option>
163 163
 										<?php } ?>
164 164
 									</select>
165
-									<p class="description"><small><?php _e( "Which option should be selected by default?", 'yikes-inc-easy-mailchimp-extender' );?></small></p>
165
+									<p class="description"><small><?php _e( "Which option should be selected by default?", 'yikes-inc-easy-mailchimp-extender' ); ?></small></p>
166 166
 								</td>
167 167
 							</tr>
168 168
 
@@ -174,25 +174,25 @@  discard block
 block discarded – undo
174 174
 					<tr valign="top">
175 175
 						<td scope="row">
176 176
 							<label for="placeholder">
177
-								<?php _e( 'Description' , 'yikes-inc-easy-mailchimp-extender' ); ?>
177
+								<?php _e( 'Description', 'yikes-inc-easy-mailchimp-extender' ); ?>
178 178
 							</label>
179 179
 						</td>
180 180
 						<td>
181
-							<textarea class="widefat field-description-input" name="field[<?php echo $group['group_id']; ?>][description]"></textarea>
182
-							<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>
181
+							<textarea class="widefat field-description-input" name="field[<?php echo $group[ 'group_id' ]; ?>][description]"></textarea>
182
+							<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>
183 183
 						</td>
184 184
 					</tr>
185 185
 
186 186
 					<!-- Description Above Field -->
187 187
 					<tr valign="top" class="yikes-checkbox-container">
188 188
 						<td scope="row">
189
-							<label for="description_above_<?php echo esc_attr( $group['group_id'] ); ?>">
190
-								<?php _e( 'Description Above Field' , 'yikes-inc-easy-mailchimp-extender' ); ?>
189
+							<label for="description_above_<?php echo esc_attr( $group[ 'group_id' ] ); ?>">
190
+								<?php _e( 'Description Above Field', 'yikes-inc-easy-mailchimp-extender' ); ?>
191 191
 							</label>
192 192
 						</td>
193 193
 						<td>
194
-							<input type="checkbox" id="description_above_<?php echo esc_attr( $group['group_id'] ); ?>" class="widefat field-description-input" name="field[<?php echo $group['group_id']; ?>][description_above]" value="1" />
195
-							<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>
194
+							<input type="checkbox" id="description_above_<?php echo esc_attr( $group[ 'group_id' ] ); ?>" class="widefat field-description-input" name="field[<?php echo $group[ 'group_id' ]; ?>][description_above]" value="1" />
195
+							<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>
196 196
 						</td>
197 197
 					</tr>
198 198
 
@@ -200,48 +200,48 @@  discard block
 block discarded – undo
200 200
 					<tr valign="top">
201 201
 						<td scope="row">
202 202
 							<label for="placeholder">
203
-								<?php _e( 'Additional Classes' , 'yikes-inc-easy-mailchimp-extender' ); ?>
203
+								<?php _e( 'Additional Classes', 'yikes-inc-easy-mailchimp-extender' ); ?>
204 204
 							</label>
205 205
 						</td>
206 206
 						<td>
207
-							<input type="text" class="widefat" name="field[<?php echo $group['group_id']; ?>][additional-classes]" value="<?php echo isset( $group['classes'] ) ? stripslashes( wp_strip_all_tags( $group['classes'] ) ) : '' ; ?>" />
208
-							<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>
207
+							<input type="text" class="widefat" name="field[<?php echo $group[ 'group_id' ]; ?>][additional-classes]" value="<?php echo isset( $group[ 'classes' ] ) ? stripslashes( wp_strip_all_tags( $group[ 'classes' ] ) ) : ''; ?>" />
208
+							<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>
209 209
 						</td>
210 210
 						</tr>
211 211
 						<!-- Required Toggle -->
212 212
 						<tr valign="top" class="yikes-checkbox-container">
213 213
 							<td scope="row">
214 214
 								<label for="field-required">
215
-									<?php _e( 'Field Required?' , 'yikes-inc-easy-mailchimp-extender' ); ?>
215
+									<?php _e( 'Field Required?', 'yikes-inc-easy-mailchimp-extender' ); ?>
216 216
 								</label>
217 217
 							</td>
218 218
 							<td>
219
-								<input type="checkbox" class="widefat" value="1" name="field[<?php echo $group['group_id']; ?>][require]">
220
-								<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>
219
+								<input type="checkbox" class="widefat" value="1" name="field[<?php echo $group[ 'group_id' ]; ?>][require]">
220
+								<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>
221 221
 							</td>
222 222
 						</tr>
223 223
 						<!-- Visible Toggle -->
224 224
 						<tr valign="top" class="yikes-checkbox-container">
225 225
 							<td scope="row">
226 226
 								<label for="hide-field">
227
-									<?php _e( 'Hide Field' , 'yikes-inc-easy-mailchimp-extender' ); ?>
227
+									<?php _e( 'Hide Field', 'yikes-inc-easy-mailchimp-extender' ); ?>
228 228
 								</label>
229 229
 							</td>
230 230
 							<td>
231
-								<input type="checkbox" class="widefat" value="1" name="field[<?php echo $group['group_id']; ?>][hide]">
232
-								<p class="description"><small><?php _e( "Hide this field from being displayed on the front end.", 'yikes-inc-easy-mailchimp-extender' );?></small></p>
231
+								<input type="checkbox" class="widefat" value="1" name="field[<?php echo $group[ 'group_id' ]; ?>][hide]">
232
+								<p class="description"><small><?php _e( "Hide this field from being displayed on the front end.", 'yikes-inc-easy-mailchimp-extender' ); ?></small></p>
233 233
 							</td>
234 234
 						</tr>
235 235
 						<!-- Toggle Field Label Visibility -->
236 236
 						<tr valign="top" class="yikes-checkbox-container">
237 237
 							<td scope="row">
238 238
 								<label for="placeholder">
239
-									<?php _e( 'Hide Label' , 'yikes-inc-easy-mailchimp-extender' ); ?>
239
+									<?php _e( 'Hide Label', 'yikes-inc-easy-mailchimp-extender' ); ?>
240 240
 								</label>
241 241
 							</td>
242 242
 							<td>
243
-								<input type="checkbox" name="field[<?php echo $group['group_id']; ?>][hide-label]" value="1" />
244
-								<p class="description"><small><?php _e( "Toggle field label visibility.", 'yikes-inc-easy-mailchimp-extender' );?></small></p>
243
+								<input type="checkbox" name="field[<?php echo $group[ 'group_id' ]; ?>][hide-label]" value="1" />
244
+								<p class="description"><small><?php _e( "Toggle field label visibility.", 'yikes-inc-easy-mailchimp-extender' ); ?></small></p>
245 245
 							</td>
246 246
 						</tr>
247 247
 						<!-- Toggle Buttons -->
@@ -251,8 +251,8 @@  discard block
 block discarded – undo
251 251
 							</td>
252 252
 							<td>
253 253
 								<span class="toggle-container">
254
-									<a href="#" class="hide-field"><?php _e( "Close" , 'yikes-inc-easy-mailchimp-extender' ); ?></a> |
255
-									<a href="#" class="remove-field" alt="<?php echo $group['group_id']; ?>"><?php _e( "Remove Field" , 'yikes-inc-easy-mailchimp-extender' ); ?></a>
254
+									<a href="#" class="hide-field"><?php _e( "Close", 'yikes-inc-easy-mailchimp-extender' ); ?></a> |
255
+									<a href="#" class="remove-field" alt="<?php echo $group[ 'group_id' ]; ?>"><?php _e( "Remove Field", 'yikes-inc-easy-mailchimp-extender' ); ?></a>
256 256
 								</span>
257 257
 							</td>
258 258
 						</tr>
Please login to merge, or discard this patch.
admin/class-yikes-inc-easy-mailchimp-extender-admin.php 1 patch
Spacing   +341 added lines, -341 removed lines patch added patch discarded remove patch
@@ -92,7 +92,7 @@  discard block
 block discarded – undo
92 92
 		/***********************/
93 93
 		/** Create A Form **/
94 94
 		/**********************/
95
-		if ( isset( $_REQUEST['action'] ) && $_REQUEST['action'] == 'yikes-easy-mc-create-form' ) {
95
+		if ( isset( $_REQUEST[ 'action' ] ) && $_REQUEST[ 'action' ] == 'yikes-easy-mc-create-form' ) {
96 96
 
97 97
 			add_action( 'init', array( $this, 'yikes_easy_mailchimp_create_form' ) );
98 98
 
@@ -101,7 +101,7 @@  discard block
 block discarded – undo
101 101
 		/***********************/
102 102
 		/** Delete A Form **/
103 103
 		/**********************/
104
-		if ( isset( $_REQUEST['action'] ) && $_REQUEST['action'] == 'yikes-easy-mc-delete-form' ) {
104
+		if ( isset( $_REQUEST[ 'action' ] ) && $_REQUEST[ 'action' ] == 'yikes-easy-mc-delete-form' ) {
105 105
 
106 106
 			add_action( 'init', array( $this, 'yikes_easy_mailchimp_delete_form' ) );
107 107
 
@@ -110,7 +110,7 @@  discard block
 block discarded – undo
110 110
 		/**********************************/
111 111
 		/** Duplicate/Clone A Form    **/
112 112
 		/********************************/
113
-		if ( isset( $_REQUEST['action'] ) && $_REQUEST['action'] == 'yikes-easy-mc-duplicate-form' ) {
113
+		if ( isset( $_REQUEST[ 'action' ] ) && $_REQUEST[ 'action' ] == 'yikes-easy-mc-duplicate-form' ) {
114 114
 
115 115
 			add_action( 'init', array( $this, 'yikes_easy_mailchimp_duplicate_form' ) );
116 116
 
@@ -119,7 +119,7 @@  discard block
 block discarded – undo
119 119
 		/*************************************/
120 120
 		/**  Reset Form Impression Stats **/
121 121
 		/***********************************/
122
-		if ( isset( $_REQUEST['action'] ) && $_REQUEST['action'] == 'yikes-easy-mc-reset-stats' ) {
122
+		if ( isset( $_REQUEST[ 'action' ] ) && $_REQUEST[ 'action' ] == 'yikes-easy-mc-reset-stats' ) {
123 123
 
124 124
 			add_action( 'init', array( $this, 'yikes_easy_mailchimp_reset_impression_stats' ) );
125 125
 
@@ -128,7 +128,7 @@  discard block
 block discarded – undo
128 128
 		/**********************************/
129 129
 		/**         Update A Form        **/
130 130
 		/********************************/
131
-		if ( isset( $_REQUEST['action'] ) && $_REQUEST['action'] == 'yikes-easy-mc-update-form' ) {
131
+		if ( isset( $_REQUEST[ 'action' ] ) && $_REQUEST[ 'action' ] == 'yikes-easy-mc-update-form' ) {
132 132
 
133 133
 			add_action( 'init', array( $this, 'yikes_easy_mailchimp_update_form' ) );
134 134
 
@@ -137,7 +137,7 @@  discard block
 block discarded – undo
137 137
 		/**************************************************/
138 138
 		/**     Clear Store Mailchimp Transient Data   **/
139 139
 		/*************************************************/
140
-		if ( isset( $_REQUEST['action'] ) && $_REQUEST['action'] == 'yikes-easy-mc-clear-transient-data' ) {
140
+		if ( isset( $_REQUEST[ 'action' ] ) && $_REQUEST[ 'action' ] == 'yikes-easy-mc-clear-transient-data' ) {
141 141
 
142 142
 			add_action( 'init', array( $this, 'yikes_easy_mailchimp_clear_transient_data' ) );
143 143
 
@@ -146,7 +146,7 @@  discard block
 block discarded – undo
146 146
 		/*******************************************/
147 147
 		/** Remove a user from a mailing list     **/
148 148
 		/*****************************************/
149
-		if ( isset( $_REQUEST['action'] ) && $_REQUEST['action'] == 'yikes-easy-mc-unsubscribe-user' ) {
149
+		if ( isset( $_REQUEST[ 'action' ] ) && $_REQUEST[ 'action' ] == 'yikes-easy-mc-unsubscribe-user' ) {
150 150
 
151 151
 			add_action( 'init', array( $this, 'yikes_easy_mailchimp_unsubscribe_user' ) );
152 152
 
@@ -155,7 +155,7 @@  discard block
 block discarded – undo
155 155
 		/*******************************************/
156 156
 		/**    Create misisng error log file  **/
157 157
 		/*****************************************/
158
-		if ( isset( $_REQUEST['action'] ) && $_REQUEST['action'] == 'yikes-easy-mc-create-error-log' ) {
158
+		if ( isset( $_REQUEST[ 'action' ] ) && $_REQUEST[ 'action' ] == 'yikes-easy-mc-create-error-log' ) {
159 159
 
160 160
 			add_action( 'init', array( $this, 'yikes_easy_mailchimp_create_missing_error_log' ) );
161 161
 
@@ -187,7 +187,7 @@  discard block
 block discarded – undo
187 187
 		/**************************************************/
188 188
 		/**        Clear Mailchimp Error Log Data        **/
189 189
 		/*************************************************/
190
-		if ( isset( $_REQUEST['action'] ) && $_REQUEST['action'] == 'yikes-easy-mc-clear-error-log' ) {
190
+		if ( isset( $_REQUEST[ 'action' ] ) && $_REQUEST[ 'action' ] == 'yikes-easy-mc-clear-error-log' ) {
191 191
 
192 192
 			add_action( 'init', array( $this, 'yikes_easy_mailchimp_clear_error_log' ) );
193 193
 
@@ -196,7 +196,7 @@  discard block
 block discarded – undo
196 196
 		/*********************************************/
197 197
 		/**        Export Mailchimp Opt-in Forms   **/
198 198
 		/*******************************************/
199
-		if ( isset( $_REQUEST['action'] ) && $_REQUEST['action'] == 'yikes-easy-mc-export-forms' ) {
199
+		if ( isset( $_REQUEST[ 'action' ] ) && $_REQUEST[ 'action' ] == 'yikes-easy-mc-export-forms' ) {
200 200
 
201 201
 			add_action( 'init', array( $this, 'yikes_easy_mailchimp_export_forms' ) );
202 202
 
@@ -205,7 +205,7 @@  discard block
 block discarded – undo
205 205
 		/*********************************************/
206 206
 		/**                Export Plugin Settings           **/
207 207
 		/*******************************************/
208
-		if ( isset( $_REQUEST['action'] ) && $_REQUEST['action'] == 'yikes-easy-mc-export-settings' ) {
208
+		if ( isset( $_REQUEST[ 'action' ] ) && $_REQUEST[ 'action' ] == 'yikes-easy-mc-export-settings' ) {
209 209
 
210 210
 			add_action( 'init', array( $this, 'yikes_easy_mailchimp_export_plugin_settings' ) );
211 211
 
@@ -214,7 +214,7 @@  discard block
 block discarded – undo
214 214
 		/*******************************************/
215 215
 		/**        Import Class Inclusion       **/
216 216
 		/*****************************************/
217
-		if ( isset( $_REQUEST['action'] ) && $_REQUEST['action'] == 'yikes-easy-mc-import-forms' ) {
217
+		if ( isset( $_REQUEST[ 'action' ] ) && $_REQUEST[ 'action' ] == 'yikes-easy-mc-import-forms' ) {
218 218
 
219 219
 			add_action( 'init', array( $this, 'yikes_easy_mailchimp_import_forms' ) );
220 220
 
@@ -223,7 +223,7 @@  discard block
 block discarded – undo
223 223
 		/*******************************************/
224 224
 		/**    Premium Support Request     **/
225 225
 		/*****************************************/
226
-		if ( isset( $_POST['submit-premium-support-request'] ) ) {
226
+		if ( isset( $_POST[ 'submit-premium-support-request' ] ) ) {
227 227
 
228 228
 			add_action( 'init', array( $this, 'yikes_easy_mailchimp_premium_support_request' ) );
229 229
 
@@ -256,8 +256,8 @@  discard block
 block discarded – undo
256 256
 		 * @ return array  $links  New array of plugin actions
257 257
 		 */
258 258
 		public function easy_forms_plugin_action_links( $links ) {
259
-			$links[] = '<a href="'. esc_url( get_admin_url(null, 'admin.php?page=yikes-inc-easy-mailchimp-settings') ) .'">' . __( 'Settings', 'yikes-inc-easy-mailchimp-extender' ) . '</a>';
260
-			$links[] = '<a href="' . esc_url( 'http://www.yikesplugins.com?utm_source=plugins-page&utm_medium=plugin-row&utm_campaign=admin' ) . '" target="_blank">' . __( 'More plugins by YIKES, Inc.', 'yikes-inc-easy-mailchimp-extender' ) . '</a>';
259
+			$links[ ] = '<a href="' . esc_url( get_admin_url( null, 'admin.php?page=yikes-inc-easy-mailchimp-settings' ) ) . '">' . __( 'Settings', 'yikes-inc-easy-mailchimp-extender' ) . '</a>';
260
+			$links[ ] = '<a href="' . esc_url( 'http://www.yikesplugins.com?utm_source=plugins-page&utm_medium=plugin-row&utm_campaign=admin' ) . '" target="_blank">' . __( 'More plugins by YIKES, Inc.', 'yikes-inc-easy-mailchimp-extender' ) . '</a>';
261 261
 			return $links;
262 262
 		}
263 263
 
@@ -358,17 +358,17 @@  discard block
 block discarded – undo
358 358
 		*/
359 359
 		public function yikes_easy_mailchimp_export_forms() {
360 360
 			// grab our nonce.
361
-			$nonce = $_REQUEST['nonce'];
361
+			$nonce = $_REQUEST[ 'nonce' ];
362 362
 			// grab the forms.
363
-			$forms = isset( $_REQUEST['yikes_export_forms'] ) ? $_REQUEST['yikes_export_forms'] : array();
363
+			$forms = isset( $_REQUEST[ 'yikes_export_forms' ] ) ? $_REQUEST[ 'yikes_export_forms' ] : array();
364 364
 			// validate nonce.
365 365
 			if ( ! wp_verify_nonce( $nonce, 'export-forms' ) ) {
366
-				wp_die( __( "We've run into an error. The security check didn't pass. Please try again." , 'yikes-inc-easy-mailchimp-extender' ) , __( "Failed nonce validation" , 'yikes-inc-easy-mailchimp-extender' ) , array( 'response' => 500 , 'back_link' => true ) );
366
+				wp_die( __( "We've run into an error. The security check didn't pass. Please try again.", 'yikes-inc-easy-mailchimp-extender' ), __( "Failed nonce validation", 'yikes-inc-easy-mailchimp-extender' ), array( 'response' => 500, 'back_link' => true ) );
367 367
 			}
368 368
 
369 369
 			// run the export function.
370 370
 			// parameters: ( $table_name, $form_ids, $file_name ).
371
-			Yikes_Inc_Easy_Mailchimp_Export_Class::yikes_mailchimp_form_export('Yikes-Inc-Easy-Mailchimp-Forms-Export', $forms );
371
+			Yikes_Inc_Easy_Mailchimp_Export_Class::yikes_mailchimp_form_export( 'Yikes-Inc-Easy-Mailchimp-Forms-Export', $forms );
372 372
 			// re-direct the user back to the page.
373 373
 			wp_redirect( esc_url_raw( admin_url( 'admin.php?page=yikes-inc-easy-mailchimp-settings&section=import-export-forms' ) ) );
374 374
 			die();
@@ -382,10 +382,10 @@  discard block
 block discarded – undo
382 382
 		*/
383 383
 		public function yikes_easy_mailchimp_export_plugin_settings() {
384 384
 			// grab our nonce
385
-			$nonce = $_REQUEST['nonce'];
385
+			$nonce = $_REQUEST[ 'nonce' ];
386 386
 			// validate nonce.
387 387
 			if ( ! wp_verify_nonce( $nonce, 'export-settings' ) ) {
388
-				wp_die( __( "We've run into an error. The security check didn't pass. Please try again." , 'yikes-inc-easy-mailchimp-extender' ) , __( "Failed nonce validation" , 'yikes-inc-easy-mailchimp-extender' ) , array( 'response' => 500 , 'back_link' => true ) );
388
+				wp_die( __( "We've run into an error. The security check didn't pass. Please try again.", 'yikes-inc-easy-mailchimp-extender' ), __( "Failed nonce validation", 'yikes-inc-easy-mailchimp-extender' ), array( 'response' => 500, 'back_link' => true ) );
389 389
 			}
390 390
 
391 391
 			// run the export function.
@@ -402,10 +402,10 @@  discard block
 block discarded – undo
402 402
 		*/
403 403
 		public function yikes_easy_mailchimp_import_forms() {
404 404
 			// grab our nonce.
405
-			$nonce = $_REQUEST['nonce'];
405
+			$nonce = $_REQUEST[ 'nonce' ];
406 406
 			// validate nonce.
407 407
 			if ( ! wp_verify_nonce( $nonce, 'import-forms' ) ) {
408
-				wp_die( __( "We've run into an error. The security check didn't pass. Please try again." , 'yikes-inc-easy-mailchimp-extender' ) , __( "Failed nonce validation" , 'yikes-inc-easy-mailchimp-extender' ) , array( 'response' => 500 , 'back_link' => true ) );
408
+				wp_die( __( "We've run into an error. The security check didn't pass. Please try again.", 'yikes-inc-easy-mailchimp-extender' ), __( "Failed nonce validation", 'yikes-inc-easy-mailchimp-extender' ), array( 'response' => 500, 'back_link' => true ) );
409 409
 			}
410 410
 			// include the export class.
411 411
 			if ( ! class_exists( 'Yikes_Inc_Easy_Mailchimp_Import_Class' ) ) {
@@ -426,18 +426,18 @@  discard block
 block discarded – undo
426 426
 		*/
427 427
 		public function yikes_easy_mailchimp_premium_support_request() {
428 428
 
429
-			if ( isset( $_POST['action'] ) && $_POST['action'] != 'yikes-support-request' ) {
429
+			if ( isset( $_POST[ 'action' ] ) && $_POST[ 'action' ] != 'yikes-support-request' ) {
430 430
 				return __( 'We encountered an error. Please contact the YIKES Inc. support team.', 'yikes-inc-easy-mailchimp-extender' );
431 431
 			}
432 432
 
433
-			$email       = isset( $_POST['user-email'] ) ? $_POST['user-email'] : '';
434
-			$topic       = isset( $_POST['support-topic'] ) ? $_POST['support-topic'] : '';
435
-			$issue       = isset( $_POST['support-content'] ) ? $_POST['support-content'] : '';
436
-			$priority    = isset( $_POST['support-priority'] ) ? $_POST['support-priority'] : 1;
437
-			$license     = isset( $_POST['license_key'] ) ? $_POST['license_key'] : '';
438
-			$plugin_name = isset( $_POST['plugin-name'] ) ? $_POST['plugin-name'] : '';
439
-			$plugin_slug = isset( $_POST['plugin-slug'] ) ? $_POST['plugin-slug'] : '';
440
-			$name        = isset( $_POST['user-name'] ) ? $_POST['user-name'] : 'Mailchimp Support';
433
+			$email       = isset( $_POST[ 'user-email' ] ) ? $_POST[ 'user-email' ] : '';
434
+			$topic       = isset( $_POST[ 'support-topic' ] ) ? $_POST[ 'support-topic' ] : '';
435
+			$issue       = isset( $_POST[ 'support-content' ] ) ? $_POST[ 'support-content' ] : '';
436
+			$priority    = isset( $_POST[ 'support-priority' ] ) ? $_POST[ 'support-priority' ] : 1;
437
+			$license     = isset( $_POST[ 'license_key' ] ) ? $_POST[ 'license_key' ] : '';
438
+			$plugin_name = isset( $_POST[ 'plugin-name' ] ) ? $_POST[ 'plugin-name' ] : '';
439
+			$plugin_slug = isset( $_POST[ 'plugin-slug' ] ) ? $_POST[ 'plugin-slug' ] : '';
440
+			$name        = isset( $_POST[ 'user-name' ] ) ? $_POST[ 'user-name' ] : 'Mailchimp Support';
441 441
 
442 442
 			$edd_item_id = $this->get_premium_license( $plugin_slug );
443 443
 
@@ -472,7 +472,7 @@  discard block
 block discarded – undo
472 472
 
473 473
 		public function get_premium_license( $plugin_slug ) {
474 474
 
475
-			switch( $plugin_slug ) {
475
+			switch ( $plugin_slug ) {
476 476
 
477 477
 				case 'form-customizer':
478 478
 					return defined( 'YIKES_CUSTOMIZER_EDD_ITEM_ID' ) ? YIKES_CUSTOMIZER_EDD_ITEM_ID : '';
@@ -516,7 +516,7 @@  discard block
 block discarded – undo
516 516
 			// add a new option to store the plugin activation date/time.
517 517
 			// @since v6.0.0.
518 518
 			// this is used to notify the user that they should review after 2 weeks.
519
-			if ( !get_option( 'yikes_easy_mailchimp_activation_date' ) ) {
519
+			if ( ! get_option( 'yikes_easy_mailchimp_activation_date' ) ) {
520 520
 				add_option( 'yikes_easy_mailchimp_activation_date', strtotime( "now" ) );
521 521
 			}
522 522
 
@@ -526,7 +526,7 @@  discard block
 block discarded – undo
526 526
 				$install_date = get_option( 'yikes_easy_mailchimp_activation_date' );
527 527
 				$past_date = strtotime( '-14 days' );
528 528
 				if ( $past_date >= $install_date && current_user_can( 'install_plugins' ) ) {
529
-					add_action( 'admin_notices', array( $this , 'yikes_easy_mailchimp_display_review_us_notice' ) );
529
+					add_action( 'admin_notices', array( $this, 'yikes_easy_mailchimp_display_review_us_notice' ) );
530 530
 				}
531 531
 			}
532 532
 
@@ -539,13 +539,13 @@  discard block
 block discarded – undo
539 539
 		*/
540 540
 		public function yikes_easy_mailchimp_display_review_us_notice() {
541 541
 			/* Lets only display our admin notice on YT4WP pages to not annoy the hell out of people :) */
542
-			if ( in_array( get_current_screen()->base , array( 'dashboard', 'post', 'edit' ) ) || strpos( get_current_screen()->base ,'yikes-inc-easy-mailchimp') !== false ) {
542
+			if ( in_array( get_current_screen()->base, array( 'dashboard', 'post', 'edit' ) ) || strpos( get_current_screen()->base, 'yikes-inc-easy-mailchimp' ) !== false ) {
543 543
 
544 544
 				// The URL of the page the user is currently on 
545
-				$current_uri  	  = isset( $_SERVER['REQUEST_URI'] ) && ! empty( $_SERVER['REQUEST_URI'] ) ? $_SERVER['REQUEST_URI'] : false;
546
-				$current_host	  = isset( $_SERVER['HTTP_HOST'] ) && ! empty( $_SERVER['HTTP_HOST'] ) ? $_SERVER['HTTP_HOST'] : false;
545
+				$current_uri = isset( $_SERVER[ 'REQUEST_URI' ] ) && ! empty( $_SERVER[ 'REQUEST_URI' ] ) ? $_SERVER[ 'REQUEST_URI' ] : false;
546
+				$current_host = isset( $_SERVER[ 'HTTP_HOST' ] ) && ! empty( $_SERVER[ 'HTTP_HOST' ] ) ? $_SERVER[ 'HTTP_HOST' ] : false;
547 547
 				$current_protocol = is_ssl() === true ? 'https://' : 'http://';
548
-				$current_url	  = ( $current_uri !== false && $current_host !== false ) ? $current_protocol . $current_host . $current_uri : admin_url();
548
+				$current_url = ( $current_uri !== false && $current_host !== false ) ? $current_protocol . $current_host . $current_uri : admin_url();
549 549
 
550 550
 				$plugin_name = '<strong>Easy Forms for Mailchimp</strong>';
551 551
 				// Review URL - Change to the URL of your plugin on WordPress.org.
@@ -556,17 +556,17 @@  discard block
 block discarded – undo
556 556
 				// Make sure all of our variables have values.
557 557
 				$reviewurl  = ( ! empty( $reviewurl ) ) ? $reviewurl : '';
558 558
 				$addons_url = ( ! empty( $addons_url ) ) ? $addons_url : '';
559
-				$nobugurl	= ( ! empty( $nobugurl ) ) ? $nobugurl : '';
559
+				$nobugurl = ( ! empty( $nobugurl ) ) ? $nobugurl : '';
560 560
 
561 561
 				$review_message = '<div id="yikes-mailchimp-logo"></div>';
562 562
 				$review_message .= sprintf( 
563 563
 					__( 'It looks like you\'ve been using %1$s for 2 weeks now. We hope you\'re enjoying the features included with the free version. If so, please consider leaving us a review. Reviews only help to catch other users attention as well as provide us with feedback to grow and improve upon. If you\'re really enjoying the plugin, consider buying an add-on or developer license for some really awesome features and premium support.', 'yikes-inc-easy-mailchimp-extender' ) 
564 564
 					. '<span class="button-container"> <a href="%2$s" target="_blank" class="button-secondary"><span class="dashicons dashicons-star-filled"></span>'
565
-						. __( "Leave A Review" , 'yikes-inc-easy-mailchimp-extender' ) 
565
+						. __( "Leave A Review", 'yikes-inc-easy-mailchimp-extender' ) 
566 566
 					. '</a> <a href="%3$s" class="button-secondary"><span class="dashicons dashicons-upload"></span>'
567
-						. __( "View Addons" , 'yikes-inc-easy-mailchimp-extender' ) 
567
+						. __( "View Addons", 'yikes-inc-easy-mailchimp-extender' ) 
568 568
 					. '</a> <a href="%4$s" class="button-secondary"><span class="dashicons dashicons-no-alt"></span>'
569
-						. __( "Dismiss" , 'yikes-inc-easy-mailchimp-extender' ) 
569
+						. __( "Dismiss", 'yikes-inc-easy-mailchimp-extender' ) 
570 570
 					. "</a> </span>", 
571 571
 				$plugin_name, $reviewurl, $addons_url, $nobugurl );
572 572
 				?>
@@ -583,7 +583,7 @@  discard block
 block discarded – undo
583 583
 			@since v3.1.1
584 584
 		*/
585 585
 		public function yikes_easy_mailchimp_stop_bugging_me() {
586
-			if ( isset( $_GET['yikes_easy_mc_icons_nobug'] ) && (int) filter_var( $_GET['yikes_easy_mc_icons_nobug'], FILTER_SANITIZE_NUMBER_INT ) === 1 ) {
586
+			if ( isset( $_GET[ 'yikes_easy_mc_icons_nobug' ] ) && (int) filter_var( $_GET[ 'yikes_easy_mc_icons_nobug' ], FILTER_SANITIZE_NUMBER_INT ) === 1 ) {
587 587
 				add_option( 'yikes_easy_mailchimp_review_stop_bugging_me', true );
588 588
 			}
589 589
 		}
@@ -621,7 +621,7 @@  discard block
 block discarded – undo
621 621
 	// inlcude the js for tinymce.
622 622
 	public function yks_mc_add_tinymce_plugin( $plugin_array ) {
623 623
 
624
-		$plugin_array['yks_mc_tinymce_button'] = plugins_url( '/js/min/yikes-inc-easy-mailchimp-tinymce-button.min.js', __FILE__ );
624
+		$plugin_array[ 'yks_mc_tinymce_button' ] = plugins_url( '/js/min/yikes-inc-easy-mailchimp-tinymce-button.min.js', __FILE__ );
625 625
 
626 626
 		return $plugin_array;
627 627
 	}
@@ -642,13 +642,13 @@  discard block
 block discarded – undo
642 642
 		if ( ! empty( $list_data ) ) {
643 643
 			// build an array to pass to our javascript.
644 644
 			foreach ( $list_data as $id => $form ) {
645
-				$lists[] = array(
646
-					'text'  => urlencode( $form['form_name'] ),
645
+				$lists[ ] = array(
646
+					'text'  => urlencode( $form[ 'form_name' ] ),
647 647
 					'value' => $id,
648 648
 				);
649 649
 			}
650 650
 		} else {
651
-			$lists[0] = array(
651
+			$lists[ 0 ] = array(
652 652
 				'text'  => __( 'Please Import Some Mailchimp Lists', 'yikes-inc-easy-mailchimp-extender' ),
653 653
 				'value' => '-',
654 654
 			);
@@ -729,8 +729,8 @@  discard block
 block discarded – undo
729 729
 
730 730
 		wp_enqueue_style( 'wp-color-picker' );
731 731
 		wp_enqueue_script( 'wp-color-picker' );
732
-		wp_enqueue_script( 'jquery.timepicker.js',YIKES_MC_URL . 'admin/js/jquery.timepicker.min.js', array( 'jquery' ) , $this->version, false );
733
-		wp_enqueue_script( 'edit-form-js', YIKES_MC_URL . 'admin/js/min/yikes-inc-easy-mailchimp-extender-edit-form.min.js', array( 'jquery.timepicker.js', 'jquery-ui-datepicker' ) , $this->version, false );
732
+		wp_enqueue_script( 'jquery.timepicker.js', YIKES_MC_URL . 'admin/js/jquery.timepicker.min.js', array( 'jquery' ), $this->version, false );
733
+		wp_enqueue_script( 'edit-form-js', YIKES_MC_URL . 'admin/js/min/yikes-inc-easy-mailchimp-extender-edit-form.min.js', array( 'jquery.timepicker.js', 'jquery-ui-datepicker' ), $this->version, false );
734 734
 
735 735
 		$localized_data = array(
736 736
 			'add_tag_nonce'                     => wp_create_nonce( 'add-tag' ),
@@ -826,7 +826,7 @@  discard block
 block discarded – undo
826 826
 	 * Convert the php date format string to a js date format
827 827
 	 */
828 828
 	public function yikes_jQuery_datepicker_date_format( $site_option ) {
829
-		switch( $site_option ) {
829
+		switch ( $site_option ) {
830 830
 			//Predefined WP date formats
831 831
 			default:
832 832
 			case 'F j, Y':
@@ -1028,7 +1028,7 @@  discard block
 block discarded – undo
1028 1028
 
1029 1029
 		/* Register General Settings Section */
1030 1030
 
1031
-		register_setting( 'yikes_inc_easy_mc_general_settings_page', 'yikes-mc-api-key', array( $this , 'yikes_mc_validate_api_key' ) );
1031
+		register_setting( 'yikes_inc_easy_mc_general_settings_page', 'yikes-mc-api-key', array( $this, 'yikes_mc_validate_api_key' ) );
1032 1032
 
1033 1033
 		register_setting( 'yikes_inc_easy_mc_general_settings_page', 'yikes-mailchimp-use-nonce' );
1034 1034
 
@@ -1073,7 +1073,7 @@  discard block
 block discarded – undo
1073 1073
 		add_settings_field(
1074 1074
 			'optin-checkbox-init',
1075 1075
 			__( 'Select Checkboxes to Generate', 'yikes-inc-easy-mailchimp-extender' ),
1076
-			'',  // callback + validation inside of admin/partials/menu/options.php
1076
+			'', // callback + validation inside of admin/partials/menu/options.php
1077 1077
 			'yikes_inc_easy_mc_checkbox_settings'
1078 1078
 		);
1079 1079
 		/* End Checkbox Settings */
@@ -1100,42 +1100,42 @@  discard block
 block discarded – undo
1100 1100
 			add_settings_field(
1101 1101
 				'yikes-mc-recaptcha-site-key',
1102 1102
 				__( 'Enter reCAPTCHA V2 Site Key', 'yikes-inc-easy-mailchimp-extender' ),
1103
-				'',  // callback + validation inside of admin/partials/menu/options.php
1103
+				'', // callback + validation inside of admin/partials/menu/options.php
1104 1104
 				'yikes_easy_mc_settings_recpatcha_section'
1105 1105
 			);
1106 1106
 
1107 1107
 			add_settings_field(
1108 1108
 				'yikes-mc-recaptcha-secret-key',
1109 1109
 				__( 'Enter reCAPTCHA V2 Secret Key', 'yikes-inc-easy-mailchimp-extender' ),
1110
-				'',  // callback + validation inside of admin/partials/menu/options.php
1110
+				'', // callback + validation inside of admin/partials/menu/options.php
1111 1111
 				'yikes_easy_mc_settings_recpatcha_section'
1112 1112
 			);
1113 1113
 
1114 1114
 			add_settings_field(
1115 1115
 				'yikes-mc-recaptcha-status',
1116 1116
 				__( 'Enable ReCaptcha', 'yikes-inc-easy-mailchimp-extender' ),
1117
-				'',  // callback + validation inside of admin/partials/menu/options.php
1117
+				'', // callback + validation inside of admin/partials/menu/options.php
1118 1118
 				'yikes_easy_mc_settings_recpatcha_section'
1119 1119
 			);
1120 1120
 
1121 1121
 			add_settings_field(
1122 1122
 				'yikes-mc-recaptcha-version-three',
1123 1123
 				__( 'Enable Version 3', 'yikes-inc-easy-mailchimp-extender' ),
1124
-				'',  // callback + validation inside of admin/partials/menu/options.php
1124
+				'', // callback + validation inside of admin/partials/menu/options.php
1125 1125
 				'yikes_easy_mc_settings_recpatcha_section'
1126 1126
 			);
1127 1127
 
1128 1128
 			add_settings_field(
1129 1129
 				'yikes-mc-recaptcha-site-key-three',
1130 1130
 				__( 'Enter reCAPTCHA V3 Site Key', 'yikes-inc-easy-mailchimp-extender' ),
1131
-				'',  // callback + validation inside of admin/partials/menu/options.php
1131
+				'', // callback + validation inside of admin/partials/menu/options.php
1132 1132
 				'yikes_easy_mc_settings_recpatcha_section'
1133 1133
 			);
1134 1134
 
1135 1135
 			add_settings_field(
1136 1136
 				'yikes-mc-recaptcha-secret-key-three',
1137 1137
 				__( 'Enter reCAPTCHA V3 Secret Key', 'yikes-inc-easy-mailchimp-extender' ),
1138
-				'',  // callback + validation inside of admin/partials/menu/options.php
1138
+				'', // callback + validation inside of admin/partials/menu/options.php
1139 1139
 				'yikes_easy_mc_settings_recpatcha_section'
1140 1140
 			);
1141 1141
 
@@ -1155,7 +1155,7 @@  discard block
 block discarded – undo
1155 1155
 			add_settings_field(
1156 1156
 				'yikes-mailchimp-debug-status',
1157 1157
 				__( 'Enable Debugging', 'yikes-inc-easy-mailchimp-extender' ),
1158
-				'',  // callback + validation inside of admin/partials/menu/options.php
1158
+				'', // callback + validation inside of admin/partials/menu/options.php
1159 1159
 				'yikes_easy_mc_settings_debug_section'
1160 1160
 			);
1161 1161
 
@@ -1175,7 +1175,7 @@  discard block
 block discarded – undo
1175 1175
 			update_option( 'yikes-mc-api-validation', 'invalid_api_key' );
1176 1176
 			return '';
1177 1177
 		}
1178
-		$api_key = strip_tags ( trim( $input ) );
1178
+		$api_key = strip_tags( trim( $input ) );
1179 1179
 		$dash_position = strpos( trim( $input ), '-' );
1180 1180
 		if ( $dash_position !== false ) {
1181 1181
 			$manager = new Yikes_Inc_Easy_Mailchimp_API_Manager( $api_key );
@@ -1190,9 +1190,9 @@  discard block
 block discarded – undo
1190 1190
 			update_option( 'yikes-mc-api-validation', 'valid_api_key' );
1191 1191
 				// Clear the API key transient data
1192 1192
 			$this->delete_yikes_mailchimp_transients();
1193
-		}  else {
1193
+		} else {
1194 1194
 			$error_logging = new Yikes_Inc_Easy_Mailchimp_Error_Logging();
1195
-			$error_logging->yikes_easy_mailchimp_write_to_error_log( $response->get_error_message() , __( "Connecting to Mailchimp" , 'yikes-inc-easy-mailchimp-extender' ) , __( "Settings Page/General Settings" , 'yikes-inc-easy-mailchimp-extender' ) );
1195
+			$error_logging->yikes_easy_mailchimp_write_to_error_log( $response->get_error_message(), __( "Connecting to Mailchimp", 'yikes-inc-easy-mailchimp-extender' ), __( "Settings Page/General Settings", 'yikes-inc-easy-mailchimp-extender' ) );
1196 1196
 			update_option( 'yikes-mc-api-invalid-key-response', $response->get_error_message() );
1197 1197
 			update_option( 'yikes-mc-api-validation', 'invalid_api_key' );
1198 1198
 		}
@@ -1239,9 +1239,9 @@  discard block
 block discarded – undo
1239 1239
 		*	and return the index ( used to find the list name assigned to a form )
1240 1240
 		*	- http://stackoverflow.com/questions/6661530/php-multi-dimensional-array-search
1241 1241
 		*/
1242
-		function findMCListID($id, $array) {
1243
-		   foreach ($array as $key => $val) {
1244
-			   if ($val['id'] === $id) {
1242
+		function findMCListID( $id, $array ) {
1243
+		   foreach ( $array as $key => $val ) {
1244
+			   if ( $val[ 'id' ] === $id ) {
1245 1245
 				   return $key;
1246 1246
 			   }
1247 1247
 		   }
@@ -1254,8 +1254,8 @@  discard block
 block discarded – undo
1254 1254
 		*	@since v5.6 - complete re-write
1255 1255
 		*/
1256 1256
 		public function generate_options_pages_sidebar_menu() {
1257
-			if ( isset( $_REQUEST['section'] ) ) {
1258
-				$selected = $_REQUEST['section'];
1257
+			if ( isset( $_REQUEST[ 'section' ] ) ) {
1258
+				$selected = $_REQUEST[ 'section' ];
1259 1259
 			}
1260 1260
 			$installed_addons = get_option( 'yikes-easy-mc-active-addons', array() );
1261 1261
 
@@ -1272,25 +1272,25 @@  discard block
 block discarded – undo
1272 1272
 				<h3><span><?php _e( 'Additional Settings', 'yikes-inc-easy-mailchimp-extender' ); ?></span></h3>
1273 1273
 				<div class="inside">
1274 1274
 					<ul id="settings-nav">
1275
-						<li><?php if ( isset( $_REQUEST['section'] ) && $_REQUEST['section'] == 'general-settings' || !isset( $_REQUEST['section'] ) ) { ?><div class="option-menu-selected-arrow"></div><?php } ?><a href="<?php echo esc_url_raw( add_query_arg( array( 'section' => 'general-settings' ) , admin_url( 'admin.php?page=yikes-inc-easy-mailchimp-settings&section=general-settings' ) ) ); ?>"><?php _e( 'General Settings', 'yikes-inc-easy-mailchimp-extender' ); ?></a></li>
1276
-						<li><?php if ( isset( $_REQUEST['section'] ) && $_REQUEST['section'] == 'integration-settings' ) { ?><div class="option-menu-selected-arrow"></div><?php } ?><a href="<?php echo esc_url_raw( add_query_arg( array( 'section' => 'integration-settings' ) , admin_url( 'admin.php?page=yikes-inc-easy-mailchimp-settings&section=integration-settings' ) ) ); ?>"><?php _e( 'Integration Settings', 'yikes-inc-easy-mailchimp-extender' ); ?></a></li>
1277
-						<li><?php if ( isset( $_REQUEST['section'] ) && $_REQUEST['section'] == 'recaptcha-settings' ) { ?><div class="option-menu-selected-arrow"></div><?php } ?><a href="<?php echo esc_url_raw( add_query_arg( array( 'section' => 'recaptcha-settings' ) , admin_url( 'admin.php?page=yikes-inc-easy-mailchimp-settings&section=recaptcha-settings' ) ) ); ?>"><?php _e( 'ReCaptcha Settings', 'yikes-inc-easy-mailchimp-extender' ); ?></a></li>
1278
-						<li><?php if ( isset( $_REQUEST['section'] ) && $_REQUEST['section'] == 'api-cache-settings' ) { ?><div class="option-menu-selected-arrow"></div><?php } ?><a href="<?php echo esc_url_raw( add_query_arg( array( 'section' => 'api-cache-settings' ) , admin_url( 'admin.php?page=yikes-inc-easy-mailchimp-settings&section=api-cache-settings' ) ) ); ?>"><?php _e( 'API Cache Settings', 'yikes-inc-easy-mailchimp-extender' ); ?></a></li>
1279
-						<li><?php if ( isset( $_REQUEST['section'] ) && $_REQUEST['section'] ==  'debug-settings' ) { ?><div class="option-menu-selected-arrow"></div><?php } ?><a href="<?php echo esc_url_raw( add_query_arg( array( 'section' => 'debug-settings' ) , admin_url( 'admin.php?page=yikes-inc-easy-mailchimp-settings&section=debug-settings' ) ) ); ?>"><?php _e( 'Debug Settings', 'yikes-inc-easy-mailchimp-extender' ); ?></a></li>
1280
-						<li><?php if ( isset( $_REQUEST['section'] ) && $_REQUEST['section'] ==  'import-export-forms' ) { ?><div class="option-menu-selected-arrow"></div><?php } ?><a href="<?php echo esc_url_raw( add_query_arg( array( 'section' => 'import-export-forms' ) , admin_url( 'admin.php?page=yikes-inc-easy-mailchimp-settings&section=import-export-forms' ) ) ); ?>"><?php _e( 'Import/Export', 'yikes-inc-easy-mailchimp-extender' ); ?></a></li>
1275
+						<li><?php if ( isset( $_REQUEST[ 'section' ] ) && $_REQUEST[ 'section' ] == 'general-settings' || ! isset( $_REQUEST[ 'section' ] ) ) { ?><div class="option-menu-selected-arrow"></div><?php } ?><a href="<?php echo esc_url_raw( add_query_arg( array( 'section' => 'general-settings' ), admin_url( 'admin.php?page=yikes-inc-easy-mailchimp-settings&section=general-settings' ) ) ); ?>"><?php _e( 'General Settings', 'yikes-inc-easy-mailchimp-extender' ); ?></a></li>
1276
+						<li><?php if ( isset( $_REQUEST[ 'section' ] ) && $_REQUEST[ 'section' ] == 'integration-settings' ) { ?><div class="option-menu-selected-arrow"></div><?php } ?><a href="<?php echo esc_url_raw( add_query_arg( array( 'section' => 'integration-settings' ), admin_url( 'admin.php?page=yikes-inc-easy-mailchimp-settings&section=integration-settings' ) ) ); ?>"><?php _e( 'Integration Settings', 'yikes-inc-easy-mailchimp-extender' ); ?></a></li>
1277
+						<li><?php if ( isset( $_REQUEST[ 'section' ] ) && $_REQUEST[ 'section' ] == 'recaptcha-settings' ) { ?><div class="option-menu-selected-arrow"></div><?php } ?><a href="<?php echo esc_url_raw( add_query_arg( array( 'section' => 'recaptcha-settings' ), admin_url( 'admin.php?page=yikes-inc-easy-mailchimp-settings&section=recaptcha-settings' ) ) ); ?>"><?php _e( 'ReCaptcha Settings', 'yikes-inc-easy-mailchimp-extender' ); ?></a></li>
1278
+						<li><?php if ( isset( $_REQUEST[ 'section' ] ) && $_REQUEST[ 'section' ] == 'api-cache-settings' ) { ?><div class="option-menu-selected-arrow"></div><?php } ?><a href="<?php echo esc_url_raw( add_query_arg( array( 'section' => 'api-cache-settings' ), admin_url( 'admin.php?page=yikes-inc-easy-mailchimp-settings&section=api-cache-settings' ) ) ); ?>"><?php _e( 'API Cache Settings', 'yikes-inc-easy-mailchimp-extender' ); ?></a></li>
1279
+						<li><?php if ( isset( $_REQUEST[ 'section' ] ) && $_REQUEST[ 'section' ] == 'debug-settings' ) { ?><div class="option-menu-selected-arrow"></div><?php } ?><a href="<?php echo esc_url_raw( add_query_arg( array( 'section' => 'debug-settings' ), admin_url( 'admin.php?page=yikes-inc-easy-mailchimp-settings&section=debug-settings' ) ) ); ?>"><?php _e( 'Debug Settings', 'yikes-inc-easy-mailchimp-extender' ); ?></a></li>
1280
+						<li><?php if ( isset( $_REQUEST[ 'section' ] ) && $_REQUEST[ 'section' ] == 'import-export-forms' ) { ?><div class="option-menu-selected-arrow"></div><?php } ?><a href="<?php echo esc_url_raw( add_query_arg( array( 'section' => 'import-export-forms' ), admin_url( 'admin.php?page=yikes-inc-easy-mailchimp-settings&section=import-export-forms' ) ) ); ?>"><?php _e( 'Import/Export', 'yikes-inc-easy-mailchimp-extender' ); ?></a></li>
1281 1281
 					</ul>
1282 1282
 					<?php
1283 1283
 						// create our add-on settings pages
1284
-						if ( !empty( $installed_addons ) ) {
1284
+						if ( ! empty( $installed_addons ) ) {
1285 1285
 							?>
1286 1286
 							<hr class="add-on-settings-divider" />
1287 1287
 							<strong><?php _e( 'Addon Settings', 'yikes-inc-easy-mailchimp-extender' ); ?></strong>
1288 1288
 							<ul id="addon-settings-nav">
1289 1289
 							<?php
1290
-							foreach( $installed_addons as $addon_name ) {
1290
+							foreach ( $installed_addons as $addon_name ) {
1291 1291
 								?>
1292 1292
 									<li>
1293
-										<?php if ( isset( $_REQUEST['section'] ) && $_REQUEST['section'] ==  $addon_name ) { ?><div class="option-menu-selected-arrow"></div><?php } ?><a href="<?php echo esc_url_raw( add_query_arg( array( 'section' => $addon_name, 'addon' => 'true' ) , admin_url( 'admin.php?page=yikes-inc-easy-mailchimp-settings&section='.$addon_name ) ) ); ?>"><?php echo ucwords( str_replace( '-', ' ', $addon_name ) ); ?></a></li>
1293
+										<?php if ( isset( $_REQUEST[ 'section' ] ) && $_REQUEST[ 'section' ] == $addon_name ) { ?><div class="option-menu-selected-arrow"></div><?php } ?><a href="<?php echo esc_url_raw( add_query_arg( array( 'section' => $addon_name, 'addon' => 'true' ), admin_url( 'admin.php?page=yikes-inc-easy-mailchimp-settings&section=' . $addon_name ) ) ); ?>"><?php echo ucwords( str_replace( '-', ' ', $addon_name ) ); ?></a></li>
1294 1294
 								<?php
1295 1295
 							}
1296 1296
 							?>
@@ -1339,19 +1339,19 @@  discard block
 block discarded – undo
1339 1339
 						<select name="associated-list" id="associated-list" class=" input-field" <?php $this->is_user_mc_api_valid_form( true ); disabled( true, empty( $lists ) ); ?>>
1340 1340
 							<?php
1341 1341
 							if ( ! empty( $lists ) ) {
1342
-								foreach( $lists as $mailing_list ) {
1342
+								foreach ( $lists as $mailing_list ) {
1343 1343
 									?>
1344
-									<option value="<?php echo $mailing_list['id']; ?>"><?php echo stripslashes( $mailing_list['name'] ) . ' (' . $mailing_list['stats']['member_count'] . ') '; ?></option>
1344
+									<option value="<?php echo $mailing_list[ 'id' ]; ?>"><?php echo stripslashes( $mailing_list[ 'name' ] ) . ' (' . $mailing_list[ 'stats' ][ 'member_count' ] . ') '; ?></option>
1345 1345
 									<?php
1346 1346
 								}
1347 1347
 							} else {
1348 1348
 								if ( get_option( 'yikes-mc-api-validation', 'invalid_api_key' ) == 'invalid_api_key' ) {
1349 1349
 									?>
1350
-									<option><?php echo __( "Please enter a valid API key." , 'yikes-inc-easy-mailchimp-extender' ); ?></option>
1350
+									<option><?php echo __( "Please enter a valid API key.", 'yikes-inc-easy-mailchimp-extender' ); ?></option>
1351 1351
 									<?php
1352 1352
 								} else {
1353 1353
 									?>
1354
-									<option><?php echo __( "No lists were found on the account." , 'yikes-inc-easy-mailchimp-extender' ); ?></option>
1354
+									<option><?php echo __( "No lists were found on the account.", 'yikes-inc-easy-mailchimp-extender' ); ?></option>
1355 1355
 									<?php
1356 1356
 
1357 1357
 								}
@@ -1360,8 +1360,8 @@  discard block
 block discarded – undo
1360 1360
 						</select>
1361 1361
 
1362 1362
 						<?php
1363
-						if ( isset( $_GET['transient-cleared'] ) ) {
1364
-							if ( 'true' === $_GET['transient-cleared'] ) {
1363
+						if ( isset( $_GET[ 'transient-cleared' ] ) ) {
1364
+							if ( 'true' === $_GET[ 'transient-cleared' ] ) {
1365 1365
 								?>
1366 1366
 								<div class="yikes-list-refreshed-notice">
1367 1367
 									<p><?php esc_attr_e( 'Mailchimp list data has been succesfully refreshed.', 'yikes-inc-easy-mailchimp-extender' ); ?></p>
@@ -1374,7 +1374,7 @@  discard block
 block discarded – undo
1374 1374
 							if ( get_option( 'yikes-mc-api-validation', 'invalid_api_key' ) != 'invalid_api_key' ) {
1375 1375
 								?>
1376 1376
 									<p class="description">
1377
-										<?php printf( __( 'Head over to <a href="http://www.Mailchimp.com" title="%s">Mailchimp</a> to create a new list.', 'yikes-inc-easy-mailchimp-extender' ) , __( 'Create a list', 'yikes-inc-easy-mailchimp-extender' ) ); ?>
1377
+										<?php printf( __( 'Head over to <a href="http://www.Mailchimp.com" title="%s">Mailchimp</a> to create a new list.', 'yikes-inc-easy-mailchimp-extender' ), __( 'Create a list', 'yikes-inc-easy-mailchimp-extender' ) ); ?>
1378 1378
 									</p>
1379 1379
 								<?php
1380 1380
 							}
@@ -1383,9 +1383,9 @@  discard block
 block discarded – undo
1383 1383
 					</label>
1384 1384
 					<?php
1385 1385
 						if ( $this->is_user_mc_api_valid_form( false ) ) {
1386
-							echo submit_button( __( 'Create', 'yikes-inc-easy-mailchimp-extender' ) , 'primary', '', false , array( 'style' => 'margin:.75em 0 .5em 0;' ) );
1386
+							echo submit_button( __( 'Create', 'yikes-inc-easy-mailchimp-extender' ), 'primary', '', false, array( 'style' => 'margin:.75em 0 .5em 0;' ) );
1387 1387
 						} else {
1388
-							echo '<p class="description">' . __( "Please enter a valid Mailchimp API key to get started." , 'yikes-inc-easy-mailchimp-extender' ) . '</p>';
1388
+							echo '<p class="description">' . __( "Please enter a valid Mailchimp API key to get started.", 'yikes-inc-easy-mailchimp-extender' ) . '</p>';
1389 1389
 							?>
1390 1390
 								<a href="<?php echo esc_url_raw( admin_url( 'admin.php?page=yikes-inc-easy-mailchimp-settings&settings-updated=true' ) ); ?>"><?php _e( 'general settings', 'yikes-inc-easy-mailchimp-extender' ); ?></a>
1391 1391
 							<?php
@@ -1415,7 +1415,7 @@  discard block
 block discarded – undo
1415 1415
 				$post_types = get_post_types();
1416 1416
 				?>
1417 1417
 				<label id="redirect-user-to-selection-label" for="redirect-user-to-selection" class="<?php if ( $redirect == '0' ) { echo 'yikes-easy-mc-hidden'; } ?>">
1418
-					<?php _e( "Select A Page or Post" , 'yikes-inc-easy-mailchimp-extender' ); ?>
1418
+					<?php _e( "Select A Page or Post", 'yikes-inc-easy-mailchimp-extender' ); ?>
1419 1419
 					<select id="redirect-user-to-selection" name="redirect-user-to-selection" onchange="shouldWeDisplayCustomURL( this );return;">
1420 1420
 				<?php
1421 1421
 
@@ -1431,7 +1431,7 @@  discard block
 block discarded – undo
1431 1431
 					$excluded_post_types = apply_filters( 'yikes-mailchimp-excluded-redirect-post-types', $excluded_post_types );
1432 1432
 
1433 1433
 						// loop over registered post types, and query!
1434
-						foreach( $post_types as $registered_post_type ) {
1434
+						foreach ( $post_types as $registered_post_type ) {
1435 1435
 
1436 1436
 							// exclude a few built in custom post types and any defined by the filter
1437 1437
 							if ( ! in_array( $registered_post_type, $excluded_post_types ) ) {
@@ -1453,8 +1453,8 @@  discard block
 block discarded – undo
1453 1453
 									?>
1454 1454
 										<optgroup label="<?php echo ucwords( str_replace( '_', ' ', $registered_post_type ) ); ?>">
1455 1455
 									<?php
1456
-											foreach( $post_ids as $post_id ) {
1457
-												?><option <?php selected( $redirect_page , $post_id ); ?> value="<?php echo $post_id; ?>"><?php echo get_the_title( $post_id ) ?></option><?php
1456
+											foreach ( $post_ids as $post_id ) {
1457
+												?><option <?php selected( $redirect_page, $post_id ); ?> value="<?php echo $post_id; ?>"><?php echo get_the_title( $post_id ) ?></option><?php
1458 1458
 											}
1459 1459
 									?>
1460 1460
 										</optgroup>
@@ -1470,7 +1470,7 @@  discard block
 block discarded – undo
1470 1470
 					</select>
1471 1471
 
1472 1472
 					<label name="custom-redirect-url" class="custom_redirect_url_label" <?php if ( ! isset( $redirect_page ) || $redirect_page != 'custom_url' ) { echo 'style="display:none;"'; } ?>>
1473
-						<?php _e( "Enter Custom URL" , 'yikes-inc-easy-mailchimp-extender' ); ?>
1473
+						<?php _e( "Enter Custom URL", 'yikes-inc-easy-mailchimp-extender' ); ?>
1474 1474
 						<input type="text" class="widefat custom-redirect-url" name="custom-redirect-url" value="<?php echo $custom_redirect_url; ?>" />
1475 1475
 					</label>
1476 1476
 
@@ -1529,7 +1529,7 @@  discard block
 block discarded – undo
1529 1529
 							</p>
1530 1530
 						</div>
1531 1531
 
1532
-						<p class="description sidebar-footer-text"><?php printf( __( "This plugin made with %s by %s" , 'yikes-inc-easy-mailchimp-extender' ), '<span class="dashicons dashicons-heart yikes-love"></span>', '<a href="http://www.yikesinc.com" target="_blank" title="YIKES Inc.">YIKES Inc.</a>' ); ?> </p>
1532
+						<p class="description sidebar-footer-text"><?php printf( __( "This plugin made with %s by %s", 'yikes-inc-easy-mailchimp-extender' ), '<span class="dashicons dashicons-heart yikes-love"></span>', '<a href="http://www.yikesinc.com" target="_blank" title="YIKES Inc.">YIKES Inc.</a>' ); ?> </p>
1533 1533
 
1534 1534
 						<section id="about-yikes-inc" class="inside">
1535 1535
 							<a href="https://www.yikesinc.com" target="_blank" title="YIKES Inc.">
@@ -1547,7 +1547,7 @@  discard block
 block discarded – undo
1547 1547
 						<!-- review us container -->
1548 1548
 						<h3><?php _e( 'Easy Forms for Mailchimp Add-Ons', 'yikes-inc-easy-mailchimp-extender' ); ?></h3>
1549 1549
 						<div id="review-yikes-easy-mc" class="inside">
1550
-							<p><?php _e( "Check out available add-ons for some seriously enhanced features." , 'yikes-inc-easy-mailchimp-extender' ); ?></p>
1550
+							<p><?php _e( "Check out available add-ons for some seriously enhanced features.", 'yikes-inc-easy-mailchimp-extender' ); ?></p>
1551 1551
 							<p><a class="button-secondary" href="<?php echo esc_url_raw( admin_url( 'admin.php?page=yikes-inc-easy-mailchimp-addons' ) ); ?>" title="<?php _e( 'View Add-Ons', 'yikes-inc-easy-mailchimp-extender' ); ?>"><?php _e( 'View Add-Ons', 'yikes-inc-easy-mailchimp-extender' ); ?></a></p>
1552 1552
 						</div>
1553 1553
 
@@ -1574,11 +1574,11 @@  discard block
 block discarded – undo
1574 1574
 
1575 1575
 			// if no list id, die!
1576 1576
 			if ( ! $list_id ) {
1577
-				wp_die( __( "We've encountered an error. No list ID was sent." , 'yikes-inc-easy-mailchimp-extender' ) );
1577
+				wp_die( __( "We've encountered an error. No list ID was sent.", 'yikes-inc-easy-mailchimp-extender' ) );
1578 1578
 			}
1579 1579
 
1580 1580
 			if ( ! $merge_variables ) {
1581
-				wp_die( __( "We've encountered an error. Reload the page and try again. If the error persists, please reach out to support." , 'yikes-inc-easy-mailchimp-extender' ) );
1581
+				wp_die( __( "We've encountered an error. Reload the page and try again. If the error persists, please reach out to support.", 'yikes-inc-easy-mailchimp-extender' ) );
1582 1582
 			}
1583 1583
 
1584 1584
 			if ( ! empty( $form_fields ) ) {
@@ -1589,17 +1589,17 @@  discard block
 block discarded – undo
1589 1589
 				$available_interest_groups	= array();
1590 1590
 
1591 1591
 				// Default variables as arrays - these are used for holding the Mailchimp merge field ID
1592
-				$merge_field_ids			= array();
1593
-				$mailchimp_merge_field_ids	= array();
1592
+				$merge_field_ids = array();
1593
+				$mailchimp_merge_field_ids = array();
1594 1594
 
1595 1595
 				// loop over merge variables
1596
-				if ( ! empty( $merge_variables['merge_fields'] ) ) {
1597
-					$available_merge_variables = wp_list_pluck( $merge_variables['merge_fields'], 'tag' );
1598
-					$mailchimp_merge_field_ids = wp_list_pluck( $merge_variables['merge_fields'], 'merge_id' );
1596
+				if ( ! empty( $merge_variables[ 'merge_fields' ] ) ) {
1597
+					$available_merge_variables = wp_list_pluck( $merge_variables[ 'merge_fields' ], 'tag' );
1598
+					$mailchimp_merge_field_ids = wp_list_pluck( $merge_variables[ 'merge_fields' ], 'merge_id' );
1599 1599
 					
1600 1600
 					// Array will look like $merge_tag => $merge_id
1601
-					foreach( $available_merge_variables as $index => $merge_tag ) { 
1602
-						$merge_field_ids[$merge_tag] = $mailchimp_merge_field_ids[$index];
1601
+					foreach ( $available_merge_variables as $index => $merge_tag ) { 
1602
+						$merge_field_ids[ $merge_tag ] = $mailchimp_merge_field_ids[ $index ];
1603 1603
 					}
1604 1604
 				}
1605 1605
 
@@ -1614,46 +1614,46 @@  discard block
 block discarded – undo
1614 1614
 				$excluded_fields = array_diff( $assigned_fields, $merged_fields );
1615 1615
 
1616 1616
 				$i = 1;
1617
-				foreach( $form_fields as $field ) {
1617
+				foreach ( $form_fields as $field ) {
1618 1618
 
1619
-					if ( isset( $field['merge'] ) ) {
1619
+					if ( isset( $field[ 'merge' ] ) ) {
1620 1620
 						// @todo: don't use in_array()
1621
-						$excluded_field = in_array( $field['merge'], $excluded_fields, true );
1621
+						$excluded_field = in_array( $field[ 'merge' ], $excluded_fields, true );
1622 1622
 						?>
1623
-						<section class="draggable" id="<?php echo $field['merge']; ?>">
1623
+						<section class="draggable" id="<?php echo $field[ 'merge' ]; ?>">
1624 1624
 							<!-- top -->
1625 1625
 							<a class="expansion-section-title settings-sidebar">
1626 1626
 								<span class="dashicons dashicons-plus yikes-mc-expansion-toggle"></span>
1627
-								<span class="yikes-mc-expansion-section-field-label"> <?php echo stripslashes( $field['label'] ); ?> </span>
1627
+								<span class="yikes-mc-expansion-section-field-label"> <?php echo stripslashes( $field[ 'label' ] ); ?> </span>
1628 1628
 								<?php if ( $excluded_field ) { ?>
1629 1629
 									<img src="<?php echo YIKES_MC_URL . 'includes/images/warning.svg'; ?>" class="field-doesnt-exist-notice" title="<?php _e( 'Field no longer exists.', 'yikes-inc-easy-mailchimp-extender' ); ?>" alt="<?php _e( 'Field no longer exists.', 'yikes-inc-easy-mailchimp-extender' ); ?>">
1630 1630
 								<?php } ?>
1631
-								<input maxlength="50" type="text" class="yikes-mc-edit-field-label-input" value="<?php echo stripslashes( $field['label'] ); ?>" />
1631
+								<input maxlength="50" type="text" class="yikes-mc-edit-field-label-input" value="<?php echo stripslashes( $field[ 'label' ] ); ?>" />
1632 1632
 								<span class="dashicons dashicons-yes yikes-mc-save-field-label-edits-icon" title="<?php _e( 'Click to save changes.', 'yikes-inc-easy-mailchimp-extender' ); ?>"></span>
1633 1633
 								<span class="dashicons dashicons-edit yikes-mc-edit-field-label-icon" title="<?php _e( 'Click to edit the label', 'yikes-inc-easy-mailchimp-extender' ); ?>"></span>
1634 1634
 								<span class="yikes-mc-edit-field-label-message"></span>
1635
-								<span class="field-type-text"><small><?php echo __( 'type', 'yikes-inc-easy-mailchimp-extender' ) . ' : ' . $field['type']; ?></small></span>
1635
+								<span class="field-type-text"><small><?php echo __( 'type', 'yikes-inc-easy-mailchimp-extender' ) . ' : ' . $field[ 'type' ]; ?></small></span>
1636 1636
 							</a>
1637 1637
 							<!-- expansion section -->
1638 1638
 							<div class="yikes-mc-settings-expansion-section">
1639 1639
 
1640 1640
 								<?php if ( $excluded_field ) { ?>
1641
-									<p class="yikes-mc-warning-message"><?php _e( "This field no longer exists in this list. Delete this field from the form to prevent issues on your website." , 'yikes-inc-easy-mailchimp-extender' ); ?></p>
1641
+									<p class="yikes-mc-warning-message"><?php _e( "This field no longer exists in this list. Delete this field from the form to prevent issues on your website.", 'yikes-inc-easy-mailchimp-extender' ); ?></p>
1642 1642
 								<?php } ?>
1643 1643
 
1644 1644
 								<!-- store field data -->
1645
-								<input type="hidden" class="yikes-mc-merge-field-label" name="field[<?php echo $field['merge']; ?>][label]" value="<?php echo htmlspecialchars( $field['label'] ); ?>" />
1646
-								<input type="hidden" class="yikes-mc-merge-field-type" name="field[<?php echo $field['merge']; ?>][type]" value="<?php echo $field['type']; ?>" />
1647
-								<input type="hidden" class="yikes-mc-merge-field-tag" name="field[<?php echo $field['merge']; ?>][merge]" value="<?php echo $field['merge']; ?>" />
1648
-								<input type="hidden" class="field-<?php echo $field['merge']; ?>-position position-input" name="field[<?php echo $field['merge']; ?>][position]" value="<?php echo $i++; ?>" />
1649
-								<?php if ( isset( $merge_field_ids[ $field['merge'] ] ) && is_int( $merge_field_ids[ $field['merge'] ] ) ) { ?> 
1650
-									<input type="hidden" class="yikes-mc-merge-field-id" name="field[<?php echo $field['merge']; ?>][id]" value="<?php echo $merge_field_ids[ $field['merge'] ] ?>" />  
1645
+								<input type="hidden" class="yikes-mc-merge-field-label" name="field[<?php echo $field[ 'merge' ]; ?>][label]" value="<?php echo htmlspecialchars( $field[ 'label' ] ); ?>" />
1646
+								<input type="hidden" class="yikes-mc-merge-field-type" name="field[<?php echo $field[ 'merge' ]; ?>][type]" value="<?php echo $field[ 'type' ]; ?>" />
1647
+								<input type="hidden" class="yikes-mc-merge-field-tag" name="field[<?php echo $field[ 'merge' ]; ?>][merge]" value="<?php echo $field[ 'merge' ]; ?>" />
1648
+								<input type="hidden" class="field-<?php echo $field[ 'merge' ]; ?>-position position-input" name="field[<?php echo $field[ 'merge' ]; ?>][position]" value="<?php echo $i++; ?>" />
1649
+								<?php if ( isset( $merge_field_ids[ $field[ 'merge' ] ] ) && is_int( $merge_field_ids[ $field[ 'merge' ] ] ) ) { ?> 
1650
+									<input type="hidden" class="yikes-mc-merge-field-id" name="field[<?php echo $field[ 'merge' ]; ?>][id]" value="<?php echo $merge_field_ids[ $field[ 'merge' ] ] ?>" />  
1651 1651
 								<?php } ?>
1652 1652
 
1653
-								<?php if ( $field['type'] == 'radio' || $field['type'] == 'dropdown' || $field['type'] == 'select' ) {
1654
-									$choices = json_decode( $field['choices'], true );
1653
+								<?php if ( $field[ 'type' ] == 'radio' || $field[ 'type' ] == 'dropdown' || $field[ 'type' ] == 'select' ) {
1654
+									$choices = json_decode( $field[ 'choices' ], true );
1655 1655
 								?>
1656
-									<input type="hidden" name="field[<?php echo $field['merge']; ?>][choices]" value='<?php echo esc_attr( json_encode( $choices ) ); ?>' />
1656
+									<input type="hidden" name="field[<?php echo $field[ 'merge' ]; ?>][choices]" value='<?php echo esc_attr( json_encode( $choices ) ); ?>' />
1657 1657
 								<?php } ?>
1658 1658
 
1659 1659
 								<!-- Single or Double Opt-in -->
@@ -1669,12 +1669,12 @@  discard block
 block discarded – undo
1669 1669
 												</label>
1670 1670
 											</td>
1671 1671
 											<td>
1672
-												<input class="widefat merge-tag-text" type="text" readonly value="<?php echo $field['merge']; ?>">
1672
+												<input class="widefat merge-tag-text" type="text" readonly value="<?php echo $field[ 'merge' ]; ?>">
1673 1673
 											</td>
1674 1674
 										</tr>
1675 1675
 
1676 1676
 										<!-- Placeholder Value -->
1677
-										<?php switch( $field['type'] ) {
1677
+										<?php switch ( $field[ 'type' ] ) {
1678 1678
 
1679 1679
 											case 'text':
1680 1680
 											case 'email':
@@ -1688,13 +1688,13 @@  discard block
 block discarded – undo
1688 1688
 										<!-- Placeholder -->
1689 1689
 										<tr valign="top">
1690 1690
 											<td scope="row">
1691
-												<label for="placeholder_<?php echo esc_attr( $field['merge'] ); ?>">
1691
+												<label for="placeholder_<?php echo esc_attr( $field[ 'merge' ] ); ?>">
1692 1692
 													<?php _e( 'Placeholder', 'yikes-inc-easy-mailchimp-extender' ); ?>
1693 1693
 												</label>
1694 1694
 											</td>
1695 1695
 											<td>
1696
-												<input type="text" id="placeholder_<?php echo esc_attr( $field['merge'] ); ?>" class="widefat" name="field[<?php echo $field['merge']; ?>][placeholder]" value="<?php echo isset( $field['placeholder'] ) ? $field['placeholder'] : '' ; ?>" />
1697
-												<p class="description"><small><?php _e( "Assign a placeholder value to this field.", 'yikes-inc-easy-mailchimp-extender' );?></small></p>
1696
+												<input type="text" id="placeholder_<?php echo esc_attr( $field[ 'merge' ] ); ?>" class="widefat" name="field[<?php echo $field[ 'merge' ]; ?>][placeholder]" value="<?php echo isset( $field[ 'placeholder' ] ) ? $field[ 'placeholder' ] : ''; ?>" />
1697
+												<p class="description"><small><?php _e( "Assign a placeholder value to this field.", 'yikes-inc-easy-mailchimp-extender' ); ?></small></p>
1698 1698
 											</td>
1699 1699
 										</tr>
1700 1700
 										<?php
@@ -1705,13 +1705,13 @@  discard block
 block discarded – undo
1705 1705
 											?>
1706 1706
 												<tr valign="top">
1707 1707
 													<td scope="row">
1708
-														<label for="placeholder_<?php echo esc_attr( $field['merge'] ); ?>">
1708
+														<label for="placeholder_<?php echo esc_attr( $field[ 'merge' ] ); ?>">
1709 1709
 															<?php _e( 'Placeholder', 'yikes-inc-easy-mailchimp-extender' ); ?>
1710 1710
 														</label>
1711 1711
 													</td>
1712 1712
 													<td>
1713
-														<input type="checkbox" id="placeholder_<?php echo esc_attr( $field['merge'] ); ?>" class="widefat" name="field[<?php echo $field['merge']; ?>][placeholder]" value="1" <?php echo isset( $field['placeholder'] ) && ! empty( $field['placeholder'] ) ? 'checked="checked"' : '' ; ?> />
1714
-														<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>
1713
+														<input type="checkbox" id="placeholder_<?php echo esc_attr( $field[ 'merge' ] ); ?>" class="widefat" name="field[<?php echo $field[ 'merge' ]; ?>][placeholder]" value="1" <?php echo isset( $field[ 'placeholder' ] ) && ! empty( $field[ 'placeholder' ] ) ? 'checked="checked"' : ''; ?> />
1714
+														<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>
1715 1715
 													</td>
1716 1716
 												</tr>
1717 1717
 											<?php
@@ -1721,7 +1721,7 @@  discard block
 block discarded – undo
1721 1721
 										?>
1722 1722
 
1723 1723
 										<!-- Default Value -->
1724
-										<?php switch( $field['type'] ) {
1724
+										<?php switch ( $field[ 'type' ] ) {
1725 1725
 											default:
1726 1726
 											case 'text':
1727 1727
 											case 'number':
@@ -1729,15 +1729,15 @@  discard block
 block discarded – undo
1729 1729
 										?>
1730 1730
 											<tr valign="top">
1731 1731
 												<td scope="row">
1732
-													<label for="default_value_<?php echo esc_attr( $field['merge'] ); ?>">
1732
+													<label for="default_value_<?php echo esc_attr( $field[ 'merge' ] ); ?>">
1733 1733
 														<?php _e( 'Default Value', 'yikes-inc-easy-mailchimp-extender' ); ?>
1734 1734
 													</label>
1735 1735
 												</td>
1736 1736
 												<td>
1737
-													<input id="default_value_<?php echo esc_attr( $field['merge'] ); ?>" <?php if ( $field['type'] != 'number' ) { ?> type="text" <?php } else { ?> type="number" <?php } ?> class="widefat" name="field[<?php echo $field['merge']; ?>][default]" <?php if ( $field['type'] != 'url' ) { ?> value="<?php echo isset( $field['default'] ) ? stripslashes( wp_strip_all_tags( $field['default'] ) ) : ''; ?>" <?php } else { ?> value="<?php echo isset( $field['default'] ) ? stripslashes( wp_strip_all_tags( esc_url_raw( $field['default'] ) ) ) : ''; ?>" <?php } ?> />
1738
-													<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>
1737
+													<input id="default_value_<?php echo esc_attr( $field[ 'merge' ] ); ?>" <?php if ( $field[ 'type' ] != 'number' ) { ?> type="text" <?php } else { ?> type="number" <?php } ?> class="widefat" name="field[<?php echo $field[ 'merge' ]; ?>][default]" <?php if ( $field[ 'type' ] != 'url' ) { ?> value="<?php echo isset( $field[ 'default' ] ) ? stripslashes( wp_strip_all_tags( $field[ 'default' ] ) ) : ''; ?>" <?php } else { ?> value="<?php echo isset( $field[ 'default' ] ) ? stripslashes( wp_strip_all_tags( esc_url_raw( $field[ 'default' ] ) ) ) : ''; ?>" <?php } ?> />
1738
+													<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>
1739 1739
 													<?php
1740
-													switch( $field['type'] ) {
1740
+													switch ( $field[ 'type' ] ) {
1741 1741
 														case 'text':
1742 1742
 															?>
1743 1743
 																<p><small class="pre-defined-tag-link"><a href="#TB_inline?width=600&height=550&inlineId=pre-defined-tag-container" onclick="storeGlobalClicked( jQuery( this ) );" class="thickbox"><?php _e( 'View Pre-Defined Tags', 'yikes-inc-easy-mailchimp-extender' ); ?></a></small></p>
@@ -1759,28 +1759,28 @@  discard block
 block discarded – undo
1759 1759
 													</td>
1760 1760
 													<td>
1761 1761
 														<?php
1762
-															$field['default_choice'] = ! isset( $field['default_choice'] ) ? 'no-default' : $field['default_choice'];
1762
+															$field[ 'default_choice' ] = ! isset( $field[ 'default_choice' ] ) ? 'no-default' : $field[ 'default_choice' ];
1763 1763
 															$x = 0;
1764 1764
 														?>
1765
-														<label for="<?php echo $field['merge'] . '-no-default'; ?>">
1766
-															<input id="<?php echo $field['merge'] . '-no-default'; ?>"
1765
+														<label for="<?php echo $field[ 'merge' ] . '-no-default'; ?>">
1766
+															<input id="<?php echo $field[ 'merge' ] . '-no-default'; ?>"
1767 1767
 															       type="radio"
1768
-															       name="field[<?php echo $field['merge']; ?>][default_choice]"
1769
-															       value="no-default" <?php checked( $field['default_choice'], 'no-default' ); ?>
1768
+															       name="field[<?php echo $field[ 'merge' ]; ?>][default_choice]"
1769
+															       value="no-default" <?php checked( $field[ 'default_choice' ], 'no-default' ); ?>
1770 1770
 															>
1771 1771
 															No Default&nbsp;
1772 1772
 														</label>
1773 1773
 														<?php
1774 1774
 														foreach ( $choices as $choice => $value ) { ?>
1775
-															<label for="<?php echo $field['merge'].'-'.$x; ?>">
1776
-																<input id="<?php echo $field['merge'].'-'.$x; ?>"
1775
+															<label for="<?php echo $field[ 'merge' ] . '-' . $x; ?>">
1776
+																<input id="<?php echo $field[ 'merge' ] . '-' . $x; ?>"
1777 1777
 																       type="radio"
1778
-																       name="field[<?php echo $field['merge']; ?>][default_choice]"
1779
-																       value="<?php echo $x; ?>" <?php checked( $field['default_choice'], $x ); ?>>
1778
+																       name="field[<?php echo $field[ 'merge' ]; ?>][default_choice]"
1779
+																       value="<?php echo $x; ?>" <?php checked( $field[ 'default_choice' ], $x ); ?>>
1780 1780
 																<?php echo $value; ?>&nbsp;
1781 1781
 															</label>
1782 1782
 														<?php $x++; } ?>
1783
-														<p class="description"><small><?php _e( "Select the option that should be selected by default.", 'yikes-inc-easy-mailchimp-extender' );?></small></p>
1783
+														<p class="description"><small><?php _e( "Select the option that should be selected by default.", 'yikes-inc-easy-mailchimp-extender' ); ?></small></p>
1784 1784
 													</td>
1785 1785
 												</tr>
1786 1786
 
@@ -1796,13 +1796,13 @@  discard block
 block discarded – undo
1796 1796
 														</label>
1797 1797
 													</td>
1798 1798
 													<td>
1799
-														<select type="default" name="field[<?php echo $field['merge']; ?>][default_choice]">
1800
-															<option value="no-default" <?php selected( $field['default_choice'] , 'no-default' ); ?>>No Default</option>
1801
-															<?php foreach( json_decode( $field['choices'], true ) as $choice => $value ) { ?>
1802
-																<option value="<?php echo $choice; ?>" <?php selected( $field['default_choice'] , $choice ); ?>><?php echo $value; ?></option>
1799
+														<select type="default" name="field[<?php echo $field[ 'merge' ]; ?>][default_choice]">
1800
+															<option value="no-default" <?php selected( $field[ 'default_choice' ], 'no-default' ); ?>>No Default</option>
1801
+															<?php foreach ( json_decode( $field[ 'choices' ], true ) as $choice => $value ) { ?>
1802
+																<option value="<?php echo $choice; ?>" <?php selected( $field[ 'default_choice' ], $choice ); ?>><?php echo $value; ?></option>
1803 1803
 															<?php } ?>
1804 1804
 														</select>
1805
-														<p class="description"><small><?php _e( "Which option should be selected by default?", 'yikes-inc-easy-mailchimp-extender' );?></small></p>
1805
+														<p class="description"><small><?php _e( "Which option should be selected by default?", 'yikes-inc-easy-mailchimp-extender' ); ?></small></p>
1806 1806
 													</td>
1807 1807
 												</tr>
1808 1808
 
@@ -1819,82 +1819,82 @@  discard block
 block discarded – undo
1819 1819
 										<!-- Field Description -->
1820 1820
 										<tr valign="top">
1821 1821
 											<td scope="row">
1822
-												<label for="description_<?php echo esc_attr( $field['merge'] ); ?>">
1822
+												<label for="description_<?php echo esc_attr( $field[ 'merge' ] ); ?>">
1823 1823
 													<?php _e( 'Description', 'yikes-inc-easy-mailchimp-extender' ); ?>
1824 1824
 												</label>
1825 1825
 											</td>
1826 1826
 											<td>
1827
-												<textarea class="widefat field-description-input" id="description_<?php echo esc_attr( $field['merge'] ); ?>" name="field[<?php echo $field['merge']; ?>][description]"><?php echo isset( $field['description'] ) ? stripslashes( esc_html( $field['description'] ) ) : '' ; ?></textarea>
1828
-												<p class="description"><small><?php _e( "Enter the description for the form field. This will be displayed to the user and will provide some direction on how the field should be filled out or selected.", 'yikes-inc-easy-mailchimp-extender' );?></small></p>
1827
+												<textarea class="widefat field-description-input" id="description_<?php echo esc_attr( $field[ 'merge' ] ); ?>" name="field[<?php echo $field[ 'merge' ]; ?>][description]"><?php echo isset( $field[ 'description' ] ) ? stripslashes( esc_html( $field[ 'description' ] ) ) : ''; ?></textarea>
1828
+												<p class="description"><small><?php _e( "Enter the description for the form field. This will be displayed to the user and will provide some direction on how the field should be filled out or selected.", 'yikes-inc-easy-mailchimp-extender' ); ?></small></p>
1829 1829
 											</td>
1830 1830
 										</tr>
1831 1831
 										<!-- Description Above Field -->
1832 1832
 										<tr valign="top" class="yikes-checkbox-container">
1833 1833
 											<td scope="row">
1834
-												<label for="description_above_<?php echo esc_attr( $field['merge'] ); ?>">
1834
+												<label for="description_above_<?php echo esc_attr( $field[ 'merge' ] ); ?>">
1835 1835
 													<?php _e( 'Description Above Field', 'yikes-inc-easy-mailchimp-extender' ); ?>
1836 1836
 												</label>
1837 1837
 											</td>
1838 1838
 											<td>
1839
-												<input type="checkbox" id="description_above_<?php echo esc_attr( $field['merge'] ); ?>" class="widefat field-description-input" name="field[<?php echo $field['merge']; ?>][description_above]" value="1" <?php echo isset( $field['description_above'] ) && $field['description_above'] === '1' ? 'checked="checked"' : ''; ?> />
1840
-												<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>
1839
+												<input type="checkbox" id="description_above_<?php echo esc_attr( $field[ 'merge' ] ); ?>" class="widefat field-description-input" name="field[<?php echo $field[ 'merge' ]; ?>][description_above]" value="1" <?php echo isset( $field[ 'description_above' ] ) && $field[ 'description_above' ] === '1' ? 'checked="checked"' : ''; ?> />
1840
+												<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>
1841 1841
 											</td>
1842 1842
 										</tr>
1843 1843
 										<!-- Additional Classes -->
1844 1844
 										<tr valign="top">
1845 1845
 											<td scope="row">
1846
-												<label for="classes_<?php echo esc_attr( $field['merge'] ); ?>">
1846
+												<label for="classes_<?php echo esc_attr( $field[ 'merge' ] ); ?>">
1847 1847
 													<?php _e( 'Additional Classes', 'yikes-inc-easy-mailchimp-extender' ); ?>
1848 1848
 												</label>
1849 1849
 											</td>
1850 1850
 											<td>
1851
-												<input type="text" id="classes_<?php echo esc_attr( $field['merge'] ); ?>" class="widefat" name="field[<?php echo $field['merge']; ?>][additional-classes]" value="<?php echo isset( $field['additional-classes'] ) ? stripslashes( wp_strip_all_tags( $field['additional-classes'] ) ) : '' ; ?>" />
1852
-												<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>
1851
+												<input type="text" id="classes_<?php echo esc_attr( $field[ 'merge' ] ); ?>" class="widefat" name="field[<?php echo $field[ 'merge' ]; ?>][additional-classes]" value="<?php echo isset( $field[ 'additional-classes' ] ) ? stripslashes( wp_strip_all_tags( $field[ 'additional-classes' ] ) ) : ''; ?>" />
1852
+												<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>
1853 1853
 											</td>
1854 1854
 										</tr>
1855 1855
 										<!-- Required Toggle -->
1856 1856
 										<tr valign="top" class="yikes-checkbox-container yikes-checkbox-container-first">
1857 1857
 											<td scope="row">
1858
-												<label for="field-required-<?php echo esc_attr( $field['merge'] ); ?>">
1858
+												<label for="field-required-<?php echo esc_attr( $field[ 'merge' ] ); ?>">
1859 1859
 													<?php _e( 'Field Required?', 'yikes-inc-easy-mailchimp-extender' ); ?>
1860 1860
 												</label>
1861 1861
 											</td>
1862 1862
 											<td>
1863
-												<?php $checked = isset( $field['require'] ) ? $field['require'] : '0'; ?>
1864
-												<input id="field-required-<?php echo esc_attr( $field['merge'] ); ?>" type="checkbox" class="widefat" value="1" name="field[<?php echo $field['merge']; ?>][require]" <?php checked( $checked , 1 ); ?> <?php if ( $field['merge'] == 'EMAIL' ) {  ?> disabled="disabled" checked="checked" title="<?php echo __( 'Email is a required field.', 'yikes-inc-easy-mailchimp-extender' ); } ?>">
1865
-												<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>
1863
+												<?php $checked = isset( $field[ 'require' ] ) ? $field[ 'require' ] : '0'; ?>
1864
+												<input id="field-required-<?php echo esc_attr( $field[ 'merge' ] ); ?>" type="checkbox" class="widefat" value="1" name="field[<?php echo $field[ 'merge' ]; ?>][require]" <?php checked( $checked, 1 ); ?> <?php if ( $field[ 'merge' ] == 'EMAIL' ) {  ?> disabled="disabled" checked="checked" title="<?php echo __( 'Email is a required field.', 'yikes-inc-easy-mailchimp-extender' ); } ?>">
1865
+												<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>
1866 1866
 											</td>
1867 1867
 										</tr>
1868 1868
 										<!-- Visible Toggle -->
1869 1869
 										<tr valign="top" class="yikes-checkbox-container">
1870 1870
 											<td scope="row">
1871
-												<label for="hide-field-<?php echo esc_attr( $field['merge'] ); ?>">
1871
+												<label for="hide-field-<?php echo esc_attr( $field[ 'merge' ] ); ?>">
1872 1872
 													<?php _e( 'Hide Field', 'yikes-inc-easy-mailchimp-extender' ); ?>
1873 1873
 												</label>
1874 1874
 											</td>
1875 1875
 											<td>
1876
-												<?php $hide = isset( $field['hide'] ) ? $field['hide'] : '0'; ?>
1877
-												<input id="hide-field-<?php echo esc_attr( $field['merge'] ); ?>" type="checkbox" class="widefat" value="1" name="field[<?php echo $field['merge']; ?>][hide]" <?php checked( $hide , 1 ); ?> <?php if ( $field['merge'] == 'EMAIL' ) {  ?> disabled="disabled" title="<?php echo __( 'Cannot toggle email field visibility.', 'yikes-inc-easy-mailchimp-extender' ); } ?>">
1878
-												<p class="description"><small><?php _e( "Hide this field from being displayed on the front end.", 'yikes-inc-easy-mailchimp-extender' );?></small></p>
1876
+												<?php $hide = isset( $field[ 'hide' ] ) ? $field[ 'hide' ] : '0'; ?>
1877
+												<input id="hide-field-<?php echo esc_attr( $field[ 'merge' ] ); ?>" type="checkbox" class="widefat" value="1" name="field[<?php echo $field[ 'merge' ]; ?>][hide]" <?php checked( $hide, 1 ); ?> <?php if ( $field[ 'merge' ] == 'EMAIL' ) {  ?> disabled="disabled" title="<?php echo __( 'Cannot toggle email field visibility.', 'yikes-inc-easy-mailchimp-extender' ); } ?>">
1878
+												<p class="description"><small><?php _e( "Hide this field from being displayed on the front end.", 'yikes-inc-easy-mailchimp-extender' ); ?></small></p>
1879 1879
 											</td>
1880 1880
 										</tr>
1881 1881
 										<!-- Toggle Field Label Visibility -->
1882 1882
 										<tr valign="top" class="yikes-checkbox-container">
1883 1883
 											<td scope="row">
1884
-												<label for="hide-label-<?php echo esc_attr( $field['merge'] ); ?>">
1884
+												<label for="hide-label-<?php echo esc_attr( $field[ 'merge' ] ); ?>">
1885 1885
 													<?php _e( 'Hide Label', 'yikes-inc-easy-mailchimp-extender' ); ?>
1886 1886
 												</label>
1887 1887
 											</td>
1888 1888
 											<td>
1889
-												<?php $hide_label = isset( $field['hide-label'] ) ? $field['hide-label'] : '0'; ?>
1890
-												<input id="hide-label-<?php echo esc_attr( $field['merge'] ); ?>" type="checkbox" name="field[<?php echo $field['merge']; ?>][hide-label]" value="1" <?php checked( $hide_label , 1 ); ?>/>
1891
-												<p class="description"><small><?php _e( "Toggle field label visibility.", 'yikes-inc-easy-mailchimp-extender' );?></small></p>
1889
+												<?php $hide_label = isset( $field[ 'hide-label' ] ) ? $field[ 'hide-label' ] : '0'; ?>
1890
+												<input id="hide-label-<?php echo esc_attr( $field[ 'merge' ] ); ?>" type="checkbox" name="field[<?php echo $field[ 'merge' ]; ?>][hide-label]" value="1" <?php checked( $hide_label, 1 ); ?>/>
1891
+												<p class="description"><small><?php _e( "Toggle field label visibility.", 'yikes-inc-easy-mailchimp-extender' ); ?></small></p>
1892 1892
 											</td>
1893 1893
 										</tr>
1894 1894
 										<!-- Display Phone/Date Formats back to the user -->
1895 1895
 										<!-- Phone Format Initial Load -->
1896 1896
 										<?php
1897
-											switch( $field['type'] ) {
1897
+											switch ( $field[ 'type' ] ) {
1898 1898
 												/* Store the phone format, for properly regex pattern */
1899 1899
 												case 'phone':
1900 1900
 												case 'birthday':
@@ -1904,23 +1904,23 @@  discard block
 block discarded – undo
1904 1904
 															<td scope="row">
1905 1905
 																<label for="placeholder">
1906 1906
 																	<?php
1907
-																		switch( $field['type'] ) {
1907
+																		switch ( $field[ 'type' ] ) {
1908 1908
 																			default:
1909 1909
 																			case 'birthday':
1910 1910
 																				$type = __( 'Date Format', 'yikes-inc-easy-mailchimp-extender' );
1911
-																				$format = ( isset( $field['date_format'] ) ) ? $field['date_format'] : 'MM/DD';
1911
+																				$format = ( isset( $field[ 'date_format' ] ) ) ? $field[ 'date_format' ] : 'MM/DD';
1912 1912
 																				$format_name = 'date_format';
1913 1913
 																				break;
1914 1914
 
1915 1915
 																			case 'date':
1916 1916
 																				$type = __( 'Date Format', 'yikes-inc-easy-mailchimp-extender' );
1917
-																				$format = ( isset( $field['date_format'] ) ) ? $field['date_format'] : 'MM/DD/YYYY';
1917
+																				$format = ( isset( $field[ 'date_format' ] ) ) ? $field[ 'date_format' ] : 'MM/DD/YYYY';
1918 1918
 																				$format_name = 'date_format';
1919 1919
 																				break;
1920 1920
 
1921 1921
 																			case 'phone':
1922 1922
 																				$type = __( 'Phone Format', 'yikes-inc-easy-mailchimp-extender' );
1923
-																				$format = isset( $field['phone_format'] ) && ! empty( $field['phone_format'] ) ? $field['phone_format'] : __( 'International', 'yikes-inc-easy-mailchimp-extender' );
1923
+																				$format = isset( $field[ 'phone_format' ] ) && ! empty( $field[ 'phone_format' ] ) ? $field[ 'phone_format' ] : __( 'International', 'yikes-inc-easy-mailchimp-extender' );
1924 1924
 																				$format_name = 'phone_format';
1925 1925
 																				break;
1926 1926
 																		}
@@ -1930,7 +1930,7 @@  discard block
 block discarded – undo
1930 1930
 															</td>
1931 1931
 															<td>
1932 1932
 																<strong><?php echo $format; ?></strong>
1933
-																<input type="hidden" name="field[<?php echo $field['merge']; ?>][<?php echo $format_name; ?>]" value="<?php echo $format; ?>" />
1933
+																<input type="hidden" name="field[<?php echo $field[ 'merge' ]; ?>][<?php echo $format_name; ?>]" value="<?php echo $format; ?>" />
1934 1934
 																<p class="description"><small>
1935 1935
 																	<?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' ) ); ?>
1936 1936
 																</small></p>
@@ -1951,8 +1951,8 @@  discard block
 block discarded – undo
1951 1951
 											</td>
1952 1952
 											<td>
1953 1953
 												<span class="toggle-container">
1954
-													<a href="#" class="close-form-expansion"><?php _e( "Close" , 'yikes-inc-easy-mailchimp-extender' ); ?></a> |
1955
-													<a href="#" class="remove-field" alt="<?php echo $field['merge']; ?>"><?php _e( "Remove Field" , 'yikes-inc-easy-mailchimp-extender' ); ?></a>
1954
+													<a href="#" class="close-form-expansion"><?php _e( "Close", 'yikes-inc-easy-mailchimp-extender' ); ?></a> |
1955
+													<a href="#" class="remove-field" alt="<?php echo $field[ 'merge' ]; ?>"><?php _e( "Remove Field", 'yikes-inc-easy-mailchimp-extender' ); ?></a>
1956 1956
 												</span>
1957 1957
 											</td>
1958 1958
 										</tr>
@@ -1970,35 +1970,35 @@  discard block
 block discarded – undo
1970 1970
 						/**** Interest Group ****/
1971 1971
 
1972 1972
 						?>
1973
-						<section class="draggable" id="<?php echo $field['group_id']; ?>">
1973
+						<section class="draggable" id="<?php echo $field[ 'group_id' ]; ?>">
1974 1974
 							<!-- top -->
1975 1975
 							<a href="#" class="expansion-section-title settings-sidebar">
1976
-								<span class="dashicons dashicons-plus yikes-mc-expansion-toggle"></span><?php echo stripslashes( $field['label'] ); ?>
1977
-								<?php if ( in_array( $field['group_id'] , $excluded_fields ) ) { ?>
1976
+								<span class="dashicons dashicons-plus yikes-mc-expansion-toggle"></span><?php echo stripslashes( $field[ 'label' ] ); ?>
1977
+								<?php if ( in_array( $field[ 'group_id' ], $excluded_fields ) ) { ?>
1978 1978
 									<img src="<?php echo YIKES_MC_URL . 'includes/images/warning.svg'; ?>" class="field-no-longer-exists-warning" title="<?php _e( 'Field no longer exists.', 'yikes-inc-easy-mailchimp-extender' ); ?>" alt="<?php _e( 'Field no longer exists.', 'yikes-inc-easy-mailchimp-extender' ); ?>">
1979 1979
 								<?php } ?>
1980
-								<span class="field-type-text"><small><?php echo __( 'type', 'yikes-inc-easy-mailchimp-extender' ) . ' : ' . $field['type']; ?></small></span>
1980
+								<span class="field-type-text"><small><?php echo __( 'type', 'yikes-inc-easy-mailchimp-extender' ) . ' : ' . $field[ 'type' ]; ?></small></span>
1981 1981
 							</a>
1982 1982
 							<!-- expansion section -->
1983 1983
 							<div class="yikes-mc-settings-expansion-section">
1984 1984
 
1985 1985
 								<!-- check if this field exists in the available interest group array -->
1986
-								<?php if ( in_array( $field['group_id'] , $excluded_fields ) ) { ?>
1987
-									<p class="yikes-mc-warning-message"><?php _e( "This field no longer exists in this list. Delete this field from the form to prevent issues on the front end." , 'yikes-inc-easy-mailchimp-extender' ); ?></p>
1986
+								<?php if ( in_array( $field[ 'group_id' ], $excluded_fields ) ) { ?>
1987
+									<p class="yikes-mc-warning-message"><?php _e( "This field no longer exists in this list. Delete this field from the form to prevent issues on the front end.", 'yikes-inc-easy-mailchimp-extender' ); ?></p>
1988 1988
 								<?php } ?>
1989 1989
 
1990 1990
 								<!-- store the label -->
1991
-								<input type="hidden" name="field[<?php echo $field['group_id']; ?>][label]" value="<?php echo htmlspecialchars( $field['label'] ); ?>" />
1992
-								<input type="hidden" name="field[<?php echo $field['group_id']; ?>][type]" value="<?php echo $field['type']; ?>" />
1993
-								<input type="hidden" name="field[<?php echo $field['group_id']; ?>][group_id]" value="<?php echo $field['group_id']; ?>" />
1994
-								<input type="hidden" name="field[<?php echo $field['group_id']; ?>][groups]" value='<?php echo esc_attr( json_encode( json_decode( $field['groups'], true ) ) ); ?>' />
1991
+								<input type="hidden" name="field[<?php echo $field[ 'group_id' ]; ?>][label]" value="<?php echo htmlspecialchars( $field[ 'label' ] ); ?>" />
1992
+								<input type="hidden" name="field[<?php echo $field[ 'group_id' ]; ?>][type]" value="<?php echo $field[ 'type' ]; ?>" />
1993
+								<input type="hidden" name="field[<?php echo $field[ 'group_id' ]; ?>][group_id]" value="<?php echo $field[ 'group_id' ]; ?>" />
1994
+								<input type="hidden" name="field[<?php echo $field[ 'group_id' ]; ?>][groups]" value='<?php echo esc_attr( json_encode( json_decode( $field[ 'groups' ], true ) ) ); ?>' />
1995 1995
 
1996 1996
 								<!-- Single or Double Opt-in -->
1997 1997
 								<p class="type-container"><!-- necessary to prevent skipping on slideToggle(); -->
1998 1998
 
1999 1999
 									<table class="form-table form-field-container">
2000 2000
 										<!-- Default Value -->
2001
-										<?php switch( $field['type'] ) {
2001
+										<?php switch ( $field[ 'type' ] ) {
2002 2002
 											default:
2003 2003
 											case 'radio':
2004 2004
 											case 'checkboxes':
@@ -2011,15 +2011,15 @@  discard block
 block discarded – undo
2011 2011
 													</td>
2012 2012
 													<td>
2013 2013
 														<?php
2014
-														$field['default_choice'] = isset( $field['default_choice'] ) ? $field['default_choice'] : '';
2014
+														$field[ 'default_choice' ] = isset( $field[ 'default_choice' ] ) ? $field[ 'default_choice' ] : '';
2015 2015
 
2016 2016
 														$default_shown = false;
2017 2017
 
2018
-														foreach ( json_decode( $field['groups'], true ) as $id => $group ) {
2019
-															$field_id   = "{$field['group_id']}-{$id}";
2020
-															$field_type = 'hidden' == $field['type'] ? 'checkbox' : $field['type'];
2018
+														foreach ( json_decode( $field[ 'groups' ], true ) as $id => $group ) {
2019
+															$field_id   = "{$field[ 'group_id' ]}-{$id}";
2020
+															$field_type = 'hidden' == $field[ 'type' ] ? 'checkbox' : $field[ 'type' ];
2021 2021
 															$field_type = 'checkboxes' == $field_type ? 'checkbox' : $field_type;
2022
-															$field_name = "field[{$field['group_id']}][default_choice]";
2022
+															$field_name = "field[{$field[ 'group_id' ]}][default_choice]";
2023 2023
 															$field_name = 'checkbox' == $field_type ? $field_name . '[]' : $field_name;
2024 2024
 
2025 2025
 															// Determine if the current group is checked.
@@ -2027,13 +2027,13 @@  discard block
 block discarded – undo
2027 2027
 															switch ( $field_type ) {
2028 2028
 																case 'radio':
2029 2029
 																default:
2030
-																	$default = is_array( $field['default_choice'] ) ? current( $field['default_choice'] ) : $field['default_choice'];
2031
-																	$checked = is_array( $field['default_choice'] ) ? checked( current( $field['default_choice'] ), $id, false ) : checked( $field['default_choice'], $id, false );
2030
+																	$default = is_array( $field[ 'default_choice' ] ) ? current( $field[ 'default_choice' ] ) : $field[ 'default_choice' ];
2031
+																	$checked = is_array( $field[ 'default_choice' ] ) ? checked( current( $field[ 'default_choice' ] ), $id, false ) : checked( $field[ 'default_choice' ], $id, false );
2032 2032
 																break;
2033 2033
 
2034 2034
 																case 'checkbox':
2035 2035
 																case 'hidden':
2036
-																	if ( is_array( $field['default_choice'] ) && in_array( $id, $field['default_choice'] ) ) {
2036
+																	if ( is_array( $field[ 'default_choice' ] ) && in_array( $id, $field[ 'default_choice' ] ) ) {
2037 2037
 																		$checked = checked( true, true, false );
2038 2038
 																	}
2039 2039
 																break;
@@ -2048,7 +2048,7 @@  discard block
 block discarded – undo
2048 2048
 																	    type="<?php echo $field_type; ?>"
2049 2049
 																	    name="<?php echo $field_name; ?>"
2050 2050
 																	    value="no-default" 
2051
-																	    <?php is_array( $field['default_choice'] ) ? checked( current( $field['default_choice'] ), 'no-default' ) : checked( $field['default_choice'], 'no-default' ); ?>>
2051
+																	    <?php is_array( $field[ 'default_choice' ] ) ? checked( current( $field[ 'default_choice' ] ), 'no-default' ) : checked( $field[ 'default_choice' ], 'no-default' ); ?>>
2052 2052
 																	No Default&nbsp;
2053 2053
 																</label>
2054 2054
 																<?php
@@ -2064,7 +2064,7 @@  discard block
 block discarded – undo
2064 2064
 															</label>
2065 2065
 															<?php
2066 2066
 														} ?>
2067
-														<p class="description"><small><?php _e( "Select the option that should be selected by default.", 'yikes-inc-easy-mailchimp-extender' );?></small></p>
2067
+														<p class="description"><small><?php _e( "Select the option that should be selected by default.", 'yikes-inc-easy-mailchimp-extender' ); ?></small></p>
2068 2068
 													</td>
2069 2069
 												</tr>
2070 2070
 
@@ -2076,13 +2076,13 @@  discard block
 block discarded – undo
2076 2076
 												<!-- Placeholder -->
2077 2077
 												<tr valign="top">
2078 2078
 													<td scope="row">
2079
-														<label for="placeholder_<?php echo esc_attr( $field['merge'] ); ?>">
2079
+														<label for="placeholder_<?php echo esc_attr( $field[ 'merge' ] ); ?>">
2080 2080
 															<?php _e( 'Placeholder', 'yikes-inc-easy-mailchimp-extender' ); ?>
2081 2081
 														</label>
2082 2082
 													</td>
2083 2083
 													<td>
2084
-														<input type="text" id="placeholder_<?php echo esc_attr( $field['merge'] ); ?>" class="widefat" name="field[<?php echo $field['merge']; ?>][placeholder]" value="<?php echo isset( $field['placeholder'] ) ? $field['placeholder'] : '' ; ?>" />
2085
-														<p class="description"><small><?php _e( "Assign a placeholder value to this field.", 'yikes-inc-easy-mailchimp-extender' );?></small></p>
2084
+														<input type="text" id="placeholder_<?php echo esc_attr( $field[ 'merge' ] ); ?>" class="widefat" name="field[<?php echo $field[ 'merge' ]; ?>][placeholder]" value="<?php echo isset( $field[ 'placeholder' ] ) ? $field[ 'placeholder' ] : ''; ?>" />
2085
+														<p class="description"><small><?php _e( "Assign a placeholder value to this field.", 'yikes-inc-easy-mailchimp-extender' ); ?></small></p>
2086 2086
 													</td>
2087 2087
 												</tr>
2088 2088
 												<tr valign="top">
@@ -2092,13 +2092,13 @@  discard block
 block discarded – undo
2092 2092
 														</label>
2093 2093
 													</td>
2094 2094
 													<td>
2095
-														<select type="default" name="field[<?php echo $field['group_id']; ?>][default_choice]">
2095
+														<select type="default" name="field[<?php echo $field[ 'group_id' ]; ?>][default_choice]">
2096 2096
 															<option value="no-default">No Default</option>
2097
-															<?php foreach( json_decode( stripslashes_deep( $field['groups'] ) , true ) as $id => $group ) { ?>
2098
-																<option value="<?php echo $id; ?>" <?php selected( $field['default_choice'] , $id ); ?>><?php echo stripslashes( $group ); ?></option>
2097
+															<?php foreach ( json_decode( stripslashes_deep( $field[ 'groups' ] ), true ) as $id => $group ) { ?>
2098
+																<option value="<?php echo $id; ?>" <?php selected( $field[ 'default_choice' ], $id ); ?>><?php echo stripslashes( $group ); ?></option>
2099 2099
 															<?php } ?>
2100 2100
 														</select>
2101
-														<p class="description"><small><?php _e( "Which option should be selected by default?", 'yikes-inc-easy-mailchimp-extender' );?></small></p>
2101
+														<p class="description"><small><?php _e( "Which option should be selected by default?", 'yikes-inc-easy-mailchimp-extender' ); ?></small></p>
2102 2102
 													</td>
2103 2103
 												</tr>
2104 2104
 
@@ -2111,78 +2111,78 @@  discard block
 block discarded – undo
2111 2111
 										<!-- Field Description -->
2112 2112
 										<tr valign="top">
2113 2113
 											<td scope="row">
2114
-												<label for="description_<?php echo esc_attr( $field['group_id'] ); ?>">
2114
+												<label for="description_<?php echo esc_attr( $field[ 'group_id' ] ); ?>">
2115 2115
 													<?php _e( 'Description', 'yikes-inc-easy-mailchimp-extender' ); ?>
2116 2116
 												</label>
2117 2117
 											</td>
2118 2118
 											<td>
2119
-												<textarea id="description_<?php echo esc_attr( $field['group_id'] ); ?>" class="widefat field-description-input" name="field[<?php echo $field['group_id']; ?>][description]"><?php echo isset( $field['description'] ) ? stripslashes( esc_html( $field['description'] ) ) : '' ; ?></textarea>
2120
-												<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>
2119
+												<textarea id="description_<?php echo esc_attr( $field[ 'group_id' ] ); ?>" class="widefat field-description-input" name="field[<?php echo $field[ 'group_id' ]; ?>][description]"><?php echo isset( $field[ 'description' ] ) ? stripslashes( esc_html( $field[ 'description' ] ) ) : ''; ?></textarea>
2120
+												<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>
2121 2121
 											</td>
2122 2122
 										</tr>
2123 2123
 
2124 2124
 										<!-- Description Above Field -->
2125 2125
 										<tr valign="top" class="yikes-checkbox-container">
2126 2126
 											<td scope="row">
2127
-												<label for="description_above_<?php echo $field['group_id']; ?>">
2127
+												<label for="description_above_<?php echo $field[ 'group_id' ]; ?>">
2128 2128
 													<?php _e( 'Description Above Field', 'yikes-inc-easy-mailchimp-extender' ); ?>
2129 2129
 												</label>
2130 2130
 											</td>
2131 2131
 											<td>
2132
-												<input type="checkbox" id="description_above_<?php echo $field['group_id']; ?>" class="widefat field-description-input" name="field[<?php echo $field['group_id']; ?>][description_above]" value="1" <?php echo isset( $field['description_above'] ) && $field['description_above'] === '1' ? 'checked="checked"' : ''; ?> />
2133
-												<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>
2132
+												<input type="checkbox" id="description_above_<?php echo $field[ 'group_id' ]; ?>" class="widefat field-description-input" name="field[<?php echo $field[ 'group_id' ]; ?>][description_above]" value="1" <?php echo isset( $field[ 'description_above' ] ) && $field[ 'description_above' ] === '1' ? 'checked="checked"' : ''; ?> />
2133
+												<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>
2134 2134
 											</td>
2135 2135
 										</tr>
2136 2136
 
2137 2137
 										<!-- Additional Classes -->
2138 2138
 										<tr valign="top">
2139 2139
 											<td scope="row">
2140
-												<label for="classes_<?php echo esc_attr( $field['group_id'] ); ?>">
2140
+												<label for="classes_<?php echo esc_attr( $field[ 'group_id' ] ); ?>">
2141 2141
 													<?php _e( 'Additional Classes', 'yikes-inc-easy-mailchimp-extender' ); ?>
2142 2142
 												</label>
2143 2143
 											</td>
2144 2144
 											<td>
2145
-												<input type="text" id="classes_<?php echo esc_attr( $field['group_id'] ); ?>" class="widefat" name="field[<?php echo $field['group_id']; ?>][additional-classes]" value="<?php echo isset( $field['additional-classes'] ) ? stripslashes( wp_strip_all_tags( $field['additional-classes'] ) ) : '' ; ?>" />
2146
-												<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>
2145
+												<input type="text" id="classes_<?php echo esc_attr( $field[ 'group_id' ] ); ?>" class="widefat" name="field[<?php echo $field[ 'group_id' ]; ?>][additional-classes]" value="<?php echo isset( $field[ 'additional-classes' ] ) ? stripslashes( wp_strip_all_tags( $field[ 'additional-classes' ] ) ) : ''; ?>" />
2146
+												<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>
2147 2147
 											</td>
2148 2148
 										</tr>
2149 2149
 										<!-- Required Toggle -->
2150 2150
 										<tr valign="top" class="yikes-checkbox-container">
2151 2151
 											<td scope="row">
2152
-												<label for="field-required-<?php echo esc_attr( $field['group_id'] ); ?>">
2152
+												<label for="field-required-<?php echo esc_attr( $field[ 'group_id' ] ); ?>">
2153 2153
 													<?php _e( 'Field Required?', 'yikes-inc-easy-mailchimp-extender' ); ?>
2154 2154
 												</label>
2155 2155
 											</td>
2156 2156
 											<td>
2157
-												<?php $checked = isset( $field['require'] ) ? $field['require'] : '0'; ?>
2158
-												<input type="checkbox" id="field-required-<?php echo esc_attr( $field['group_id'] ); ?>" class="widefat" value="1" name="field[<?php echo $field['group_id']; ?>][require]" <?php checked( $checked , 1 ); ?>>
2159
-												<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>
2157
+												<?php $checked = isset( $field[ 'require' ] ) ? $field[ 'require' ] : '0'; ?>
2158
+												<input type="checkbox" id="field-required-<?php echo esc_attr( $field[ 'group_id' ] ); ?>" class="widefat" value="1" name="field[<?php echo $field[ 'group_id' ]; ?>][require]" <?php checked( $checked, 1 ); ?>>
2159
+												<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>
2160 2160
 											</td>
2161 2161
 										</tr>
2162 2162
 										<!-- Visible Toggle -->
2163 2163
 										<tr valign="top" class="yikes-checkbox-container">
2164 2164
 											<td scope="row">
2165
-												<label for="hide-field-<?php echo esc_attr( $field['group_id'] ); ?>">
2165
+												<label for="hide-field-<?php echo esc_attr( $field[ 'group_id' ] ); ?>">
2166 2166
 													<?php _e( 'Hide Field', 'yikes-inc-easy-mailchimp-extender' ); ?>
2167 2167
 												</label>
2168 2168
 											</td>
2169 2169
 											<td>
2170
-												<?php $hide = isset( $field['hide'] ) ? $field['hide'] : '0'; ?>
2171
-												<input type="checkbox" id="hide-field-<?php echo esc_attr( $field['group_id'] ); ?>" class="widefat" value="1" name="field[<?php echo $field['group_id']; ?>][hide]" <?php checked( $hide , 1 ); ?>>
2172
-												<p class="description"><small><?php _e( "Hide this field from being displayed on the front end.", 'yikes-inc-easy-mailchimp-extender' );?></small></p>
2170
+												<?php $hide = isset( $field[ 'hide' ] ) ? $field[ 'hide' ] : '0'; ?>
2171
+												<input type="checkbox" id="hide-field-<?php echo esc_attr( $field[ 'group_id' ] ); ?>" class="widefat" value="1" name="field[<?php echo $field[ 'group_id' ]; ?>][hide]" <?php checked( $hide, 1 ); ?>>
2172
+												<p class="description"><small><?php _e( "Hide this field from being displayed on the front end.", 'yikes-inc-easy-mailchimp-extender' ); ?></small></p>
2173 2173
 											</td>
2174 2174
 										</tr>
2175 2175
 										<!-- Toggle Field Label Visibility -->
2176 2176
 										<tr valign="top" class="yikes-checkbox-container">
2177 2177
 											<td scope="row">
2178
-												<label for="hide-label-<?php echo esc_attr( $field['group_id'] ); ?>">
2178
+												<label for="hide-label-<?php echo esc_attr( $field[ 'group_id' ] ); ?>">
2179 2179
 													<?php _e( 'Hide Label', 'yikes-inc-easy-mailchimp-extender' ); ?>
2180 2180
 												</label>
2181 2181
 											</td>
2182 2182
 											<td>
2183
-												<?php $hide = isset( $field['hide-label'] ) ? $field['hide-label'] : '0'; ?>
2184
-												<input type="checkbox" id="hide-label-<?php echo esc_attr( $field['group_id'] ); ?>" name="field[<?php echo $field['group_id']; ?>][hide-label]" value="1" <?php checked( $hide , 1 ); ?>/>
2185
-												<p class="description"><small><?php _e( "Toggle field label visibility.", 'yikes-inc-easy-mailchimp-extender' );?></small></p>
2183
+												<?php $hide = isset( $field[ 'hide-label' ] ) ? $field[ 'hide-label' ] : '0'; ?>
2184
+												<input type="checkbox" id="hide-label-<?php echo esc_attr( $field[ 'group_id' ] ); ?>" name="field[<?php echo $field[ 'group_id' ]; ?>][hide-label]" value="1" <?php checked( $hide, 1 ); ?>/>
2185
+												<p class="description"><small><?php _e( "Toggle field label visibility.", 'yikes-inc-easy-mailchimp-extender' ); ?></small></p>
2186 2186
 											</td>
2187 2187
 										</tr>
2188 2188
 										<!-- Toggle Buttons -->
@@ -2192,8 +2192,8 @@  discard block
 block discarded – undo
2192 2192
 											</td>
2193 2193
 											<td>
2194 2194
 												<span class="toggle-container">
2195
-													<a href="#" class="close-form-expansion"><?php _e( "Close" , 'yikes-inc-easy-mailchimp-extender' ); ?></a> |
2196
-													<a href="#" class="remove-field" alt="<?php echo $field['group_id']; ?>"><?php _e( "Remove Field" , 'yikes-inc-easy-mailchimp-extender' ); ?></a>
2195
+													<a href="#" class="close-form-expansion"><?php _e( "Close", 'yikes-inc-easy-mailchimp-extender' ); ?></a> |
2196
+													<a href="#" class="remove-field" alt="<?php echo $field[ 'group_id' ]; ?>"><?php _e( "Remove Field", 'yikes-inc-easy-mailchimp-extender' ); ?></a>
2197 2197
 												</span>
2198 2198
 											</td>
2199 2199
 										</tr>
@@ -2214,7 +2214,7 @@  discard block
 block discarded – undo
2214 2214
 				add_thickbox();
2215 2215
 				// enqueue jquery qtip for our tooltip
2216 2216
 				wp_enqueue_script( 'jquery-qtip-tooltip', YIKES_MC_URL . 'admin/js/min/jquery.qtip.min.js', array( 'jquery' ) );
2217
-				wp_enqueue_style( 'jquery-qtip-style',  YIKES_MC_URL . 'admin/css/jquery.qtip.min.css' );
2217
+				wp_enqueue_style( 'jquery-qtip-style', YIKES_MC_URL . 'admin/css/jquery.qtip.min.css' );
2218 2218
 					$available_tags = array(
2219 2219
 						array(
2220 2220
 							'tag' => '{page_title}',
@@ -2269,14 +2269,14 @@  discard block
 block discarded – undo
2269 2269
 						<h3><?php _e( 'Pre Defined Tags', 'yikes-inc-easy-mailchimp-extender' ); ?></h3>
2270 2270
 						<p class="description"><?php _e( 'You can use any of the following tags to populate a Mailchimp text field with dynamic content. This can be used to determine which page the user signed up on, if the user was logged in and more.', 'yikes-inc-easy-mailchimp-extender' ); ?></p>
2271 2271
 						<ul>
2272
-							<?php foreach( apply_filters( 'yikes-mailchimp-custom-default-value-tags', $available_tags ) as $tag ) { ?>
2272
+							<?php foreach ( apply_filters( 'yikes-mailchimp-custom-default-value-tags', $available_tags ) as $tag ) { ?>
2273 2273
 								<li class="tooltop-tag">
2274 2274
 									<!-- link/tag -->
2275
-									<a href="#" onclick="populateDefaultValue( '<?php echo $tag['tag']; ?>' );return false;" data-attr-tag="<?php echo $tag['tag']; ?>" title="<?php echo $tag['title']; ?>"><?php echo $tag['title']; ?></a>
2275
+									<a href="#" onclick="populateDefaultValue( '<?php echo $tag[ 'tag' ]; ?>' );return false;" data-attr-tag="<?php echo $tag[ 'tag' ]; ?>" title="<?php echo $tag[ 'title' ]; ?>"><?php echo $tag[ 'title' ]; ?></a>
2276 2276
 									<!-- help icon -->
2277 2277
 									<span class="dashicons dashicons-editor-help"></span>
2278 2278
 									<!-- tooltip -->
2279
-									<div class="tooltiptext qtip-bootstrap yikes-easy-mc-hidden"><?php echo $tag['description']; ?></div>
2279
+									<div class="tooltiptext qtip-bootstrap yikes-easy-mc-hidden"><?php echo $tag[ 'description' ]; ?></div>
2280 2280
 								</li>
2281 2281
 							<?php } ?>
2282 2282
 						</ul>
@@ -2295,32 +2295,32 @@  discard block
 block discarded – undo
2295 2295
 		public function build_available_merge_vars( $form_fields, $available_merge_variables ) {
2296 2296
 			$fields_assigned_to_form = array();
2297 2297
 			foreach ( $form_fields as $field ) {
2298
-				if ( isset( $field['merge'] ) ) {
2299
-					$fields_assigned_to_form[ $field['merge'] ] = true;
2298
+				if ( isset( $field[ 'merge' ] ) ) {
2299
+					$fields_assigned_to_form[ $field[ 'merge' ] ] = true;
2300 2300
 				}
2301 2301
 			}
2302 2302
 
2303
-			if ( ! empty( $available_merge_variables['merge_fields'] ) ) {
2303
+			if ( ! empty( $available_merge_variables[ 'merge_fields' ] ) ) {
2304 2304
 				?>
2305 2305
 				<ul id="available-fields"><?php
2306
-				foreach ( $available_merge_variables['merge_fields'] as $merge_var ) {
2307
-					$not_available = isset( $fields_assigned_to_form[ $merge_var['tag'] ] );
2306
+				foreach ( $available_merge_variables[ 'merge_fields' ] as $merge_var ) {
2307
+					$not_available = isset( $fields_assigned_to_form[ $merge_var[ 'tag' ] ] );
2308 2308
 					?>
2309 2309
 					<li class="available-field <?php echo $not_available ? 'not-available' : ''; ?>"
2310
-						alt="<?php echo esc_attr( $merge_var['tag'] ); ?>"
2311
-						data-attr-field-type="<?php echo esc_attr( $merge_var['type'] ); ?>"
2312
-						data-attr-field-name="<?php echo esc_attr( $merge_var['name'] ); ?>"
2313
-						data-attr-form-id="<?php echo esc_attr( $available_merge_variables['list_id'] ); ?>"
2310
+						alt="<?php echo esc_attr( $merge_var[ 'tag' ] ); ?>"
2311
+						data-attr-field-type="<?php echo esc_attr( $merge_var[ 'type' ] ); ?>"
2312
+						data-attr-field-name="<?php echo esc_attr( $merge_var[ 'name' ] ); ?>"
2313
+						data-attr-form-id="<?php echo esc_attr( $available_merge_variables[ 'list_id' ] ); ?>"
2314 2314
 						title="<?php echo $not_available ? esc_attr__( 'Already assigned to your form', 'yikes-inc-easy-mailchimp-extender' ) : ''; ?>"
2315 2315
 						<?php echo $not_available ? 'disabled="disabled"' : ''; ?>
2316 2316
 					>
2317 2317
 						<?php
2318
-							echo esc_html( stripslashes( $merge_var['name'] ) );
2319
-							if ( $merge_var['required'] ) {
2318
+							echo esc_html( stripslashes( $merge_var[ 'name' ] ) );
2319
+							if ( $merge_var[ 'required' ] ) {
2320 2320
 								echo ' <span class="field-required" title="' . __( 'required field', 'yikes-inc-easy-mailchimp-extender' ) . '">*</span>';
2321 2321
 							}
2322 2322
 						?>
2323
-						<small class="field-type-text"><?php echo esc_html( $merge_var['type'] ); ?></small>
2323
+						<small class="field-type-text"><?php echo esc_html( $merge_var[ 'type' ] ); ?></small>
2324 2324
 					</li>
2325 2325
 					<?php
2326 2326
 				}
@@ -2345,8 +2345,8 @@  discard block
 block discarded – undo
2345 2345
 			$fields_assigned_to_form = array();
2346 2346
 			if ( ! empty( $form_fields ) ) {
2347 2347
 				foreach ( $form_fields as $field ) {
2348
-					if ( isset( $field['group_id'] ) ) {
2349
-						$fields_assigned_to_form[ $field['group_id'] ] = true;
2348
+					if ( isset( $field[ 'group_id' ] ) ) {
2349
+						$fields_assigned_to_form[ $field[ 'group_id' ] ] = true;
2350 2350
 					}
2351 2351
 				}
2352 2352
 			}
@@ -2356,19 +2356,19 @@  discard block
 block discarded – undo
2356 2356
 				<ul id="available-interest-groups">
2357 2357
 				<?php
2358 2358
 					foreach ( $available_interest_groups as $interest_group ) {
2359
-						$not_available = isset( $fields_assigned_to_form[ $interest_group['id'] ] );
2359
+						$not_available = isset( $fields_assigned_to_form[ $interest_group[ 'id' ] ] );
2360 2360
 						?>
2361 2361
 						<li class="available-field <?php echo $not_available ? 'not-available' : ''; ?>" 
2362
-							alt="<?php echo esc_attr( $interest_group['id'] ); ?>" 
2363
-							data-group-id="<?php echo esc_attr( $interest_group['id'] ); ?>" 
2364
-							data-attr-field-name="<?php echo esc_attr( htmlspecialchars( $interest_group['title'] ) ); ?>" 
2365
-							data-attr-field-type="<?php echo esc_attr( $interest_group['type'] ); ?>" 
2362
+							alt="<?php echo esc_attr( $interest_group[ 'id' ] ); ?>" 
2363
+							data-group-id="<?php echo esc_attr( $interest_group[ 'id' ] ); ?>" 
2364
+							data-attr-field-name="<?php echo esc_attr( htmlspecialchars( $interest_group[ 'title' ] ) ); ?>" 
2365
+							data-attr-field-type="<?php echo esc_attr( $interest_group[ 'type' ] ); ?>" 
2366 2366
 							data-attr-form-id="<?php echo esc_attr( $list_id ); ?>"
2367 2367
 							title="<?php echo $not_available ? __( 'Already assigned to your form', 'yikes-inc-easy-mailchimp-extender' ) : ''; ?>"
2368 2368
 							<?php echo $not_available ? 'disabled="disabled"' : ''; ?>
2369 2369
 						>
2370
-							<?php echo esc_html( stripslashes( $interest_group['title'] ) ); ?>
2371
-							<small class="field-type-text"><?php echo esc_html( $interest_group['type'] ); ?></small>
2370
+							<?php echo esc_html( stripslashes( $interest_group[ 'title' ] ) ); ?>
2371
+							<small class="field-type-text"><?php echo esc_html( $interest_group[ 'type' ] ); ?></small>
2372 2372
 						</li>
2373 2373
 						<?php
2374 2374
 					}
@@ -2394,13 +2394,13 @@  discard block
 block discarded – undo
2394 2394
 				$not_available = isset( $form_tags[ $tag_id ] );
2395 2395
 				?>
2396 2396
 				<li class="available-field <?php echo $not_available ? 'not-available' : ''; ?>"
2397
-					id="tag-<?php echo esc_attr( $tag['id'] ); ?>"
2398
-					data-tag-id="<?php echo esc_attr( $tag['id'] ); ?>"
2399
-					data-tag-name="<?php echo esc_attr( $tag['name'] ); ?>"
2400
-					title="<?php echo $not_available ? __( 'Already assigned to your form', 'yikes-inc-easy-mailchimp-extender' ) : esc_attr( $tag['name'] ); ?>"
2397
+					id="tag-<?php echo esc_attr( $tag[ 'id' ] ); ?>"
2398
+					data-tag-id="<?php echo esc_attr( $tag[ 'id' ] ); ?>"
2399
+					data-tag-name="<?php echo esc_attr( $tag[ 'name' ] ); ?>"
2400
+					title="<?php echo $not_available ? __( 'Already assigned to your form', 'yikes-inc-easy-mailchimp-extender' ) : esc_attr( $tag[ 'name' ] ); ?>"
2401 2401
 					<?php echo $not_available ? 'disabled="disabled"' : ''; ?>
2402 2402
 				>
2403
-					<?php echo esc_html( $tag['name'] ); ?>
2403
+					<?php echo esc_html( $tag[ 'name' ] ); ?>
2404 2404
 				</li>
2405 2405
 				<?php
2406 2406
 			}
@@ -2421,15 +2421,15 @@  discard block
 block discarded – undo
2421 2421
 		*	- must clean up db tables , ensure what data is going in and what is needed...
2422 2422
 		*/
2423 2423
 		public function yikes_easy_mailchimp_create_form() {
2424
-			$nonce = $_REQUEST['nonce'];
2424
+			$nonce = $_REQUEST[ 'nonce' ];
2425 2425
 			if ( ! wp_verify_nonce( $nonce, 'create_mailchimp_form' ) ) {
2426
-				wp_die( __( "We've run into an error. The security check didn't pass. Please try again." , 'yikes-inc-easy-mailchimp-extender' ) );
2426
+				wp_die( __( "We've run into an error. The security check didn't pass. Please try again.", 'yikes-inc-easy-mailchimp-extender' ) );
2427 2427
 			}
2428 2428
 
2429 2429
 			$result = $this->form_interface->create_form( array(
2430
-				'list_id'          => sanitize_key( $_POST['associated-list'] ),
2431
-				'form_name'        => stripslashes( $_POST['form-name'] ),
2432
-				'form_description' => stripslashes( $_POST['form-description'] ),
2430
+				'list_id'          => sanitize_key( $_POST[ 'associated-list' ] ),
2431
+				'form_name'        => stripslashes( $_POST[ 'form-name' ] ),
2432
+				'form_description' => stripslashes( $_POST[ 'form-description' ] ),
2433 2433
 			) );
2434 2434
 
2435 2435
 			// if an error occurs during the form creation process
@@ -2437,11 +2437,11 @@  discard block
 block discarded – undo
2437 2437
 				// write it to the error log
2438 2438
 				// if the form was not created successfully
2439 2439
 				$error_logging = new Yikes_Inc_Easy_Mailchimp_Error_Logging();
2440
-				$error_logging->maybe_write_to_log( __( 'Error creating a new form', 'yikes-inc-easy-mailchimp-extender') , __( "Creating a new form" , 'yikes-inc-easy-mailchimp-extender' ) , __( "Forms" , 'yikes-inc-easy-mailchimp-extender' ) );
2440
+				$error_logging->maybe_write_to_log( __( 'Error creating a new form', 'yikes-inc-easy-mailchimp-extender' ), __( "Creating a new form", 'yikes-inc-easy-mailchimp-extender' ), __( "Forms", 'yikes-inc-easy-mailchimp-extender' ) );
2441 2441
 				wp_redirect( esc_url_raw( admin_url( 'admin.php?page=yikes-mailchimp-edit-form&sql_error=' . urlencode( __( 'Error creating a new form', 'yikes-inc-easy-mailchimp-extender' ) ) ) ) );
2442 2442
 			} else {
2443 2443
 				// redirect the user to the new form edit page
2444
-				wp_redirect( esc_url_raw( admin_url( 'admin.php?page=yikes-mailchimp-edit-form&id=' . $result) ) );
2444
+				wp_redirect( esc_url_raw( admin_url( 'admin.php?page=yikes-mailchimp-edit-form&id=' . $result ) ) );
2445 2445
 			}
2446 2446
 			exit();
2447 2447
 		}
@@ -2454,11 +2454,11 @@  discard block
 block discarded – undo
2454 2454
 		*/
2455 2455
 		public function yikes_easy_mailchimp_delete_form() {
2456 2456
 			// grab & store our variables ( associated list & form name )
2457
-			$nonce = $_REQUEST['nonce'];
2458
-			$post_id_to_delete = $_REQUEST['mailchimp-form'];
2457
+			$nonce = $_REQUEST[ 'nonce' ];
2458
+			$post_id_to_delete = $_REQUEST[ 'mailchimp-form' ];
2459 2459
 			// verify our nonce
2460
-			if ( ! wp_verify_nonce( $nonce, 'delete-mailchimp-form-'.$post_id_to_delete ) ) {
2461
-				wp_die( __( "We've run into an error. The security check didn't pass. Please try again." , 'yikes-inc-easy-mailchimp-extender' ) , __( "Failed nonce validation" , 'yikes-inc-easy-mailchimp-extender' ) , array( 'response' => 500 , 'back_link' => true ) );
2460
+			if ( ! wp_verify_nonce( $nonce, 'delete-mailchimp-form-' . $post_id_to_delete ) ) {
2461
+				wp_die( __( "We've run into an error. The security check didn't pass. Please try again.", 'yikes-inc-easy-mailchimp-extender' ), __( "Failed nonce validation", 'yikes-inc-easy-mailchimp-extender' ), array( 'response' => 500, 'back_link' => true ) );
2462 2462
 			}
2463 2463
 
2464 2464
 			$this->form_interface->delete_form( $post_id_to_delete );
@@ -2474,19 +2474,19 @@  discard block
 block discarded – undo
2474 2474
 		*/
2475 2475
 		public function yikes_easy_mailchimp_duplicate_form() {
2476 2476
 			// grab & store our variables ( associated list & form name )
2477
-			$nonce = $_REQUEST['nonce'];
2478
-			$post_id_to_clone = $_REQUEST['mailchimp-form'];
2477
+			$nonce = $_REQUEST[ 'nonce' ];
2478
+			$post_id_to_clone = $_REQUEST[ 'mailchimp-form' ];
2479 2479
 			// verify our nonce
2480
-			if ( ! wp_verify_nonce( $nonce, 'duplicate-mailchimp-form-'.$post_id_to_clone ) ) {
2481
-				wp_die( __( "We've run into an error. The security check didn't pass. Please try again." , 'yikes-inc-easy-mailchimp-extender' ) , __( "Failed nonce validation" , 'yikes-inc-easy-mailchimp-extender' ) , array( 'response' => 500 , 'back_link' => true ) );
2480
+			if ( ! wp_verify_nonce( $nonce, 'duplicate-mailchimp-form-' . $post_id_to_clone ) ) {
2481
+				wp_die( __( "We've run into an error. The security check didn't pass. Please try again.", 'yikes-inc-easy-mailchimp-extender' ), __( "Failed nonce validation", 'yikes-inc-easy-mailchimp-extender' ), array( 'response' => 500, 'back_link' => true ) );
2482 2482
 			}
2483 2483
 
2484 2484
 			// Get the current form data.
2485 2485
 			$form_data = $this->form_interface->get_form( $post_id_to_clone );
2486 2486
 
2487 2487
 			// Update some of the data before duplication
2488
-			$form_data['form_name'] .= ' - Copy';
2489
-			$form_data['impressions'] = $form_data['submissions'] = 0;
2488
+			$form_data[ 'form_name' ] .= ' - Copy';
2489
+			$form_data[ 'impressions' ] = $form_data[ 'submissions' ] = 0;
2490 2490
 
2491 2491
 			// Create the new form, and handle the result.
2492 2492
 			$result = $this->form_interface->create_form( $form_data );
@@ -2517,11 +2517,11 @@  discard block
 block discarded – undo
2517 2517
 		*/
2518 2518
 		public function yikes_easy_mailchimp_reset_impression_stats() {
2519 2519
 			// grab & store our variables ( associated list & form name )
2520
-			$nonce = $_REQUEST['nonce'];
2521
-			$form_id_to_reset = $_REQUEST['mailchimp-form'];
2520
+			$nonce = $_REQUEST[ 'nonce' ];
2521
+			$form_id_to_reset = $_REQUEST[ 'mailchimp-form' ];
2522 2522
 			// verify our nonce
2523
-			if ( ! wp_verify_nonce( $nonce, 'reset-stats-mailchimp-form-'.$form_id_to_reset ) ) {
2524
-				wp_die( __( "We've run into an error. The security check didn't pass. Please try again." , 'yikes-inc-easy-mailchimp-extender' ) , __( "Failed nonce validation" , 'yikes-inc-easy-mailchimp-extender' ) , array( 'response' => 500 , 'back_link' => true ) );
2523
+			if ( ! wp_verify_nonce( $nonce, 'reset-stats-mailchimp-form-' . $form_id_to_reset ) ) {
2524
+				wp_die( __( "We've run into an error. The security check didn't pass. Please try again.", 'yikes-inc-easy-mailchimp-extender' ), __( "Failed nonce validation", 'yikes-inc-easy-mailchimp-extender' ), array( 'response' => 500, 'back_link' => true ) );
2525 2525
 			}
2526 2526
 
2527 2527
 			$result = $this->form_interface->update_form(
@@ -2549,8 +2549,8 @@  discard block
 block discarded – undo
2549 2549
 		*/
2550 2550
 		public function yikes_easy_mailchimp_update_form() {
2551 2551
 
2552
-			$nonce   = $_REQUEST['nonce'];
2553
-			$form_id = $_REQUEST['id'];
2552
+			$nonce   = $_REQUEST[ 'nonce' ];
2553
+			$form_id = $_REQUEST[ 'id' ];
2554 2554
 
2555 2555
 			// verify our nonce
2556 2556
 			if ( ! wp_verify_nonce( $nonce, 'update-mailchimp-form-' . $form_id ) ) {
@@ -2564,70 +2564,70 @@  discard block
 block discarded – undo
2564 2564
 			}
2565 2565
 
2566 2566
 			// Store our values!
2567
-			$list_id                 = $_POST['associated-list'];
2568
-			$form_name               = stripslashes( $_POST['form-name'] );
2569
-			$form_description        = sanitize_text_field( stripslashes( $_POST['form-description'] ) );
2570
-			$redirect_user_on_submit = $_POST['redirect-user-on-submission'];
2571
-			$redirect_page           = $_POST['redirect-user-to-selection'];
2567
+			$list_id                 = $_POST[ 'associated-list' ];
2568
+			$form_name               = stripslashes( $_POST[ 'form-name' ] );
2569
+			$form_description        = sanitize_text_field( stripslashes( $_POST[ 'form-description' ] ) );
2570
+			$redirect_user_on_submit = $_POST[ 'redirect-user-on-submission' ];
2571
+			$redirect_page           = $_POST[ 'redirect-user-to-selection' ];
2572 2572
 
2573 2573
 			// stripslashes_deep on save, to prevent foreign languages from added excessive backslashes
2574
-			$assigned_fields = isset( $_POST['field'] ) ? stripslashes_deep( $_POST['field'] ): array();
2574
+			$assigned_fields = isset( $_POST[ 'field' ] ) ? stripslashes_deep( $_POST[ 'field' ] ) : array();
2575 2575
 
2576 2576
 			// setup our submission settings serialized array
2577 2577
 			$submission_settings = array(
2578
-				'ajax'                   => $_POST['form-ajax-submission'],
2579
-				'redirect_on_submission' => $_POST['redirect-user-on-submission'],
2580
-				'redirect_page'          => $_POST['redirect-user-to-selection'],
2581
-				'custom_redirect_url'    => esc_url( $_POST['custom-redirect-url'] ),
2582
-				'redirect_new_window'	 => $_POST['redirect_new_window'],
2583
-				'hide_form_post_signup'  => $_POST['hide-form-post-signup'],
2584
-				'replace_interests'      => $_POST['replace-interest-groups'],
2578
+				'ajax'                   => $_POST[ 'form-ajax-submission' ],
2579
+				'redirect_on_submission' => $_POST[ 'redirect-user-on-submission' ],
2580
+				'redirect_page'          => $_POST[ 'redirect-user-to-selection' ],
2581
+				'custom_redirect_url'    => esc_url( $_POST[ 'custom-redirect-url' ] ),
2582
+				'redirect_new_window'	 => $_POST[ 'redirect_new_window' ],
2583
+				'hide_form_post_signup'  => $_POST[ 'hide-form-post-signup' ],
2584
+				'replace_interests'      => $_POST[ 'replace-interest-groups' ],
2585 2585
 			);
2586 2586
 
2587 2587
 			// setup our opt-in settings serialized array
2588 2588
 			$optin_settings = array(
2589
-				'optin'                => $_POST['single-double-optin'],
2590
-				'update_existing_user' => $_POST['update-existing-user'],
2591
-				'send_update_email'    => $_POST['update-existing-email'],
2589
+				'optin'                => $_POST[ 'single-double-optin' ],
2590
+				'update_existing_user' => $_POST[ 'update-existing-user' ],
2591
+				'send_update_email'    => $_POST[ 'update-existing-email' ],
2592 2592
 			);
2593 2593
 
2594 2594
 			// Setup our error settings serialized array
2595 2595
 			$error_settings = array(
2596
-				'success'				=> trim( $_POST['yikes-easy-mc-success-message'] ) ? trim( stripslashes( $_POST['yikes-easy-mc-success-message'] ) ) : '',
2597
-				'success-single-optin'	=> trim( $_POST['yikes-easy-mc-success-single-optin-message'] ) ? trim( stripslashes( $_POST['yikes-easy-mc-success-single-optin-message'] ) ) : '',
2598
-				'success-resubscribed'	=> trim( $_POST['yikes-easy-mc-user-resubscribed-success-message'] ) ? trim( stripslashes( $_POST['yikes-easy-mc-user-resubscribed-success-message'] ) ) : '',
2599
-				'general-error'			=> trim( $_POST['yikes-easy-mc-general-error-message'] ) ? trim( stripslashes( $_POST['yikes-easy-mc-general-error-message'] ) ) : '',
2600
-				'already-subscribed'	=> trim( $_POST['yikes-easy-mc-user-subscribed-message'] ) ? trim( stripslashes( $_POST['yikes-easy-mc-user-subscribed-message'] ) ) : '',
2601
-				'update-link'			=> trim( $_POST['yikes-easy-mc-user-update-link'] ) ? trim( stripslashes( $_POST['yikes-easy-mc-user-update-link'] ) ) : '',
2602
-				'email-subject'			=> trim( $_POST['yikes-easy-mc-user-email-subject'] ) ? trim( stripslashes( $_POST['yikes-easy-mc-user-email-subject'] ) ) : '',
2603
-				'email-body'			=> trim( $_POST['yikes-easy-mc-user-email-body'] ) ? trim( stripslashes( $_POST['yikes-easy-mc-user-email-body'] ) ) : '',
2604
-				'update-email-success'  => trim( $_POST['yikes-easy-mc-update-email-successful'] ) ? trim( stripslashes( $_POST['yikes-easy-mc-update-email-successful'] ) ) : '',
2605
-				'update-email-failure'  => trim( $_POST['yikes-easy-mc-update-email-failure'] ) ? trim( stripslashes( $_POST['yikes-easy-mc-update-email-failure'] ) ) : '',
2596
+				'success'				=> trim( $_POST[ 'yikes-easy-mc-success-message' ] ) ? trim( stripslashes( $_POST[ 'yikes-easy-mc-success-message' ] ) ) : '',
2597
+				'success-single-optin'	=> trim( $_POST[ 'yikes-easy-mc-success-single-optin-message' ] ) ? trim( stripslashes( $_POST[ 'yikes-easy-mc-success-single-optin-message' ] ) ) : '',
2598
+				'success-resubscribed'	=> trim( $_POST[ 'yikes-easy-mc-user-resubscribed-success-message' ] ) ? trim( stripslashes( $_POST[ 'yikes-easy-mc-user-resubscribed-success-message' ] ) ) : '',
2599
+				'general-error'			=> trim( $_POST[ 'yikes-easy-mc-general-error-message' ] ) ? trim( stripslashes( $_POST[ 'yikes-easy-mc-general-error-message' ] ) ) : '',
2600
+				'already-subscribed'	=> trim( $_POST[ 'yikes-easy-mc-user-subscribed-message' ] ) ? trim( stripslashes( $_POST[ 'yikes-easy-mc-user-subscribed-message' ] ) ) : '',
2601
+				'update-link'			=> trim( $_POST[ 'yikes-easy-mc-user-update-link' ] ) ? trim( stripslashes( $_POST[ 'yikes-easy-mc-user-update-link' ] ) ) : '',
2602
+				'email-subject'			=> trim( $_POST[ 'yikes-easy-mc-user-email-subject' ] ) ? trim( stripslashes( $_POST[ 'yikes-easy-mc-user-email-subject' ] ) ) : '',
2603
+				'email-body'			=> trim( $_POST[ 'yikes-easy-mc-user-email-body' ] ) ? trim( stripslashes( $_POST[ 'yikes-easy-mc-user-email-body' ] ) ) : '',
2604
+				'update-email-success'  => trim( $_POST[ 'yikes-easy-mc-update-email-successful' ] ) ? trim( stripslashes( $_POST[ 'yikes-easy-mc-update-email-successful' ] ) ) : '',
2605
+				'update-email-failure'  => trim( $_POST[ 'yikes-easy-mc-update-email-failure' ] ) ? trim( stripslashes( $_POST[ 'yikes-easy-mc-update-email-failure' ] ) ) : '',
2606 2606
 			);
2607 2607
 
2608 2608
 			// Setup the new form settings array
2609 2609
 			// @since 6.0.3.8
2610 2610
 			// To Do: Combine date & time so it's a single unix timestamp
2611 2611
 			$form_settings = array(
2612
-				'yikes-easy-mc-form-class-names'                 => trim( $_POST['yikes-easy-mc-form-class-names'] ),
2613
-				'yikes-easy-mc-inline-form'                      => $_POST['yikes-easy-mc-inline-form'][0],
2614
-				'yikes-easy-mc-submit-button-type'               => $_POST['yikes-easy-mc-submit-button-type'][0],
2615
-				'yikes-easy-mc-submit-button-text'               => trim( $_POST['yikes-easy-mc-submit-button-text'] ),
2616
-				'yikes-easy-mc-submit-button-image'              => esc_url( trim( $_POST['yikes-easy-mc-submit-button-image'] ) ),
2617
-				'yikes-easy-mc-submit-button-classes'            => trim( $_POST['yikes-easy-mc-submit-button-classes'] ),
2618
-				'yikes-easy-mc-form-schedule'                    => ( isset( $_POST['yikes-easy-mc-form-schedule'] ) ) ? '1' : '0',
2619
-				'yikes-easy-mc-form-restriction-start'           => strtotime( $_POST['yikes-easy-mc-form-restriction-start-date'] . ' ' . $_POST['yikes-easy-mc-form-restriction-start-time'] ),
2620
-				'yikes-easy-mc-form-restriction-end'             => strtotime( $_POST['yikes-easy-mc-form-restriction-end-date'] . ' ' . $_POST['yikes-easy-mc-form-restriction-end-time'] ),
2621
-				'yikes-easy-mc-form-restriction-pending-message' => trim( $_POST['yikes-easy-mc-form-restriction-pending-message'] ),
2622
-				'yikes-easy-mc-form-restriction-expired-message' => trim( $_POST['yikes-easy-mc-form-restriction-expired-message'] ),
2623
-				'yikes-easy-mc-form-login-required'              => ( isset( $_POST['yikes-easy-mc-form-login-required'] ) ) ? '1' : '0',
2624
-				'yikes-easy-mc-form-restriction-login-message'   => trim( $_POST['yikes-easy-mc-form-restriction-login-message'] ),
2612
+				'yikes-easy-mc-form-class-names'                 => trim( $_POST[ 'yikes-easy-mc-form-class-names' ] ),
2613
+				'yikes-easy-mc-inline-form'                      => $_POST[ 'yikes-easy-mc-inline-form' ][ 0 ],
2614
+				'yikes-easy-mc-submit-button-type'               => $_POST[ 'yikes-easy-mc-submit-button-type' ][ 0 ],
2615
+				'yikes-easy-mc-submit-button-text'               => trim( $_POST[ 'yikes-easy-mc-submit-button-text' ] ),
2616
+				'yikes-easy-mc-submit-button-image'              => esc_url( trim( $_POST[ 'yikes-easy-mc-submit-button-image' ] ) ),
2617
+				'yikes-easy-mc-submit-button-classes'            => trim( $_POST[ 'yikes-easy-mc-submit-button-classes' ] ),
2618
+				'yikes-easy-mc-form-schedule'                    => ( isset( $_POST[ 'yikes-easy-mc-form-schedule' ] ) ) ? '1' : '0',
2619
+				'yikes-easy-mc-form-restriction-start'           => strtotime( $_POST[ 'yikes-easy-mc-form-restriction-start-date' ] . ' ' . $_POST[ 'yikes-easy-mc-form-restriction-start-time' ] ),
2620
+				'yikes-easy-mc-form-restriction-end'             => strtotime( $_POST[ 'yikes-easy-mc-form-restriction-end-date' ] . ' ' . $_POST[ 'yikes-easy-mc-form-restriction-end-time' ] ),
2621
+				'yikes-easy-mc-form-restriction-pending-message' => trim( $_POST[ 'yikes-easy-mc-form-restriction-pending-message' ] ),
2622
+				'yikes-easy-mc-form-restriction-expired-message' => trim( $_POST[ 'yikes-easy-mc-form-restriction-expired-message' ] ),
2623
+				'yikes-easy-mc-form-login-required'              => ( isset( $_POST[ 'yikes-easy-mc-form-login-required' ] ) ) ? '1' : '0',
2624
+				'yikes-easy-mc-form-restriction-login-message'   => trim( $_POST[ 'yikes-easy-mc-form-restriction-login-message' ] ),
2625 2625
 			);
2626 2626
 
2627 2627
 			// additional custom fields (extensions / user defined fields)
2628 2628
 			$custom_fields = array();
2629
-			if ( isset( $_POST['custom-field'] ) ) {
2630
-				foreach ( $_POST['custom-field'] as $custom_field => $custom_value ) {
2629
+			if ( isset( $_POST[ 'custom-field' ] ) ) {
2630
+				foreach ( $_POST[ 'custom-field' ] as $custom_field => $custom_value ) {
2631 2631
 					if ( is_array( $custom_value ) ) {
2632 2632
 						$custom_fields[ $custom_field ] = array_filter( stripslashes_deep( $custom_value ) ); // array_filters to remove empty items (don't save them!)
2633 2633
 					} else {
@@ -2659,7 +2659,7 @@  discard block
 block discarded – undo
2659 2659
 			$this->form_interface->update_form( $form_id, $form_updates );
2660 2660
 
2661 2661
 			/* Custom action hook which allows users to update specific options when a form is updated - used in add ons */
2662
-			do_action( 'yikes-mailchimp-save-form', $form_id,  $custom_fields );
2662
+			do_action( 'yikes-mailchimp-save-form', $form_id, $custom_fields );
2663 2663
 
2664 2664
 			// redirect the user to the manage forms page, display confirmation
2665 2665
 			wp_redirect( esc_url_raw( admin_url( 'admin.php?page=yikes-mailchimp-edit-form&id=' . $form_id . '&updated-form=true' ) ) );
@@ -2670,11 +2670,11 @@  discard block
 block discarded – undo
2670 2670
 			$email_body  = '<p>' . __( 'Greetings,', 'yikes-inc-easy-mailchimp-extender' ) . '</p>'; 
2671 2671
 
2672 2672
 			$email_body .= '<p>';
2673
-			$email_body .= 	__( 'A request has been made to update your Mailchimp account profile information.', 'yikes-inc-easy-mailchimp-extender' );
2674
-			$email_body .=	__( ' To do so please use the following link: ', 'yikes-inc-easy-mailchimp-extender' );
2675
-			$email_body .=	'[link]';
2676
-			$email_body .=		__( 'Update Mailchimp Profile Info', 'yikes-inc-easy-mailchimp-extender' );
2677
-			$email_body .= 	'[/link]';
2673
+			$email_body .= __( 'A request has been made to update your Mailchimp account profile information.', 'yikes-inc-easy-mailchimp-extender' );
2674
+			$email_body .= __( ' To do so please use the following link: ', 'yikes-inc-easy-mailchimp-extender' );
2675
+			$email_body .= '[link]';
2676
+			$email_body .= __( 'Update Mailchimp Profile Info', 'yikes-inc-easy-mailchimp-extender' );
2677
+			$email_body .= '[/link]';
2678 2678
 			$email_body .= '</p>';
2679 2679
 
2680 2680
 			$email_body .= '<p>' . __( 'If you did not request this update, please disregard this email.', 'yikes-inc-easy-mailchimp-extender' ) . '</p>';
@@ -2690,13 +2690,13 @@  discard block
 block discarded – undo
2690 2690
 
2691 2691
 		/* Unsubscribe a given user from our list */
2692 2692
 		public function yikes_easy_mailchimp_unsubscribe_user() {
2693
-			$nonce    = $_REQUEST['nonce'];
2694
-			$list_id  = $_REQUEST['mailchimp-list'];
2695
-			$email_id = $_REQUEST['email_id'];
2693
+			$nonce    = $_REQUEST[ 'nonce' ];
2694
+			$list_id  = $_REQUEST[ 'mailchimp-list' ];
2695
+			$email_id = $_REQUEST[ 'email_id' ];
2696 2696
 
2697 2697
 			// verify our nonce
2698 2698
 			if ( ! wp_verify_nonce( $nonce, 'unsubscribe-user-' . $email_id ) ) {
2699
-				wp_die( __( "We've run into an error. The security check didn't pass. Please try again." , 'yikes-inc-easy-mailchimp-extender' ) , __( "Failed nonce validation" , 'yikes-inc-easy-mailchimp-extender' ) , array( 'response' => 500 , 'back_link' => true ) );
2699
+				wp_die( __( "We've run into an error. The security check didn't pass. Please try again.", 'yikes-inc-easy-mailchimp-extender' ), __( "Failed nonce validation", 'yikes-inc-easy-mailchimp-extender' ), array( 'response' => 500, 'back_link' => true ) );
2700 2700
 			}
2701 2701
 
2702 2702
 			$response = yikes_get_mc_api_manager()->get_list_handler()->member_unsubscribe( $list_id, $email_id );
@@ -2715,21 +2715,21 @@  discard block
 block discarded – undo
2715 2715
 
2716 2716
 		public function yikes_easy_mailchimp_create_missing_error_log() {
2717 2717
 			// grab our nonnce
2718
-			$nonce = $_REQUEST['nonce'];
2718
+			$nonce = $_REQUEST[ 'nonce' ];
2719 2719
 			// validate nonce
2720
-			if ( !wp_verify_nonce( $nonce, 'create_error_log' ) ) {
2721
-				wp_die( __( "We've run into an error. The security check didn't pass. Please try again." , 'yikes-inc-easy-mailchimp-extender' ) , __( "Failed nonce validation" , 'yikes-inc-easy-mailchimp-extender' ) , array( 'response' => 500 , 'back_link' => true ) );
2720
+			if ( ! wp_verify_nonce( $nonce, 'create_error_log' ) ) {
2721
+				wp_die( __( "We've run into an error. The security check didn't pass. Please try again.", 'yikes-inc-easy-mailchimp-extender' ), __( "Failed nonce validation", 'yikes-inc-easy-mailchimp-extender' ), array( 'response' => 500, 'back_link' => true ) );
2722 2722
 			}
2723 2723
 			// setup the path to the error log
2724 2724
 			$error_log = fopen( plugin_dir_path( __FILE__ ) . '../includes/error_log/yikes-easy-mailchimp-error-log.php', 'w' );
2725 2725
 			try {
2726 2726
 				// create the file
2727
-				fwrite( $error_log , '' );
2727
+				fwrite( $error_log, '' );
2728 2728
 				// close out
2729 2729
 				fclose( $error_log );
2730 2730
 				wp_redirect( esc_url_raw( admin_url( 'admin.php?page=yikes-inc-easy-mailchimp-settings&section=debug-settings&error_log_created=true' ) ) );
2731 2731
 			} catch ( Exception $e ) {
2732
-				wp_redirect( esc_url_raw( admin_url( 'admin.php?page=yikes-inc-easy-mailchimp-settings&section=debug-settings&error_log_created=false&error_message='.urlencode( $e->getMessage() ) ) ) );
2732
+				wp_redirect( esc_url_raw( admin_url( 'admin.php?page=yikes-inc-easy-mailchimp-settings&section=debug-settings&error_log_created=false&error_message=' . urlencode( $e->getMessage() ) ) ) );
2733 2733
 			}
2734 2734
 		}
2735 2735
 
@@ -2740,9 +2740,9 @@  discard block
 block discarded – undo
2740 2740
 		public function yikes_easy_mailchimp_clear_transient_data() {
2741 2741
 
2742 2742
 			// verify our nonce
2743
-			$nonce = $_REQUEST['nonce'];
2743
+			$nonce = $_REQUEST[ 'nonce' ];
2744 2744
 			if ( ! wp_verify_nonce( $nonce, 'clear-mc-transient-data' ) ) {
2745
-				wp_die( __( "We've run into an error. The security check didn't pass. Please try again." , 'yikes-inc-easy-mailchimp-extender' ) , __( "Failed nonce validation" , 'yikes-inc-easy-mailchimp-extender' ) , array( 'response' => 500 , 'back_link' => true ) );
2745
+				wp_die( __( "We've run into an error. The security check didn't pass. Please try again.", 'yikes-inc-easy-mailchimp-extender' ), __( "Failed nonce validation", 'yikes-inc-easy-mailchimp-extender' ), array( 'response' => 500, 'back_link' => true ) );
2746 2746
 			}
2747 2747
 
2748 2748
 			$this->delete_yikes_mailchimp_transients();
@@ -2751,10 +2751,10 @@  discard block
 block discarded – undo
2751 2751
 			$referer = wp_get_referer();
2752 2752
 			if ( $referer && ( strpos( $referer, 'yikes-inc-easy-mailchimp-settings' ) > 0 ) ) {
2753 2753
 				wp_redirect( esc_url_raw( admin_url( 'admin.php?page=yikes-inc-easy-mailchimp-settings&section=api-cache-settings&transient-cleared=true' ) ) );
2754
-			} elseif ( isset( $_REQUEST['page'] ) && $_REQUEST['page'] === 'yikes-mailchimp-edit-form' && isset( $_REQUEST['id'] ) && ! empty( $_REQUEST['id'] ) ) {
2754
+			} elseif ( isset( $_REQUEST[ 'page' ] ) && $_REQUEST[ 'page' ] === 'yikes-mailchimp-edit-form' && isset( $_REQUEST[ 'id' ] ) && ! empty( $_REQUEST[ 'id' ] ) ) {
2755 2755
 
2756 2756
 				// else check if we were editing a form.
2757
-				$id = filter_var( $_REQUEST['id'], FILTER_SANITIZE_NUMBER_INT );
2757
+				$id = filter_var( $_REQUEST[ 'id' ], FILTER_SANITIZE_NUMBER_INT );
2758 2758
 				wp_redirect( esc_url_raw( admin_url( 'admin.php?page=yikes-mailchimp-edit-form&id=' . $id ) ) );
2759 2759
 			} else {
2760 2760
 				// else redirect to the manage forms page.
@@ -2798,7 +2798,7 @@  discard block
 block discarded – undo
2798 2798
 		 */
2799 2799
 		public function yikes_mailchimp_load_helper_class() {
2800 2800
 			// check to see if it's already loaded up.
2801
-			if ( !class_exists( 'Yikes_Inc_Easy_Mailchimp_Forms_Helper' ) ) {
2801
+			if ( ! class_exists( 'Yikes_Inc_Easy_Mailchimp_Forms_Helper' ) ) {
2802 2802
 				// Include our main helper class file
2803 2803
 				include_once( YIKES_MC_PATH . 'admin/partials/helpers/init.php' );
2804 2804
 			}
Please login to merge, or discard this patch.
admin/partials/helpers/fields/yikes-mailchimp-select-field.php 1 patch
Spacing   +11 added lines, -11 removed lines patch added patch discarded remove patch
@@ -5,26 +5,26 @@
 block discarded – undo
5 5
 	*	For help on using, see our documentation [https://yikesplugins.com/support/knowledge-base/product/easy-forms-for-mailchimp/]
6 6
 	* 	@since 6.0
7 7
 	*/
8
-	if ( is_string( $form_data['custom_fields'] ) ) {
9
-		$field_data = json_decode( $form_data['custom_fields'] , true );
10
-	} elseif ( is_array( $form_data['custom_fields'] ) ) {
11
-		$field_data = $form_data['custom_fields'];
8
+	if ( is_string( $form_data[ 'custom_fields' ] ) ) {
9
+		$field_data = json_decode( $form_data[ 'custom_fields' ], true );
10
+	} elseif ( is_array( $form_data[ 'custom_fields' ] ) ) {
11
+		$field_data = $form_data[ 'custom_fields' ];
12 12
 	}
13 13
 ?>
14 14
 <div class="custom-field-section">
15 15
 	<!-- title -->
16
-	<strong><?php echo $field['label']; ?></strong>
16
+	<strong><?php echo $field[ 'label' ]; ?></strong>
17 17
 	
18 18
 	<!-- Dropdown -->
19
-	<select class="custom-select-field" name="custom-field[<?php echo $field['id']; ?>]">
20
-		<?php foreach( $field['options'] as $value => $label ) { ?>
21
-			<option value="" disabled selected><?php echo isset( $field['placeholder'] ) ? $field['placeholder'] : 'Select...'; ?></option>
22
-			<option value="<?php echo $value; ?>" <?php if( isset( $field_data[$field['id']] ) ) { selected( $field_data[$field['id']] , $value ); } ?>><?php echo $label; ?></option>
19
+	<select class="custom-select-field" name="custom-field[<?php echo $field[ 'id' ]; ?>]">
20
+		<?php foreach ( $field[ 'options' ] as $value => $label ) { ?>
21
+			<option value="" disabled selected><?php echo isset( $field[ 'placeholder' ] ) ? $field[ 'placeholder' ] : 'Select...'; ?></option>
22
+			<option value="<?php echo $value; ?>" <?php if ( isset( $field_data[ $field[ 'id' ] ] ) ) { selected( $field_data[ $field[ 'id' ] ], $value ); } ?>><?php echo $label; ?></option>
23 23
 		<?php } ?>
24 24
 	</select>
25 25
 	
26 26
 	<!-- description -->
27
-	<?php if( isset( $field['description'] ) && $field['description'] != '' ) { ?>
28
-		<p class="description"><?php echo $field['description']; ?></p>
27
+	<?php if ( isset( $field[ 'description' ] ) && $field[ 'description' ] != '' ) { ?>
28
+		<p class="description"><?php echo $field[ 'description' ]; ?></p>
29 29
 	<?php } ?>
30 30
 </div>
31 31
\ No newline at end of file
Please login to merge, or discard this patch.
admin/partials/ajax/add_field_to_form.php 1 patch
Spacing   +86 added lines, -86 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
 
@@ -214,30 +214,30 @@  discard block
 block discarded – undo
214 214
 							<tr valign="top">
215 215
 								<td scope="row">
216 216
 									<label for="placeholder">
217
-										<?php _e( 'Default Value' , 'yikes-inc-easy-mailchimp-extender' ); ?>
217
+										<?php _e( 'Default Value', 'yikes-inc-easy-mailchimp-extender' ); ?>
218 218
 									</label>
219 219
 								</td>
220 220
 								<td>
221
-									<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'] ) ) ) : ''; } ?>" />
222
-									<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>
221
+									<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' ] ) ) ) : ''; } ?>" />
222
+									<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>
223 223
 								</td>
224 224
 							</tr>
225 225
 
226 226
 							<tr valign="top">
227 227
 								<td scope="row">
228 228
 									<label for="placeholder">
229
-										<?php _e( 'Default Selection' , 'yikes-inc-easy-mailchimp-extender' ); ?>
229
+										<?php _e( 'Default Selection', 'yikes-inc-easy-mailchimp-extender' ); ?>
230 230
 									</label>
231 231
 								</td>
232 232
 								<td>
233
-									<select type="default" name="field[<?php echo $merge_field_data['tag']; ?>][default_choice]">
234
-										<?php $pre_selected = ! empty( $merge_field_data['default_choice'] ) ? $merge_field_data['default_choice'] : 'no-default'; ?>
233
+									<select type="default" name="field[<?php echo $merge_field_data[ 'tag' ]; ?>][default_choice]">
234
+										<?php $pre_selected = ! empty( $merge_field_data[ 'default_choice' ] ) ? $merge_field_data[ 'default_choice' ] : 'no-default'; ?>
235 235
 										<option value="no-default" <?php selected( $pre_selected, $choice ); ?>>No Default</option>
236
-										<?php foreach ( $merge_field_data['options']['choices'] as $choice => $value ) { ?>
236
+										<?php foreach ( $merge_field_data[ 'options' ][ 'choices' ] as $choice => $value ) { ?>
237 237
 											<option value="<?php echo $choice; ?>" <?php selected( $pre_selected, $choice ); ?>><?php echo stripslashes( $value ); ?></option>
238 238
 										<?php } ?>
239 239
 									</select>
240
-									<p class="description"><small><?php _e( "Which option should be selected by default?", 'yikes-inc-easy-mailchimp-extender' );?></small></p>
240
+									<p class="description"><small><?php _e( "Which option should be selected by default?", 'yikes-inc-easy-mailchimp-extender' ); ?></small></p>
241 241
 								</td>
242 242
 							</tr>
243 243
 
@@ -250,77 +250,77 @@  discard block
 block discarded – undo
250 250
 				<tr valign="top">
251 251
 					<td scope="row">
252 252
 						<label for="placeholder">
253
-							<?php _e( 'Description' , 'yikes-inc-easy-mailchimp-extender' ); ?>
253
+							<?php _e( 'Description', 'yikes-inc-easy-mailchimp-extender' ); ?>
254 254
 						</label>
255 255
 					</td>
256 256
 					<td>
257
-						<textarea class="widefat field-description-input" name="field[<?php echo $merge_field_data['tag']; ?>][description]"></textarea>
258
-						<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>
257
+						<textarea class="widefat field-description-input" name="field[<?php echo $merge_field_data[ 'tag' ]; ?>][description]"></textarea>
258
+						<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>
259 259
 					</td>
260 260
 				</tr>
261 261
 				<!-- Description Above Field -->
262 262
 				<tr valign="top" class="yikes-checkbox-container">
263 263
 					<td scope="row">
264
-						<label for="description_above_<?php echo esc_attr( $merge_field_data['tag'] ); ?>">
265
-							<?php _e( 'Description Above Field' , 'yikes-inc-easy-mailchimp-extender' ); ?>
264
+						<label for="description_above_<?php echo esc_attr( $merge_field_data[ 'tag' ] ); ?>">
265
+							<?php _e( 'Description Above Field', 'yikes-inc-easy-mailchimp-extender' ); ?>
266 266
 						</label>
267 267
 					</td>
268 268
 					<td>
269
-						<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" />
270
-						<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>
269
+						<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" />
270
+						<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>
271 271
 					</td>
272 272
 				</tr>
273 273
 				<!-- Additional Classes -->
274 274
 				<tr valign="top">
275 275
 					<td scope="row">
276 276
 						<label for="placeholder">
277
-							<?php _e( 'Additional Classes' , 'yikes-inc-easy-mailchimp-extender' ); ?>
277
+							<?php _e( 'Additional Classes', 'yikes-inc-easy-mailchimp-extender' ); ?>
278 278
 						</label>
279 279
 					</td>
280 280
 					<td>
281
-						<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'] ) ) : '' ; ?>" />
282
-						<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>
281
+						<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' ] ) ) : ''; ?>" />
282
+						<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>
283 283
 					</td>
284 284
 				</tr>
285 285
 					<!-- Required Toggle -->
286 286
 					<tr valign="top" class="yikes-checkbox-container">
287 287
 						<td scope="row">
288 288
 							<label for="field-required">
289
-								<?php _e( 'Field Required?' , 'yikes-inc-easy-mailchimp-extender' ); ?>
289
+								<?php _e( 'Field Required?', 'yikes-inc-easy-mailchimp-extender' ); ?>
290 290
 							</label>
291 291
 						</td>
292 292
 						<td>
293
-							<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' ); } ?>">
294
-							<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>
293
+							<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' ); } ?>">
294
+							<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>
295 295
 						</td>
296 296
 					</tr>
297 297
 					<!-- Visible Toggle -->
298 298
 					<tr valign="top" class="yikes-checkbox-container">
299 299
 						<td scope="row">
300 300
 							<label for="hide-field">
301
-								<?php _e( 'Hide Field' , 'yikes-inc-easy-mailchimp-extender' ); ?>
301
+								<?php _e( 'Hide Field', 'yikes-inc-easy-mailchimp-extender' ); ?>
302 302
 							</label>
303 303
 						</td>
304 304
 						<td>
305
-							<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' ); } ?>">
306
-							<p class="description"><small><?php _e( "Hide this field from being displayed on the front end.", 'yikes-inc-easy-mailchimp-extender' );?></small></p>
305
+							<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' ); } ?>">
306
+							<p class="description"><small><?php _e( "Hide this field from being displayed on the front end.", 'yikes-inc-easy-mailchimp-extender' ); ?></small></p>
307 307
 						</td>
308 308
 					</tr>
309 309
 					<!-- Toggle Field Label Visibility -->
310 310
 					<tr valign="top" class="yikes-checkbox-container">
311 311
 						<td scope="row">
312 312
 							<label for="placeholder">
313
-								<?php _e( 'Hide Label' , 'yikes-inc-easy-mailchimp-extender' ); ?>
313
+								<?php _e( 'Hide Label', 'yikes-inc-easy-mailchimp-extender' ); ?>
314 314
 							</label>
315 315
 						</td>
316 316
 						<td>
317
-							<input type="checkbox" name="field[<?php echo $merge_field_data['tag']; ?>][hide-label]" value="1" />
318
-							<p class="description"><small><?php _e( "Toggle field label visibility.", 'yikes-inc-easy-mailchimp-extender' );?></small></p>
317
+							<input type="checkbox" name="field[<?php echo $merge_field_data[ 'tag' ]; ?>][hide-label]" value="1" />
318
+							<p class="description"><small><?php _e( "Toggle field label visibility.", 'yikes-inc-easy-mailchimp-extender' ); ?></small></p>
319 319
 						</td>
320 320
 					</tr>
321 321
 					<!-- Display Phone/Date Formats back to the user -->
322 322
 					<?php
323
-						switch( $form_data['field_type'] ) {
323
+						switch ( $form_data[ 'field_type' ] ) {
324 324
 
325 325
 							/* Store the phone format, for properly regex pattern */
326 326
 							case 'phone':
@@ -331,23 +331,23 @@  discard block
 block discarded – undo
331 331
 									<td scope="row">
332 332
 										<label for="placeholder">
333 333
 										<?php
334
-											switch( $form_data['field_type'] ) {
334
+											switch ( $form_data[ 'field_type' ] ) {
335 335
 												default:
336 336
 												case 'birthday':
337
-													$type = __( 'Date Format' , 'yikes-inc-easy-mailchimp-extender' );
338
-													$format = $merge_field_data['options']['date_format'];
337
+													$type = __( 'Date Format', 'yikes-inc-easy-mailchimp-extender' );
338
+													$format = $merge_field_data[ 'options' ][ 'date_format' ];
339 339
 													$format_name = 'date_format';
340 340
 													break;
341 341
 
342 342
 												case 'date':
343
-													$type = __( 'Date Format' , 'yikes-inc-easy-mailchimp-extender' );
344
-													$format = $merge_field_data['options']['date_format'];
343
+													$type = __( 'Date Format', 'yikes-inc-easy-mailchimp-extender' );
344
+													$format = $merge_field_data[ 'options' ][ 'date_format' ];
345 345
 													$format_name = 'date_format';
346 346
 													break;
347 347
 
348 348
 												case 'phone':
349
-													$type = __( 'Phone Format' , 'yikes-inc-easy-mailchimp-extender' );
350
-													$format = ( ( $merge_field_data['options']['phone_format'] == 'none' ) ? __( 'International', 'yikes-inc-easy-mailchimp-extender' ) : $merge_field_data['options']['phone_format'] );
349
+													$type = __( 'Phone Format', 'yikes-inc-easy-mailchimp-extender' );
350
+													$format = ( ( $merge_field_data[ 'options' ][ 'phone_format' ] == 'none' ) ? __( 'International', 'yikes-inc-easy-mailchimp-extender' ) : $merge_field_data[ 'options' ][ 'phone_format' ] );
351 351
 													$format_name = 'phone_format';
352 352
 													break;
353 353
 											}
@@ -357,7 +357,7 @@  discard block
 block discarded – undo
357 357
 									</td>
358 358
 									<td>
359 359
 										<strong><?php echo $format; ?></strong>
360
-										<input type="hidden" name="field[<?php echo $merge_field_data['tag']; ?>][<?php echo $format_name; ?>]" value="<?php echo $format; ?>" />
360
+										<input type="hidden" name="field[<?php echo $merge_field_data[ 'tag' ]; ?>][<?php echo $format_name; ?>]" value="<?php echo $format; ?>" />
361 361
 										<p class="description"><small>
362 362
 											<?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' ) ); ?>
363 363
 										</small></p>
@@ -378,8 +378,8 @@  discard block
 block discarded – undo
378 378
 						</td>
379 379
 						<td>
380 380
 							<span class="toggle-container">
381
-								<a href="#" class="hide-field"><?php _e( "Close" , 'yikes-inc-easy-mailchimp-extender' ); ?></a> |
382
-								<a href="#" class="remove-field" alt="<?php echo $merge_field_data['tag']; ?>"><?php _e( "Remove Field" , 'yikes-inc-easy-mailchimp-extender' ); ?></a>
381
+								<a href="#" class="hide-field"><?php _e( "Close", 'yikes-inc-easy-mailchimp-extender' ); ?></a> |
382
+								<a href="#" class="remove-field" alt="<?php echo $merge_field_data[ 'tag' ]; ?>"><?php _e( "Remove Field", 'yikes-inc-easy-mailchimp-extender' ); ?></a>
383 383
 							</span>
384 384
 						</td>
385 385
 					</tr>
Please login to merge, or discard this patch.