Completed
Push — staging ( 703689...2a3eee )
by
unknown
17:55
created
admin/partials/menu/options-sections/general-settings.php 1 patch
Braces   +5 added lines, -2 removed lines patch added patch discarded remove patch
@@ -22,8 +22,11 @@
 block discarded – undo
22 22
 		?>
23 23
 		</span>
24 24
 	</h3>
25
-<?php else : ?>
26
-	<h3><span><?php _e( 'General Settings' , 'yikes-inc-easy-mailchimp-extender' ); ?></span><?php echo $api_connection; ?></h3>
25
+<?php else {
26
+	: ?>
27
+	<h3><span><?php _e( 'General Settings' , 'yikes-inc-easy-mailchimp-extender' );
28
+}
29
+?></span><?php echo $api_connection; ?></h3>
27 30
 <?php endif; ?>
28 31
 
29 32
 <div class="inside">
Please login to merge, or discard this patch.
public/classes/checkbox-integrations.php 1 patch
Braces   +28 added lines, -28 removed lines patch added patch discarded remove patch
@@ -9,7 +9,7 @@  discard block
 block discarded – undo
9 9
 /**
10 10
  * Main Checkbox Integration class.
11 11
  */
12
-class Yikes_Easy_MC_Checkbox_Integration_Class {
12
+class Yikes_Easy_MC_Checkbox_Integration_Class {
13 13
 
14 14
 	/**
15 15
 	 * The integration type.
@@ -28,10 +28,10 @@  discard block
 block discarded – undo
28 28
 	 *
29 29
 	 * @return bool Whether the current user is subscribed to a list.
30 30
 	 */
31
-	public function is_user_already_subscribed( $type, $email = '' ) {
31
+	public function is_user_already_subscribed( $type, $email = '' ) {
32 32
 		// Make sure we have an email address to use.
33
-		if ( empty( $email ) ) {
34
-			if ( ! is_user_logged_in() ) {
33
+		if ( empty( $email ) ) {
34
+			if ( ! is_user_logged_in() ) {
35 35
 				return false;
36 36
 			}
37 37
 
@@ -40,13 +40,13 @@  discard block
 block discarded – undo
40 40
 		}
41 41
 
42 42
 		// Ensure we have a valid email.
43
-		if ( ! is_email( $email ) ) {
43
+		if ( ! is_email( $email ) ) {
44 44
 			return false;
45 45
 		}
46 46
 
47 47
 		// Convert the integration type to a list ID.
48 48
 		$checkbox_options = get_option( 'optin-checkbox-init', '' );
49
-		if ( empty( $checkbox_options ) || ! isset( $checkbox_options[ $type ] ) || ! isset( $checkbox_options[ $type ]['associated-list'] ) ) {
49
+		if ( empty( $checkbox_options ) || ! isset( $checkbox_options[ $type ] ) || ! isset( $checkbox_options[ $type ]['associated-list'] ) ) {
50 50
 			return false;
51 51
 		}
52 52
 
@@ -54,8 +54,8 @@  discard block
 block discarded – undo
54 54
 		$list_ids = is_array( $list_ids ) ? $list_ids : array( $list_ids );
55 55
 
56 56
 		// Go through each list...
57
-		foreach ( $list_ids as $list_id ) {
58
-			if ( ! $this->is_user_subscribed( $email, $list_id, $type ) ) {
57
+		foreach ( $list_ids as $list_id ) {
58
+			if ( ! $this->is_user_subscribed( $email, $list_id, $type ) ) {
59 59
 				return false;
60 60
 			}
61 61
 		}
@@ -74,19 +74,19 @@  discard block
 block discarded – undo
74 74
 	 *
75 75
 	 * @return bool Whether the email is subscribed to the list.
76 76
 	 */
77
-	public function is_user_subscribed( $email, $list_id, $type ) {
77
+	public function is_user_subscribed( $email, $list_id, $type ) {
78 78
 		$email      = sanitize_email( $email );
79 79
 		$email_hash = md5( $email );
80 80
 
81 81
 		// Check the API to see the status.
82 82
 		$response = yikes_get_mc_api_manager()->get_list_handler()->get_member( $list_id, $email_hash, false );
83
-		if ( is_wp_error( $response ) ) {
83
+		if ( is_wp_error( $response ) ) {
84 84
 			$data = $response->get_error_data();
85 85
 
86 86
 			// If the error response is a 404, they are not subscribed.
87
-			if ( isset( $data['status'] ) && 404 === (int) $data['status'] ) {
87
+			if ( isset( $data['status'] ) && 404 === (int) $data['status'] ) {
88 88
 				return false;
89
-			} else {
89
+			} else {
90 90
 				$error_logging = new Yikes_Inc_Easy_Mailchimp_Error_Logging();
91 91
 				$error_logging->maybe_write_to_log(
92 92
 					$response->get_error_code(),
@@ -110,14 +110,14 @@  discard block
 block discarded – undo
110 110
 	 *
111 111
 	 * @return string The HTML for the checkbox.
112 112
 	 */
113
-	public function yikes_get_checkbox() {
113
+	public function yikes_get_checkbox() {
114 114
 
115 115
 		// Get our options.
116 116
 		$checkbox_options = get_option( 'optin-checkbox-init', array() );
117 117
 		$has_list_ids     = isset( $checkbox_options[ $this->type ]['associated-list'] ) && '-' !== $checkbox_options[ $this->type ]['associated-list'] && is_array( $checkbox_options[ $this->type ]['associated-list'] );
118 118
 		$has_list_ids     = $has_list_ids && ! in_array( '-', $checkbox_options[ $this->type ]['associated-list'], true );
119 119
 
120
-		if ( $has_list_ids ) {
120
+		if ( $has_list_ids ) {
121 121
 			$label    = isset( $checkbox_options[ $this->type ]['label'] ) && ! empty( $checkbox_options[ $this->type ]['label'] ) ? trim( $checkbox_options[ $this->type ]['label'] ) : __( 'Sign me up for your mailing list.', 'yikes-inc-easy-mailchimp-extender' );
122 122
 			$checked  = 'true' === $checkbox_options[ $this->type ]['precheck'] ? 'checked="checked"' : '';
123 123
 			$before   = apply_filters( 'yikes-mailchimp-before-checkbox-html', '' );
@@ -145,11 +145,11 @@  discard block
 block discarded – undo
145 145
 	 * @param array  $merge_vars       The array of form data to send.
146 146
 	 * @param array  $integration_vars An array of additional information that can be used to filter the subscribe request.
147 147
 	 */
148
-	public function subscribe_user_integration( $email, $type, $merge_vars, $integration_vars = array() ) {
148
+	public function subscribe_user_integration( $email, $type, $merge_vars, $integration_vars = array() ) {
149 149
 		$options = get_option( 'optin-checkbox-init', '' );
150 150
 
151 151
 		// Make sure we have a list ID.
152
-		if ( ! isset( $options[ $type ] ) || ! isset( $options[ $type ]['associated-list'] ) ) {
152
+		if ( ! isset( $options[ $type ] ) || ! isset( $options[ $type ]['associated-list'] ) ) {
153 153
 			// @todo: Throw some kind of error?
154 154
 			return;
155 155
 		}
@@ -158,7 +158,7 @@  discard block
 block discarded – undo
158 158
 
159 159
 		// Check for an IP address.
160 160
 		$user_ip = sanitize_text_field( $_SERVER['REMOTE_ADDR'] );
161
-		if ( isset( $merge_vars['OPTIN_IP'] ) ) {
161
+		if ( isset( $merge_vars['OPTIN_IP'] ) ) {
162 162
 			$user_ip = sanitize_text_field( $merge_vars['OPTIN_IP'] );
163 163
 		}
164 164
 
@@ -174,19 +174,19 @@  discard block
 block discarded – undo
174 174
 			'ip_signup'     => $user_ip,
175 175
 		);
176 176
 
177
-		foreach ( $list_ids as $list_id ) {
177
+		foreach ( $list_ids as $list_id ) {
178 178
 
179 179
 			$interests = isset( $options[ $type ]['interest-groups'] ) ? $options[ $type ]['interest-groups'] : array();
180 180
 			$interests = isset( $interests[ $list_id ] ) ? $interests[ $list_id ] : $interests;
181 181
 
182 182
 			// Only re-format and add interest groups if not empty.
183
-			if ( ! empty( $interests ) ) {
183
+			if ( ! empty( $interests ) ) {
184 184
 				$groups = array();
185 185
 
186 186
 				// Need to reformat interest groups array as $interest_group_ID => true.
187
-				foreach ( $interests as $interest ) {
188
-					if ( is_array( $interest ) ) {
189
-						foreach ( $interest as $group_id ) {
187
+				foreach ( $interests as $interest ) {
188
+					if ( is_array( $interest ) ) {
189
+						foreach ( $interest as $group_id ) {
190 190
 							$groups[ $group_id ] = true;
191 191
 						}
192 192
 					}
@@ -218,14 +218,14 @@  discard block
 block discarded – undo
218 218
 			$list_id = apply_filters( 'yikes-mailchimp-checkbox-integration-list-id', $list_id, $data, $type, $integration_vars );
219 219
 
220 220
 			// Don't send an empty merge fields array.
221
-			if ( empty( $data['merge_fields'] ) ) {
221
+			if ( empty( $data['merge_fields'] ) ) {
222 222
 				unset( $data['merge_fields'] );
223 223
 			}
224 224
 
225 225
 			// Subscribe the user to the list via the API.
226 226
 			$response = yikes_get_mc_api_manager()->get_list_handler()->member_subscribe( $list_id, $id, $data );
227 227
 
228
-			if ( is_wp_error( $response ) ) {
228
+			if ( is_wp_error( $response ) ) {
229 229
 				$error_logging = new Yikes_Inc_Easy_Mailchimp_Error_Logging();
230 230
 				$error_logging->maybe_write_to_log(
231 231
 					$response->get_error_code(),
@@ -243,15 +243,15 @@  discard block
 block discarded – undo
243 243
 	 *
244 244
 	 * @param WP_User $user A WP User.
245 245
 	 */
246
-	public function user_merge_vars( WP_User $user ) {
246
+	public function user_merge_vars( WP_User $user ) {
247 247
 
248 248
 		// Setup our array.
249 249
 		$merge_vars = array();
250 250
 
251
-		if ( ! empty( $user->first_name ) ) {
251
+		if ( ! empty( $user->first_name ) ) {
252 252
 			$merge_vars['FNAME'] = $user->first_name;
253 253
 		}
254
-		if ( ! empty( $user->last_name ) ) {
254
+		if ( ! empty( $user->last_name ) ) {
255 255
 			$merge_vars['LNAME'] = $user->last_name;
256 256
 		}
257 257
 
@@ -275,7 +275,7 @@  discard block
 block discarded – undo
275 275
 	 *
276 276
 	 * @return bool True if the checkbox was checked.
277 277
 	 */
278
-	public function was_checkbox_checked( $type ) {
278
+	public function was_checkbox_checked( $type ) {
279 279
 		return isset( $_POST[ 'yikes_mailchimp_checkbox_' . $type ] ) && '1' === filter_var( $_POST[ 'yikes_mailchimp_checkbox_' . $type ], FILTER_SANITIZE_STRING );
280 280
 	}
281 281
 }
Please login to merge, or discard this patch.
admin/class-yikes-inc-easy-mailchimp-extender-admin.php 1 patch
Braces   +217 added lines, -217 removed lines patch added patch discarded remove patch
@@ -9,7 +9,7 @@  discard block
 block discarded – undo
9 9
  * @subpackage Yikes_Inc_Easy_Mailchimp_Forms/admin
10 10
  * @author     YIKES, Inc. <[email protected]>
11 11
  */
12
-class Yikes_Inc_Easy_Mailchimp_Forms_Admin {
12
+class Yikes_Inc_Easy_Mailchimp_Forms_Admin {
13 13
 
14 14
 	/**
15 15
 	 * The ID of this plugin.
@@ -49,7 +49,7 @@  discard block
 block discarded – undo
49 49
 		$yikes_inc_easy_mailchimp_extender,
50 50
 		$version,
51 51
 		Yikes_Inc_Easy_Mailchimp_Extender_Form_Interface $form_interface
52
-	) {
52
+	) {
53 53
 		$this->yikes_inc_easy_mailchimp_extender = $yikes_inc_easy_mailchimp_extender;
54 54
 		$this->version                           = $version;
55 55
 		$this->form_interface                    = $form_interface;
@@ -60,7 +60,7 @@  discard block
 block discarded – undo
60 60
 	 *
61 61
 	 * @author Jeremy Pry
62 62
 	 */
63
-	public function hooks() {
63
+	public function hooks() {
64 64
 
65 65
 		// Register admin pages.
66 66
 		add_action( 'admin_menu', array( $this, 'register_admin_pages' ), 11 );
@@ -92,7 +92,7 @@  discard block
 block discarded – undo
92 92
 		/***********************/
93 93
 		/** Create A Form **/
94 94
 		/**********************/
95
-		if ( isset( $_REQUEST['action'] ) && $_REQUEST['action'] == 'yikes-easy-mc-create-form' ) {
95
+		if ( isset( $_REQUEST['action'] ) && $_REQUEST['action'] == 'yikes-easy-mc-create-form' ) {
96 96
 
97 97
 			add_action( 'init', array( $this, 'yikes_easy_mailchimp_create_form' ) );
98 98
 
@@ -101,7 +101,7 @@  discard block
 block discarded – undo
101 101
 		/***********************/
102 102
 		/** Delete A Form **/
103 103
 		/**********************/
104
-		if ( isset( $_REQUEST['action'] ) && $_REQUEST['action'] == 'yikes-easy-mc-delete-form' ) {
104
+		if ( isset( $_REQUEST['action'] ) && $_REQUEST['action'] == 'yikes-easy-mc-delete-form' ) {
105 105
 
106 106
 			add_action( 'init', array( $this, 'yikes_easy_mailchimp_delete_form' ) );
107 107
 
@@ -110,7 +110,7 @@  discard block
 block discarded – undo
110 110
 		/**********************************/
111 111
 		/** Duplicate/Clone A Form    **/
112 112
 		/********************************/
113
-		if ( isset( $_REQUEST['action'] ) && $_REQUEST['action'] == 'yikes-easy-mc-duplicate-form' ) {
113
+		if ( isset( $_REQUEST['action'] ) && $_REQUEST['action'] == 'yikes-easy-mc-duplicate-form' ) {
114 114
 
115 115
 			add_action( 'init', array( $this, 'yikes_easy_mailchimp_duplicate_form' ) );
116 116
 
@@ -119,7 +119,7 @@  discard block
 block discarded – undo
119 119
 		/*************************************/
120 120
 		/**  Reset Form Impression Stats **/
121 121
 		/***********************************/
122
-		if ( isset( $_REQUEST['action'] ) && $_REQUEST['action'] == 'yikes-easy-mc-reset-stats' ) {
122
+		if ( isset( $_REQUEST['action'] ) && $_REQUEST['action'] == 'yikes-easy-mc-reset-stats' ) {
123 123
 
124 124
 			add_action( 'init', array( $this, 'yikes_easy_mailchimp_reset_impression_stats' ) );
125 125
 
@@ -128,7 +128,7 @@  discard block
 block discarded – undo
128 128
 		/**********************************/
129 129
 		/**         Update A Form        **/
130 130
 		/********************************/
131
-		if ( isset( $_REQUEST['action'] ) && $_REQUEST['action'] == 'yikes-easy-mc-update-form' ) {
131
+		if ( isset( $_REQUEST['action'] ) && $_REQUEST['action'] == 'yikes-easy-mc-update-form' ) {
132 132
 
133 133
 			add_action( 'init', array( $this, 'yikes_easy_mailchimp_update_form' ) );
134 134
 
@@ -137,7 +137,7 @@  discard block
 block discarded – undo
137 137
 		/**************************************************/
138 138
 		/**     Clear Store Mailchimp Transient Data   **/
139 139
 		/*************************************************/
140
-		if ( isset( $_REQUEST['action'] ) && $_REQUEST['action'] == 'yikes-easy-mc-clear-transient-data' ) {
140
+		if ( isset( $_REQUEST['action'] ) && $_REQUEST['action'] == 'yikes-easy-mc-clear-transient-data' ) {
141 141
 
142 142
 			add_action( 'init', array( $this, 'yikes_easy_mailchimp_clear_transient_data' ) );
143 143
 
@@ -146,7 +146,7 @@  discard block
 block discarded – undo
146 146
 		/*******************************************/
147 147
 		/** Remove a user from a mailing list     **/
148 148
 		/*****************************************/
149
-		if ( isset( $_REQUEST['action'] ) && $_REQUEST['action'] == 'yikes-easy-mc-unsubscribe-user' ) {
149
+		if ( isset( $_REQUEST['action'] ) && $_REQUEST['action'] == 'yikes-easy-mc-unsubscribe-user' ) {
150 150
 
151 151
 			add_action( 'init', array( $this, 'yikes_easy_mailchimp_unsubscribe_user' ) );
152 152
 
@@ -155,7 +155,7 @@  discard block
 block discarded – undo
155 155
 		/*******************************************/
156 156
 		/**    Create misisng error log file  **/
157 157
 		/*****************************************/
158
-		if ( isset( $_REQUEST['action'] ) && $_REQUEST['action'] == 'yikes-easy-mc-create-error-log' ) {
158
+		if ( isset( $_REQUEST['action'] ) && $_REQUEST['action'] == 'yikes-easy-mc-create-error-log' ) {
159 159
 
160 160
 			add_action( 'init', array( $this, 'yikes_easy_mailchimp_create_missing_error_log' ) );
161 161
 
@@ -167,14 +167,14 @@  discard block
 block discarded – undo
167 167
 		add_action( 'admin_head', array( $this, 'add_tinyMCE_buttons' ) );
168 168
 
169 169
 		// pass our lists data to tinyMCE button for use.
170
-		foreach ( array( 'post.php', 'post-new.php' ) as $hook ) {
170
+		foreach ( array( 'post.php', 'post-new.php' ) as $hook ) {
171 171
 
172 172
 			add_action( 'admin_enqueue_scripts', array( $this, 'tinymce_yikes_easy_mc' ) );
173 173
 
174 174
 		}
175 175
 
176 176
 		// display an admin notice for users on PHP < 5.3.
177
-		if ( phpversion() < '5.3' ) {
177
+		if ( phpversion() < '5.3' ) {
178 178
 			add_action( "admin_notices", array( $this, 'display_php_warning' ), 999 );
179 179
 		}
180 180
 
@@ -187,7 +187,7 @@  discard block
 block discarded – undo
187 187
 		/**************************************************/
188 188
 		/**        Clear Mailchimp Error Log Data        **/
189 189
 		/*************************************************/
190
-		if ( isset( $_REQUEST['action'] ) && $_REQUEST['action'] == 'yikes-easy-mc-clear-error-log' ) {
190
+		if ( isset( $_REQUEST['action'] ) && $_REQUEST['action'] == 'yikes-easy-mc-clear-error-log' ) {
191 191
 
192 192
 			add_action( 'init', array( $this, 'yikes_easy_mailchimp_clear_error_log' ) );
193 193
 
@@ -196,7 +196,7 @@  discard block
 block discarded – undo
196 196
 		/*********************************************/
197 197
 		/**        Export Mailchimp Opt-in Forms   **/
198 198
 		/*******************************************/
199
-		if ( isset( $_REQUEST['action'] ) && $_REQUEST['action'] == 'yikes-easy-mc-export-forms' ) {
199
+		if ( isset( $_REQUEST['action'] ) && $_REQUEST['action'] == 'yikes-easy-mc-export-forms' ) {
200 200
 
201 201
 			add_action( 'init', array( $this, 'yikes_easy_mailchimp_export_forms' ) );
202 202
 
@@ -205,7 +205,7 @@  discard block
 block discarded – undo
205 205
 		/*********************************************/
206 206
 		/**                Export Plugin Settings           **/
207 207
 		/*******************************************/
208
-		if ( isset( $_REQUEST['action'] ) && $_REQUEST['action'] == 'yikes-easy-mc-export-settings' ) {
208
+		if ( isset( $_REQUEST['action'] ) && $_REQUEST['action'] == 'yikes-easy-mc-export-settings' ) {
209 209
 
210 210
 			add_action( 'init', array( $this, 'yikes_easy_mailchimp_export_plugin_settings' ) );
211 211
 
@@ -214,7 +214,7 @@  discard block
 block discarded – undo
214 214
 		/*******************************************/
215 215
 		/**        Import Class Inclusion       **/
216 216
 		/*****************************************/
217
-		if ( isset( $_REQUEST['action'] ) && $_REQUEST['action'] == 'yikes-easy-mc-import-forms' ) {
217
+		if ( isset( $_REQUEST['action'] ) && $_REQUEST['action'] == 'yikes-easy-mc-import-forms' ) {
218 218
 
219 219
 			add_action( 'init', array( $this, 'yikes_easy_mailchimp_import_forms' ) );
220 220
 
@@ -223,7 +223,7 @@  discard block
 block discarded – undo
223 223
 		/*******************************************/
224 224
 		/**    Premium Support Request     **/
225 225
 		/*****************************************/
226
-		if ( isset( $_POST['submit-premium-support-request'] ) ) {
226
+		if ( isset( $_POST['submit-premium-support-request'] ) ) {
227 227
 
228 228
 			add_action( 'init', array( $this, 'yikes_easy_mailchimp_premium_support_request' ) );
229 229
 
@@ -255,7 +255,7 @@  discard block
 block discarded – undo
255 255
 		 * @ param  array  $links  Pre-existing plugin action links
256 256
 		 * @ return array  $links  New array of plugin actions
257 257
 		 */
258
-		public function easy_forms_plugin_action_links( $links ) {
258
+		public function easy_forms_plugin_action_links( $links ) {
259 259
 			$links[] = '<a href="'. esc_url( get_admin_url(null, 'admin.php?page=yikes-inc-easy-mailchimp-settings') ) .'">' . __( 'Settings', 'yikes-inc-easy-mailchimp-extender' ) . '</a>';
260 260
 			$links[] = '<a href="' . esc_url( 'http://www.yikesplugins.com?utm_source=plugins-page&utm_medium=plugin-row&utm_campaign=admin' ) . '" target="_blank">' . __( 'More plugins by YIKES, Inc.', 'yikes-inc-easy-mailchimp-extender' ) . '</a>';
261 261
 			return $links;
@@ -271,13 +271,13 @@  discard block
 block discarded – undo
271 271
 		 *
272 272
 		 * @return string
273 273
 		 */
274
-		public function yikes_easy_forms_admin_disclaimer( $footer_text ) {
274
+		public function yikes_easy_forms_admin_disclaimer( $footer_text ) {
275 275
 			$page = get_current_screen();
276 276
 			$base = $page->base;
277
-			if ( strpos( $base, 'yikes-inc-easy-mailchimp' ) !== false || strpos( $base, 'yikes-mailchimp' ) !== false ) {
277
+			if ( strpos( $base, 'yikes-inc-easy-mailchimp' ) !== false || strpos( $base, 'yikes-mailchimp' ) !== false ) {
278 278
 				$disclaimer_text = sprintf( '<em>' . __( 'Disclaimer: <strong>Easy Forms for Mailchimp</strong> is in no way endorsed, affiliated or backed by Mailchimp, or its parent company Rocket Science Group.', 'yikes-inc-easy-mailchimp-extender' ), '<a href="https://wordpress.org/support/view/plugin-reviews/give?filter=5#postform" target="_blank" class="give-rating-link" data-rated="' . __( 'Thanks :)', 'yikes-inc-easy-mailchimp-extender' ) . '">', '</a></em>' );
279 279
 				return $disclaimer_text;
280
-			} else {
280
+			} else {
281 281
 				return $footer_text;
282 282
 			}
283 283
 		}
@@ -289,32 +289,32 @@  discard block
 block discarded – undo
289 289
 		*	@since 6.0.0
290 290
 		*	@return	parsed tag content
291 291
 		*/
292
-		public function parse_mailchimp_default_tag( $default_tag ) {
293
-			if ( ! $default_tag || $default_tag == '' ) {
292
+		public function parse_mailchimp_default_tag( $default_tag ) {
293
+			if ( ! $default_tag || $default_tag == '' ) {
294 294
 				return $default_tag;
295 295
 			}
296 296
 			global $post;
297 297
 			// page title.
298
-			if ( $default_tag == '{page_title}' ) {
298
+			if ( $default_tag == '{page_title}' ) {
299 299
 				$default_tag = get_the_title( $post->ID );
300 300
 			}
301 301
 			// page id.
302
-			if ( $default_tag == '{page_id}' ) {
302
+			if ( $default_tag == '{page_id}' ) {
303 303
 				$default_tag = $post->ID;
304 304
 			}
305 305
 			// page url.
306
-			if ( $default_tag == '{page_url}' ) {
306
+			if ( $default_tag == '{page_url}' ) {
307 307
 				$default_tag = get_permalink( $post->ID );
308 308
 			}
309 309
 			// blog name.
310
-			if ( $default_tag == '{blog_name}' ) {
310
+			if ( $default_tag == '{blog_name}' ) {
311 311
 				$default_tag = get_bloginfo( 'name' );
312 312
 			}
313 313
 			// is user logged in.
314
-			if ( $default_tag == '{user_logged_in}' ) {
315
-				if ( is_user_logged_in() ) {
314
+			if ( $default_tag == '{user_logged_in}' ) {
315
+				if ( is_user_logged_in() ) {
316 316
 					$default_tag = 'Registered User';
317
-				} else {
317
+				} else {
318 318
 					$default_tag = 'Guest User';
319 319
 				}
320 320
 			}
@@ -328,21 +328,21 @@  discard block
 block discarded – undo
328 328
 		*	When a user clicks 'Clear Log' on the debug settings page, this funciton
329 329
 		*	is used to clear the data out of our php file.
330 330
 		*/
331
-		public function yikes_easy_mailchimp_clear_error_log() {
331
+		public function yikes_easy_mailchimp_clear_error_log() {
332 332
 
333 333
 			// Get our error log class.
334 334
 			$error_logging = new Yikes_Inc_Easy_Mailchimp_Error_Logging();
335 335
 
336 336
 			// file put contents $returned error + other data.
337
-			if ( file_exists( $error_logging->error_log_file_path ) ) {
337
+			if ( file_exists( $error_logging->error_log_file_path ) ) {
338 338
 
339 339
 				$clear_log = file_put_contents( $error_logging->error_log_file_path, '' );
340 340
 
341
-				if ( $clear_log === false ) {
341
+				if ( $clear_log === false ) {
342 342
 
343 343
 					// redirect the user to the manage forms page, display error message.
344 344
 					wp_redirect( esc_url_raw( admin_url( 'admin.php?page=yikes-inc-easy-mailchimp-settings&section=debug-settings&error-log-cleared=false' ) ) );
345
-				} else {
345
+				} else {
346 346
 
347 347
 					// redirect the user to the manage forms page, display confirmation.
348 348
 					wp_redirect( esc_url_raw( admin_url( 'admin.php?page=yikes-inc-easy-mailchimp-settings&section=debug-settings&error-log-cleared=true' ) ) );
@@ -356,13 +356,13 @@  discard block
 block discarded – undo
356 356
 		*	@since 		6.0.0
357 357
 		*	@return 	CSV export file
358 358
 		*/
359
-		public function yikes_easy_mailchimp_export_forms() {
359
+		public function yikes_easy_mailchimp_export_forms() {
360 360
 			// grab our nonce.
361 361
 			$nonce = $_REQUEST['nonce'];
362 362
 			// grab the forms.
363 363
 			$forms = isset( $_REQUEST['yikes_export_forms'] ) ? $_REQUEST['yikes_export_forms'] : array();
364 364
 			// validate nonce.
365
-			if ( ! wp_verify_nonce( $nonce, 'export-forms' ) ) {
365
+			if ( ! wp_verify_nonce( $nonce, 'export-forms' ) ) {
366 366
 				wp_die( __( "We've run into an error. The security check didn't pass. Please try again." , 'yikes-inc-easy-mailchimp-extender' ) , __( "Failed nonce validation" , 'yikes-inc-easy-mailchimp-extender' ) , array( 'response' => 500 , 'back_link' => true ) );
367 367
 			}
368 368
 
@@ -380,11 +380,11 @@  discard block
 block discarded – undo
380 380
 		*	@since 		6.0.0
381 381
 		*	@return 	CSV export file
382 382
 		*/
383
-		public function yikes_easy_mailchimp_export_plugin_settings() {
383
+		public function yikes_easy_mailchimp_export_plugin_settings() {
384 384
 			// grab our nonce
385 385
 			$nonce = $_REQUEST['nonce'];
386 386
 			// validate nonce.
387
-			if ( ! wp_verify_nonce( $nonce, 'export-settings' ) ) {
387
+			if ( ! wp_verify_nonce( $nonce, 'export-settings' ) ) {
388 388
 				wp_die( __( "We've run into an error. The security check didn't pass. Please try again." , 'yikes-inc-easy-mailchimp-extender' ) , __( "Failed nonce validation" , 'yikes-inc-easy-mailchimp-extender' ) , array( 'response' => 500 , 'back_link' => true ) );
389 389
 			}
390 390
 
@@ -400,15 +400,15 @@  discard block
 block discarded – undo
400 400
 		*	Custom import function to import all or specific forms
401 401
 		*	@since 6.0.0
402 402
 		*/
403
-		public function yikes_easy_mailchimp_import_forms() {
403
+		public function yikes_easy_mailchimp_import_forms() {
404 404
 			// grab our nonce.
405 405
 			$nonce = $_REQUEST['nonce'];
406 406
 			// validate nonce.
407
-			if ( ! wp_verify_nonce( $nonce, 'import-forms' ) ) {
407
+			if ( ! wp_verify_nonce( $nonce, 'import-forms' ) ) {
408 408
 				wp_die( __( "We've run into an error. The security check didn't pass. Please try again." , 'yikes-inc-easy-mailchimp-extender' ) , __( "Failed nonce validation" , 'yikes-inc-easy-mailchimp-extender' ) , array( 'response' => 500 , 'back_link' => true ) );
409 409
 			}
410 410
 			// include the export class.
411
-			if ( ! class_exists( 'Yikes_Inc_Easy_Mailchimp_Import_Class' ) ) {
411
+			if ( ! class_exists( 'Yikes_Inc_Easy_Mailchimp_Import_Class' ) ) {
412 412
 				include_once( YIKES_MC_PATH . 'includes/import-export/yikes-easy-mailchimp-import.class.php' );
413 413
 			}
414 414
 			// run the import function.
@@ -424,9 +424,9 @@  discard block
 block discarded – undo
424 424
 		*	Premium Support Request
425 425
 		*	@since 6.0.0
426 426
 		*/
427
-		public function yikes_easy_mailchimp_premium_support_request() {
427
+		public function yikes_easy_mailchimp_premium_support_request() {
428 428
 
429
-			if ( isset( $_POST['action'] ) && $_POST['action'] != 'yikes-support-request' ) {
429
+			if ( isset( $_POST['action'] ) && $_POST['action'] != 'yikes-support-request' ) {
430 430
 				return __( 'We encountered an error. Please contact the YIKES Inc. support team.', 'yikes-inc-easy-mailchimp-extender' );
431 431
 			}
432 432
 
@@ -462,7 +462,7 @@  discard block
 block discarded – undo
462 462
 			) );
463 463
 
464 464
 			// Catch the error.
465
-			if ( is_wp_error( $response ) ) {
465
+			if ( is_wp_error( $response ) ) {
466 466
 				wp_send_json_error( $response->getMessage() );
467 467
 			}
468 468
 
@@ -470,9 +470,9 @@  discard block
 block discarded – undo
470 470
 			$response_body = json_decode( wp_remote_retrieve_body( $response ) );
471 471
 		}
472 472
 
473
-		public function get_premium_license( $plugin_slug ) {
473
+		public function get_premium_license( $plugin_slug ) {
474 474
 
475
-			switch( $plugin_slug ) {
475
+			switch( $plugin_slug ) {
476 476
 
477 477
 				case 'form-customizer':
478 478
 					return defined( 'YIKES_CUSTOMIZER_EDD_ITEM_ID' ) ? YIKES_CUSTOMIZER_EDD_ITEM_ID : '';
@@ -495,8 +495,8 @@  discard block
 block discarded – undo
495 495
 		 *
496 496
 		 * @since 6.0.0
497 497
 		 */
498
-		public function load_error_logging_class() {
499
-			if ( get_option( 'yikes-mailchimp-debug-status', '' ) == '1' ) {
498
+		public function load_error_logging_class() {
499
+			if ( get_option( 'yikes-mailchimp-debug-status', '' ) == '1' ) {
500 500
 				// if error logging is enabled we should include our error logging class
501 501
 				/* Generate oure error logging table */
502 502
 				require_once YIKES_MC_PATH . '/includes/error_log/class-yikes-inc-easy-mailchimp-error-logging.php';
@@ -511,21 +511,21 @@  discard block
 block discarded – undo
511 511
 		 *
512 512
 		 * @since v6.0.0
513 513
 		 */
514
-		public function yikes_easy_mailchimp_check_installation_date() {
514
+		public function yikes_easy_mailchimp_check_installation_date() {
515 515
 
516 516
 			// add a new option to store the plugin activation date/time.
517 517
 			// @since v6.0.0.
518 518
 			// this is used to notify the user that they should review after 2 weeks.
519
-			if ( !get_option( 'yikes_easy_mailchimp_activation_date' ) ) {
519
+			if ( !get_option( 'yikes_easy_mailchimp_activation_date' ) ) {
520 520
 				add_option( 'yikes_easy_mailchimp_activation_date', strtotime( "now" ) );
521 521
 			}
522 522
 
523 523
 			$stop_bugging_me = get_option( 'yikes_easy_mailchimp_review_stop_bugging_me' );
524 524
 
525
-			if ( ! $stop_bugging_me ) {
525
+			if ( ! $stop_bugging_me ) {
526 526
 				$install_date = get_option( 'yikes_easy_mailchimp_activation_date' );
527 527
 				$past_date = strtotime( '-14 days' );
528
-				if ( $past_date >= $install_date && current_user_can( 'install_plugins' ) ) {
528
+				if ( $past_date >= $install_date && current_user_can( 'install_plugins' ) ) {
529 529
 					add_action( 'admin_notices', array( $this , 'yikes_easy_mailchimp_display_review_us_notice' ) );
530 530
 				}
531 531
 			}
@@ -537,9 +537,9 @@  discard block
 block discarded – undo
537 537
 			asking for a review, and for user feedback
538 538
 			@since v6.0.0
539 539
 		*/
540
-		public function yikes_easy_mailchimp_display_review_us_notice() {
540
+		public function yikes_easy_mailchimp_display_review_us_notice() {
541 541
 			/* Lets only display our admin notice on YT4WP pages to not annoy the hell out of people :) */
542
-			if ( in_array( get_current_screen()->base , array( 'dashboard', 'post', 'edit' ) ) || strpos( get_current_screen()->base ,'yikes-inc-easy-mailchimp') !== false ) {
542
+			if ( in_array( get_current_screen()->base , array( 'dashboard', 'post', 'edit' ) ) || strpos( get_current_screen()->base ,'yikes-inc-easy-mailchimp') !== false ) {
543 543
 
544 544
 				// The URL of the page the user is currently on
545 545
 				$current_uri  	  = isset( $_SERVER['REQUEST_URI'] ) && ! empty( $_SERVER['REQUEST_URI'] ) ? $_SERVER['REQUEST_URI'] : false;
@@ -582,8 +582,8 @@  discard block
 block discarded – undo
582 582
 			Remove the Review us notification when user clicks 'Dismiss'
583 583
 			@since v3.1.1
584 584
 		*/
585
-		public function yikes_easy_mailchimp_stop_bugging_me() {
586
-			if ( isset( $_GET['yikes_easy_mc_icons_nobug'] ) && (int) filter_var( $_GET['yikes_easy_mc_icons_nobug'], FILTER_SANITIZE_NUMBER_INT ) === 1 ) {
585
+		public function yikes_easy_mailchimp_stop_bugging_me() {
586
+			if ( isset( $_GET['yikes_easy_mc_icons_nobug'] ) && (int) filter_var( $_GET['yikes_easy_mc_icons_nobug'], FILTER_SANITIZE_NUMBER_INT ) === 1 ) {
587 587
 				add_option( 'yikes_easy_mailchimp_review_stop_bugging_me', true );
588 588
 			}
589 589
 		}
@@ -591,7 +591,7 @@  discard block
 block discarded – undo
591 591
 	/* End Two Week Notification */
592 592
 
593 593
 		/* Display a warning users who are using PHP < 5.3 */
594
-		public function display_php_warning() {
594
+		public function display_php_warning() {
595 595
 			$message = __( 'Easy Forms for Mailchimp requires a minimum of PHP 5.3. The plugin will not function properly until you update. Please reach out to your host provider for assistance.', 'yikes-inc-easy-mailchimp-extender' );
596 596
 			echo "<div class='error'> <p><span class='dashicons dashicons-no-alt' style='color:rgb(231, 98, 98)'></span> $message</p></div>";
597 597
 		}
@@ -601,10 +601,10 @@  discard block
 block discarded – undo
601 601
 	 * TinyMCE Functions
602 602
 	 */
603 603
 	// load our button and pass in the JS form data variable.
604
-	public function add_tinyMCE_buttons() {
604
+	public function add_tinyMCE_buttons() {
605 605
 		global $typenow;
606 606
 		// only on Post Type: post and page.
607
-		if ( ! in_array( $typenow, array( 'post', 'page' ) ) ) {
607
+		if ( ! in_array( $typenow, array( 'post', 'page' ) ) ) {
608 608
 			return;
609 609
 		}
610 610
 		add_filter( 'mce_buttons', array( $this, 'yks_mc_add_tinymce_button' ) );
@@ -612,14 +612,14 @@  discard block
 block discarded – undo
612 612
 	}
613 613
 
614 614
 	// Add the button key for address via JS.
615
-	public function yks_mc_add_tinymce_button( $buttons ) {
615
+	public function yks_mc_add_tinymce_button( $buttons ) {
616 616
 		array_push( $buttons, 'yks_mc_tinymce_button_key' );
617 617
 		// Print all buttons.
618 618
 		return $buttons;
619 619
 	}
620 620
 
621 621
 	// inlcude the js for tinymce.
622
-	public function yks_mc_add_tinymce_plugin( $plugin_array ) {
622
+	public function yks_mc_add_tinymce_plugin( $plugin_array ) {
623 623
 
624 624
 		$plugin_array['yks_mc_tinymce_button'] = plugins_url( '/js/min/yikes-inc-easy-mailchimp-tinymce-button.min.js', __FILE__ );
625 625
 
@@ -631,23 +631,23 @@  discard block
 block discarded – undo
631 631
 		 * Pass our imported list data, to the JS file
632 632
 		 * to build the drop down list in the modal
633 633
 		 */
634
-	public function tinymce_yikes_easy_mc() {
634
+	public function tinymce_yikes_easy_mc() {
635 635
 		// check capabilities.
636
-		if ( ! current_user_can( apply_filters( 'yikes-mailchimp-user-role-access', 'manage_options' ) ) ) {
636
+		if ( ! current_user_can( apply_filters( 'yikes-mailchimp-user-role-access', 'manage_options' ) ) ) {
637 637
 			return;
638 638
 		}
639 639
 
640 640
 		$list_data = $this->form_interface->get_all_forms();
641 641
 		$lists     = array();
642
-		if ( ! empty( $list_data ) ) {
642
+		if ( ! empty( $list_data ) ) {
643 643
 			// build an array to pass to our javascript.
644
-			foreach ( $list_data as $id => $form ) {
644
+			foreach ( $list_data as $id => $form ) {
645 645
 				$lists[] = array(
646 646
 					'text'  => urlencode( $form['form_name'] ),
647 647
 					'value' => $id,
648 648
 				);
649 649
 			}
650
-		} else {
650
+		} else {
651 651
 			$lists[0] = array(
652 652
 				'text'  => __( 'Please Import Some Mailchimp Lists', 'yikes-inc-easy-mailchimp-extender' ),
653 653
 				'value' => '-',
@@ -672,7 +672,7 @@  discard block
 block discarded – undo
672 672
 	/**
673 673
 	 *  Fix the Mailchimp icon spacing in the admin menu.
674 674
 	 */
675
-	public function fix_menu_icon_spacing() {
675
+	public function fix_menu_icon_spacing() {
676 676
 		?>
677 677
 			<style>
678 678
 			a[href="admin.php?page=yikes-inc-easy-mailchimp"] .wp-menu-image img {
@@ -687,7 +687,7 @@  discard block
 block discarded – undo
687 687
 	 *
688 688
 	 * @since    6.0.0
689 689
 	 */
690
-	public function enqueue_styles() {
690
+	public function enqueue_styles() {
691 691
 		/**
692 692
 		 *	Enqueue our global dashboard styles.
693 693
 		 */
@@ -696,7 +696,7 @@  discard block
 block discarded – undo
696 696
 		/*
697 697
 		*	Enqueue Add-ons styles.
698 698
 		*/
699
-		if ( get_current_screen()->base == 'easy-forms_page_yikes-inc-easy-mailchimp-addons' ) {
699
+		if ( get_current_screen()->base == 'easy-forms_page_yikes-inc-easy-mailchimp-addons' ) {
700 700
 			wp_enqueue_style( 'yikes-inc-easy-mailchimp-extender-addons-styles', plugin_dir_url( __FILE__ ) . 'css/yikes-inc-easy-mailchimp-extender-addons.min.css', array(), $this->version, 'all' );
701 701
 		}
702 702
 	}
@@ -705,7 +705,7 @@  discard block
 block discarded – undo
705 705
 	 *
706 706
 	 * @since    6.0.0
707 707
 	 */
708
-	public function enqueue_scripts() {
708
+	public function enqueue_scripts() {
709 709
 		wp_enqueue_script( 'yikes-inc-easy-mailchimp-extender-admin-js', plugin_dir_url( __FILE__ ) . 'js/min/yikes-inc-easy-mailchimp-extender-admin.min.js', array( 'jquery', 'jquery-ui-sortable' ), $this->version, false );
710 710
 
711 711
 		$localized_data = array(
@@ -720,7 +720,7 @@  discard block
 block discarded – undo
720 720
 
721 721
 		// Enqueue required scripts for the form editor
722 722
 		$screen = get_current_screen();
723
-		if ( ! isset( $screen->base ) || 'admin_page_yikes-mailchimp-edit-form' !== $screen->base ) {
723
+		if ( ! isset( $screen->base ) || 'admin_page_yikes-mailchimp-edit-form' !== $screen->base ) {
724 724
 			return;
725 725
 		}
726 726
 
@@ -768,12 +768,12 @@  discard block
 block discarded – undo
768 768
 	/**
769 769
 	 * Convert the php date format string to a js date format
770 770
 	 */
771
-	public function yikes_jQuery_datepicker_date_format_php_to_js( $sFormat, $type ) {
772
-		switch ( $type ) {
771
+	public function yikes_jQuery_datepicker_date_format_php_to_js( $sFormat, $type ) {
772
+		switch ( $type ) {
773 773
 			default:
774 774
 			case 'date':
775 775
 				// Standard Date Fields
776
-				switch ( $sFormat ) {
776
+				switch ( $sFormat ) {
777 777
 					//Predefined WP date formats
778 778
 					case 'F j, Y':
779 779
 					case 'j F Y':
@@ -796,7 +796,7 @@  discard block
 block discarded – undo
796 796
 				break;
797 797
 			// Birthday Fields
798 798
 			case 'birthday':
799
-				switch ( $sFormat ) {
799
+				switch ( $sFormat ) {
800 800
 					//Predefined WP date formats
801 801
 					case 'F j, Y':
802 802
 					case 'j F Y':
@@ -825,8 +825,8 @@  discard block
 block discarded – undo
825 825
 	/**
826 826
 	 * Convert the php date format string to a js date format
827 827
 	 */
828
-	public function yikes_jQuery_datepicker_date_format( $site_option ) {
829
-		switch( $site_option ) {
828
+	public function yikes_jQuery_datepicker_date_format( $site_option ) {
829
+		switch( $site_option ) {
830 830
 			//Predefined WP date formats
831 831
 			default:
832 832
 			case 'F j, Y':
@@ -846,7 +846,7 @@  discard block
 block discarded – undo
846 846
 	*	Register our admin pages
847 847
 	*	used to display data back to the user
848 848
 	**/
849
-	public function register_admin_pages() {
849
+	public function register_admin_pages() {
850 850
 
851 851
 		/* Top Level Menu 'Easy Mailchimp' */
852 852
 		add_menu_page(
@@ -959,7 +959,7 @@  discard block
 block discarded – undo
959 959
 	*	when they click 'Go Pro' in the admin menu
960 960
 	*	to do: populate with sales URL
961 961
 	*/
962
-	public function generateAddOnsPage() {
962
+	public function generateAddOnsPage() {
963 963
 		require_once YIKES_MC_PATH . 'admin/partials/menu/add-ons.php'; // include our add-ons page
964 964
 	}
965 965
 
@@ -968,7 +968,7 @@  discard block
 block discarded – undo
968 968
 	*
969 969
 	* @since    1.0.0
970 970
 	*/
971
-	function generateManageFormsPage() {
971
+	function generateManageFormsPage() {
972 972
 		require_once YIKES_MC_PATH . 'admin/partials/menu/manage-forms.php'; // include our manage forms page
973 973
 	}
974 974
 
@@ -977,7 +977,7 @@  discard block
 block discarded – undo
977 977
 	*
978 978
 	* @since    1.0.0
979 979
 	*/
980
-	function generateManageListsPage() {
980
+	function generateManageListsPage() {
981 981
 		require_once YIKES_MC_PATH . 'admin/partials/menu/manage-lists.php'; // include our lists page
982 982
 	}
983 983
 
@@ -986,7 +986,7 @@  discard block
 block discarded – undo
986 986
 	*
987 987
 	* @since    1.0.0
988 988
 	*/
989
-	function generateSupportPage() {
989
+	function generateSupportPage() {
990 990
 
991 991
 		wp_enqueue_script( 'yikes-inc-easy-mailchimp-extender-support-scripts', plugin_dir_url( __FILE__ ) . 'js/support.js', array( 'jquery' ), $this->version, false );
992 992
 		require_once YIKES_MC_PATH . 'admin/partials/menu/support.php';
@@ -997,7 +997,7 @@  discard block
 block discarded – undo
997 997
 	*
998 998
 	* @since    1.0.0
999 999
 	*/
1000
-	function generateEditFormPage() {
1000
+	function generateEditFormPage() {
1001 1001
 		require_once YIKES_MC_PATH . 'admin/partials/edit-form.php'; // include our options page
1002 1002
 	}
1003 1003
 
@@ -1006,7 +1006,7 @@  discard block
 block discarded – undo
1006 1006
 	*
1007 1007
 	* @since    1.0.0
1008 1008
 	*/
1009
-	function generateViewListPage() {
1009
+	function generateViewListPage() {
1010 1010
 		require_once YIKES_MC_PATH . 'admin/partials/view-list.php'; // include our options page
1011 1011
 	}
1012 1012
 
@@ -1015,7 +1015,7 @@  discard block
 block discarded – undo
1015 1015
 	*
1016 1016
 	* @since    1.0.0
1017 1017
 	*/
1018
-	function generateViewUserPage() {
1018
+	function generateViewUserPage() {
1019 1019
 		require_once YIKES_MC_PATH . 'admin/partials/view-user.php'; // include our options page
1020 1020
 	}
1021 1021
 
@@ -1024,7 +1024,7 @@  discard block
 block discarded – undo
1024 1024
 	*
1025 1025
 	* @since v.5.4
1026 1026
 	**/
1027
-	function yikes_easy_mc_settings_init() {
1027
+	function yikes_easy_mc_settings_init() {
1028 1028
 
1029 1029
 		/* Register General Settings Section */
1030 1030
 
@@ -1170,27 +1170,27 @@  discard block
 block discarded – undo
1170 1170
 	*	Options Sanitization & Validation
1171 1171
 	*	@since complete re-write
1172 1172
 	**/
1173
-	function yikes_mc_validate_api_key( $input ) {
1174
-		if ( $input === '' ) {
1173
+	function yikes_mc_validate_api_key( $input ) {
1174
+		if ( $input === '' ) {
1175 1175
 			update_option( 'yikes-mc-api-validation', 'invalid_api_key' );
1176 1176
 			return '';
1177 1177
 		}
1178 1178
 		$api_key = strip_tags ( trim( $input ) );
1179 1179
 		$dash_position = strpos( trim( $input ), '-' );
1180
-		if ( $dash_position !== false ) {
1180
+		if ( $dash_position !== false ) {
1181 1181
 			$manager = new Yikes_Inc_Easy_Mailchimp_API_Manager( $api_key );
1182
-		} else {
1182
+		} else {
1183 1183
 			update_option( 'yikes-mc-api-invalid-key-response', __( 'Your API key appears to be invalid.', 'yikes-inc-easy-mailchimp-extender' ) );
1184 1184
 			update_option( 'yikes-mc-api-validation', 'invalid_api_key' );
1185 1185
 			return $api_key;
1186 1186
 		}
1187 1187
 
1188 1188
 		$response = $manager->get_account_handler()->get_account( false );
1189
-		if ( ! is_wp_error( $response ) ) {
1189
+		if ( ! is_wp_error( $response ) ) {
1190 1190
 			update_option( 'yikes-mc-api-validation', 'valid_api_key' );
1191 1191
 				// Clear the API key transient data
1192 1192
 			$this->delete_yikes_mailchimp_transients();
1193
-		}  else {
1193
+		} else {
1194 1194
 			$error_logging = new Yikes_Inc_Easy_Mailchimp_Error_Logging();
1195 1195
 			$error_logging->yikes_easy_mailchimp_write_to_error_log( $response->get_error_message() , __( "Connecting to Mailchimp" , 'yikes-inc-easy-mailchimp-extender' ) , __( "Settings Page/General Settings" , 'yikes-inc-easy-mailchimp-extender' ) );
1196 1196
 			update_option( 'yikes-mc-api-invalid-key-response', $response->get_error_message() );
@@ -1205,7 +1205,7 @@  discard block
 block discarded – undo
1205 1205
 	*
1206 1206
 	* @since    1.0.0
1207 1207
 	*/
1208
-	function generatePageOptions() {
1208
+	function generatePageOptions() {
1209 1209
 		require_once YIKES_MC_PATH . 'admin/partials/menu/options.php'; // include our options page
1210 1210
 	}
1211 1211
 
@@ -1215,15 +1215,15 @@  discard block
 block discarded – undo
1215 1215
 	*	to form fields. (input, dropdowns, buttons etc.)
1216 1216
 	* 	@since v5.5 re-write
1217 1217
 	**/
1218
-	public function is_user_mc_api_valid_form( $echo = true ) {
1219
-		if ( $echo == true ) {
1220
-			if ( get_option( 'yikes-mc-api-validation', 'invalid_api_key' ) == 'invalid_api_key' ) {
1218
+	public function is_user_mc_api_valid_form( $echo = true ) {
1219
+		if ( $echo == true ) {
1220
+			if ( get_option( 'yikes-mc-api-validation', 'invalid_api_key' ) == 'invalid_api_key' ) {
1221 1221
 				echo 'disabled="disabled"';
1222 1222
 			}
1223
-		} else {
1224
-			if ( get_option( 'yikes-mc-api-validation', 'invalid_api_key' ) == 'invalid_api_key' ) {
1223
+		} else {
1224
+			if ( get_option( 'yikes-mc-api-validation', 'invalid_api_key' ) == 'invalid_api_key' ) {
1225 1225
 				return false;
1226
-			} else {
1226
+			} else {
1227 1227
 				return true;
1228 1228
 			}
1229 1229
 		}
@@ -1239,9 +1239,9 @@  discard block
 block discarded – undo
1239 1239
 		*	and return the index ( used to find the list name assigned to a form )
1240 1240
 		*	- http://stackoverflow.com/questions/6661530/php-multi-dimensional-array-search
1241 1241
 		*/
1242
-		function findMCListID($id, $array) {
1243
-		   foreach ($array as $key => $val) {
1244
-			   if ($val['id'] === $id) {
1242
+		function findMCListID($id, $array) {
1243
+		   foreach ($array as $key => $val) {
1244
+			   if ($val['id'] === $id) {
1245 1245
 				   return $key;
1246 1246
 			   }
1247 1247
 		   }
@@ -1253,8 +1253,8 @@  discard block
 block discarded – undo
1253 1253
 		*	Render our sidebar menu on all of the setings pages (general, form, checkbox, recaptcha, popup, debug etc. )
1254 1254
 		*	@since v5.6 - complete re-write
1255 1255
 		*/
1256
-		public function generate_options_pages_sidebar_menu() {
1257
-			if ( isset( $_REQUEST['section'] ) ) {
1256
+		public function generate_options_pages_sidebar_menu() {
1257
+			if ( isset( $_REQUEST['section'] ) ) {
1258 1258
 				$selected = $_REQUEST['section'];
1259 1259
 			}
1260 1260
 			$installed_addons = get_option( 'yikes-easy-mc-active-addons', array() );
@@ -1281,13 +1281,13 @@  discard block
 block discarded – undo
1281 1281
 					</ul>
1282 1282
 					<?php
1283 1283
 						// create our add-on settings pages
1284
-						if ( !empty( $installed_addons ) ) {
1284
+						if ( !empty( $installed_addons ) ) {
1285 1285
 							?>
1286 1286
 							<hr class="add-on-settings-divider" />
1287 1287
 							<strong><?php _e( 'Addon Settings', 'yikes-inc-easy-mailchimp-extender' ); ?></strong>
1288 1288
 							<ul id="addon-settings-nav">
1289 1289
 							<?php
1290
-							foreach( $installed_addons as $addon_name ) {
1290
+							foreach( $installed_addons as $addon_name ) {
1291 1291
 								?>
1292 1292
 									<li>
1293 1293
 										<?php if ( isset( $_REQUEST['section'] ) && $_REQUEST['section'] ==  $addon_name ) { ?><div class="option-menu-selected-arrow"></div><?php } ?><a href="<?php echo esc_url_raw( add_query_arg( array( 'section' => $addon_name, 'addon' => 'true' ) , admin_url( 'admin.php?page=yikes-inc-easy-mailchimp-settings&section='.$addon_name ) ) ); ?>"><?php echo ucwords( str_replace( '-', ' ', $addon_name ) ); ?></a></li>
@@ -1307,7 +1307,7 @@  discard block
 block discarded – undo
1307 1307
 		*	Render our sidebar menu on all of the setings pages (general, form, checkbox, recaptcha, popup, debug etc. )
1308 1308
 		*	@since v5.6 - complete re-write
1309 1309
 		*/
1310
-		public function generate_manage_forms_sidebar( $lists ) {
1310
+		public function generate_manage_forms_sidebar( $lists ) {
1311 1311
 			// create a custom URL to allow for creating fields
1312 1312
 			$url = esc_url_raw(
1313 1313
 				add_query_arg(
@@ -1338,18 +1338,18 @@  discard block
 block discarded – undo
1338 1338
 					<label for="associated-list"><strong><?php _e( 'Associated List', 'yikes-inc-easy-mailchimp-extender' ); ?></strong>
1339 1339
 						<select name="associated-list" id="associated-list" class=" input-field" <?php $this->is_user_mc_api_valid_form( true ); disabled( true, empty( $lists ) ); ?>>
1340 1340
 							<?php
1341
-							if ( ! empty( $lists ) ) {
1342
-								foreach( $lists as $mailing_list ) {
1341
+							if ( ! empty( $lists ) ) {
1342
+								foreach( $lists as $mailing_list ) {
1343 1343
 									?>
1344 1344
 									<option value="<?php echo $mailing_list['id']; ?>"><?php echo stripslashes( $mailing_list['name'] ) . ' (' . $mailing_list['stats']['member_count'] . ') '; ?></option>
1345 1345
 									<?php
1346 1346
 								}
1347
-							} else {
1348
-								if ( get_option( 'yikes-mc-api-validation', 'invalid_api_key' ) == 'invalid_api_key' ) {
1347
+							} else {
1348
+								if ( get_option( 'yikes-mc-api-validation', 'invalid_api_key' ) == 'invalid_api_key' ) {
1349 1349
 									?>
1350 1350
 									<option><?php echo __( "Please enter a valid API key." , 'yikes-inc-easy-mailchimp-extender' ); ?></option>
1351 1351
 									<?php
1352
-								} else {
1352
+								} else {
1353 1353
 									?>
1354 1354
 									<option><?php echo __( "No lists were found on the account." , 'yikes-inc-easy-mailchimp-extender' ); ?></option>
1355 1355
 									<?php
@@ -1360,8 +1360,8 @@  discard block
 block discarded – undo
1360 1360
 						</select>
1361 1361
 
1362 1362
 						<?php
1363
-						if ( isset( $_GET['transient-cleared'] ) ) {
1364
-							if ( 'true' === $_GET['transient-cleared'] ) {
1363
+						if ( isset( $_GET['transient-cleared'] ) ) {
1364
+							if ( 'true' === $_GET['transient-cleared'] ) {
1365 1365
 								?>
1366 1366
 								<div class="yikes-list-refreshed-notice">
1367 1367
 									<p><?php esc_attr_e( 'Mailchimp list data has been succesfully refreshed.', 'yikes-inc-easy-mailchimp-extender' ); ?></p>
@@ -1370,8 +1370,8 @@  discard block
 block discarded – undo
1370 1370
 							}
1371 1371
 						}
1372 1372
 
1373
-						if ( isset( $lists ) && empty( $lists ) ) {
1374
-							if ( get_option( 'yikes-mc-api-validation', 'invalid_api_key' ) != 'invalid_api_key' ) {
1373
+						if ( isset( $lists ) && empty( $lists ) ) {
1374
+							if ( get_option( 'yikes-mc-api-validation', 'invalid_api_key' ) != 'invalid_api_key' ) {
1375 1375
 								?>
1376 1376
 									<p class="description">
1377 1377
 										<?php printf( __( 'Head over to <a href="http://www.Mailchimp.com" title="%s">Mailchimp</a> to create a new list.', 'yikes-inc-easy-mailchimp-extender' ) , __( 'Create a list', 'yikes-inc-easy-mailchimp-extender' ) ); ?>
@@ -1382,9 +1382,9 @@  discard block
 block discarded – undo
1382 1382
 						?>
1383 1383
 					</label>
1384 1384
 					<?php
1385
-						if ( $this->is_user_mc_api_valid_form( false ) ) {
1385
+						if ( $this->is_user_mc_api_valid_form( false ) ) {
1386 1386
 							echo submit_button( __( 'Create', 'yikes-inc-easy-mailchimp-extender' ) , 'primary', '', false , array( 'style' => 'margin:.75em 0 .5em 0;' ) );
1387
-						} else {
1387
+						} else {
1388 1388
 							echo '<p class="description">' . __( "Please enter a valid Mailchimp API key to get started." , 'yikes-inc-easy-mailchimp-extender' ) . '</p>';
1389 1389
 							?>
1390 1390
 								<a href="<?php echo esc_url_raw( admin_url( 'admin.php?page=yikes-inc-easy-mailchimp-settings&settings-updated=true' ) ); ?>"><?php _e( 'general settings', 'yikes-inc-easy-mailchimp-extender' ); ?></a>
@@ -1395,7 +1395,7 @@  discard block
 block discarded – undo
1395 1395
 
1396 1396
 				<!-- Clear API CACHE -->
1397 1397
 				<?php
1398
-				if ( isset( $lists ) && ! empty( $lists ) ) {
1398
+				if ( isset( $lists ) && ! empty( $lists ) ) {
1399 1399
 					if ( false !== get_transient( 'yikes-easy-mailchimp-list-data' ) ) { ?>
1400 1400
 						<form action="<?php echo esc_url_raw( add_query_arg( array( 'action' => 'yikes-easy-mc-clear-transient-data', 'nonce' => wp_create_nonce( 'clear-mc-transient-data' ) ) ) ); ?>" method="post">
1401 1401
 							<input type="submit" class="button-secondary clear-mailchimp-api-cache" value="<?php _e( 'Refresh Lists', 'yikes-inc-easy-mailchimp-extender' ); ?>" />
@@ -1411,7 +1411,7 @@  discard block
 block discarded – undo
1411 1411
 		*	Generate a dropdown of post and pages
1412 1412
 		*	so the user can send the user to on form submission
1413 1413
 		*/
1414
-		public function generate_page_redirect_dropdown( $redirect, $redirect_page, $custom_redirect_url ) {
1414
+		public function generate_page_redirect_dropdown( $redirect, $redirect_page, $custom_redirect_url ) {
1415 1415
 				$post_types = get_post_types();
1416 1416
 				?>
1417 1417
 				<label id="redirect-user-to-selection-label" for="redirect-user-to-selection" class="<?php if ( $redirect == '0' ) { echo 'yikes-easy-mc-hidden'; } ?>">
@@ -1431,10 +1431,10 @@  discard block
 block discarded – undo
1431 1431
 					$excluded_post_types = apply_filters( 'yikes-mailchimp-excluded-redirect-post-types', $excluded_post_types );
1432 1432
 
1433 1433
 						// loop over registered post types, and query!
1434
-						foreach( $post_types as $registered_post_type ) {
1434
+						foreach( $post_types as $registered_post_type ) {
1435 1435
 
1436 1436
 							// exclude a few built in custom post types and any defined by the filter
1437
-							if ( ! in_array( $registered_post_type, $excluded_post_types ) ) {
1437
+							if ( ! in_array( $registered_post_type, $excluded_post_types ) ) {
1438 1438
 
1439 1439
 								// Grab only the post IDs - in the past we've created timeout issues on some servers with lots of posts
1440 1440
 								$wp_query_args = array(
@@ -1449,11 +1449,11 @@  discard block
 block discarded – undo
1449 1449
 
1450 1450
 								$post_ids = ! empty( $wp_query_result->posts ) ? $wp_query_result->posts : array();
1451 1451
 
1452
-								if ( ! empty ( $post_ids ) ) {
1452
+								if ( ! empty ( $post_ids ) ) {
1453 1453
 									?>
1454 1454
 										<optgroup label="<?php echo ucwords( str_replace( '_', ' ', $registered_post_type ) ); ?>">
1455 1455
 									<?php
1456
-											foreach( $post_ids as $post_id ) {
1456
+											foreach( $post_ids as $post_id ) {
1457 1457
 												?><option <?php selected( $redirect_page , $post_id ); ?> value="<?php echo $post_id; ?>"><?php echo get_the_title( $post_id ) ?></option><?php
1458 1458
 											}
1459 1459
 									?>
@@ -1484,15 +1484,15 @@  discard block
 block discarded – undo
1484 1484
 		*
1485 1485
 		* 	Displayed in sidebars
1486 1486
 		*/
1487
-		public function generate_show_some_love_container() {
1487
+		public function generate_show_some_love_container() {
1488 1488
 			// if no active add-ons are installed,
1489 1489
 			// lets display our branding and add-on sidebar
1490 1490
 			$options = get_option( 'yikes-easy-mc-active-addons', array() );
1491
-			if ( empty( $options ) ) {
1491
+			if ( empty( $options ) ) {
1492 1492
 
1493 1493
 				/* On Edit Forms Page Display Upsell to Customizer */
1494 1494
 				$screen = get_current_screen();
1495
-				if ( isset( $screen ) && $screen->base == 'admin_page_yikes-mailchimp-edit-form' ) {
1495
+				if ( isset( $screen ) && $screen->base == 'admin_page_yikes-mailchimp-edit-form' ) {
1496 1496
 				?>
1497 1497
 
1498 1498
 					<div class="postbox yikes-easy-mc-postbox show-some-love-container">
@@ -1570,18 +1570,18 @@  discard block
 block discarded – undo
1570 1570
 		*	-
1571 1571
 		* @parameters - $list_id - pass in the list ID to retreive merge variables from
1572 1572
 		*/
1573
-		public function generate_form_editor( $form_fields, $list_id, $merge_variables, $interest_groups ) {
1573
+		public function generate_form_editor( $form_fields, $list_id, $merge_variables, $interest_groups ) {
1574 1574
 
1575 1575
 			// if no list id, die!
1576
-			if ( ! $list_id ) {
1576
+			if ( ! $list_id ) {
1577 1577
 				wp_die( __( "We've encountered an error. No list ID was sent." , 'yikes-inc-easy-mailchimp-extender' ) );
1578 1578
 			}
1579 1579
 
1580
-			if ( ! $merge_variables ) {
1580
+			if ( ! $merge_variables ) {
1581 1581
 				wp_die( __( "We've encountered an error. Reload the page and try again. If the error persists, please reach out to support." , 'yikes-inc-easy-mailchimp-extender' ) );
1582 1582
 			}
1583 1583
 
1584
-			if ( ! empty( $form_fields ) ) {
1584
+			if ( ! empty( $form_fields ) ) {
1585 1585
 
1586 1586
 				// find any fields that are assigned to this form, that don't exist in Mailchimp
1587 1587
 				// or else were going to run into issues when we submit the form
@@ -1593,18 +1593,18 @@  discard block
 block discarded – undo
1593 1593
 				$mailchimp_merge_field_ids	= array();
1594 1594
 
1595 1595
 				// loop over merge variables
1596
-				if ( ! empty( $merge_variables['merge_fields'] ) ) {
1596
+				if ( ! empty( $merge_variables['merge_fields'] ) ) {
1597 1597
 					$available_merge_variables = wp_list_pluck( $merge_variables['merge_fields'], 'tag' );
1598 1598
 					$mailchimp_merge_field_ids = wp_list_pluck( $merge_variables['merge_fields'], 'merge_id' );
1599 1599
 
1600 1600
 					// Array will look like $merge_tag => $merge_id
1601
-					foreach( $available_merge_variables as $index => $merge_tag ) {
1601
+					foreach( $available_merge_variables as $index => $merge_tag ) {
1602 1602
 						$merge_field_ids[$merge_tag] = $mailchimp_merge_field_ids[$index];
1603 1603
 					}
1604 1604
 				}
1605 1605
 
1606 1606
 				// loop over interest groups
1607
-				if ( ! empty( $interest_groups ) ) {
1607
+				if ( ! empty( $interest_groups ) ) {
1608 1608
 					$available_interest_groups = array_keys( $interest_groups );
1609 1609
 				}
1610 1610
 
@@ -1613,14 +1613,14 @@  discard block
 block discarded – undo
1613 1613
 				$merged_fields   = array_merge( $available_merge_variables, $available_interest_groups );
1614 1614
 				$excluded_fields = array_diff( $assigned_fields, $merged_fields );
1615 1615
 
1616
-				$form_fields = array_filter($form_fields, function($field){
1616
+				$form_fields = array_filter($form_fields, function($field) {
1617 1617
 					return isset($field['type']);
1618 1618
 				});
1619 1619
 
1620 1620
 				$i = 1;
1621
-				foreach( $form_fields as $field ) {
1621
+				foreach( $form_fields as $field ) {
1622 1622
 
1623
-					if ( isset( $field['merge'] ) ) {
1623
+					if ( isset( $field['merge'] ) ) {
1624 1624
 						// @todo: don't use in_array()
1625 1625
 						$excluded_field = in_array( $field['merge'], $excluded_fields, true );
1626 1626
 						?>
@@ -1654,7 +1654,7 @@  discard block
 block discarded – undo
1654 1654
 									<input type="hidden" class="yikes-mc-merge-field-id" name="field[<?php echo $field['merge']; ?>][id]" value="<?php echo $merge_field_ids[ $field['merge'] ] ?>" />
1655 1655
 								<?php } ?>
1656 1656
 
1657
-								<?php if ( $field['type'] == 'radio' || $field['type'] == 'dropdown' || $field['type'] == 'select' ) {
1657
+								<?php if ( $field['type'] == 'radio' || $field['type'] == 'dropdown' || $field['type'] == 'select' ) {
1658 1658
 									$choices = json_decode( $field['choices'], true );
1659 1659
 								?>
1660 1660
 									<input type="hidden" name="field[<?php echo $field['merge']; ?>][choices]" value='<?php echo esc_attr( json_encode( $choices ) ); ?>' />
@@ -1678,7 +1678,7 @@  discard block
 block discarded – undo
1678 1678
 										</tr>
1679 1679
 
1680 1680
 										<!-- Placeholder Value -->
1681
-										<?php switch( $field['type'] ) {
1681
+										<?php switch( $field['type'] ) {
1682 1682
 
1683 1683
 											case 'text':
1684 1684
 											case 'email':
@@ -1725,7 +1725,7 @@  discard block
 block discarded – undo
1725 1725
 										?>
1726 1726
 
1727 1727
 										<!-- Default Value -->
1728
-										<?php switch( $field['type'] ) {
1728
+										<?php switch( $field['type'] ) {
1729 1729
 											default:
1730 1730
 											case 'text':
1731 1731
 											case 'number':
@@ -1741,7 +1741,7 @@  discard block
 block discarded – undo
1741 1741
 													<input id="default_value_<?php echo esc_attr( $field['merge'] ); ?>" <?php if ( $field['type'] != 'number' ) { ?> type="text" <?php } else { ?> type="number" <?php } ?> class="widefat" name="field[<?php echo $field['merge']; ?>][default]" <?php if ( $field['type'] != 'url' ) { ?> value="<?php echo isset( $field['default'] ) ? stripslashes( wp_strip_all_tags( $field['default'] ) ) : ''; ?>" <?php } else { ?> value="<?php echo isset( $field['default'] ) ? stripslashes( wp_strip_all_tags( esc_url_raw( $field['default'] ) ) ) : ''; ?>" <?php } ?> />
1742 1742
 													<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>
1743 1743
 													<?php
1744
-													switch( $field['type'] ) {
1744
+													switch( $field['type'] ) {
1745 1745
 														case 'text':
1746 1746
 															?>
1747 1747
 																<p><small class="pre-defined-tag-link"><a href="#TB_inline?width=600&height=550&inlineId=pre-defined-tag-container" onclick="storeGlobalClicked( jQuery( this ) );" class="thickbox"><?php _e( 'View Pre-Defined Tags', 'yikes-inc-easy-mailchimp-extender' ); ?></a></small></p>
@@ -1910,7 +1910,7 @@  discard block
 block discarded – undo
1910 1910
 										<!-- Display Phone/Date Formats back to the user -->
1911 1911
 										<!-- Phone Format Initial Load -->
1912 1912
 										<?php
1913
-											switch( $field['type'] ) {
1913
+											switch( $field['type'] ) {
1914 1914
 												/* Store the phone format, for properly regex pattern */
1915 1915
 												case 'phone':
1916 1916
 												case 'birthday':
@@ -1920,7 +1920,7 @@  discard block
 block discarded – undo
1920 1920
 															<td scope="row">
1921 1921
 																<label for="placeholder">
1922 1922
 																	<?php
1923
-																		switch( $field['type'] ) {
1923
+																		switch( $field['type'] ) {
1924 1924
 																			default:
1925 1925
 																			case 'birthday':
1926 1926
 																				$type = __( 'Date Format', 'yikes-inc-easy-mailchimp-extender' );
@@ -1981,7 +1981,7 @@  discard block
 block discarded – undo
1981 1981
 
1982 1982
 
1983 1983
 
1984
-					} else {
1984
+					} else {
1985 1985
 
1986 1986
 						/**** Interest Group ****/
1987 1987
 
@@ -2014,7 +2014,7 @@  discard block
 block discarded – undo
2014 2014
 
2015 2015
 									<table class="form-table form-field-container">
2016 2016
 										<!-- Default Value -->
2017
-										<?php switch( $field['type'] ) {
2017
+										<?php switch( $field['type'] ) {
2018 2018
 											default:
2019 2019
 											case 'radio':
2020 2020
 											case 'checkboxes':
@@ -2031,7 +2031,7 @@  discard block
 block discarded – undo
2031 2031
 
2032 2032
 														$default_shown = false;
2033 2033
 
2034
-														foreach ( json_decode( $field['groups'], true ) as $id => $group ) {
2034
+														foreach ( json_decode( $field['groups'], true ) as $id => $group ) {
2035 2035
 															$field_id   = "{$field['group_id']}-{$id}";
2036 2036
 															$field_type = 'hidden' == $field['type'] ? 'checkbox' : $field['type'];
2037 2037
 															$field_type = 'checkboxes' == $field_type ? 'checkbox' : $field_type;
@@ -2040,7 +2040,7 @@  discard block
 block discarded – undo
2040 2040
 
2041 2041
 															// Determine if the current group is checked.
2042 2042
 															$checked = '';
2043
-															switch ( $field_type ) {
2043
+															switch ( $field_type ) {
2044 2044
 																case 'radio':
2045 2045
 																default:
2046 2046
 																	$default = is_array( $field['default_choice'] ) ? current( $field['default_choice'] ) : $field['default_choice'];
@@ -2049,14 +2049,14 @@  discard block
 block discarded – undo
2049 2049
 
2050 2050
 																case 'checkbox':
2051 2051
 																case 'hidden':
2052
-																	if ( is_array( $field['default_choice'] ) && in_array( $id, $field['default_choice'] ) ) {
2052
+																	if ( is_array( $field['default_choice'] ) && in_array( $id, $field['default_choice'] ) ) {
2053 2053
 																		$checked = checked( true, true, false );
2054 2054
 																	}
2055 2055
 																break;
2056 2056
 															}
2057 2057
 
2058 2058
 															// Allow users to not set a default choice for radio buttons.
2059
-															if ( $field_type === 'radio' && $default_shown === false ) {
2059
+															if ( $field_type === 'radio' && $default_shown === false ) {
2060 2060
 																$default_shown = true;
2061 2061
 																?>
2062 2062
 																<label for="<?php echo $field_id . 'no-default'; ?>">
@@ -2221,7 +2221,7 @@  discard block
 block discarded – undo
2221 2221
 						<?php
2222 2222
 					}
2223 2223
 				}
2224
-			} else {
2224
+			} else {
2225 2225
 				?>
2226 2226
 					<h4 class="no-fields-assigned-notice non-draggable-yikes"><em><?php _e( 'No fields are assigned to this form. Select fields from the right hand column to add to this form.', 'yikes-inc-easy-mailchimp-extender' ); ?></em></h4>
2227 2227
 				<?php
@@ -2308,18 +2308,18 @@  discard block
 block discarded – undo
2308 2308
 		 *	-
2309 2309
 		 * @parameters - $list_id - pass in the list ID to retreive merge variables from
2310 2310
 		 */
2311
-		public function build_available_merge_vars( $form_fields, $available_merge_variables ) {
2311
+		public function build_available_merge_vars( $form_fields, $available_merge_variables ) {
2312 2312
 			$fields_assigned_to_form = array();
2313
-			foreach ( $form_fields as $field ) {
2314
-				if ( isset( $field['merge'] ) ) {
2313
+			foreach ( $form_fields as $field ) {
2314
+				if ( isset( $field['merge'] ) ) {
2315 2315
 					$fields_assigned_to_form[ $field['merge'] ] = true;
2316 2316
 				}
2317 2317
 			}
2318 2318
 
2319
-			if ( ! empty( $available_merge_variables['merge_fields'] ) ) {
2319
+			if ( ! empty( $available_merge_variables['merge_fields'] ) ) {
2320 2320
 				?>
2321 2321
 				<ul id="available-fields"><?php
2322
-				foreach ( $available_merge_variables['merge_fields'] as $merge_var ) {
2322
+				foreach ( $available_merge_variables['merge_fields'] as $merge_var ) {
2323 2323
 					$not_available = isset( $fields_assigned_to_form[ $merge_var['tag'] ] );
2324 2324
 					?>
2325 2325
 					<li class="available-field <?php echo $not_available ? 'not-available' : ''; ?>"
@@ -2332,7 +2332,7 @@  discard block
 block discarded – undo
2332 2332
 					>
2333 2333
 						<?php
2334 2334
 							echo esc_html( stripslashes( $merge_var['name'] ) );
2335
-							if ( $merge_var['required'] ) {
2335
+							if ( $merge_var['required'] ) {
2336 2336
 								echo ' <span class="field-required" title="' . __( 'required field', 'yikes-inc-easy-mailchimp-extender' ) . '">*</span>';
2337 2337
 							}
2338 2338
 						?>
@@ -2357,21 +2357,21 @@  discard block
 block discarded – undo
2357 2357
 		 *	-
2358 2358
 		 * @parameters - $list_id - pass in the list ID to retreive merge variables from
2359 2359
 		 */
2360
-		public function build_available_interest_groups( $form_fields, $available_interest_groups, $list_id ) {
2360
+		public function build_available_interest_groups( $form_fields, $available_interest_groups, $list_id ) {
2361 2361
 			$fields_assigned_to_form = array();
2362
-			if ( ! empty( $form_fields ) ) {
2363
-				foreach ( $form_fields as $field ) {
2364
-					if ( isset( $field['group_id'] ) ) {
2362
+			if ( ! empty( $form_fields ) ) {
2363
+				foreach ( $form_fields as $field ) {
2364
+					if ( isset( $field['group_id'] ) ) {
2365 2365
 						$fields_assigned_to_form[ $field['group_id'] ] = true;
2366 2366
 					}
2367 2367
 				}
2368 2368
 			}
2369 2369
 
2370
-			if ( ! empty( $available_interest_groups ) ) {
2370
+			if ( ! empty( $available_interest_groups ) ) {
2371 2371
 			?>
2372 2372
 				<ul id="available-interest-groups">
2373 2373
 				<?php
2374
-					foreach ( $available_interest_groups as $interest_group ) {
2374
+					foreach ( $available_interest_groups as $interest_group ) {
2375 2375
 						$not_available = isset( $fields_assigned_to_form[ $interest_group['id'] ] );
2376 2376
 						?>
2377 2377
 						<li class="available-field <?php echo $not_available ? 'not-available' : ''; ?>"
@@ -2402,11 +2402,11 @@  discard block
 block discarded – undo
2402 2402
 		/**
2403 2403
 		 * Smt.
2404 2404
 		 */
2405
-		public function build_available_tags( $form_tags, $tags, $list_id ) {
2405
+		public function build_available_tags( $form_tags, $tags, $list_id ) {
2406 2406
 			?>
2407 2407
 			<ul id="available-tags">
2408 2408
 			<?php
2409
-			foreach ( $tags as $tag_id => $tag ) {
2409
+			foreach ( $tags as $tag_id => $tag ) {
2410 2410
 				$not_available = isset( $form_tags[ $tag_id ] );
2411 2411
 				?>
2412 2412
 				<li class="available-field <?php echo $not_available ? 'not-available' : ''; ?>"
@@ -2436,9 +2436,9 @@  discard block
 block discarded – undo
2436 2436
 		*	and include it here for easy maintenance
2437 2437
 		*	- must clean up db tables , ensure what data is going in and what is needed...
2438 2438
 		*/
2439
-		public function yikes_easy_mailchimp_create_form() {
2439
+		public function yikes_easy_mailchimp_create_form() {
2440 2440
 			$nonce = $_REQUEST['nonce'];
2441
-			if ( ! wp_verify_nonce( $nonce, 'create_mailchimp_form' ) ) {
2441
+			if ( ! wp_verify_nonce( $nonce, 'create_mailchimp_form' ) ) {
2442 2442
 				wp_die( __( "We've run into an error. The security check didn't pass. Please try again." , 'yikes-inc-easy-mailchimp-extender' ) );
2443 2443
 			}
2444 2444
 
@@ -2449,13 +2449,13 @@  discard block
 block discarded – undo
2449 2449
 			) );
2450 2450
 
2451 2451
 			// if an error occurs during the form creation process
2452
-			if ( false == $result ) {
2452
+			if ( false == $result ) {
2453 2453
 				// write it to the error log
2454 2454
 				// if the form was not created successfully
2455 2455
 				$error_logging = new Yikes_Inc_Easy_Mailchimp_Error_Logging();
2456 2456
 				$error_logging->maybe_write_to_log( __( 'Error creating a new form', 'yikes-inc-easy-mailchimp-extender') , __( "Creating a new form" , 'yikes-inc-easy-mailchimp-extender' ) , __( "Forms" , 'yikes-inc-easy-mailchimp-extender' ) );
2457 2457
 				wp_redirect( esc_url_raw( admin_url( 'admin.php?page=yikes-mailchimp-edit-form&sql_error=' . urlencode( __( 'Error creating a new form', 'yikes-inc-easy-mailchimp-extender' ) ) ) ) );
2458
-			} else {
2458
+			} else {
2459 2459
 				// redirect the user to the new form edit page
2460 2460
 				wp_redirect( esc_url_raw( admin_url( 'admin.php?page=yikes-mailchimp-edit-form&id=' . $result) ) );
2461 2461
 			}
@@ -2468,12 +2468,12 @@  discard block
 block discarded – undo
2468 2468
 		*	and include it here for easy maintenance
2469 2469
 		*	- must clean up db tables , ensure what data is going in and what is needed...
2470 2470
 		*/
2471
-		public function yikes_easy_mailchimp_delete_form() {
2471
+		public function yikes_easy_mailchimp_delete_form() {
2472 2472
 			// grab & store our variables ( associated list & form name )
2473 2473
 			$nonce = $_REQUEST['nonce'];
2474 2474
 			$post_id_to_delete = $_REQUEST['mailchimp-form'];
2475 2475
 			// verify our nonce
2476
-			if ( ! wp_verify_nonce( $nonce, 'delete-mailchimp-form-'.$post_id_to_delete ) ) {
2476
+			if ( ! wp_verify_nonce( $nonce, 'delete-mailchimp-form-'.$post_id_to_delete ) ) {
2477 2477
 				wp_die( __( "We've run into an error. The security check didn't pass. Please try again." , 'yikes-inc-easy-mailchimp-extender' ) , __( "Failed nonce validation" , 'yikes-inc-easy-mailchimp-extender' ) , array( 'response' => 500 , 'back_link' => true ) );
2478 2478
 			}
2479 2479
 
@@ -2488,12 +2488,12 @@  discard block
 block discarded – undo
2488 2488
 		*	Duplicate an entire form !
2489 2489
 		*	Probably Move these to its own file,
2490 2490
 		*/
2491
-		public function yikes_easy_mailchimp_duplicate_form() {
2491
+		public function yikes_easy_mailchimp_duplicate_form() {
2492 2492
 			// grab & store our variables ( associated list & form name )
2493 2493
 			$nonce = $_REQUEST['nonce'];
2494 2494
 			$post_id_to_clone = $_REQUEST['mailchimp-form'];
2495 2495
 			// verify our nonce
2496
-			if ( ! wp_verify_nonce( $nonce, 'duplicate-mailchimp-form-'.$post_id_to_clone ) ) {
2496
+			if ( ! wp_verify_nonce( $nonce, 'duplicate-mailchimp-form-'.$post_id_to_clone ) ) {
2497 2497
 				wp_die( __( "We've run into an error. The security check didn't pass. Please try again." , 'yikes-inc-easy-mailchimp-extender' ) , __( "Failed nonce validation" , 'yikes-inc-easy-mailchimp-extender' ) , array( 'response' => 500 , 'back_link' => true ) );
2498 2498
 			}
2499 2499
 
@@ -2517,10 +2517,10 @@  discard block
 block discarded – undo
2517 2517
 			*/
2518 2518
 			do_action( 'yikes-mailchimp-after-duplicating-form', $post_id_to_clone, $result, $form_data );
2519 2519
 
2520
-			if ( false === $result ) {
2520
+			if ( false === $result ) {
2521 2521
 				// redirect the user to the manage forms page, display error
2522 2522
 				wp_redirect( esc_url_raw( admin_url( 'admin.php?page=yikes-inc-easy-mailchimp&duplicated-form=false' ) ) );
2523
-			} else {
2523
+			} else {
2524 2524
 				// redirect the user to the manage forms page, display confirmation
2525 2525
 				wp_redirect( esc_url_raw( admin_url( 'admin.php?page=yikes-inc-easy-mailchimp&duplicated-form=true' ) ) );
2526 2526
 			}
@@ -2531,12 +2531,12 @@  discard block
 block discarded – undo
2531 2531
 		/*
2532 2532
 		*	Reset a forms impression stats
2533 2533
 		*/
2534
-		public function yikes_easy_mailchimp_reset_impression_stats() {
2534
+		public function yikes_easy_mailchimp_reset_impression_stats() {
2535 2535
 			// grab & store our variables ( associated list & form name )
2536 2536
 			$nonce = $_REQUEST['nonce'];
2537 2537
 			$form_id_to_reset = $_REQUEST['mailchimp-form'];
2538 2538
 			// verify our nonce
2539
-			if ( ! wp_verify_nonce( $nonce, 'reset-stats-mailchimp-form-'.$form_id_to_reset ) ) {
2539
+			if ( ! wp_verify_nonce( $nonce, 'reset-stats-mailchimp-form-'.$form_id_to_reset ) ) {
2540 2540
 				wp_die( __( "We've run into an error. The security check didn't pass. Please try again." , 'yikes-inc-easy-mailchimp-extender' ) , __( "Failed nonce validation" , 'yikes-inc-easy-mailchimp-extender' ) , array( 'response' => 500 , 'back_link' => true ) );
2541 2541
 			}
2542 2542
 
@@ -2548,10 +2548,10 @@  discard block
 block discarded – undo
2548 2548
 				)
2549 2549
 			);
2550 2550
 
2551
-			if ( false === $result ) {
2551
+			if ( false === $result ) {
2552 2552
 				// redirect the user to the manage forms page, display error
2553 2553
 				wp_redirect( esc_url_raw( admin_url( 'admin.php?page=yikes-inc-easy-mailchimp&reset-stats=false' ) ) );
2554
-			} else {
2554
+			} else {
2555 2555
 				// redirect the user to the manage forms page, display confirmation
2556 2556
 				wp_redirect( esc_url_raw( admin_url( 'admin.php?page=yikes-inc-easy-mailchimp&reset-stats=true' ) ) );
2557 2557
 			}
@@ -2563,13 +2563,13 @@  discard block
 block discarded – undo
2563 2563
 		*	Update an entire form !
2564 2564
 		*	Probably Move these to its own file,
2565 2565
 		*/
2566
-		public function yikes_easy_mailchimp_update_form() {
2566
+		public function yikes_easy_mailchimp_update_form() {
2567 2567
 
2568 2568
 			$nonce   = $_REQUEST['nonce'];
2569 2569
 			$form_id = $_REQUEST['id'];
2570 2570
 
2571 2571
 			// verify our nonce
2572
-			if ( ! wp_verify_nonce( $nonce, 'update-mailchimp-form-' . $form_id ) ) {
2572
+			if ( ! wp_verify_nonce( $nonce, 'update-mailchimp-form-' . $form_id ) ) {
2573 2573
 				wp_die(
2574 2574
 					__( "We've run into an error. The security check didn't pass. Please try again.", 'yikes-inc-easy-mailchimp-extender' ),
2575 2575
 					__( "Failed nonce validation", 'yikes-inc-easy-mailchimp-extender' ),
@@ -2642,11 +2642,11 @@  discard block
 block discarded – undo
2642 2642
 
2643 2643
 			// additional custom fields (extensions / user defined fields)
2644 2644
 			$custom_fields = array();
2645
-			if ( isset( $_POST['custom-field'] ) ) {
2646
-				foreach ( $_POST['custom-field'] as $custom_field => $custom_value ) {
2647
-					if ( is_array( $custom_value ) ) {
2645
+			if ( isset( $_POST['custom-field'] ) ) {
2646
+				foreach ( $_POST['custom-field'] as $custom_field => $custom_value ) {
2647
+					if ( is_array( $custom_value ) ) {
2648 2648
 						$custom_fields[ $custom_field ] = array_filter( stripslashes_deep( $custom_value ) ); // array_filters to remove empty items (don't save them!)
2649
-					} else {
2649
+					} else {
2650 2650
 						$custom_fields[ $custom_field ] = stripslashes( $custom_value );
2651 2651
 					}
2652 2652
 				}
@@ -2682,7 +2682,7 @@  discard block
 block discarded – undo
2682 2682
 			exit();
2683 2683
 		}
2684 2684
 
2685
-		public static function generate_default_email_body() {
2685
+		public static function generate_default_email_body() {
2686 2686
 			$email_body  = '<p>' . __( 'Greetings,', 'yikes-inc-easy-mailchimp-extender' ) . '</p>';
2687 2687
 
2688 2688
 			$email_body .= '<p>';
@@ -2705,18 +2705,18 @@  discard block
 block discarded – undo
2705 2705
 		}
2706 2706
 
2707 2707
 		/* Unsubscribe a given user from our list */
2708
-		public function yikes_easy_mailchimp_unsubscribe_user() {
2708
+		public function yikes_easy_mailchimp_unsubscribe_user() {
2709 2709
 			$nonce    = $_REQUEST['nonce'];
2710 2710
 			$list_id  = $_REQUEST['mailchimp-list'];
2711 2711
 			$email_id = $_REQUEST['email_id'];
2712 2712
 
2713 2713
 			// verify our nonce
2714
-			if ( ! wp_verify_nonce( $nonce, 'unsubscribe-user-' . $email_id ) ) {
2714
+			if ( ! wp_verify_nonce( $nonce, 'unsubscribe-user-' . $email_id ) ) {
2715 2715
 				wp_die( __( "We've run into an error. The security check didn't pass. Please try again." , 'yikes-inc-easy-mailchimp-extender' ) , __( "Failed nonce validation" , 'yikes-inc-easy-mailchimp-extender' ) , array( 'response' => 500 , 'back_link' => true ) );
2716 2716
 			}
2717 2717
 
2718 2718
 			$response = yikes_get_mc_api_manager()->get_list_handler()->member_unsubscribe( $list_id, $email_id );
2719
-			if ( is_wp_error( $response ) ) {
2719
+			if ( is_wp_error( $response ) ) {
2720 2720
 				$error_logging = new Yikes_Inc_Easy_Mailchimp_Error_Logging();
2721 2721
 				$error_logging->maybe_write_to_log(
2722 2722
 					$response->get_error_code(),
@@ -2729,22 +2729,22 @@  discard block
 block discarded – undo
2729 2729
 			exit;
2730 2730
 		}
2731 2731
 
2732
-		public function yikes_easy_mailchimp_create_missing_error_log() {
2732
+		public function yikes_easy_mailchimp_create_missing_error_log() {
2733 2733
 			// grab our nonnce
2734 2734
 			$nonce = $_REQUEST['nonce'];
2735 2735
 			// validate nonce
2736
-			if ( !wp_verify_nonce( $nonce, 'create_error_log' ) ) {
2736
+			if ( !wp_verify_nonce( $nonce, 'create_error_log' ) ) {
2737 2737
 				wp_die( __( "We've run into an error. The security check didn't pass. Please try again." , 'yikes-inc-easy-mailchimp-extender' ) , __( "Failed nonce validation" , 'yikes-inc-easy-mailchimp-extender' ) , array( 'response' => 500 , 'back_link' => true ) );
2738 2738
 			}
2739 2739
 			// setup the path to the error log
2740 2740
 			$error_log = fopen( plugin_dir_path( __FILE__ ) . '../includes/error_log/yikes-easy-mailchimp-error-log.php', 'w' );
2741
-			try {
2741
+			try {
2742 2742
 				// create the file
2743 2743
 				fwrite( $error_log , '' );
2744 2744
 				// close out
2745 2745
 				fclose( $error_log );
2746 2746
 				wp_redirect( esc_url_raw( admin_url( 'admin.php?page=yikes-inc-easy-mailchimp-settings&section=debug-settings&error_log_created=true' ) ) );
2747
-			} catch ( Exception $e ) {
2747
+			} catch ( Exception $e ) {
2748 2748
 				wp_redirect( esc_url_raw( admin_url( 'admin.php?page=yikes-inc-easy-mailchimp-settings&section=debug-settings&error_log_created=false&error_message='.urlencode( $e->getMessage() ) ) ) );
2749 2749
 			}
2750 2750
 		}
@@ -2753,11 +2753,11 @@  discard block
 block discarded – undo
2753 2753
 		*	Clear Transient Data !
2754 2754
 		*	Probably Move these to its own file,
2755 2755
 		*/
2756
-		public function yikes_easy_mailchimp_clear_transient_data() {
2756
+		public function yikes_easy_mailchimp_clear_transient_data() {
2757 2757
 
2758 2758
 			// verify our nonce
2759 2759
 			$nonce = $_REQUEST['nonce'];
2760
-			if ( ! wp_verify_nonce( $nonce, 'clear-mc-transient-data' ) ) {
2760
+			if ( ! wp_verify_nonce( $nonce, 'clear-mc-transient-data' ) ) {
2761 2761
 				wp_die( __( "We've run into an error. The security check didn't pass. Please try again." , 'yikes-inc-easy-mailchimp-extender' ) , __( "Failed nonce validation" , 'yikes-inc-easy-mailchimp-extender' ) , array( 'response' => 500 , 'back_link' => true ) );
2762 2762
 			}
2763 2763
 
@@ -2765,14 +2765,14 @@  discard block
 block discarded – undo
2765 2765
 
2766 2766
 			// if the request came from the settings page, redirect to the settings page.
2767 2767
 			$referer = wp_get_referer();
2768
-			if ( $referer && ( strpos( $referer, 'yikes-inc-easy-mailchimp-settings' ) > 0 ) ) {
2768
+			if ( $referer && ( strpos( $referer, 'yikes-inc-easy-mailchimp-settings' ) > 0 ) ) {
2769 2769
 				wp_redirect( esc_url_raw( admin_url( 'admin.php?page=yikes-inc-easy-mailchimp-settings&section=api-cache-settings&transient-cleared=true' ) ) );
2770
-			} elseif ( isset( $_REQUEST['page'] ) && $_REQUEST['page'] === 'yikes-mailchimp-edit-form' && isset( $_REQUEST['id'] ) && ! empty( $_REQUEST['id'] ) ) {
2770
+			} elseif ( isset( $_REQUEST['page'] ) && $_REQUEST['page'] === 'yikes-mailchimp-edit-form' && isset( $_REQUEST['id'] ) && ! empty( $_REQUEST['id'] ) ) {
2771 2771
 
2772 2772
 				// else check if we were editing a form.
2773 2773
 				$id = filter_var( $_REQUEST['id'], FILTER_SANITIZE_NUMBER_INT );
2774 2774
 				wp_redirect( esc_url_raw( admin_url( 'admin.php?page=yikes-mailchimp-edit-form&id=' . $id ) ) );
2775
-			} else {
2775
+			} else {
2776 2776
 				// else redirect to the manage forms page.
2777 2777
 				wp_redirect( esc_url_raw( admin_url( 'admin.php?page=yikes-inc-easy-mailchimp&transient-cleared=true' ) ) );
2778 2778
 			}
@@ -2788,17 +2788,17 @@  discard block
 block discarded – undo
2788 2788
 		 * @since 6.0.2
2789 2789
 		 * @return $list_id_array - array of list id's to loop over
2790 2790
 		 */
2791
-		public function get_mailchimp_list_ids_on_account() {
2791
+		public function get_mailchimp_list_ids_on_account() {
2792 2792
 			$api_key = yikes_get_mc_api_key();
2793
-			if ( ! $api_key ) {
2793
+			if ( ! $api_key ) {
2794 2794
 				// if no api key is set/site is not connected, return an empty array.
2795 2795
 				return array();
2796 2796
 			}
2797 2797
 
2798 2798
 			$lists = get_transient( 'yikesinc_eme_list_ids' );
2799
-			if ( false === $lists ) {
2799
+			if ( false === $lists ) {
2800 2800
 				$lists = yikes_get_mc_api_manager()->get_list_handler()->get_list_ids();
2801
-				if ( is_wp_error( $lists ) ) {
2801
+				if ( is_wp_error( $lists ) ) {
2802 2802
 					return array();
2803 2803
 				}
2804 2804
 				set_transient( 'yikesinc_eme_list_ids', $lists, HOUR_IN_SECONDS );
@@ -2812,9 +2812,9 @@  discard block
 block discarded – undo
2812 2812
 		 *
2813 2813
 		 *	@since 6.0
2814 2814
 		 */
2815
-		public function yikes_mailchimp_load_helper_class() {
2815
+		public function yikes_mailchimp_load_helper_class() {
2816 2816
 			// check to see if it's already loaded up.
2817
-			if ( !class_exists( 'Yikes_Inc_Easy_Mailchimp_Forms_Helper' ) ) {
2817
+			if ( !class_exists( 'Yikes_Inc_Easy_Mailchimp_Forms_Helper' ) ) {
2818 2818
 				// Include our main helper class file
2819 2819
 				include_once( YIKES_MC_PATH . 'admin/partials/helpers/init.php' );
2820 2820
 			}
@@ -2827,11 +2827,11 @@  discard block
 block discarded – undo
2827 2827
 		 * @order requires that yikes-inc-easy-mailchimp-extender-admin.min.css be enqueued, so we can override the defaults (handle: yikes-inc-easy-mailchimp-extender-admin)
2828 2828
 		 * @return print out custom styles to the admin header to alter the default blue color
2829 2829
 		 */
2830
-		public function alter_yikes_easy_mc_color_scheme() {
2830
+		public function alter_yikes_easy_mc_color_scheme() {
2831 2831
 			// get the current set color scheme for the logged in user
2832 2832
 			$current_color_scheme = get_user_option( 'admin_color' );
2833 2833
 			// switch over each color scheme, and set our variable
2834
-			switch ( $current_color_scheme ) {
2834
+			switch ( $current_color_scheme ) {
2835 2835
 				default:
2836 2836
 				case 'fresh': // default blue (defined by this plugin)
2837 2837
 					$main_color = '#00a0d2';
@@ -2879,16 +2879,16 @@  discard block
 block discarded – undo
2879 2879
 		/**
2880 2880
 		 *	Display premium support page if any add-ons are installed, otherwise display free support page
2881 2881
 		 */
2882
-		public function display_support_page_content() {
2882
+		public function display_support_page_content() {
2883 2883
 
2884 2884
 			$addons = get_option( 'yikes-easy-mc-active-addons', array() );
2885 2885
 
2886 2886
 			// If we have premium add-ons...
2887
-			if ( ! empty( $addons ) ) {
2887
+			if ( ! empty( $addons ) ) {
2888 2888
 
2889 2889
 				// Add our premium support partial.
2890 2890
 				include_once( YIKES_MC_PATH . 'admin/partials/helpers/premium-support.php' );
2891
-			} else {
2891
+			} else {
2892 2892
 
2893 2893
 				// Otherwise add our free support partial.
2894 2894
 				include_once( YIKES_MC_PATH . 'admin/partials/helpers/free-support.php' );
@@ -2900,8 +2900,8 @@  discard block
 block discarded – undo
2900 2900
 		 *
2901 2901
 		 * @since 6.0.4
2902 2902
 		 */
2903
-		public function check_yikes_mc_table_version() {
2904
-			if ( get_option( 'yikes_mc_database_version', '0.00' ) < '1.0' ) {
2903
+		public function check_yikes_mc_table_version() {
2904
+			if ( get_option( 'yikes_mc_database_version', '0.00' ) < '1.0' ) {
2905 2905
 				require_once YIKES_MC_PATH . 'includes/class-yikes-inc-easy-mailchimp-extender-activator.php';
2906 2906
 				global $wpdb;
2907 2907
 				Yikes_Inc_Easy_Mailchimp_Extender_Activator::_activate_yikes_easy_mailchimp( $wpdb );
@@ -2915,7 +2915,7 @@  discard block
 block discarded – undo
2915 2915
 		 *
2916 2916
 		 * @since 6.0.4.4
2917 2917
 		 */
2918
-		public function process_subscriber_count_shortcode_in_form_descriptions( $form_description, $form_id ) {
2918
+		public function process_subscriber_count_shortcode_in_form_descriptions( $form_description, $form_id ) {
2919 2919
 			$form_description = str_replace( '[yikes-mailchimp-subscriber-count]', do_shortcode( '[yikes-mailchimp-subscriber-count form="' . $form_id . '"]' ), $form_description );
2920 2920
 			return $form_description;
2921 2921
 		}
@@ -2925,9 +2925,9 @@  discard block
 block discarded – undo
2925 2925
 		 *
2926 2926
 		 * @since 6.0.3
2927 2927
 		 */
2928
-		public function generate_edit_forms_upsell_ad() {
2928
+		public function generate_edit_forms_upsell_ad() {
2929 2929
 		$upsell_ads = glob( YIKES_MC_PATH . 'includes/upsells/*.php' );
2930
-		if ( $upsell_ads && ! empty( $upsell_ads ) ) {
2930
+		if ( $upsell_ads && ! empty( $upsell_ads ) ) {
2931 2931
 			$ad_count = absint( count( $upsell_ads ) - 1 );
2932 2932
 			$ad       = $upsell_ads[ mt_rand( 0, $ad_count ) ];
2933 2933
 			ob_start();
@@ -2944,11 +2944,11 @@  discard block
 block discarded – undo
2944 2944
 		 * Mainly used when the API key is altered, changed or removed.
2945 2945
 		 * @since 6.1.3
2946 2946
 		 */
2947
-		public function delete_yikes_mailchimp_transients() {
2947
+		public function delete_yikes_mailchimp_transients() {
2948 2948
 
2949 2949
 		// delete all of the list_id transients.
2950 2950
 		$list_ids = $this->get_mailchimp_list_ids_on_account();
2951
-		foreach ( $list_ids as $id ) {
2951
+		foreach ( $list_ids as $id ) {
2952 2952
 			delete_transient( "yikes_eme_list_{$id}" );
2953 2953
 			delete_transient( "yikes_eme_merge_variables_{$id}" );
2954 2954
 			delete_transient( "yikes_eme_interest_categories_{$id}" );
@@ -2970,7 +2970,7 @@  discard block
 block discarded – undo
2970 2970
 	 *
2971 2971
 	 * @author Jeremy Pry
2972 2972
 	 */
2973
-	public function register_optin_widget() {
2973
+	public function register_optin_widget() {
2974 2974
 		register_widget( 'Yikes_Inc_Easy_Mailchimp_Extender_Widget' );
2975 2975
 	}
2976 2976
 }
Please login to merge, or discard this patch.