Completed
Pull Request — staging (#799)
by Viktor
05:05
created
admin/partials/helpers/premium-support.php 1 patch
Spacing   +14 added lines, -14 removed lines patch added patch discarded remove patch
@@ -6,7 +6,7 @@  discard block
 block discarded – undo
6 6
 			<h2 class="premium-support-title"><?php _e( 'Priority & Add-on Support', 'yikes-inc-easy-mailchimp-extender' ); ?></h2>
7 7
 
8 8
 			<?php
9
-				if ( isset( $_POST['submit-premium-support-request'] ) ) {
9
+				if ( isset( $_POST[ 'submit-premium-support-request' ] ) ) {
10 10
 			?>
11 11
 					<h4><?php _e( 'Success!', 'yikes-inc-easy-mailchimp-extender' ); ?></h2>
12 12
 					<p><?php _e( 'We have received your support request and will get in touch shortly regarding your issue.', 'yikes-inc-easy-mailchimp-extender' ); ?></p>
@@ -15,7 +15,7 @@  discard block
 block discarded – undo
15 15
 			?>
16 16
 
17 17
 			<!-- Premium Support Form -->
18
-			<form id="premium-support-form" method="post" action="<?php echo esc_url( admin_url( 'admin.php?page=yikes-inc-easy-mailchimp-support#premium-support-form' ) ); ?>" <?php echo (isset($_POST['submit-premium-support-request'])) ? 'class="support-form-hidden"' : ''; ?>>
18
+			<form id="premium-support-form" method="post" action="<?php echo esc_url( admin_url( 'admin.php?page=yikes-inc-easy-mailchimp-support#premium-support-form' ) ); ?>" <?php echo ( isset( $_POST[ 'submit-premium-support-request' ] ) ) ? 'class="support-form-hidden"' : ''; ?>>
19 19
 
20 20
 				<label><?php _e( 'Add-On:', 'yikes-inc-easy-mailchimp-extender' ); ?>
21 21
 					<select name="license_key" id="license-key">
@@ -25,13 +25,13 @@  discard block
 block discarded – undo
25 25
 								// get the license for the respective extension
26 26
 								$options = get_option( 'yikes-mailchimp-' . $extension . '-settings', array() );
27 27
 
28
-								if ( isset( $options['license'] ) && $options['status'] == 'valid' ) {
29
-									echo '<option data-plugin-slug="' . esc_attr( $extension ) . '" data-plugin-name="' . esc_attr( ucwords( str_replace( '-', ' ', $extension ) ) ) . '" value="' . esc_attr( trim( $options['license'] ) ) . '">' . ucwords( str_replace( '-', ' ', $extension ) ) . ' ' . '</option>';
28
+								if ( isset( $options[ 'license' ] ) && $options[ 'status' ] == 'valid' ) {
29
+									echo '<option data-plugin-slug="' . esc_attr( $extension ) . '" data-plugin-name="' . esc_attr( ucwords( str_replace( '-', ' ', $extension ) ) ) . '" value="' . esc_attr( trim( $options[ 'license' ] ) ) . '">' . ucwords( str_replace( '-', ' ', $extension ) ) . ' ' . '</option>';
30 30
 								}
31 31
 							}
32 32
 						?>
33 33
 					</select>
34
-					<p class="description"><?php _e( 'Select the add-on that you are looking for help with.' , 'yikes-inc-easy-mailchimp-extender' ); ?></p>
34
+					<p class="description"><?php _e( 'Select the add-on that you are looking for help with.', 'yikes-inc-easy-mailchimp-extender' ); ?></p>
35 35
 
36 36
 					<input type="hidden" name="plugin-slug" id="plugin-slug" value="">
37 37
 					<input type="hidden" name="plugin-name" id="plugin-name" value="">
@@ -39,31 +39,31 @@  discard block
 block discarded – undo
39 39
 
40 40
 				<label><?php _e( 'Name:', 'yikes-inc-easy-mailchimp-extender' ); ?>
41 41
 					<input type="text" name="user-name" required>
42
-					<p class="description"><?php _e( 'Enter your name.' , 'yikes-inc-easy-mailchimp-extender' ); ?></p>
42
+					<p class="description"><?php _e( 'Enter your name.', 'yikes-inc-easy-mailchimp-extender' ); ?></p>
43 43
 				</label>
44 44
 
45 45
 				<label><?php _e( 'Contact Email:', 'yikes-inc-easy-mailchimp-extender' ); ?>
46 46
 					<input type="email" name="user-email" required>
47
-					<p class="description"><?php _e( 'Enter the email address you would prefer to be contact at.' , 'yikes-inc-easy-mailchimp-extender' ); ?></p>
47
+					<p class="description"><?php _e( 'Enter the email address you would prefer to be contact at.', 'yikes-inc-easy-mailchimp-extender' ); ?></p>
48 48
 				</label>
49 49
 
50 50
 				<label><?php _e( 'Topic:', 'yikes-inc-easy-mailchimp-extender' ); ?>
51 51
 					<input type="text" name="support-topic" required>
52
-					<p class="description"><?php _e( 'Pleae enter the topic of your support request.' , 'yikes-inc-easy-mailchimp-extender' ); ?></p>
52
+					<p class="description"><?php _e( 'Pleae enter the topic of your support request.', 'yikes-inc-easy-mailchimp-extender' ); ?></p>
53 53
 				</label>
54 54
 
55 55
 				<label><?php _e( 'Priority:', 'yikes-inc-easy-mailchimp-extender' ); ?>
56 56
 					<select name="support-priority">
57
-						<option value="1"><?php _e( 'Low' , 'yikes-inc-easy-mailchimp-extender' ); ?></option>
58
-						<option value="2"><?php _e( 'Medium' , 'yikes-inc-easy-mailchimp-extender' ); ?></option>
59
-						<option value="3"><?php _e( 'High' , 'yikes-inc-easy-mailchimp-extender' ); ?></option>
60
-						<option value="4"><?php _e( 'Urgent' , 'yikes-inc-easy-mailchimp-extender' ); ?></option>
57
+						<option value="1"><?php _e( 'Low', 'yikes-inc-easy-mailchimp-extender' ); ?></option>
58
+						<option value="2"><?php _e( 'Medium', 'yikes-inc-easy-mailchimp-extender' ); ?></option>
59
+						<option value="3"><?php _e( 'High', 'yikes-inc-easy-mailchimp-extender' ); ?></option>
60
+						<option value="4"><?php _e( 'Urgent', 'yikes-inc-easy-mailchimp-extender' ); ?></option>
61 61
 					</select>
62
-					<p class="description"><?php _e( 'Select the priority of this ticket.' , 'yikes-inc-easy-mailchimp-extender' ); ?><em><?php _e( 'Note: Please do not abuse "urgent".' , 'yikes-inc-easy-mailchimp-extender' ); ?></em></p>
62
+					<p class="description"><?php _e( 'Select the priority of this ticket.', 'yikes-inc-easy-mailchimp-extender' ); ?><em><?php _e( 'Note: Please do not abuse "urgent".', 'yikes-inc-easy-mailchimp-extender' ); ?></em></p>
63 63
 				</label>
64 64
 				<label><?php _e( 'Issue:', 'yikes-inc-easy-mailchimp-extender' ); ?>
65 65
 					<?php wp_editor( '', 'support-content', array( 'textarea_name' => 'support-content', 'media_buttons' => false ) ); ?>
66
-					<p class="description"><?php _e( 'Enter as much detail about the issue you are encontering as possible. After we make initial contact you can attach any screenshots necessary.' , 'yikes-inc-easy-mailchimp-extender' ); ?></p>
66
+					<p class="description"><?php _e( 'Enter as much detail about the issue you are encontering as possible. After we make initial contact you can attach any screenshots necessary.', 'yikes-inc-easy-mailchimp-extender' ); ?></p>
67 67
 				</label>
68 68
 
69 69
 				<input type="hidden" name="action" value="yikes-support-request">
Please login to merge, or discard this patch.
admin/partials/front-end-widgets/front-end-widget-form.php 1 patch
Spacing   +18 added lines, -18 removed lines patch added patch discarded remove patch
@@ -25,7 +25,7 @@  discard block
 block discarded – undo
25 25
 			// Widget name will appear in UI
26 26
 			__( 'Easy MailChimp Forms', 'yikes-inc-easy-mailchimp-extender' ),
27 27
 			// Widget description
28
-			array( 'description' => __( 'MailChimp opt-in widget for your sidebar.', 'yikes-inc-easy-mailchimp-extender' ), )
28
+			array( 'description' => __( 'MailChimp opt-in widget for your sidebar.', 'yikes-inc-easy-mailchimp-extender' ),)
29 29
 		);
30 30
 	}
31 31
 
@@ -39,10 +39,10 @@  discard block
 block discarded – undo
39 39
 		// Get all form IDs so we can use the first one as a default.
40 40
 		$form_ids = $this->form_interface->get_form_ids();
41 41
 
42
-		$title              = isset( $instance['title'] ) ? apply_filters( 'widget_title', $instance['title'] ) : __( 'MailChimp Signup Form', 'yikes-inc-easy-mailchimp-extender' );
43
-		$form_id            = isset( $instance['form_id'] ) ? $instance['form_id'] : $form_ids[0];
44
-		$form_description   = isset( $instance['form_description'] ) ? $instance['form_description'] : '';
45
-		$submit_button_text = isset( $instance['submit_text'] ) ? $instance['submit_text'] : __( 'Submit', 'yikes-inc-easy-mailchimp-extender' );
42
+		$title              = isset( $instance[ 'title' ] ) ? apply_filters( 'widget_title', $instance[ 'title' ] ) : __( 'MailChimp Signup Form', 'yikes-inc-easy-mailchimp-extender' );
43
+		$form_id            = isset( $instance[ 'form_id' ] ) ? $instance[ 'form_id' ] : $form_ids[ 0 ];
44
+		$form_description   = isset( $instance[ 'form_description' ] ) ? $instance[ 'form_description' ] : '';
45
+		$submit_button_text = isset( $instance[ 'submit_text' ] ) ? $instance[ 'submit_text' ] : __( 'Submit', 'yikes-inc-easy-mailchimp-extender' );
46 46
 
47 47
 		// Build our array based on settings chosen
48 48
 		$shortcode_attributes = array(
@@ -54,10 +54,10 @@  discard block
 block discarded – undo
54 54
 		$shortcode_attributes = apply_filters( 'yikes_mailchimp_widget_shortcode_attributes', $shortcode_attributes, $instance );
55 55
 
56 56
 		// before and after widget arguments are defined by themes
57
-		echo $args['before_widget'];
57
+		echo $args[ 'before_widget' ];
58 58
 
59 59
 		if ( ! empty( $title ) ) {
60
-			echo $args['before_title'] . $title . $args['after_title'];
60
+			echo $args[ 'before_title' ] . $title . $args[ 'after_title' ];
61 61
 		}
62 62
 
63 63
 		// Custom action hooks to place content in the widget before the form
@@ -73,7 +73,7 @@  discard block
 block discarded – undo
73 73
 		do_action( 'yikes-mailchimp-after-form-' . $form_id );
74 74
 		do_action( 'yikes-mailchimp-after-form' );
75 75
 
76
-		echo $args['after_widget'];
76
+		echo $args[ 'after_widget' ];
77 77
 	}
78 78
 
79 79
 	// Widget Backend 
@@ -83,7 +83,7 @@  discard block
 block discarded – undo
83 83
 		if ( empty( $all_forms ) ) {
84 84
 			?>
85 85
 				<section class="no-forms-widget">
86
-				<strong><span class="dashicons dashicons-no-alt no-forms-found-icon"></span><?php echo sprintf( __( 'No forms found. It looks like you need to <a href="%s" title="%s">%s</a>.', 'yikes-inc-easy-mailchimp-extender' ), esc_url_raw( admin_url( 'admin.php?page=yikes-inc-easy-mailchimp' ) ), __( 'Create a form' , 'yikes-inc-easy-mailchimp-extender' ), __( 'create a form' , 'yikes-inc-easy-mailchimp-extender' ) ); ?></strong>
86
+				<strong><span class="dashicons dashicons-no-alt no-forms-found-icon"></span><?php echo sprintf( __( 'No forms found. It looks like you need to <a href="%s" title="%s">%s</a>.', 'yikes-inc-easy-mailchimp-extender' ), esc_url_raw( admin_url( 'admin.php?page=yikes-inc-easy-mailchimp' ) ), __( 'Create a form', 'yikes-inc-easy-mailchimp-extender' ), __( 'create a form', 'yikes-inc-easy-mailchimp-extender' ) ); ?></strong>
87 87
 				</section>
88 88
 			<?php
89 89
 			return;
@@ -110,9 +110,9 @@  discard block
 block discarded – undo
110 110
 			$submit_text = __( 'Submit', 'yikes-inc-easy-mailchimp-extender' );
111 111
 		}
112 112
 
113
-		 if( get_option( 'yikes-mc-api-validation' , 'invalid_api_key' ) == 'invalid_api_key' ) {
113
+		 if ( get_option( 'yikes-mc-api-validation', 'invalid_api_key' ) == 'invalid_api_key' ) {
114 114
 			?>
115
-				<p class="enter-valid-api-error-widget"><strong><?php _e( 'Please enter a valid MailChimp API key to connect your site to MailChimp.' , 'yikes-inc-easy-mailchimp-extender' ); ?></strong></p>
115
+				<p class="enter-valid-api-error-widget"><strong><?php _e( 'Please enter a valid MailChimp API key to connect your site to MailChimp.', 'yikes-inc-easy-mailchimp-extender' ); ?></strong></p>
116 116
 			<?php
117 117
 			return;
118 118
 		}
@@ -129,9 +129,9 @@  discard block
 block discarded – undo
129 129
 			<select id="<?php echo $this->get_field_id( 'form_id' ); ?>" name="<?php echo $this->get_field_name( 'form_id' ); ?>" class="widefat">
130 130
 				<?php
131 131
 				// build our array
132
-				foreach( $all_forms as $id => $form ) {
132
+				foreach ( $all_forms as $id => $form ) {
133 133
 					?>
134
-						<option <?php selected( $selected_form , $id ); ?> name="<?php echo $this->get_field_name( 'form_id' ); ?>" value="<?php echo $id; ?>"><?php echo stripslashes( $form['form_name'] ); ?></option>
134
+						<option <?php selected( $selected_form, $id ); ?> name="<?php echo $this->get_field_name( 'form_id' ); ?>" value="<?php echo $id; ?>"><?php echo stripslashes( $form[ 'form_name' ] ); ?></option>
135 135
 					<?php
136 136
 				}
137 137
 				?>
@@ -140,7 +140,7 @@  discard block
 block discarded – undo
140 140
 
141 141
 		<p>
142 142
 			<label for="<?php echo $this->get_field_id( 'form_description' ); ?>"><?php _e( 'Display Form Description:' ); ?></label>
143
-			<input class="widefat" id="<?php echo $this->get_field_id( 'form_description' ); ?>" name="<?php echo $this->get_field_name( 'form_description' ); ?>" type="checkbox" value="1" <?php if( isset( $instance['form_description'] ) ) { checked( $instance['form_description'] , 1 ); } ?> />
143
+			<input class="widefat" id="<?php echo $this->get_field_id( 'form_description' ); ?>" name="<?php echo $this->get_field_name( 'form_description' ); ?>" type="checkbox" value="1" <?php if ( isset( $instance[ 'form_description' ] ) ) { checked( $instance[ 'form_description' ], 1 ); } ?> />
144 144
 		</p>
145 145
 
146 146
 		<p>
@@ -153,10 +153,10 @@  discard block
 block discarded – undo
153 153
 	// Updating widget replacing old instances with new
154 154
 	public function update( $new_instance, $old_instance ) {
155 155
 		$instance = array();
156
-		$instance['title'] = ( ! empty( $new_instance['title'] ) ) ? strip_tags( $new_instance['title'] ) : '';
157
-		$instance['form_id'] = $new_instance['form_id'];
158
-		$instance['form_description'] = isset( $new_instance['form_description'] ) ? '1' : '';
159
-		$instance['submit_text'] = ( ! empty( $new_instance['submit_text'] ) ) ? strip_tags( $new_instance['submit_text'] ) : 'Submit';
156
+		$instance[ 'title' ] = ( ! empty( $new_instance[ 'title' ] ) ) ? strip_tags( $new_instance[ 'title' ] ) : '';
157
+		$instance[ 'form_id' ] = $new_instance[ 'form_id' ];
158
+		$instance[ 'form_description' ] = isset( $new_instance[ 'form_description' ] ) ? '1' : '';
159
+		$instance[ 'submit_text' ] = ( ! empty( $new_instance[ 'submit_text' ] ) ) ? strip_tags( $new_instance[ 'submit_text' ] ) : 'Submit';
160 160
 		return $instance;
161 161
 	}
162 162
 	
Please login to merge, or discard this patch.
includes/api/class-yikes-inc-easy-mailchimp-api-lists.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -174,7 +174,7 @@  discard block
 block discarded – undo
174 174
 		$email_field = apply_filters( 'yikes-easy-mailchimp-email-address-field', $email_field, $list_id );
175 175
 
176 176
 		array_unshift( $merge_fields, $email_field );
177
-		$merge_object['merge_fields'] = $merge_fields;
177
+		$merge_object[ 'merge_fields' ] = $merge_fields;
178 178
 		set_transient( "yikes_eme_merge_variables_{$list_id}", $merge_object, HOUR_IN_SECONDS );
179 179
 
180 180
 		return $merge_object;
@@ -195,8 +195,8 @@  discard block
 block discarded – undo
195 195
 	* @return array | WP_Error
196 196
 	*/
197 197
 	public function update_merge_field( $list_id, $field_id, $field_data, $clear_transient = true ) {
198
-		$path	= "{$this->base_path}/{$list_id}/merge-fields/{$field_id}";
199
-		$field	= $this->patch_to_api( $path, $field_data );
198
+		$path = "{$this->base_path}/{$list_id}/merge-fields/{$field_id}";
199
+		$field = $this->patch_to_api( $path, $field_data );
200 200
 
201 201
 		if ( is_wp_error( $field ) ) {
202 202
 			return $field;
@@ -244,7 +244,7 @@  discard block
 block discarded – undo
244 244
 				return $interests;
245 245
 			}
246 246
 
247
-			$category['items'] = $interests;
247
+			$category[ 'items' ] = $interests;
248 248
 		}
249 249
 
250 250
 		set_transient( "yikes_eme_interest_categories_{$list_id}", $categories, HOUR_IN_SECONDS );
Please login to merge, or discard this patch.
admin/partials/menu/manage-lists.php 1 patch
Spacing   +28 added lines, -28 removed lines patch added patch discarded remove patch
@@ -27,16 +27,16 @@  discard block
 block discarded – undo
27 27
 ?>
28 28
 <div class="wrap">
29 29
 	<!-- Freddie Logo -->
30
-	<img src="<?php echo YIKES_MC_URL . 'includes/images/MailChimp_Assets/Freddie_60px.png'; ?>" alt="<?php __( 'Freddie - MailChimp Mascot' , 'yikes-inc-easy-mailchimp-extender' ); ?>" class="yikes-mc-freddie-logo" />
30
+	<img src="<?php echo YIKES_MC_URL . 'includes/images/MailChimp_Assets/Freddie_60px.png'; ?>" alt="<?php __( 'Freddie - MailChimp Mascot', 'yikes-inc-easy-mailchimp-extender' ); ?>" class="yikes-mc-freddie-logo" />
31 31
 
32
-	<h1>Easy Forms for MailChimp | <?php _e( 'Manage Mailing Lists' , 'yikes-inc-easy-mailchimp-extender' ); ?></h1>
32
+	<h1>Easy Forms for MailChimp | <?php _e( 'Manage Mailing Lists', 'yikes-inc-easy-mailchimp-extender' ); ?></h1>
33 33
 
34 34
 	<!-- Settings Page Description -->
35
-	<p class="yikes-easy-mc-about-text about-text"><?php _e( 'Make edits to your MailChimp lists.' , 'yikes-inc-easy-mailchimp-extender' ); ?></p>
35
+	<p class="yikes-easy-mc-about-text about-text"><?php _e( 'Make edits to your MailChimp lists.', 'yikes-inc-easy-mailchimp-extender' ); ?></p>
36 36
 
37 37
 	<?php
38 38
 		/* If the user hasn't authenticated yet, lets kill off */
39
-		if( get_option( 'yikes-mc-api-validation' , 'invalid_api_key' ) != 'valid_api_key' ) {
39
+		if ( get_option( 'yikes-mc-api-validation', 'invalid_api_key' ) != 'valid_api_key' ) {
40 40
 
41 41
 			$error_string = sprintf(
42 42
 				esc_html__( 'You need to connect to MailChimp before you can start creating forms. Head over to the %s and enter your API key.', 'yikes-inc-easy-mailchimp-extender' ),
@@ -72,8 +72,8 @@  discard block
 block discarded – undo
72 72
 									<!-- TABLE HEAD -->
73 73
 									<thead>
74 74
 										<tr>
75
-											<th id="columnname" class="manage-column column-columnname" scope="col"><?php _e( 'List Name' , 'yikes-inc-easy-mailchimp-extender' ); ?></th>
76
-											<th id="columnname" class="manage-column column-columnname num" scope="col"><?php _e( 'Subscriber Count' , 'yikes-inc-easy-mailchimp-extender' ); ?></th>
75
+											<th id="columnname" class="manage-column column-columnname" scope="col"><?php _e( 'List Name', 'yikes-inc-easy-mailchimp-extender' ); ?></th>
76
+											<th id="columnname" class="manage-column column-columnname num" scope="col"><?php _e( 'Subscriber Count', 'yikes-inc-easy-mailchimp-extender' ); ?></th>
77 77
 										</tr>
78 78
 									</thead>
79 79
 									<!-- end header -->
@@ -81,25 +81,25 @@  discard block
 block discarded – undo
81 81
 									<!-- FOOTER -->
82 82
 									<tfoot>
83 83
 										<tr>
84
-											<th class="manage-column column-columnname" scope="col"><?php _e( 'List Name' , 'yikes-inc-easy-mailchimp-extender' ); ?></th>
85
-											<th class="manage-column column-columnname num" scope="col"><?php _e( 'Subscriber Count' , 'yikes-inc-easy-mailchimp-extender' ); ?></th>
84
+											<th class="manage-column column-columnname" scope="col"><?php _e( 'List Name', 'yikes-inc-easy-mailchimp-extender' ); ?></th>
85
+											<th class="manage-column column-columnname num" scope="col"><?php _e( 'Subscriber Count', 'yikes-inc-easy-mailchimp-extender' ); ?></th>
86 86
 										</tr>
87 87
 									</tfoot>
88 88
 									<!-- end footer -->
89 89
 
90 90
 									<!-- TABLE BODY -->
91 91
 									<tbody>
92
-										<?php if( count( $list_data ) > 0 ) {
92
+										<?php if ( count( $list_data ) > 0 ) {
93 93
 											$i = 1;
94
-											foreach( $list_data as $list ) {
94
+											foreach ( $list_data as $list ) {
95 95
 												?>
96
-												<tr class="<?php if( $i % 2 == 0 ) { echo 'alternate'; } ?>">
96
+												<tr class="<?php if ( $i % 2 == 0 ) { echo 'alternate'; } ?>">
97 97
 													<td class="column-columnname">
98
-														<a href="<?php echo esc_url_raw( add_query_arg( array( 'list-id' => $list['id'] ) , admin_url( 'admin.php?page=yikes-mailchimp-view-list' ) ) ); ?>" class="row-title">
99
-															<?php echo stripslashes( $list['name'] ); ?>
98
+														<a href="<?php echo esc_url_raw( add_query_arg( array( 'list-id' => $list[ 'id' ] ), admin_url( 'admin.php?page=yikes-mailchimp-view-list' ) ) ); ?>" class="row-title">
99
+															<?php echo stripslashes( $list[ 'name' ] ); ?>
100 100
 														</a>
101 101
 														<div class="row-actions">
102
-															<span><a href="<?php echo esc_url_raw( add_query_arg( array( 'list-id' => $list['id'] ) , admin_url( 'admin.php?page=yikes-mailchimp-view-list' ) ) ); ?>"><?php _e( "View" , 'yikes-inc-easy-mailchimp-extender' ); ?></a></span>
102
+															<span><a href="<?php echo esc_url_raw( add_query_arg( array( 'list-id' => $list[ 'id' ] ), admin_url( 'admin.php?page=yikes-mailchimp-view-list' ) ) ); ?>"><?php _e( "View", 'yikes-inc-easy-mailchimp-extender' ); ?></a></span>
103 103
 															<?php
104 104
 																/*
105 105
 																*	Custom action to allow users to add additional action links
@@ -109,7 +109,7 @@  discard block
 block discarded – undo
109 109
 															?>
110 110
 														</div>
111 111
 													</td>
112
-													<td class="column-columnname num"><?php echo $list['stats']['member_count']; ?></td>
112
+													<td class="column-columnname num"><?php echo $list[ 'stats' ][ 'member_count' ]; ?></td>
113 113
 												</tr>
114 114
 												<?php
115 115
 												$i++;
@@ -117,7 +117,7 @@  discard block
 block discarded – undo
117 117
 											} else {
118 118
 											?>
119 119
 											<tr class="no-items">
120
-												<td class="colspanchange no-mailchimp-lists-found" colspan="3"><em><?php printf( __( 'No MailChimp lists found. Head over to <a href="%s" title="MailChimp.com">MailChimp.com</a> to setup your first mailing list. Once thats done you can head back here to customize it!' , 'yikes-inc-easy-mailchimp-extender' ), esc_url( 'http://mailchimp.com/' ) ); ?></em></td>
120
+												<td class="colspanchange no-mailchimp-lists-found" colspan="3"><em><?php printf( __( 'No MailChimp lists found. Head over to <a href="%s" title="MailChimp.com">MailChimp.com</a> to setup your first mailing list. Once thats done you can head back here to customize it!', 'yikes-inc-easy-mailchimp-extender' ), esc_url( 'http://mailchimp.com/' ) ); ?></em></td>
121 121
 											</tr>
122 122
 										<?php } ?>
123 123
 									</tbody>
@@ -137,8 +137,8 @@  discard block
 block discarded – undo
137 137
 					<div class="postbox yikes-easy-mc-postbox">
138 138
 						<div class="inside">
139 139
 
140
-							<a href="https://us3.admin.mailchimp.com/" title="<?php _e( 'MailChimp Site' , 'yikes-inc-easy-mailchimp-extender' ); ?>" target="_blank">
141
-								<img src="<?php echo YIKES_MC_URL . 'includes/images/Welcome_Page/mailchimp-logo.png'; ?>" title="<?php _e( 'MailChimp Site' , 'yikes-inc-easy-mailchimp-extender' ); ?>" class="list-page-mailchimp-logo">
140
+							<a href="https://us3.admin.mailchimp.com/" title="<?php _e( 'MailChimp Site', 'yikes-inc-easy-mailchimp-extender' ); ?>" target="_blank">
141
+								<img src="<?php echo YIKES_MC_URL . 'includes/images/Welcome_Page/mailchimp-logo.png'; ?>" title="<?php _e( 'MailChimp Site', 'yikes-inc-easy-mailchimp-extender' ); ?>" class="list-page-mailchimp-logo">
142 142
 							</a>
143 143
 
144 144
 						</div>
@@ -148,42 +148,42 @@  discard block
 block discarded – undo
148 148
 					<div class="postbox yikes-easy-mc-postbox list-page-sidebar">
149 149
 						<div class="inside">
150 150
 
151
-							<h2 class="account-status"><?php echo $account_details['username']; ?> <small>(<?php echo $account_details['role']; ?>)</small></h2>
151
+							<h2 class="account-status"><?php echo $account_details[ 'username' ]; ?> <small>(<?php echo $account_details[ 'role' ]; ?>)</small></h2>
152 152
 
153
-							<img class="mailchimp-avatar" src="<?php echo esc_url_raw( $account_details['avatar_url'] ); ?>" title="<?php echo $account_details['username'] . ' ' . __( "MailChimp avatar" , 'yikes-inc-easy-mailchimp-extender' ); ?>">
153
+							<img class="mailchimp-avatar" src="<?php echo esc_url_raw( $account_details[ 'avatar_url' ] ); ?>" title="<?php echo $account_details[ 'username' ] . ' ' . __( "MailChimp avatar", 'yikes-inc-easy-mailchimp-extender' ); ?>">
154 154
 
155 155
 							<table class="form-table" id="account-details-table">
156 156
 								<tr valign="top">
157 157
 									<td scope="row">
158 158
 										<label for="tablecell">
159
-											<strong><?php _e( 'Company' , 'yikes-inc-easy-mailchimp-extender' ); ?></strong>
159
+											<strong><?php _e( 'Company', 'yikes-inc-easy-mailchimp-extender' ); ?></strong>
160 160
 										</label>
161 161
 									</td>
162
-									<td><?php echo $account_details['contact']['company']; ?><br /><?php echo $account_details['contact']['city'] . ', ' . $account_details['contact']['state']; ?></td>
162
+									<td><?php echo $account_details[ 'contact' ][ 'company' ]; ?><br /><?php echo $account_details[ 'contact' ][ 'city' ] . ', ' . $account_details[ 'contact' ][ 'state' ]; ?></td>
163 163
 								</tr>
164 164
 								<tr valign="top">
165 165
 									<td scope="row">
166 166
 										<label for="tablecell">
167
-											<strong><?php _e( 'Industry' , 'yikes-inc-easy-mailchimp-extender' ); ?></strong>
167
+											<strong><?php _e( 'Industry', 'yikes-inc-easy-mailchimp-extender' ); ?></strong>
168 168
 										</label>
169 169
 									</td>
170
-									<td><?php echo $account_details['account_industry']; ?></td>
170
+									<td><?php echo $account_details[ 'account_industry' ]; ?></td>
171 171
 								</tr>
172 172
 								<tr valign="top">
173 173
 									<td scope="row">
174 174
 										<label for="tablecell">
175
-											<strong><?php _e( 'Member Since' , 'yikes-inc-easy-mailchimp-extender' ); ?></strong>
175
+											<strong><?php _e( 'Member Since', 'yikes-inc-easy-mailchimp-extender' ); ?></strong>
176 176
 										</label>
177 177
 									</td>
178
-									<td><?php echo date( get_option('date_format') , strtotime( $account_details['member_since'] ) ); ?></td>
178
+									<td><?php echo date( get_option( 'date_format' ), strtotime( $account_details[ 'member_since' ] ) ); ?></td>
179 179
 								</tr>
180 180
 								<tr valign="top">
181 181
 									<td scope="row">
182 182
 										<label for="tablecell">
183
-											<strong><?php _e( 'Plan Type' , 'yikes-inc-easy-mailchimp-extender' ); ?></strong>
183
+											<strong><?php _e( 'Plan Type', 'yikes-inc-easy-mailchimp-extender' ); ?></strong>
184 184
 										</label>
185 185
 									</td>
186
-									<td><?php echo ucwords( $account_details['pricing_plan_type'] ); ?></td>
186
+									<td><?php echo ucwords( $account_details[ 'pricing_plan_type' ] ); ?></td>
187 187
 								</tr>
188 188
 							</table>
189 189
 
Please login to merge, or discard this patch.
includes/error_log/class-yikes-inc-easy-mailchimp-error-logging.php 1 patch
Spacing   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -122,10 +122,10 @@  discard block
 block discarded – undo
122 122
 	*	@returned_error 
123 123
 	*	@error_type - what was running when the error occured ie (new user subscription, remove user etc)
124 124
 	*/
125
-	public function yikes_easy_mailchimp_write_to_error_log( $returned_error , $error_type , $page='' ) {
125
+	public function yikes_easy_mailchimp_write_to_error_log( $returned_error, $error_type, $page = '' ) {
126 126
 		
127 127
 		// confirm error logging is toggled on, else lets exit
128
-		if( get_option( 'yikes-mailchimp-debug-status' , '' )  != '1' ) {
128
+		if ( get_option( 'yikes-mailchimp-debug-status', '' ) != '1' ) {
129 129
 			return;
130 130
 		}
131 131
 		
@@ -171,12 +171,12 @@  discard block
 block discarded – undo
171 171
 	public function yikes_easy_mailchimp_generate_error_log_table() {		
172 172
 
173 173
 		// ensure file_get_contents exists
174
-		if( function_exists( 'file_get_contents' ) ) {	
174
+		if ( function_exists( 'file_get_contents' ) ) {	
175 175
 			// confirm that our file exists
176
-			if( file_exists( $this->error_log_file_path ) ) {
176
+			if ( file_exists( $this->error_log_file_path ) ) {
177 177
 				$error_log_contents = file_get_contents( $this->error_log_file_path, true );							
178
-				if( $error_log_contents === FALSE ) {
179
-					return _e( 'File get contents not available' , 'yikes-inc-easy-mailchimp-extender' );
178
+				if ( $error_log_contents === FALSE ) {
179
+					return _e( 'File get contents not available', 'yikes-inc-easy-mailchimp-extender' );
180 180
 				}
181 181
 				if ( $error_log_contents != '' ) {
182 182
 					// return $error_log_contents;
@@ -187,7 +187,7 @@  discard block
 block discarded – undo
187 187
 						<tr class="error-log-tr">
188 188
 							<td class="row-title colspanchange" colspan="2">
189 189
 								<strong><span class='dashicons dashicons-no-alt'></span> <?php _e( 'No errors logged.', 'yikes-inc-easy-mailchimp-extender' ); ?></strong>
190
-								<?php if( get_option( 'yikes-mailchimp-debug-status' , '' ) == '' ) { ?>
190
+								<?php if ( get_option( 'yikes-mailchimp-debug-status', '' ) == '' ) { ?>
191 191
 									<br />
192 192
 									<p class="to-start-logging-errors-notice"><em><?php _e( "To start logging errors toggle on the 'Enable Debugging' option above.", 'yikes-inc-easy-mailchimp-extender' ); ?></em></p>
193 193
 								<?php } ?>
@@ -215,7 +215,7 @@  discard block
 block discarded – undo
215 215
 									);
216 216
 									?>
217 217
 									<form id="create-error-log" method="POST" action="<?php echo $url; ?>">
218
-										<?php submit_button( __( 'Attempt to Create Error Log' , 'yikes-inc-easy-mailchimp-extender' ) , 'secondary' , '' , '' , array() ); ?>
218
+										<?php submit_button( __( 'Attempt to Create Error Log', 'yikes-inc-easy-mailchimp-extender' ), 'secondary', '', '', array() ); ?>
219 219
 									</form>
220 220
 									
221 221
 								</p>
Please login to merge, or discard this patch.
admin/partials/menu/options-sections/integration-settings.php 1 patch
Spacing   +25 added lines, -25 removed lines patch added patch discarded remove patch
@@ -54,23 +54,23 @@  discard block
 block discarded – undo
54 54
 
55 55
 	// Easy Digital Downloads.
56 56
 	if ( class_exists( 'Easy_Digital_Downloads' ) ) {
57
-		$active_plugins['easy_digital_downloads_checkout_form'] = __( 'Easy Digital Downloads Checkout', 'yikes-inc-easy-mailchimp-extender' );
57
+		$active_plugins[ 'easy_digital_downloads_checkout_form' ] = __( 'Easy Digital Downloads Checkout', 'yikes-inc-easy-mailchimp-extender' );
58 58
 	}
59 59
 	// WooCommerce.
60 60
 	if ( class_exists( 'WooCommerce' ) ) {
61
-		$active_plugins['woocommerce_checkout_form'] = __( 'WooCommerce Checkout', 'yikes-inc-easy-mailchimp-extender' );
61
+		$active_plugins[ 'woocommerce_checkout_form' ] = __( 'WooCommerce Checkout', 'yikes-inc-easy-mailchimp-extender' );
62 62
 	}
63 63
 	// BuddyPress.
64 64
 	if ( class_exists( 'BuddyPress' ) ) {
65
-		$active_plugins['buddypress_form'] = __( 'BuddyPress Registration', 'yikes-inc-easy-mailchimp-extender' );
65
+		$active_plugins[ 'buddypress_form' ] = __( 'BuddyPress Registration', 'yikes-inc-easy-mailchimp-extender' );
66 66
 	}
67 67
 	// bbPress.
68 68
 	if ( class_exists( 'bbPress' ) ) {
69
-		$active_plugins['bbpress_forms'] = __( 'bbPress', 'yikes-inc-easy-mailchimp-extender' );
69
+		$active_plugins[ 'bbpress_forms' ] = __( 'bbPress', 'yikes-inc-easy-mailchimp-extender' );
70 70
 	}
71 71
 	// Contact Form 7.
72 72
 	if ( is_plugin_active( 'contact-form-7/wp-contact-form-7.php' ) ) {
73
-		$active_plugins['contact_form_7'] = __( 'Contact Form 7', 'yikes-inc-easy-mailchimp-extender' );
73
+		$active_plugins[ 'contact_form_7' ] = __( 'Contact Form 7', 'yikes-inc-easy-mailchimp-extender' );
74 74
 	}
75 75
 
76 76
 	// store our checkbox options.
@@ -87,7 +87,7 @@  discard block
 block discarded – undo
87 87
 			$error_logging = new Yikes_Inc_Easy_Mailchimp_Error_Logging();
88 88
 			$error_logging->maybe_write_to_log(
89 89
 				$list_data->get_error_code(),
90
-				__( "Get Account Lists" , 'yikes-inc-easy-mailchimp-extender' ),
90
+				__( "Get Account Lists", 'yikes-inc-easy-mailchimp-extender' ),
91 91
 				"Integration Settings Page"
92 92
 			);
93 93
 		}
@@ -118,26 +118,26 @@  discard block
 block discarded – undo
118 118
 		<?php
119 119
 			if ( ! empty( $active_plugins ) ) {
120 120
 
121
-				foreach( $active_plugins as $class => $value ) {
121
+				foreach ( $active_plugins as $class => $value ) {
122 122
 
123
-					$checked              = isset( $options[$class]['value'] ) ? 'checked="checked"' : '';
124
-					$hidden               = ! isset( $options[$class]['value'] ) ? 'yikes-easy-mc-hidden' : '';
125
-					$checkbox_label       = isset( $options[$class]['label'] ) ? esc_attr( $options[$class]['label'] ) : '';
126
-					$precheck_checkbox    = isset( $options[$class]['precheck'] ) ? $options[$class]['precheck'] : '';
127
-					$selected_list        = isset( $options[$class]['associated-list'] ) ? $options[$class]['associated-list'] : '-';
128
-					$list_interest_groups = isset( $options[$class]['interest-groups'] ) ? $options[$class]['interest-groups'] : false;
123
+					$checked              = isset( $options[ $class ][ 'value' ] ) ? 'checked="checked"' : '';
124
+					$hidden               = ! isset( $options[ $class ][ 'value' ] ) ? 'yikes-easy-mc-hidden' : '';
125
+					$checkbox_label       = isset( $options[ $class ][ 'label' ] ) ? esc_attr( $options[ $class ][ 'label' ] ) : '';
126
+					$precheck_checkbox    = isset( $options[ $class ][ 'precheck' ] ) ? $options[ $class ][ 'precheck' ] : '';
127
+					$selected_list        = isset( $options[ $class ][ 'associated-list' ] ) ? $options[ $class ][ 'associated-list' ] : '-';
128
+					$list_interest_groups = isset( $options[ $class ][ 'interest-groups' ] ) ? $options[ $class ][ 'interest-groups' ] : false;
129 129
 
130 130
 					// Force the selected list to be an array (@since 6.4).
131 131
 					$selected_list        = is_array( $selected_list ) ? $selected_list : array( $selected_list );
132 132
 					?>
133 133
 						<li class="yikes-mailchimp-checkbox-integration-item">
134 134
 							<label>
135
-								<input type="checkbox" name="optin-checkbox-init[<?php echo $class; ?>][value]" value="on" <?php echo $checked; ?> onclick="jQuery(this).parents('li').next().stop().slideToggle();"><?php echo ucwords( $value ); ?><span class="dashicons dashicons-editor-help"></span><div class="tooltiptext qtip-bootstrap" style="display:none;"><?php echo $class_descriptions[$class]; ?></div>
135
+								<input type="checkbox" name="optin-checkbox-init[<?php echo $class; ?>][value]" value="on" <?php echo $checked; ?> onclick="jQuery(this).parents('li').next().stop().slideToggle();"><?php echo ucwords( $value ); ?><span class="dashicons dashicons-editor-help"></span><div class="tooltiptext qtip-bootstrap" style="display:none;"><?php echo $class_descriptions[ $class ]; ?></div>
136 136
 							</label>
137 137
 						</li>
138 138
 						<!-- checkbox settings, text - associated list etc. -->
139 139
 						<li class="optin-checkbox-init[<?php echo $class; ?>]-settings <?php echo $hidden; ?>">
140
-							<?php if( $class == 'contact_form_7' ) { ?>
140
+							<?php if ( $class == 'contact_form_7' ) { ?>
141 141
 								<p style="margin-top:0;"><small class="contact-form-7-notice"><?php printf( __( 'Use %s in Contact Form 7 to display the checkbox.', 'yikes-inc-easy-mailchimp-extender' ), '<code>[yikes_mailchimp_checkbox]</code>' ); ?></small></p>
142 142
 							<?php } ?>
143 143
 							<p style="margin-top:0;padding-top:0;margin-bottom:0;padding-bottom:0;">
@@ -147,24 +147,24 @@  discard block
 block discarded – undo
147 147
 									<?php
148 148
 									if ( count( $list_data ) > 0 ) {
149 149
 									?>
150
-										<?php foreach( $list_data as $list ) { ?>
150
+										<?php foreach ( $list_data as $list ) { ?>
151 151
 
152 152
 											<?php
153
-												$list_interest_groups = isset( $list_interest_groups[ $list['id'] ] ) ? $list_interest_groups[ $list['id'] ] : $list_interest_groups;
153
+												$list_interest_groups = isset( $list_interest_groups[ $list[ 'id' ] ] ) ? $list_interest_groups[ $list[ 'id' ] ] : $list_interest_groups;
154 154
 											?>
155 155
 
156
-											<label class="yikes-mailchimp-checkbox-integration-list" for="list-<?php echo $class ?>-<?php echo $list['id']; ?>">
156
+											<label class="yikes-mailchimp-checkbox-integration-list" for="list-<?php echo $class ?>-<?php echo $list[ 'id' ]; ?>">
157 157
 												<input type="checkbox" class="checkbox-settings-list-item" data-integration="<?php echo $class; ?>" 
158 158
 													name="optin-checkbox-init[<?php echo $class; ?>][associated-list][]"
159
-													value="<?php echo $list['id']; ?>" <?php echo in_array( $list['id'], $selected_list ) ? 'checked="checked"' : ''; ?> 
160
-													id="list-<?php echo $class ?>-<?php echo $list['id']; ?>">
161
-												<?php echo $list['name']; ?>
159
+													value="<?php echo $list[ 'id' ]; ?>" <?php echo in_array( $list[ 'id' ], $selected_list ) ? 'checked="checked"' : ''; ?> 
160
+													id="list-<?php echo $class ?>-<?php echo $list[ 'id' ]; ?>">
161
+												<?php echo $list[ 'name' ]; ?>
162 162
 											</label>
163 163
 
164 164
 											<!-- If interest groups have been selected already, load them here -->
165 165
 											<?php
166
-											if ( in_array( $list['id'], $selected_list ) && $list_interest_groups ) {
167
-												YIKES_Inc_Easy_MailChimp_Process_Ajax::check_list_for_interest_groups( $list['id'], $class, true );
166
+											if ( in_array( $list[ 'id' ], $selected_list ) && $list_interest_groups ) {
167
+												YIKES_Inc_Easy_MailChimp_Process_Ajax::check_list_for_interest_groups( $list[ 'id' ], $class, true );
168 168
 											}
169 169
 											?>
170 170
 
@@ -185,8 +185,8 @@  discard block
 block discarded – undo
185 185
 								<label class="optin-checkbox-label">
186 186
 									<strong><?php _e( 'Precheck Checkbox?', 'yikes-inc-easy-mailchimp-extender' ); ?></strong>
187 187
 									<select id="optin-checkbox-init[<?php echo $class; ?>][precheck]" name="optin-checkbox-init[<?php echo $class; ?>][precheck]" class="optin-checkbox-init[<?php echo $class; ?>][precheck] checkbox-settings-list-dropdown">
188
-										<option value="true" <?php selected( $precheck_checkbox , 'true' ); ?>><?php _e( 'Yes', 'yikes-inc-easy-mailchimp-extender' ); ?></option>
189
-										<option value="false" <?php selected( $precheck_checkbox , 'false' ); ?>><?php _e( 'No', 'yikes-inc-easy-mailchimp-extender' ); ?></option>
188
+										<option value="true" <?php selected( $precheck_checkbox, 'true' ); ?>><?php _e( 'Yes', 'yikes-inc-easy-mailchimp-extender' ); ?></option>
189
+										<option value="false" <?php selected( $precheck_checkbox, 'false' ); ?>><?php _e( 'No', 'yikes-inc-easy-mailchimp-extender' ); ?></option>
190 190
 									</select>
191 191
 								</label>
192 192
 							</p>
Please login to merge, or discard this patch.
partials/menu/options-sections/templates/integration-interest-groups.php 1 patch
Spacing   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -27,13 +27,13 @@  discard block
 block discarded – undo
27 27
 		*/
28 28
 		foreach ( $interest_groupings as $id => $interest_group ) {
29 29
 
30
-			$interest_group_type      = isset( $interest_group['type'] ) ? $interest_group['type'] : '';
31
-			$interest_groups_fields   = isset( $interest_group['items'] ) ? $interest_group['items'] : array();
32
-			$selected_interest_groups = isset( $integration_options[ $integration_type ]['interest-groups'] ) ? $integration_options[ $integration_type ]['interest-groups'] : array();
33
-			$selected_interest_groups = isset( $selected_interest_groups[$list_id] ) ? $selected_interest_groups[$list_id] : $selected_interest_groups;
30
+			$interest_group_type      = isset( $interest_group[ 'type' ] ) ? $interest_group[ 'type' ] : '';
31
+			$interest_groups_fields   = isset( $interest_group[ 'items' ] ) ? $interest_group[ 'items' ] : array();
32
+			$selected_interest_groups = isset( $integration_options[ $integration_type ][ 'interest-groups' ] ) ? $integration_options[ $integration_type ][ 'interest-groups' ] : array();
33
+			$selected_interest_groups = isset( $selected_interest_groups[ $list_id ] ) ? $selected_interest_groups[ $list_id ] : $selected_interest_groups;
34 34
 			?>
35 35
 			<section class="interest-group-section">
36
-				<strong class="interest-group-section-title"><?php echo ucwords( $interest_group['title'] ); ?></strong>
36
+				<strong class="interest-group-section-title"><?php echo ucwords( $interest_group[ 'title' ] ); ?></strong>
37 37
 			<?php
38 38
 
39 39
 			/*
@@ -55,7 +55,7 @@  discard block
 block discarded – undo
55 55
 							<input type="checkbox"
56 56
 								name="optin-checkbox-init[<?php echo $integration_type; ?>][interest-groups][<?php echo $list_id; ?>][<?php echo $id; ?>][]"
57 57
 								value="<?php echo $field_id; ?>" <?php echo $checked; ?>>
58
-							<?php echo $field['name']; ?>
58
+							<?php echo $field[ 'name' ]; ?>
59 59
 						</label>
60 60
 						<?php
61 61
 					}
@@ -71,7 +71,7 @@  discard block
 block discarded – undo
71 71
 							<input type="radio"
72 72
 								name="optin-checkbox-init[<?php echo $integration_type; ?>][interest-groups][<?php echo $list_id; ?>][<?php echo $id; ?>][]"
73 73
 								value="<?php echo $field_id; ?>" <?php echo $checked; ?>>
74
-							<?php echo $field['name']; ?>
74
+							<?php echo $field[ 'name' ]; ?>
75 75
 						</label>
76 76
 						<?php
77 77
 					}
@@ -89,7 +89,7 @@  discard block
 block discarded – undo
89 89
 							}
90 90
 						?>
91 91
 							<option value="<?php echo $field_id; ?>" <?php echo $selected; ?>>
92
-								<?php echo $field['name']; ?>
92
+								<?php echo $field[ 'name' ]; ?>
93 93
 							</option>
94 94
 						<?php
95 95
 						}
Please login to merge, or discard this patch.
admin/partials/ajax/add_field_to_form.php 1 patch
Spacing   +83 added lines, -83 removed lines patch added patch discarded remove patch
@@ -1,15 +1,15 @@  discard block
 block discarded – undo
1 1
 <?php
2 2
 $form_data = array(
3
-	'field_name' => $_POST['field_name'],
4
-	'merge_tag'  => $_POST['merge_tag'],
5
-	'field_type' => $_POST['field_type'],
6
-	'list_id'    => $_POST['list_id'],
3
+	'field_name' => $_POST[ 'field_name' ],
4
+	'merge_tag'  => $_POST[ 'merge_tag' ],
5
+	'field_type' => $_POST[ 'field_type' ],
6
+	'list_id'    => $_POST[ 'list_id' ],
7 7
 );
8 8
 
9 9
 // Grab our list handler.
10 10
 $list_handler = yikes_get_mc_api_manager()->get_list_handler();
11 11
 
12
-$available_merge_variables = $list_handler->get_merge_fields( $form_data['list_id'] );
12
+$available_merge_variables = $list_handler->get_merge_fields( $form_data[ 'list_id' ] );
13 13
 if ( is_wp_error( $available_merge_variables ) ) {
14 14
 	$error_logging = new Yikes_Inc_Easy_Mailchimp_Error_Logging();
15 15
 	$error_logging->maybe_write_to_log(
@@ -28,17 +28,17 @@  discard block
 block discarded – undo
28 28
 }
29 29
 
30 30
 // find and return the location of this merge field in the array
31
-$index = $this->findMCListIndex( $form_data['merge_tag'], $available_merge_variables['merge_fields'], 'tag' );
31
+$index = $this->findMCListIndex( $form_data[ 'merge_tag' ], $available_merge_variables[ 'merge_fields' ], 'tag' );
32 32
 
33 33
 // store it and use it to pre-populate field data (only on initial add to form)
34
-$merge_field_data = $available_merge_variables['merge_fields'][ $index ];
34
+$merge_field_data = $available_merge_variables[ 'merge_fields' ][ $index ];
35 35
 ?>
36
-<section class="draggable" id="<?php echo $form_data['field_name']; ?>">
36
+<section class="draggable" id="<?php echo $form_data[ 'field_name' ]; ?>">
37 37
 	<!-- top -->
38 38
 	<a href="#" class="expansion-section-title settings-sidebar">
39
-		<span class="dashicons dashicons-plus yikes-mc-expansion-toggle" title="<?php _e( 'Expand Field' , 'yikes-inc-easy-mailchimp-extender' ); ?>"></span>
40
-		<?php echo stripslashes( $form_data['field_name'] ); ?>
41
-		<span class="field-type-text"><small><?php echo __( 'type' , 'yikes-inc-easy-mailchimp-extender' ) . ' : ' . $form_data['field_type']; ?></small></span>
39
+		<span class="dashicons dashicons-plus yikes-mc-expansion-toggle" title="<?php _e( 'Expand Field', 'yikes-inc-easy-mailchimp-extender' ); ?>"></span>
40
+		<?php echo stripslashes( $form_data[ 'field_name' ] ); ?>
41
+		<span class="field-type-text"><small><?php echo __( 'type', 'yikes-inc-easy-mailchimp-extender' ) . ' : ' . $form_data[ 'field_type' ]; ?></small></span>
42 42
 	</a>
43 43
 	<!-- expansion section -->
44 44
 	<div class="yikes-mc-settings-expansion-section">
@@ -46,14 +46,14 @@  discard block
 block discarded – undo
46 46
 		<!-- Single or Double Opt-in -->
47 47
 		<p class="type-container form-field-container"><!-- necessary to prevent skipping on slideToggle(); -->
48 48
 			<!-- store the label -->
49
-			<input type="hidden" name="field[<?php echo $merge_field_data['tag']; ?>][label]" value="<?php echo htmlspecialchars( $form_data['field_name'] ); ?>" />
50
-			<input type="hidden" name="field[<?php echo $merge_field_data['tag']; ?>][type]" value="<?php echo $form_data['field_type']; ?>" />
51
-			<input type="hidden" name="field[<?php echo $merge_field_data['tag']; ?>][merge]" value="<?php echo $merge_field_data['tag']; ?>" />
52
-			<input type="hidden" class="field-<?php echo $merge_field_data['tag']; ?>-position position-input" name="field[<?php echo $merge_field_data['tag']; ?>][position]" value="" />
49
+			<input type="hidden" name="field[<?php echo $merge_field_data[ 'tag' ]; ?>][label]" value="<?php echo htmlspecialchars( $form_data[ 'field_name' ] ); ?>" />
50
+			<input type="hidden" name="field[<?php echo $merge_field_data[ 'tag' ]; ?>][type]" value="<?php echo $form_data[ 'field_type' ]; ?>" />
51
+			<input type="hidden" name="field[<?php echo $merge_field_data[ 'tag' ]; ?>][merge]" value="<?php echo $merge_field_data[ 'tag' ]; ?>" />
52
+			<input type="hidden" class="field-<?php echo $merge_field_data[ 'tag' ]; ?>-position position-input" name="field[<?php echo $merge_field_data[ 'tag' ]; ?>][position]" value="" />
53 53
 
54
-			<?php if ( $form_data['field_type'] == 'radio' || $form_data['field_type'] == 'dropdown' ) { ?>
55
-				<?php $choices = ( isset( $merge_field_data['options']['choices'] ) ) ? esc_attr( json_encode( $merge_field_data['options']['choices'] ) ) : ''; ?>
56
-				<input type="hidden" name="field[<?php echo $merge_field_data['tag']; ?>][choices]" value='<?php echo $choices; ?>' />
54
+			<?php if ( $form_data[ 'field_type' ] == 'radio' || $form_data[ 'field_type' ] == 'dropdown' ) { ?>
55
+				<?php $choices = ( isset( $merge_field_data[ 'options' ][ 'choices' ] ) ) ? esc_attr( json_encode( $merge_field_data[ 'options' ][ 'choices' ] ) ) : ''; ?>
56
+				<input type="hidden" name="field[<?php echo $merge_field_data[ 'tag' ]; ?>][choices]" value='<?php echo $choices; ?>' />
57 57
 			<?php } ?>
58 58
 
59 59
 			<table class="form-table form-field-container">
@@ -62,15 +62,15 @@  discard block
 block discarded – undo
62 62
 					<tr valign="top">
63 63
 						<td scope="row">
64 64
 							<label for="merge-tag">
65
-								<?php _e( 'Merge Tag' , 'yikes-inc-easy-mailchimp-extender' ); ?>
65
+								<?php _e( 'Merge Tag', 'yikes-inc-easy-mailchimp-extender' ); ?>
66 66
 							</label>
67 67
 						</td>
68 68
 						<td>
69
-							<input class="widefat merge-tag-text" type="text" readonly value="<?php echo $merge_field_data['tag']; ?>">
69
+							<input class="widefat merge-tag-text" type="text" readonly value="<?php echo $merge_field_data[ 'tag' ]; ?>">
70 70
 						</td>
71 71
 					</tr>
72 72
 
73
-			<?php switch( $form_data['field_type'] ) {
73
+			<?php switch ( $form_data[ 'field_type' ] ) {
74 74
 
75 75
 					default:
76 76
 						break;
@@ -87,12 +87,12 @@  discard block
 block discarded – undo
87 87
 					<tr valign="top">
88 88
 						<td scope="row">
89 89
 							<label for="placeholder">
90
-								<?php _e( 'Placeholder' , 'yikes-inc-easy-mailchimp-extender' ); ?>
90
+								<?php _e( 'Placeholder', 'yikes-inc-easy-mailchimp-extender' ); ?>
91 91
 							</label>
92 92
 						</td>
93 93
 						<td>
94
-						<input type="text" class="widefat" name="field[<?php echo $merge_field_data['tag']; ?>][placeholder]" value="<?php echo isset( $merge_field_data['placeholder'] ) ? stripslashes( wp_strip_all_tags( $merge_field_data['placeholder'] ) ): '' ; ?>" />
95
-							<p class="description"><small><?php _e( "Assign a placeholder value to this field.", 'yikes-inc-easy-mailchimp-extender' );?></small></p>
94
+						<input type="text" class="widefat" name="field[<?php echo $merge_field_data[ 'tag' ]; ?>][placeholder]" value="<?php echo isset( $merge_field_data[ 'placeholder' ] ) ? stripslashes( wp_strip_all_tags( $merge_field_data[ 'placeholder' ] ) ) : ''; ?>" />
95
+							<p class="description"><small><?php _e( "Assign a placeholder value to this field.", 'yikes-inc-easy-mailchimp-extender' ); ?></small></p>
96 96
 						</td>
97 97
 					</tr>
98 98
 
@@ -101,27 +101,27 @@  discard block
 block discarded – undo
101 101
 					*	Loop over field types and store necessary formats
102 102
 					*	( date, birthday - dateformat ; phone - phoneformat )
103 103
 					*/
104
-					switch( $form_data['field_type'] ) {
104
+					switch ( $form_data[ 'field_type' ] ) {
105 105
 
106 106
 						/* Store the date format, for properly rendering dates on the front end */
107 107
 						case 'date':
108
-							$date_format = isset( $merge_field_data['options']['dateformat'] ) ? $merge_field_data['options']['dateformat'] : 'MM/DD/YYYY';
108
+							$date_format = isset( $merge_field_data[ 'options' ][ 'dateformat' ] ) ? $merge_field_data[ 'options' ][ 'dateformat' ] : 'MM/DD/YYYY';
109 109
 							?>
110
-							<input type="hidden" name="field[<?php echo $merge_field_data['tag']; ?>][date_format]" value="<?php echo strtolower( $date_format ); ?>" />
110
+							<input type="hidden" name="field[<?php echo $merge_field_data[ 'tag' ]; ?>][date_format]" value="<?php echo strtolower( $date_format ); ?>" />
111 111
 							<?php
112 112
 						break;
113 113
 
114 114
 						case 'birthday':
115
-							$date_format = isset( $merge_field_data['options']['dateformat'] ) ? $merge_field_data['options']['dateformat'] : 'MM/DD';
115
+							$date_format = isset( $merge_field_data[ 'options' ][ 'dateformat' ] ) ? $merge_field_data[ 'options' ][ 'dateformat' ] : 'MM/DD';
116 116
 							?>
117
-							<input type="hidden" name="field[<?php echo $merge_field_data['tag']; ?>][date_format]" value="<?php echo strtolower( $date_format ); ?>" />
117
+							<input type="hidden" name="field[<?php echo $merge_field_data[ 'tag' ]; ?>][date_format]" value="<?php echo strtolower( $date_format ); ?>" />
118 118
 							<?php
119 119
 						break;
120 120
 
121 121
 						/* Store the phone format, for properly regex pattern */
122 122
 						case 'phone':
123 123
 							?>
124
-							<input type="hidden" name="field[<?php echo $merge_field_data['tag']; ?>][phone_format]" value="<?php echo $merge_field_data['options']['phone_format']; ?>" />
124
+							<input type="hidden" name="field[<?php echo $merge_field_data[ 'tag' ]; ?>][phone_format]" value="<?php echo $merge_field_data[ 'options' ][ 'phone_format' ]; ?>" />
125 125
 							<?php
126 126
 						break;
127 127
 					}
@@ -132,13 +132,13 @@  discard block
 block discarded – undo
132 132
 						?>
133 133
 							<tr valign="top">
134 134
 								<td scope="row">
135
-									<label for="placeholder_<?php echo esc_attr( $field['merge'] ); ?>">
136
-										<?php _e( 'Placeholder' , 'yikes-inc-easy-mailchimp-extender' ); ?>
135
+									<label for="placeholder_<?php echo esc_attr( $field[ 'merge' ] ); ?>">
136
+										<?php _e( 'Placeholder', 'yikes-inc-easy-mailchimp-extender' ); ?>
137 137
 									</label>
138 138
 								</td>
139 139
 								<td>
140
-									<input type="checkbox" class="widefat" name="field[<?php echo $merge_field_data['tag']; ?>][placeholder]" value="1" />
141
-									<span class="description"><small><?php _e( "Use placeholders for this field (these will be automatically filled in with field names).", 'yikes-inc-easy-mailchimp-extender' );?></small></span>
140
+									<input type="checkbox" class="widefat" name="field[<?php echo $merge_field_data[ 'tag' ]; ?>][placeholder]" value="1" />
141
+									<span class="description"><small><?php _e( "Use placeholders for this field (these will be automatically filled in with field names).", 'yikes-inc-easy-mailchimp-extender' ); ?></small></span>
142 142
 								</td>
143 143
 							</tr>
144 144
 						<?php
@@ -148,7 +148,7 @@  discard block
 block discarded – undo
148 148
 			?>
149 149
 
150 150
 				<!-- Default Value -->
151
-				<?php switch( $form_data['field_type'] ) {
151
+				<?php switch ( $form_data[ 'field_type' ] ) {
152 152
 
153 153
 					default:
154 154
 					case 'text':
@@ -156,17 +156,17 @@  discard block
 block discarded – undo
156 156
 						<tr valign="top">
157 157
 							<td scope="row">
158 158
 								<label for="placeholder">
159
-									<?php _e( 'Default Value' , 'yikes-inc-easy-mailchimp-extender' ); ?>
159
+									<?php _e( 'Default Value', 'yikes-inc-easy-mailchimp-extender' ); ?>
160 160
 								</label>
161 161
 							</td>
162 162
 							<td>
163
-								<input type="text" class="widefat" name="field[<?php echo $merge_field_data['tag']; ?>][default]" <?php if( $form_data['field_type'] != 'url' ) { ?> value="<?php echo isset( $merge_field_data['default_value'] ) ? stripslashes( wp_strip_all_tags( $merge_field_data['default_value'] ) ) : ''; ?>" <?php } else { ?> value="<?php echo isset( $merge_field_data['default_value'] ) ? stripslashes( wp_strip_all_tags( esc_url_raw( $merge_field_data['default_value'] ) ) ) : ''; } ?>" />
164
-								<p class="description"><small><?php _e( "Assign a default value to populate this field with on initial page load.", 'yikes-inc-easy-mailchimp-extender' );?></small></p>
163
+								<input type="text" class="widefat" name="field[<?php echo $merge_field_data[ 'tag' ]; ?>][default]" <?php if ( $form_data[ 'field_type' ] != 'url' ) { ?> value="<?php echo isset( $merge_field_data[ 'default_value' ] ) ? stripslashes( wp_strip_all_tags( $merge_field_data[ 'default_value' ] ) ) : ''; ?>" <?php } else { ?> value="<?php echo isset( $merge_field_data[ 'default_value' ] ) ? stripslashes( wp_strip_all_tags( esc_url_raw( $merge_field_data[ 'default_value' ] ) ) ) : ''; } ?>" />
164
+								<p class="description"><small><?php _e( "Assign a default value to populate this field with on initial page load.", 'yikes-inc-easy-mailchimp-extender' ); ?></small></p>
165 165
 								<?php
166
-								switch ( $form_data['field_type'] ) {
166
+								switch ( $form_data[ 'field_type' ] ) {
167 167
 									case 'text':
168 168
 										?>
169
-										<p><small class="pre-defined-tag-link"><a href="#TB_inline?width=600&height=550&inlineId=pre-defined-tag-container" class="thickbox" onclick="storeGlobalClicked( jQuery( this ) );"><?php _e( 'View Pre-Defined Tags' , 'yikes-inc-easy-mailchimp-extender' ); ?></a></small></p>
169
+										<p><small class="pre-defined-tag-link"><a href="#TB_inline?width=600&height=550&inlineId=pre-defined-tag-container" class="thickbox" onclick="storeGlobalClicked( jQuery( this ) );"><?php _e( 'View Pre-Defined Tags', 'yikes-inc-easy-mailchimp-extender' ); ?></a></small></p>
170 170
 										<?php
171 171
 									break;
172 172
 								} ?>
@@ -180,28 +180,28 @@  discard block
 block discarded – undo
180 180
 							<tr valign="top">
181 181
 								<td scope="row">
182 182
 									<label for="placeholder">
183
-										<?php _e( 'Default Selection' , 'yikes-inc-easy-mailchimp-extender' ); ?>
183
+										<?php _e( 'Default Selection', 'yikes-inc-easy-mailchimp-extender' ); ?>
184 184
 									</label>
185 185
 								</td>
186 186
 								<td>
187
-									<?php $pre_selected = ! empty( $merge_field_data['default_choice'] ) ? $merge_field_data['default_choice'] : 'no-default'; ?>
188
-									<label for="<?php echo $merge_field_data['tag'] . '-no-default'; ?>">
189
-										<input id="<?php echo $merge_field_data['tag'] . '-no-default'; ?>"
187
+									<?php $pre_selected = ! empty( $merge_field_data[ 'default_choice' ] ) ? $merge_field_data[ 'default_choice' ] : 'no-default'; ?>
188
+									<label for="<?php echo $merge_field_data[ 'tag' ] . '-no-default'; ?>">
189
+										<input id="<?php echo $merge_field_data[ 'tag' ] . '-no-default'; ?>"
190 190
 										       type="radio"
191
-										       name="field[<?php echo $merge_field_data['tag']; ?>][default_choice]"
191
+										       name="field[<?php echo $merge_field_data[ 'tag' ]; ?>][default_choice]"
192 192
 										       value="no-default" <?php checked( $pre_selected, 'no-default' ); ?>
193 193
 										>
194 194
 										No Default&nbsp;
195 195
 									</label>
196 196
 									<?php
197 197
 									$x = 0;
198
-									foreach ( $merge_field_data['options']['choices'] as $choice => $value ) { ?>
198
+									foreach ( $merge_field_data[ 'options' ][ 'choices' ] as $choice => $value ) { ?>
199 199
 										<label>
200
-											<input type="radio" name="field[<?php echo $merge_field_data['tag']; ?>][default_choice]" value="<?php echo $x; ?>" <?php checked( $pre_selected, $choice ); ?>><?php echo $value; ?>
200
+											<input type="radio" name="field[<?php echo $merge_field_data[ 'tag' ]; ?>][default_choice]" value="<?php echo $x; ?>" <?php checked( $pre_selected, $choice ); ?>><?php echo $value; ?>
201 201
 										</label>
202 202
 										<?php $x++;
203 203
 									} ?>
204
-									<p class="description"><small><?php _e( "Select the option that should be selected by default.", 'yikes-inc-easy-mailchimp-extender' );?></small></p>
204
+									<p class="description"><small><?php _e( "Select the option that should be selected by default.", 'yikes-inc-easy-mailchimp-extender' ); ?></small></p>
205 205
 								</td>
206 206
 							</tr>
207 207
 
@@ -213,18 +213,18 @@  discard block
 block discarded – undo
213 213
 							<tr valign="top">
214 214
 								<td scope="row">
215 215
 									<label for="placeholder">
216
-										<?php _e( 'Default Selection' , 'yikes-inc-easy-mailchimp-extender' ); ?>
216
+										<?php _e( 'Default Selection', 'yikes-inc-easy-mailchimp-extender' ); ?>
217 217
 									</label>
218 218
 								</td>
219 219
 								<td>
220
-									<select type="default" name="field[<?php echo $merge_field_data['tag']; ?>][default_choice]">
221
-										<?php $pre_selected = ! empty( $merge_field_data['default_choice'] ) ? $merge_field_data['default_choice'] : 'no-default'; ?>
220
+									<select type="default" name="field[<?php echo $merge_field_data[ 'tag' ]; ?>][default_choice]">
221
+										<?php $pre_selected = ! empty( $merge_field_data[ 'default_choice' ] ) ? $merge_field_data[ 'default_choice' ] : 'no-default'; ?>
222 222
 										<option value="no-default" <?php selected( $pre_selected, $choice ); ?>>No Default</option>
223
-										<?php foreach ( $merge_field_data['options']['choices'] as $choice => $value ) { ?>
223
+										<?php foreach ( $merge_field_data[ 'options' ][ 'choices' ] as $choice => $value ) { ?>
224 224
 											<option value="<?php echo $choice; ?>" <?php selected( $pre_selected, $choice ); ?>><?php echo stripslashes( $value ); ?></option>
225 225
 										<?php } ?>
226 226
 									</select>
227
-									<p class="description"><small><?php _e( "Which option should be selected by default?", 'yikes-inc-easy-mailchimp-extender' );?></small></p>
227
+									<p class="description"><small><?php _e( "Which option should be selected by default?", 'yikes-inc-easy-mailchimp-extender' ); ?></small></p>
228 228
 								</td>
229 229
 							</tr>
230 230
 
@@ -237,77 +237,77 @@  discard block
 block discarded – undo
237 237
 				<tr valign="top">
238 238
 					<td scope="row">
239 239
 						<label for="placeholder">
240
-							<?php _e( 'Description' , 'yikes-inc-easy-mailchimp-extender' ); ?>
240
+							<?php _e( 'Description', 'yikes-inc-easy-mailchimp-extender' ); ?>
241 241
 						</label>
242 242
 					</td>
243 243
 					<td>
244
-						<textarea class="widefat field-description-input" name="field[<?php echo $merge_field_data['tag']; ?>][description]"></textarea>
245
-						<p class="description"><small><?php _e( "Enter the description for the form field. This will be displayed to the user and provide some direction on how the field should be filled out or selected.", 'yikes-inc-easy-mailchimp-extender' );?></small></p>
244
+						<textarea class="widefat field-description-input" name="field[<?php echo $merge_field_data[ 'tag' ]; ?>][description]"></textarea>
245
+						<p class="description"><small><?php _e( "Enter the description for the form field. This will be displayed to the user and provide some direction on how the field should be filled out or selected.", 'yikes-inc-easy-mailchimp-extender' ); ?></small></p>
246 246
 					</td>
247 247
 				</tr>
248 248
 				<!-- Description Above Field -->
249 249
 				<tr valign="top">
250 250
 					<td scope="row">
251
-						<label for="description_above_<?php echo esc_attr( $merge_field_data['tag'] ); ?>">
252
-							<?php _e( 'Description Above Field' , 'yikes-inc-easy-mailchimp-extender' ); ?>
251
+						<label for="description_above_<?php echo esc_attr( $merge_field_data[ 'tag' ] ); ?>">
252
+							<?php _e( 'Description Above Field', 'yikes-inc-easy-mailchimp-extender' ); ?>
253 253
 						</label>
254 254
 					</td>
255 255
 					<td>
256
-						<input type="checkbox" id="description_above_<?php echo esc_attr( $merge_field_data['tag'] ); ?>" class="widefat field-description-input" name="field[<?php echo $merge_field_data['tag']; ?>][description_above]" value="1" />
257
-						<span 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></span>
256
+						<input type="checkbox" id="description_above_<?php echo esc_attr( $merge_field_data[ 'tag' ] ); ?>" class="widefat field-description-input" name="field[<?php echo $merge_field_data[ 'tag' ]; ?>][description_above]" value="1" />
257
+						<span 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></span>
258 258
 					</td>
259 259
 				</tr>
260 260
 				<!-- Additional Classes -->
261 261
 				<tr valign="top">
262 262
 					<td scope="row">
263 263
 						<label for="placeholder">
264
-							<?php _e( 'Additional Classes' , 'yikes-inc-easy-mailchimp-extender' ); ?>
264
+							<?php _e( 'Additional Classes', 'yikes-inc-easy-mailchimp-extender' ); ?>
265 265
 						</label>
266 266
 					</td>
267 267
 					<td>
268
-						<input type="text" class="widefat" name="field[<?php echo $merge_field_data['tag']; ?>][additional-classes]" value="<?php echo isset( $form_data['classes'] ) ? stripslashes( wp_strip_all_tags( $form_data['classes'] ) ) : '' ; ?>" />
269
-						<p class="description"><small><?php printf( __( "Assign additional classes to this field. %s.", 'yikes-inc-easy-mailchimp-extender' ), '<a target="_blank" href="' . esc_url( 'https://yikesplugins.com/support/knowledge-base/bundled-css-classes/' ) . '">' . __( 'View bundled classes', 'yikes-inc-easy-mailchimp-extender' ) . '</a>' );?></small></p>
268
+						<input type="text" class="widefat" name="field[<?php echo $merge_field_data[ 'tag' ]; ?>][additional-classes]" value="<?php echo isset( $form_data[ 'classes' ] ) ? stripslashes( wp_strip_all_tags( $form_data[ 'classes' ] ) ) : ''; ?>" />
269
+						<p class="description"><small><?php printf( __( "Assign additional classes to this field. %s.", 'yikes-inc-easy-mailchimp-extender' ), '<a target="_blank" href="' . esc_url( 'https://yikesplugins.com/support/knowledge-base/bundled-css-classes/' ) . '">' . __( 'View bundled classes', 'yikes-inc-easy-mailchimp-extender' ) . '</a>' ); ?></small></p>
270 270
 					</td>
271 271
 				</tr>
272 272
 					<!-- Required Toggle -->
273 273
 					<tr valign="top">
274 274
 						<td scope="row">
275 275
 							<label for="field-required">
276
-								<?php _e( 'Field Required?' , 'yikes-inc-easy-mailchimp-extender' ); ?>
276
+								<?php _e( 'Field Required?', 'yikes-inc-easy-mailchimp-extender' ); ?>
277 277
 							</label>
278 278
 						</td>
279 279
 						<td>
280
-							<input type="checkbox" class="widefat" value="1" name="field[<?php echo $merge_field_data['tag']; ?>][require]" <?php checked( $merge_field_data['required'], 1 ); ?> <?php if( $merge_field_data['tag'] == 'EMAIL' ) {  ?> disabled="disabled" checked="checked" title="<?php echo __( 'Email is a required field.' , 'yikes-inc-easy-mailchimp-extender' ); } ?>">
281
-							<p class="description"><small><?php _e( "Require this field to be filled in before the form can be submitted.", 'yikes-inc-easy-mailchimp-extender' );?></small></p>
280
+							<input type="checkbox" class="widefat" value="1" name="field[<?php echo $merge_field_data[ 'tag' ]; ?>][require]" <?php checked( $merge_field_data[ 'required' ], 1 ); ?> <?php if ( $merge_field_data[ 'tag' ] == 'EMAIL' ) {  ?> disabled="disabled" checked="checked" title="<?php echo __( 'Email is a required field.', 'yikes-inc-easy-mailchimp-extender' ); } ?>">
281
+							<p class="description"><small><?php _e( "Require this field to be filled in before the form can be submitted.", 'yikes-inc-easy-mailchimp-extender' ); ?></small></p>
282 282
 						</td>
283 283
 					</tr>
284 284
 					<!-- Visible Toggle -->
285 285
 					<tr valign="top">
286 286
 						<td scope="row">
287 287
 							<label for="hide-field">
288
-								<?php _e( 'Hide Field' , 'yikes-inc-easy-mailchimp-extender' ); ?>
288
+								<?php _e( 'Hide Field', 'yikes-inc-easy-mailchimp-extender' ); ?>
289 289
 							</label>
290 290
 						</td>
291 291
 						<td>
292
-							<input type="checkbox" class="widefat" value="1" name="field[<?php echo $merge_field_data['tag']; ?>][hide]" <?php checked( $merge_field_data['public'], '' ); ?> <?php if( $merge_field_data['tag'] == 'EMAIL' ) {  ?> disabled="disabled" title="<?php echo __( 'Cannot toggle email field visibility.' , 'yikes-inc-easy-mailchimp-extender' ); } ?>">
293
-							<p class="description"><small><?php _e( "Hide this field from being displayed on the front end.", 'yikes-inc-easy-mailchimp-extender' );?></small></p>
292
+							<input type="checkbox" class="widefat" value="1" name="field[<?php echo $merge_field_data[ 'tag' ]; ?>][hide]" <?php checked( $merge_field_data[ 'public' ], '' ); ?> <?php if ( $merge_field_data[ 'tag' ] == 'EMAIL' ) {  ?> disabled="disabled" title="<?php echo __( 'Cannot toggle email field visibility.', 'yikes-inc-easy-mailchimp-extender' ); } ?>">
293
+							<p class="description"><small><?php _e( "Hide this field from being displayed on the front end.", 'yikes-inc-easy-mailchimp-extender' ); ?></small></p>
294 294
 						</td>
295 295
 					</tr>
296 296
 					<!-- Toggle Field Label Visibility -->
297 297
 					<tr valign="top">
298 298
 						<td scope="row">
299 299
 							<label for="placeholder">
300
-								<?php _e( 'Hide Label' , 'yikes-inc-easy-mailchimp-extender' ); ?>
300
+								<?php _e( 'Hide Label', 'yikes-inc-easy-mailchimp-extender' ); ?>
301 301
 							</label>
302 302
 						</td>
303 303
 						<td>
304
-							<input type="checkbox" name="field[<?php echo $merge_field_data['tag']; ?>][hide-label]" value="1" />
305
-							<p class="description"><small><?php _e( "Toggle field label visibility.", 'yikes-inc-easy-mailchimp-extender' );?></small></p>
304
+							<input type="checkbox" name="field[<?php echo $merge_field_data[ 'tag' ]; ?>][hide-label]" value="1" />
305
+							<p class="description"><small><?php _e( "Toggle field label visibility.", 'yikes-inc-easy-mailchimp-extender' ); ?></small></p>
306 306
 						</td>
307 307
 					</tr>
308 308
 					<!-- Display Phone/Date Formats back to the user -->
309 309
 					<?php
310
-						switch( $form_data['field_type'] ) {
310
+						switch ( $form_data[ 'field_type' ] ) {
311 311
 
312 312
 							/* Store the phone format, for properly regex pattern */
313 313
 							case 'phone':
@@ -318,23 +318,23 @@  discard block
 block discarded – undo
318 318
 									<td scope="row">
319 319
 										<label for="placeholder">
320 320
 										<?php
321
-											switch( $form_data['field_type'] ) {
321
+											switch ( $form_data[ 'field_type' ] ) {
322 322
 												default:
323 323
 												case 'birthday':
324
-													$type = __( 'Date Format' , 'yikes-inc-easy-mailchimp-extender' );
325
-													$format = $merge_field_data['options']['date_format'];
324
+													$type = __( 'Date Format', 'yikes-inc-easy-mailchimp-extender' );
325
+													$format = $merge_field_data[ 'options' ][ 'date_format' ];
326 326
 													$format_name = 'date_format';
327 327
 													break;
328 328
 
329 329
 												case 'date':
330
-													$type = __( 'Date Format' , 'yikes-inc-easy-mailchimp-extender' );
331
-													$format = $merge_field_data['options']['date_format'];
330
+													$type = __( 'Date Format', 'yikes-inc-easy-mailchimp-extender' );
331
+													$format = $merge_field_data[ 'options' ][ 'date_format' ];
332 332
 													$format_name = 'date_format';
333 333
 													break;
334 334
 
335 335
 												case 'phone':
336
-													$type = __( 'Phone Format' , 'yikes-inc-easy-mailchimp-extender' );
337
-													$format = ( ( $merge_field_data['options']['phone_format'] == 'none' ) ? __( 'International', 'yikes-inc-easy-mailchimp-extender' ) : $merge_field_data['options']['phone_format'] );
336
+													$type = __( 'Phone Format', 'yikes-inc-easy-mailchimp-extender' );
337
+													$format = ( ( $merge_field_data[ 'options' ][ 'phone_format' ] == 'none' ) ? __( 'International', 'yikes-inc-easy-mailchimp-extender' ) : $merge_field_data[ 'options' ][ 'phone_format' ] );
338 338
 													$format_name = 'phone_format';
339 339
 													break;
340 340
 											}
@@ -344,7 +344,7 @@  discard block
 block discarded – undo
344 344
 									</td>
345 345
 									<td>
346 346
 										<strong><?php echo $format; ?></strong>
347
-										<input type="hidden" name="field[<?php echo $merge_field_data['tag']; ?>][<?php echo $format_name; ?>]" value="<?php echo $format; ?>" />
347
+										<input type="hidden" name="field[<?php echo $merge_field_data[ 'tag' ]; ?>][<?php echo $format_name; ?>]" value="<?php echo $format; ?>" />
348 348
 										<p class="description"><small>
349 349
 											<?php printf( __( 'To change the %s please head over to <a href="%s" title="MailChimp" target="_blank">MailChimp</a>. If you alter the format, you should re-import this field.', 'yikes-inc-easy-mailchimp-extender' ), strtolower( $type ), esc_url( 'http://www.mailchimp.com' ) ); ?>
350 350
 										</small></p>
@@ -365,8 +365,8 @@  discard block
 block discarded – undo
365 365
 						</td>
366 366
 						<td>
367 367
 							<span class="toggle-container">
368
-								<a href="#" class="hide-field"><?php _e( "Close" , 'yikes-inc-easy-mailchimp-extender' ); ?></a> |
369
-								<a href="#" class="remove-field" alt="<?php echo $merge_field_data['tag']; ?>"><?php _e( "Remove Field" , 'yikes-inc-easy-mailchimp-extender' ); ?></a>
368
+								<a href="#" class="hide-field"><?php _e( "Close", 'yikes-inc-easy-mailchimp-extender' ); ?></a> |
369
+								<a href="#" class="remove-field" alt="<?php echo $merge_field_data[ 'tag' ]; ?>"><?php _e( "Remove Field", 'yikes-inc-easy-mailchimp-extender' ); ?></a>
370 370
 							</span>
371 371
 						</td>
372 372
 					</tr>
Please login to merge, or discard this patch.
admin/partials/ajax/add_interest_group_to_form.php 1 patch
Spacing   +52 added lines, -52 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">
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,18 +138,18 @@  discard block
 block discarded – undo
138 138
 							<tr valign="top">
139 139
 								<td scope="row">
140 140
 									<label for="placeholder">
141
-										<?php _e( 'Default Selection' , 'yikes-inc-easy-mailchimp-extender' ); ?>
141
+										<?php _e( 'Default Selection', 'yikes-inc-easy-mailchimp-extender' ); ?>
142 142
 									</label>
143 143
 								</td>
144 144
 								<td>
145
-									<select type="default" name="field[<?php echo $group['group_id']; ?>][default_choice]">
146
-										<?php $pre_selected = ! empty( $field_data['default_choice'] ) ? $field_data['default_choice'] : 'no-default'; ?>
145
+									<select type="default" name="field[<?php echo $group[ 'group_id' ]; ?>][default_choice]">
146
+										<?php $pre_selected = ! empty( $field_data[ 'default_choice' ] ) ? $field_data[ 'default_choice' ] : 'no-default'; ?>
147 147
 										<option value="no-default">No Default</option>
148
-										<?php foreach ( $field_data['items'] as $id => $interest_group ) { ?>
149
-											<option value="<?php echo $id; ?>" <?php selected( $pre_selected, $id ); ?>><?php echo $interest_group['name']; ?></option>
148
+										<?php foreach ( $field_data[ 'items' ] as $id => $interest_group ) { ?>
149
+											<option value="<?php echo $id; ?>" <?php selected( $pre_selected, $id ); ?>><?php echo $interest_group[ 'name' ]; ?></option>
150 150
 										<?php } ?>
151 151
 									</select>
152
-									<p class="description"><small><?php _e( "Which option should be selected by default?", 'yikes-inc-easy-mailchimp-extender' );?></small></p>
152
+									<p class="description"><small><?php _e( "Which option should be selected by default?", 'yikes-inc-easy-mailchimp-extender' ); ?></small></p>
153 153
 								</td>
154 154
 							</tr>
155 155
 
@@ -161,25 +161,25 @@  discard block
 block discarded – undo
161 161
 					<tr valign="top">
162 162
 						<td scope="row">
163 163
 							<label for="placeholder">
164
-								<?php _e( 'Description' , 'yikes-inc-easy-mailchimp-extender' ); ?>
164
+								<?php _e( 'Description', 'yikes-inc-easy-mailchimp-extender' ); ?>
165 165
 							</label>
166 166
 						</td>
167 167
 						<td>
168
-							<textarea class="widefat field-description-input" name="field[<?php echo $group['group_id']; ?>][description]"></textarea>
169
-							<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>
168
+							<textarea class="widefat field-description-input" name="field[<?php echo $group[ 'group_id' ]; ?>][description]"></textarea>
169
+							<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>
170 170
 						</td>
171 171
 					</tr>
172 172
 
173 173
 					<!-- Description Above Field -->
174 174
 					<tr valign="top">
175 175
 						<td scope="row">
176
-							<label for="description_above_<?php echo esc_attr( $group['group_id'] ); ?>">
177
-								<?php _e( 'Description Above Field' , 'yikes-inc-easy-mailchimp-extender' ); ?>
176
+							<label for="description_above_<?php echo esc_attr( $group[ 'group_id' ] ); ?>">
177
+								<?php _e( 'Description Above Field', 'yikes-inc-easy-mailchimp-extender' ); ?>
178 178
 							</label>
179 179
 						</td>
180 180
 						<td>
181
-							<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" />
182
-							<span 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></span>
181
+							<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" />
182
+							<span 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></span>
183 183
 						</td>
184 184
 					</tr>
185 185
 
@@ -187,48 +187,48 @@  discard block
 block discarded – undo
187 187
 					<tr valign="top">
188 188
 						<td scope="row">
189 189
 							<label for="placeholder">
190
-								<?php _e( 'Additional Classes' , 'yikes-inc-easy-mailchimp-extender' ); ?>
190
+								<?php _e( 'Additional Classes', 'yikes-inc-easy-mailchimp-extender' ); ?>
191 191
 							</label>
192 192
 						</td>
193 193
 						<td>
194
-							<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'] ) ) : '' ; ?>" />
195
-							<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>
194
+							<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' ] ) ) : ''; ?>" />
195
+							<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>
196 196
 						</td>
197 197
 						</tr>
198 198
 						<!-- Required Toggle -->
199 199
 						<tr valign="top">
200 200
 							<td scope="row">
201 201
 								<label for="field-required">
202
-									<?php _e( 'Field Required?' , 'yikes-inc-easy-mailchimp-extender' ); ?>
202
+									<?php _e( 'Field Required?', 'yikes-inc-easy-mailchimp-extender' ); ?>
203 203
 								</label>
204 204
 							</td>
205 205
 							<td>
206
-								<input type="checkbox" class="widefat" value="1" name="field[<?php echo $group['group_id']; ?>][require]">
207
-								<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>
206
+								<input type="checkbox" class="widefat" value="1" name="field[<?php echo $group[ 'group_id' ]; ?>][require]">
207
+								<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>
208 208
 							</td>
209 209
 						</tr>
210 210
 						<!-- Visible Toggle -->
211 211
 						<tr valign="top">
212 212
 							<td scope="row">
213 213
 								<label for="hide-field">
214
-									<?php _e( 'Hide Field' , 'yikes-inc-easy-mailchimp-extender' ); ?>
214
+									<?php _e( 'Hide Field', 'yikes-inc-easy-mailchimp-extender' ); ?>
215 215
 								</label>
216 216
 							</td>
217 217
 							<td>
218
-								<input type="checkbox" class="widefat" value="1" name="field[<?php echo $group['group_id']; ?>][hide]">
219
-								<p class="description"><small><?php _e( "Hide this field from being displayed on the front end.", 'yikes-inc-easy-mailchimp-extender' );?></small></p>
218
+								<input type="checkbox" class="widefat" value="1" name="field[<?php echo $group[ 'group_id' ]; ?>][hide]">
219
+								<p class="description"><small><?php _e( "Hide this field from being displayed on the front end.", 'yikes-inc-easy-mailchimp-extender' ); ?></small></p>
220 220
 							</td>
221 221
 						</tr>
222 222
 						<!-- Toggle Field Label Visibility -->
223 223
 						<tr valign="top">
224 224
 							<td scope="row">
225 225
 								<label for="placeholder">
226
-									<?php _e( 'Hide Label' , 'yikes-inc-easy-mailchimp-extender' ); ?>
226
+									<?php _e( 'Hide Label', 'yikes-inc-easy-mailchimp-extender' ); ?>
227 227
 								</label>
228 228
 							</td>
229 229
 							<td>
230
-								<input type="checkbox" name="field[<?php echo $group['group_id']; ?>][hide-label]" value="1" />
231
-								<p class="description"><small><?php _e( "Toggle field label visibility.", 'yikes-inc-easy-mailchimp-extender' );?></small></p>
230
+								<input type="checkbox" name="field[<?php echo $group[ 'group_id' ]; ?>][hide-label]" value="1" />
231
+								<p class="description"><small><?php _e( "Toggle field label visibility.", 'yikes-inc-easy-mailchimp-extender' ); ?></small></p>
232 232
 							</td>
233 233
 						</tr>
234 234
 						<!-- Toggle Buttons -->
@@ -238,8 +238,8 @@  discard block
 block discarded – undo
238 238
 							</td>
239 239
 							<td>
240 240
 								<span class="toggle-container">
241
-									<a href="#" class="hide-field"><?php _e( "Close" , 'yikes-inc-easy-mailchimp-extender' ); ?></a> |
242
-									<a href="#" class="remove-field" alt="<?php echo $group['group_id']; ?>"><?php _e( "Remove Field" , 'yikes-inc-easy-mailchimp-extender' ); ?></a>
241
+									<a href="#" class="hide-field"><?php _e( "Close", 'yikes-inc-easy-mailchimp-extender' ); ?></a> |
242
+									<a href="#" class="remove-field" alt="<?php echo $group[ 'group_id' ]; ?>"><?php _e( "Remove Field", 'yikes-inc-easy-mailchimp-extender' ); ?></a>
243 243
 								</span>
244 244
 							</td>
245 245
 						</tr>
Please login to merge, or discard this patch.