Completed
Pull Request — staging (#840)
by
unknown
19:08
created
admin/partials/ajax/add_field_to_form.php 1 patch
Spacing   +83 added lines, -83 removed lines patch added patch discarded remove patch
@@ -1,15 +1,15 @@  discard block
 block discarded – undo
1 1
 <?php
2 2
 $form_data = array(
3
-	'field_name' => $_POST['field_name'],
4
-	'merge_tag'  => $_POST['merge_tag'],
5
-	'field_type' => $_POST['field_type'],
6
-	'list_id'    => $_POST['list_id'],
3
+	'field_name' => $_POST[ 'field_name' ],
4
+	'merge_tag'  => $_POST[ 'merge_tag' ],
5
+	'field_type' => $_POST[ 'field_type' ],
6
+	'list_id'    => $_POST[ 'list_id' ],
7 7
 );
8 8
 
9 9
 // Grab our list handler.
10 10
 $list_handler = yikes_get_mc_api_manager()->get_list_handler();
11 11
 
12
-$available_merge_variables = $list_handler->get_merge_fields( $form_data['list_id'] );
12
+$available_merge_variables = $list_handler->get_merge_fields( $form_data[ 'list_id' ] );
13 13
 if ( is_wp_error( $available_merge_variables ) ) {
14 14
 	$error_logging = new Yikes_Inc_Easy_Mailchimp_Error_Logging();
15 15
 	$error_logging->maybe_write_to_log(
@@ -28,17 +28,17 @@  discard block
 block discarded – undo
28 28
 }
29 29
 
30 30
 // find and return the location of this merge field in the array
31
-$index = $this->findMCListIndex( $form_data['merge_tag'], $available_merge_variables['merge_fields'], 'tag' );
31
+$index = $this->findMCListIndex( $form_data[ 'merge_tag' ], $available_merge_variables[ 'merge_fields' ], 'tag' );
32 32
 
33 33
 // store it and use it to pre-populate field data (only on initial add to form)
34
-$merge_field_data = $available_merge_variables['merge_fields'][ $index ];
34
+$merge_field_data = $available_merge_variables[ 'merge_fields' ][ $index ];
35 35
 ?>
36
-<section class="draggable" id="<?php echo $form_data['field_name']; ?>">
36
+<section class="draggable" id="<?php echo $form_data[ 'field_name' ]; ?>">
37 37
 	<!-- top -->
38 38
 	<a href="#" class="expansion-section-title settings-sidebar">
39
-		<span class="dashicons dashicons-plus yikes-mc-expansion-toggle" title="<?php _e( 'Expand Field' , 'yikes-inc-easy-mailchimp-extender' ); ?>"></span>
40
-		<?php echo stripslashes( $form_data['field_name'] ); ?>
41
-		<span class="field-type-text"><small><?php echo __( 'type' , 'yikes-inc-easy-mailchimp-extender' ) . ' : ' . $form_data['field_type']; ?></small></span>
39
+		<span class="dashicons dashicons-plus yikes-mc-expansion-toggle" title="<?php _e( 'Expand Field', 'yikes-inc-easy-mailchimp-extender' ); ?>"></span>
40
+		<?php echo stripslashes( $form_data[ 'field_name' ] ); ?>
41
+		<span class="field-type-text"><small><?php echo __( 'type', 'yikes-inc-easy-mailchimp-extender' ) . ' : ' . $form_data[ 'field_type' ]; ?></small></span>
42 42
 	</a>
43 43
 	<!-- expansion section -->
44 44
 	<div class="yikes-mc-settings-expansion-section">
@@ -46,14 +46,14 @@  discard block
 block discarded – undo
46 46
 		<!-- Single or Double Opt-in -->
47 47
 		<p class="type-container form-field-container"><!-- necessary to prevent skipping on slideToggle(); -->
48 48
 			<!-- store the label -->
49
-			<input type="hidden" name="field[<?php echo $merge_field_data['tag']; ?>][label]" value="<?php echo htmlspecialchars( $form_data['field_name'] ); ?>" />
50
-			<input type="hidden" name="field[<?php echo $merge_field_data['tag']; ?>][type]" value="<?php echo $form_data['field_type']; ?>" />
51
-			<input type="hidden" name="field[<?php echo $merge_field_data['tag']; ?>][merge]" value="<?php echo $merge_field_data['tag']; ?>" />
52
-			<input type="hidden" class="field-<?php echo $merge_field_data['tag']; ?>-position position-input" name="field[<?php echo $merge_field_data['tag']; ?>][position]" value="" />
49
+			<input type="hidden" name="field[<?php echo $merge_field_data[ 'tag' ]; ?>][label]" value="<?php echo htmlspecialchars( $form_data[ 'field_name' ] ); ?>" />
50
+			<input type="hidden" name="field[<?php echo $merge_field_data[ 'tag' ]; ?>][type]" value="<?php echo $form_data[ 'field_type' ]; ?>" />
51
+			<input type="hidden" name="field[<?php echo $merge_field_data[ 'tag' ]; ?>][merge]" value="<?php echo $merge_field_data[ 'tag' ]; ?>" />
52
+			<input type="hidden" class="field-<?php echo $merge_field_data[ 'tag' ]; ?>-position position-input" name="field[<?php echo $merge_field_data[ 'tag' ]; ?>][position]" value="" />
53 53
 
54
-			<?php if ( $form_data['field_type'] == 'radio' || $form_data['field_type'] == 'dropdown' ) { ?>
55
-				<?php $choices = ( isset( $merge_field_data['options']['choices'] ) ) ? esc_attr( json_encode( $merge_field_data['options']['choices'] ) ) : ''; ?>
56
-				<input type="hidden" name="field[<?php echo $merge_field_data['tag']; ?>][choices]" value='<?php echo $choices; ?>' />
54
+			<?php if ( $form_data[ 'field_type' ] == 'radio' || $form_data[ 'field_type' ] == 'dropdown' ) { ?>
55
+				<?php $choices = ( isset( $merge_field_data[ 'options' ][ 'choices' ] ) ) ? esc_attr( json_encode( $merge_field_data[ 'options' ][ 'choices' ] ) ) : ''; ?>
56
+				<input type="hidden" name="field[<?php echo $merge_field_data[ 'tag' ]; ?>][choices]" value='<?php echo $choices; ?>' />
57 57
 			<?php } ?>
58 58
 
59 59
 			<table class="form-table form-field-container">
@@ -62,15 +62,15 @@  discard block
 block discarded – undo
62 62
 					<tr valign="top">
63 63
 						<td scope="row">
64 64
 							<label for="merge-tag">
65
-								<?php _e( 'Merge Tag' , 'yikes-inc-easy-mailchimp-extender' ); ?>
65
+								<?php _e( 'Merge Tag', 'yikes-inc-easy-mailchimp-extender' ); ?>
66 66
 							</label>
67 67
 						</td>
68 68
 						<td>
69
-							<input class="widefat merge-tag-text" type="text" readonly value="<?php echo $merge_field_data['tag']; ?>">
69
+							<input class="widefat merge-tag-text" type="text" readonly value="<?php echo $merge_field_data[ 'tag' ]; ?>">
70 70
 						</td>
71 71
 					</tr>
72 72
 
73
-			<?php switch( $form_data['field_type'] ) {
73
+			<?php switch ( $form_data[ 'field_type' ] ) {
74 74
 
75 75
 					default:
76 76
 						break;
@@ -88,12 +88,12 @@  discard block
 block discarded – undo
88 88
 					<tr valign="top">
89 89
 						<td scope="row">
90 90
 							<label for="placeholder">
91
-								<?php _e( 'Placeholder' , 'yikes-inc-easy-mailchimp-extender' ); ?>
91
+								<?php _e( 'Placeholder', 'yikes-inc-easy-mailchimp-extender' ); ?>
92 92
 							</label>
93 93
 						</td>
94 94
 						<td>
95
-						<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'] ) ): '' ; ?>" />
96
-							<p class="description"><small><?php _e( "Assign a placeholder value to this field.", 'yikes-inc-easy-mailchimp-extender' );?></small></p>
95
+						<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' ] ) ) : ''; ?>" />
96
+							<p class="description"><small><?php _e( "Assign a placeholder value to this field.", 'yikes-inc-easy-mailchimp-extender' ); ?></small></p>
97 97
 						</td>
98 98
 					</tr>
99 99
 
@@ -102,27 +102,27 @@  discard block
 block discarded – undo
102 102
 					*	Loop over field types and store necessary formats
103 103
 					*	( date, birthday - dateformat ; phone - phoneformat )
104 104
 					*/
105
-					switch( $form_data['field_type'] ) {
105
+					switch ( $form_data[ 'field_type' ] ) {
106 106
 
107 107
 						/* Store the date format, for properly rendering dates on the front end */
108 108
 						case 'date':
109
-							$date_format = isset( $merge_field_data['options']['dateformat'] ) ? $merge_field_data['options']['dateformat'] : 'MM/DD/YYYY';
109
+							$date_format = isset( $merge_field_data[ 'options' ][ 'dateformat' ] ) ? $merge_field_data[ 'options' ][ 'dateformat' ] : 'MM/DD/YYYY';
110 110
 							?>
111
-							<input type="hidden" name="field[<?php echo $merge_field_data['tag']; ?>][date_format]" value="<?php echo strtolower( $date_format ); ?>" />
111
+							<input type="hidden" name="field[<?php echo $merge_field_data[ 'tag' ]; ?>][date_format]" value="<?php echo strtolower( $date_format ); ?>" />
112 112
 							<?php
113 113
 						break;
114 114
 
115 115
 						case 'birthday':
116
-							$date_format = isset( $merge_field_data['options']['dateformat'] ) ? $merge_field_data['options']['dateformat'] : 'MM/DD';
116
+							$date_format = isset( $merge_field_data[ 'options' ][ 'dateformat' ] ) ? $merge_field_data[ 'options' ][ 'dateformat' ] : 'MM/DD';
117 117
 							?>
118
-							<input type="hidden" name="field[<?php echo $merge_field_data['tag']; ?>][date_format]" value="<?php echo strtolower( $date_format ); ?>" />
118
+							<input type="hidden" name="field[<?php echo $merge_field_data[ 'tag' ]; ?>][date_format]" value="<?php echo strtolower( $date_format ); ?>" />
119 119
 							<?php
120 120
 						break;
121 121
 
122 122
 						/* Store the phone format, for properly regex pattern */
123 123
 						case 'phone':
124 124
 							?>
125
-							<input type="hidden" name="field[<?php echo $merge_field_data['tag']; ?>][phone_format]" value="<?php echo $merge_field_data['options']['phone_format']; ?>" />
125
+							<input type="hidden" name="field[<?php echo $merge_field_data[ 'tag' ]; ?>][phone_format]" value="<?php echo $merge_field_data[ 'options' ][ 'phone_format' ]; ?>" />
126 126
 							<?php
127 127
 						break;
128 128
 					}
@@ -133,13 +133,13 @@  discard block
 block discarded – undo
133 133
 						?>
134 134
 							<tr valign="top">
135 135
 								<td scope="row">
136
-									<label for="placeholder_<?php echo esc_attr( $field['merge'] ); ?>">
137
-										<?php _e( 'Placeholder' , 'yikes-inc-easy-mailchimp-extender' ); ?>
136
+									<label for="placeholder_<?php echo esc_attr( $field[ 'merge' ] ); ?>">
137
+										<?php _e( 'Placeholder', 'yikes-inc-easy-mailchimp-extender' ); ?>
138 138
 									</label>
139 139
 								</td>
140 140
 								<td>
141
-									<input type="checkbox" class="widefat" name="field[<?php echo $merge_field_data['tag']; ?>][placeholder]" value="1" />
142
-									<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>
141
+									<input type="checkbox" class="widefat" name="field[<?php echo $merge_field_data[ 'tag' ]; ?>][placeholder]" value="1" />
142
+									<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>
143 143
 								</td>
144 144
 							</tr>
145 145
 						<?php
@@ -149,7 +149,7 @@  discard block
 block discarded – undo
149 149
 			?>
150 150
 
151 151
 				<!-- Default Value -->
152
-				<?php switch( $form_data['field_type'] ) {
152
+				<?php switch ( $form_data[ 'field_type' ] ) {
153 153
 
154 154
 					default:
155 155
 					case 'text':
@@ -157,17 +157,17 @@  discard block
 block discarded – undo
157 157
 						<tr valign="top">
158 158
 							<td scope="row">
159 159
 								<label for="placeholder">
160
-									<?php _e( 'Default Value' , 'yikes-inc-easy-mailchimp-extender' ); ?>
160
+									<?php _e( 'Default Value', 'yikes-inc-easy-mailchimp-extender' ); ?>
161 161
 								</label>
162 162
 							</td>
163 163
 							<td>
164
-								<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'] ) ) ) : ''; } ?>" />
165
-								<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>
164
+								<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' ] ) ) ) : ''; } ?>" />
165
+								<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>
166 166
 								<?php
167
-								switch ( $form_data['field_type'] ) {
167
+								switch ( $form_data[ 'field_type' ] ) {
168 168
 									case 'text':
169 169
 										?>
170
-										<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
+										<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>
171 171
 										<?php
172 172
 									break;
173 173
 								} ?>
@@ -181,28 +181,28 @@  discard block
 block discarded – undo
181 181
 							<tr valign="top">
182 182
 								<td scope="row">
183 183
 									<label for="placeholder">
184
-										<?php _e( 'Default Selection' , 'yikes-inc-easy-mailchimp-extender' ); ?>
184
+										<?php _e( 'Default Selection', 'yikes-inc-easy-mailchimp-extender' ); ?>
185 185
 									</label>
186 186
 								</td>
187 187
 								<td>
188
-									<?php $pre_selected = ! empty( $merge_field_data['default_choice'] ) ? $merge_field_data['default_choice'] : 'no-default'; ?>
189
-									<label for="<?php echo $merge_field_data['tag'] . '-no-default'; ?>">
190
-										<input id="<?php echo $merge_field_data['tag'] . '-no-default'; ?>"
188
+									<?php $pre_selected = ! empty( $merge_field_data[ 'default_choice' ] ) ? $merge_field_data[ 'default_choice' ] : 'no-default'; ?>
189
+									<label for="<?php echo $merge_field_data[ 'tag' ] . '-no-default'; ?>">
190
+										<input id="<?php echo $merge_field_data[ 'tag' ] . '-no-default'; ?>"
191 191
 										       type="radio"
192
-										       name="field[<?php echo $merge_field_data['tag']; ?>][default_choice]"
192
+										       name="field[<?php echo $merge_field_data[ 'tag' ]; ?>][default_choice]"
193 193
 										       value="no-default" <?php checked( $pre_selected, 'no-default' ); ?>
194 194
 										>
195 195
 										No Default&nbsp;
196 196
 									</label>
197 197
 									<?php
198 198
 									$x = 0;
199
-									foreach ( $merge_field_data['options']['choices'] as $choice => $value ) { ?>
199
+									foreach ( $merge_field_data[ 'options' ][ 'choices' ] as $choice => $value ) { ?>
200 200
 										<label>
201
-											<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
+											<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; ?>
202 202
 										</label>
203 203
 										<?php $x++;
204 204
 									} ?>
205
-									<p class="description"><small><?php _e( "Select the option that should be selected by default.", 'yikes-inc-easy-mailchimp-extender' );?></small></p>
205
+									<p class="description"><small><?php _e( "Select the option that should be selected by default.", 'yikes-inc-easy-mailchimp-extender' ); ?></small></p>
206 206
 								</td>
207 207
 							</tr>
208 208
 
@@ -214,18 +214,18 @@  discard block
 block discarded – undo
214 214
 							<tr valign="top">
215 215
 								<td scope="row">
216 216
 									<label for="placeholder">
217
-										<?php _e( 'Default DROPDOWN Selection' , 'yikes-inc-easy-mailchimp-extender' ); ?>
217
+										<?php _e( 'Default DROPDOWN Selection', 'yikes-inc-easy-mailchimp-extender' ); ?>
218 218
 									</label>
219 219
 								</td>
220 220
 								<td>
221
-									<select type="default" name="field[<?php echo $merge_field_data['tag']; ?>][default_choice]">
222
-										<?php $pre_selected = ! empty( $merge_field_data['default_choice'] ) ? $merge_field_data['default_choice'] : 'no-default'; ?>
221
+									<select type="default" name="field[<?php echo $merge_field_data[ 'tag' ]; ?>][default_choice]">
222
+										<?php $pre_selected = ! empty( $merge_field_data[ 'default_choice' ] ) ? $merge_field_data[ 'default_choice' ] : 'no-default'; ?>
223 223
 										<option value="no-default" <?php selected( $pre_selected, $choice ); ?>>No Default</option>
224
-										<?php foreach ( $merge_field_data['options']['choices'] as $choice => $value ) { ?>
224
+										<?php foreach ( $merge_field_data[ 'options' ][ 'choices' ] as $choice => $value ) { ?>
225 225
 											<option value="<?php echo $choice; ?>" <?php selected( $pre_selected, $choice ); ?>><?php echo stripslashes( $value ); ?></option>
226 226
 										<?php } ?>
227 227
 									</select>
228
-									<p class="description"><small><?php _e( "Which option should be selected by default?", 'yikes-inc-easy-mailchimp-extender' );?></small></p>
228
+									<p class="description"><small><?php _e( "Which option should be selected by default?", 'yikes-inc-easy-mailchimp-extender' ); ?></small></p>
229 229
 								</td>
230 230
 							</tr>
231 231
 
@@ -238,77 +238,77 @@  discard block
 block discarded – undo
238 238
 				<tr valign="top">
239 239
 					<td scope="row">
240 240
 						<label for="placeholder">
241
-							<?php _e( 'Description' , 'yikes-inc-easy-mailchimp-extender' ); ?>
241
+							<?php _e( 'Description', 'yikes-inc-easy-mailchimp-extender' ); ?>
242 242
 						</label>
243 243
 					</td>
244 244
 					<td>
245
-						<textarea class="widefat field-description-input" name="field[<?php echo $merge_field_data['tag']; ?>][description]"></textarea>
246
-						<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>
245
+						<textarea class="widefat field-description-input" name="field[<?php echo $merge_field_data[ 'tag' ]; ?>][description]"></textarea>
246
+						<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>
247 247
 					</td>
248 248
 				</tr>
249 249
 				<!-- Description Above Field -->
250 250
 				<tr valign="top" class="yikes-checkbox-container">
251 251
 					<td scope="row">
252
-						<label for="description_above_<?php echo esc_attr( $merge_field_data['tag'] ); ?>">
253
-							<?php _e( 'Description Above Field' , 'yikes-inc-easy-mailchimp-extender' ); ?>
252
+						<label for="description_above_<?php echo esc_attr( $merge_field_data[ 'tag' ] ); ?>">
253
+							<?php _e( 'Description Above Field', 'yikes-inc-easy-mailchimp-extender' ); ?>
254 254
 						</label>
255 255
 					</td>
256 256
 					<td>
257
-						<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" />
258
-						<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>
257
+						<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" />
258
+						<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>
259 259
 					</td>
260 260
 				</tr>
261 261
 				<!-- Additional Classes -->
262 262
 				<tr valign="top">
263 263
 					<td scope="row">
264 264
 						<label for="placeholder">
265
-							<?php _e( 'Additional Classes' , 'yikes-inc-easy-mailchimp-extender' ); ?>
265
+							<?php _e( 'Additional Classes', 'yikes-inc-easy-mailchimp-extender' ); ?>
266 266
 						</label>
267 267
 					</td>
268 268
 					<td>
269
-						<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'] ) ) : '' ; ?>" />
270
-						<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>
269
+						<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' ] ) ) : ''; ?>" />
270
+						<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>
271 271
 					</td>
272 272
 				</tr>
273 273
 					<!-- Required Toggle -->
274 274
 					<tr valign="top" class="yikes-checkbox-container">
275 275
 						<td scope="row">
276 276
 							<label for="field-required">
277
-								<?php _e( 'Field Required?' , 'yikes-inc-easy-mailchimp-extender' ); ?>
277
+								<?php _e( 'Field Required?', 'yikes-inc-easy-mailchimp-extender' ); ?>
278 278
 							</label>
279 279
 						</td>
280 280
 						<td>
281
-							<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' ); } ?>">
282
-							<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>
281
+							<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' ); } ?>">
282
+							<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>
283 283
 						</td>
284 284
 					</tr>
285 285
 					<!-- Visible Toggle -->
286 286
 					<tr valign="top" class="yikes-checkbox-container">
287 287
 						<td scope="row">
288 288
 							<label for="hide-field">
289
-								<?php _e( 'Hide Field' , 'yikes-inc-easy-mailchimp-extender' ); ?>
289
+								<?php _e( 'Hide Field', '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']; ?>][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' ); } ?>">
294
-							<p class="description"><small><?php _e( "Hide this field from being displayed on the front end.", 'yikes-inc-easy-mailchimp-extender' );?></small></p>
293
+							<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' ); } ?>">
294
+							<p class="description"><small><?php _e( "Hide this field from being displayed on the front end.", 'yikes-inc-easy-mailchimp-extender' ); ?></small></p>
295 295
 						</td>
296 296
 					</tr>
297 297
 					<!-- Toggle Field Label Visibility -->
298 298
 					<tr valign="top" class="yikes-checkbox-container">
299 299
 						<td scope="row">
300 300
 							<label for="placeholder">
301
-								<?php _e( 'Hide Label' , 'yikes-inc-easy-mailchimp-extender' ); ?>
301
+								<?php _e( 'Hide Label', 'yikes-inc-easy-mailchimp-extender' ); ?>
302 302
 							</label>
303 303
 						</td>
304 304
 						<td>
305
-							<input type="checkbox" name="field[<?php echo $merge_field_data['tag']; ?>][hide-label]" value="1" />
306
-							<p class="description"><small><?php _e( "Toggle field label visibility.", 'yikes-inc-easy-mailchimp-extender' );?></small></p>
305
+							<input type="checkbox" name="field[<?php echo $merge_field_data[ 'tag' ]; ?>][hide-label]" value="1" />
306
+							<p class="description"><small><?php _e( "Toggle field label visibility.", 'yikes-inc-easy-mailchimp-extender' ); ?></small></p>
307 307
 						</td>
308 308
 					</tr>
309 309
 					<!-- Display Phone/Date Formats back to the user -->
310 310
 					<?php
311
-						switch( $form_data['field_type'] ) {
311
+						switch ( $form_data[ 'field_type' ] ) {
312 312
 
313 313
 							/* Store the phone format, for properly regex pattern */
314 314
 							case 'phone':
@@ -319,23 +319,23 @@  discard block
 block discarded – undo
319 319
 									<td scope="row">
320 320
 										<label for="placeholder">
321 321
 										<?php
322
-											switch( $form_data['field_type'] ) {
322
+											switch ( $form_data[ 'field_type' ] ) {
323 323
 												default:
324 324
 												case 'birthday':
325
-													$type = __( 'Date Format' , 'yikes-inc-easy-mailchimp-extender' );
326
-													$format = $merge_field_data['options']['date_format'];
325
+													$type = __( 'Date Format', 'yikes-inc-easy-mailchimp-extender' );
326
+													$format = $merge_field_data[ 'options' ][ 'date_format' ];
327 327
 													$format_name = 'date_format';
328 328
 													break;
329 329
 
330 330
 												case 'date':
331
-													$type = __( 'Date Format' , 'yikes-inc-easy-mailchimp-extender' );
332
-													$format = $merge_field_data['options']['date_format'];
331
+													$type = __( 'Date Format', 'yikes-inc-easy-mailchimp-extender' );
332
+													$format = $merge_field_data[ 'options' ][ 'date_format' ];
333 333
 													$format_name = 'date_format';
334 334
 													break;
335 335
 
336 336
 												case 'phone':
337
-													$type = __( 'Phone Format' , 'yikes-inc-easy-mailchimp-extender' );
338
-													$format = ( ( $merge_field_data['options']['phone_format'] == 'none' ) ? __( 'International', 'yikes-inc-easy-mailchimp-extender' ) : $merge_field_data['options']['phone_format'] );
337
+													$type = __( 'Phone Format', 'yikes-inc-easy-mailchimp-extender' );
338
+													$format = ( ( $merge_field_data[ 'options' ][ 'phone_format' ] == 'none' ) ? __( 'International', 'yikes-inc-easy-mailchimp-extender' ) : $merge_field_data[ 'options' ][ 'phone_format' ] );
339 339
 													$format_name = 'phone_format';
340 340
 													break;
341 341
 											}
@@ -345,7 +345,7 @@  discard block
 block discarded – undo
345 345
 									</td>
346 346
 									<td>
347 347
 										<strong><?php echo $format; ?></strong>
348
-										<input type="hidden" name="field[<?php echo $merge_field_data['tag']; ?>][<?php echo $format_name; ?>]" value="<?php echo $format; ?>" />
348
+										<input type="hidden" name="field[<?php echo $merge_field_data[ 'tag' ]; ?>][<?php echo $format_name; ?>]" value="<?php echo $format; ?>" />
349 349
 										<p class="description"><small>
350 350
 											<?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' ) ); ?>
351 351
 										</small></p>
@@ -366,8 +366,8 @@  discard block
 block discarded – undo
366 366
 						</td>
367 367
 						<td>
368 368
 							<span class="toggle-container">
369
-								<a href="#" class="hide-field"><?php _e( "Close" , 'yikes-inc-easy-mailchimp-extender' ); ?></a> |
370
-								<a href="#" class="remove-field" alt="<?php echo $merge_field_data['tag']; ?>"><?php _e( "Remove Field" , 'yikes-inc-easy-mailchimp-extender' ); ?></a>
369
+								<a href="#" class="hide-field"><?php _e( "Close", 'yikes-inc-easy-mailchimp-extender' ); ?></a> |
370
+								<a href="#" class="remove-field" alt="<?php echo $merge_field_data[ 'tag' ]; ?>"><?php _e( "Remove Field", 'yikes-inc-easy-mailchimp-extender' ); ?></a>
371 371
 							</span>
372 372
 						</td>
373 373
 					</tr>
Please login to merge, or discard this patch.