View GitHub Repository yikes-inc-easy-mailchimp-extender

Schedule Inspection
Subscribe
Completed
Pull Request — master (#900)
by
unknown
18:08
created
Status
Category
Toggle Patches
public/classes/checkbox-integrations.php 2 patches
Spacing   +20 added lines, -20 removed lines patch added patch discarded remove patch 
@@ -46,11 +46,11 @@  discard block
 
 block discarded – undo
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
53 
-		$list_ids = $checkbox_options[ $type ]['associated-list'];
53 
+		$list_ids = $checkbox_options[ $type ][ 'associated-list' ];
54 54 
 		$list_ids = is_array( $list_ids ) ? $list_ids : array( $list_ids );
55 55
56 56 
 		// Go through each list...

@@ -84,7 +84,7 @@  discard block
 
 block discarded – undo
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 89 
 			} else {
90 90 
 				$error_logging = new Yikes_Inc_Easy_Mailchimp_Error_Logging();

@@ -100,7 +100,7 @@  discard block
 
 block discarded – undo
100 100 
 		}
101 101
102 102 
 		// Look at the status from the API.
103 
-		$subscribed = 'subscribed' === $response['status'];
103 
+		$subscribed = 'subscribed' === $response[ 'status' ];
104 104
105 105 
 		return apply_filters( 'yikes-mailchimp-integration-is-user-subscribed', $subscribed, $type );
106 106 
 	}

@@ -114,12 +114,12 @@  discard block
 
 block discarded – undo
114 114
115 115 
 		// Get our options.
116 116 
 		$checkbox_options = get_option( 'optin-checkbox-init', array() );
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 
-		$has_list_ids     = $has_list_ids && ! in_array( '-', $checkbox_options[ $this->type ]['associated-list'], true );
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 
+		$has_list_ids     = $has_list_ids && ! in_array( '-', $checkbox_options[ $this->type ][ 'associated-list' ], true );
119 119
120 120 
 		if ( $has_list_ids ) {
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 
-			$checked  = 'true' === $checkbox_options[ $this->type ]['precheck'] ? 'checked="checked"' : '';
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 
+			$checked  = 'true' === $checkbox_options[ $this->type ][ 'precheck' ] ? 'checked="checked"' : '';
123 123 
 			$before   = apply_filters( 'yikes-mailchimp-before-checkbox-html', '' );
124 124 
 			$content  = '<p id="yikes-easy-mailchimp-' . esc_attr( $this->type ) . '-checkbox" class="yikes-easy-mailchimp-' . esc_attr( $this->type ) . '-checkbox">';
125 125 
 			$content .= '<label>';

@@ -149,7 +149,7 @@  discard block
 
 block discarded – undo
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 
 		}

@@ -157,14 +157,14 @@  discard block
 
 block discarded – undo
157 157 
 		$email = sanitize_email( $email );
158 158
159 159 
 		// Check for an IP address.
160 
-		$user_ip = sanitize_text_field( $_SERVER['REMOTE_ADDR'] );
161 
-		if ( isset( $merge_vars['OPTIN_IP'] ) ) {
162 
-			$user_ip = sanitize_text_field( $merge_vars['OPTIN_IP'] );
160 
+		$user_ip = sanitize_text_field( $_SERVER[ 'REMOTE_ADDR' ] );
161 
+		if ( isset( $merge_vars[ 'OPTIN_IP' ] ) ) {
162 
+			$user_ip = sanitize_text_field( $merge_vars[ 'OPTIN_IP' ] );
163 163 
 		}
164 164
165 165 
 		// Build our request data.
166 
-		$list_ids = $options[ $type ]['associated-list'];
167 
-		$list_ids = is_array( $options[ $type ]['associated-list'] ) ? $options[ $type ]['associated-list'] : array( $options[ $type ]['associated-list'] );
166 
+		$list_ids = $options[ $type ][ 'associated-list' ];
167 
+		$list_ids = is_array( $options[ $type ][ 'associated-list' ] ) ? $options[ $type ][ 'associated-list' ] : array( $options[ $type ][ 'associated-list' ] );
168 168 
 		$id       = md5( $email );
169 169 
 		$data     = array(
170 170 
 			'email_address' => $email,

@@ -176,7 +176,7 @@  discard block
 
 block discarded – undo
176 176
177 177 
 		foreach ( $list_ids as $list_id ) {
178 178
179 
-			$interests = isset( $options[ $type ]['interest-groups'] ) ? $options[ $type ]['interest-groups'] : array();
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.

@@ -192,7 +192,7 @@  discard block
 
 block discarded – undo
192 192 
 					}
193 193 
 				}
194 194
195 
-				$data['interests'] = $groups;
195 
+				$data[ 'interests' ] = $groups;
196 196 
 			}
197 197
198 198 
 			/**

@@ -218,8 +218,8 @@  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'] ) ) {
222 
-				unset( $data['merge_fields'] );
221 
+			if ( empty( $data[ 'merge_fields' ] ) ) {
222 
+				unset( $data[ 'merge_fields' ] );
223 223 
 			}
224 224
225 225 
 			// Subscribe the user to the list via the API.

@@ -249,10 +249,10 @@  discard block
 
 block discarded – undo
249 249 
 		$merge_vars = array();
250 250
251 251 
 		if ( ! empty( $user->first_name ) ) {
252 
-			$merge_vars['FNAME'] = $user->first_name;
252 
+			$merge_vars[ 'FNAME' ] = $user->first_name;
253 253 
 		}
254 254 
 		if ( ! empty( $user->last_name ) ) {
255 
-			$merge_vars['LNAME'] = $user->last_name;
255 
+			$merge_vars[ 'LNAME' ] = $user->last_name;
256 256 
 		}
257 257
258 258 
 		/**
Please login to merge, or discard this 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 3 patches
Indentation   +67 added lines, -67 removed lines patch added patch discarded remove patch 
@@ -581,7 +581,7 @@  discard block
 
 block discarded – undo
581 581 
 			yikes_easy_mailchimp_stop_bugging_me()
582 582 
 			Remove the Review us notification when user clicks 'Dismiss'
583 583 
 			@since v3.1.1
584 
-		*/
584 
+		 */
585 585 
 		public function yikes_easy_mailchimp_stop_bugging_me() {
586 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 );

@@ -843,9 +843,9 @@  discard block
 
 block discarded – undo
843 843 
 	}
844 844
845 845 
 	/**
846 
-	*	Register our admin pages
847 
-	*	used to display data back to the user
848 
-	**/
846 
+	 *	Register our admin pages
847 
+	 *	used to display data back to the user
848 
+	 **/
849 849 
 	public function register_admin_pages() {
850 850
851 851 
 		/* Top Level Menu 'Easy Mailchimp' */

@@ -964,28 +964,28 @@  discard block
 
 block discarded – undo
964 964 
 	}
965 965
966 966 
 	/**
967 
-	* Generate Us Easy Mailchimp Manage Forms Page
968 
-	*
969 
-	* @since    1.0.0
970 
-	*/
967 
+	 * Generate Us Easy Mailchimp Manage Forms Page
968 
+	 *
969 
+	 * @since    1.0.0
970 
+	 */
971 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
975 975 
 	/**
976 
-	* Generate Us Easy Mailchimp Manage Lists Page
977 
-	*
978 
-	* @since    1.0.0
979 
-	*/
976 
+	 * Generate Us Easy Mailchimp Manage Lists Page
977 
+	 *
978 
+	 * @since    1.0.0
979 
+	 */
980 980 
 	function generateManageListsPage() {
981 981 
 		require_once YIKES_MC_PATH . 'admin/partials/menu/manage-lists.php'; // include our lists page
982 982 
 	}
983 983
984 984 
 	/**
985 
-	* Generate Us Easy Mailchimp Support Page
986 
-	*
987 
-	* @since    1.0.0
988 
-	*/
985 
+	 * Generate Us Easy Mailchimp Support Page
986 
+	 *
987 
+	 * @since    1.0.0
988 
+	 */
989 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 );

@@ -993,37 +993,37 @@  discard block
 
 block discarded – undo
993 993 
 	}
994 994
995 995 
 	/**
996 
-	* Generate Us Easy Mailchimp Edit Form Page
997 
-	*
998 
-	* @since    1.0.0
999 
-	*/
996 
+	 * Generate Us Easy Mailchimp Edit Form Page
997 
+	 *
998 
+	 * @since    1.0.0
999 
+	 */
1000 1000 
 	function generateEditFormPage() {
1001 1001 
 		require_once YIKES_MC_PATH . 'admin/partials/edit-form.php'; // include our options page
1002 1002 
 	}
1003 1003
1004 1004 
 	/**
1005 
-	* Generate Us Easy Mailchimp View List Page
1006 
-	*
1007 
-	* @since    1.0.0
1008 
-	*/
1005 
+	 * Generate Us Easy Mailchimp View List Page
1006 
+	 *
1007 
+	 * @since    1.0.0
1008 
+	 */
1009 1009 
 	function generateViewListPage() {
1010 1010 
 		require_once YIKES_MC_PATH . 'admin/partials/view-list.php'; // include our options page
1011 1011 
 	}
1012 1012
1013 1013 
 	/**
1014 
-	* Generate Us Easy Mailchimp View User Page
1015 
-	*
1016 
-	* @since    1.0.0
1017 
-	*/
1014 
+	 * Generate Us Easy Mailchimp View User Page
1015 
+	 *
1016 
+	 * @since    1.0.0
1017 
+	 */
1018 1018 
 	function generateViewUserPage() {
1019 1019 
 		require_once YIKES_MC_PATH . 'admin/partials/view-user.php'; // include our options page
1020 1020 
 	}
1021 1021
1022 1022 
 	/**
1023 
-	*	Register our plugin settings, and display them on our settings page
1024 
-	*
1025 
-	* @since v.5.4
1026 
-	**/
1023 
+	 *	Register our plugin settings, and display them on our settings page
1024 
+	 *
1025 
+	 * @since v.5.4
1026 
+	 **/
1027 1027 
 	function yikes_easy_mc_settings_init() {
1028 1028
1029 1029 
 		/* Register General Settings Section */

@@ -1167,9 +1167,9 @@  discard block
 
 block discarded – undo
1167 1167 
 	}
1168 1168
1169 1169 
 	/**
1170 
-	*	Options Sanitization & Validation
1171 
-	*	@since complete re-write
1172 
-	**/
1170 
+	 *	Options Sanitization & Validation
1171 
+	 *	@since complete re-write
1172 
+	 **/
1173 1173 
 	function yikes_mc_validate_api_key( $input ) {
1174 1174 
 		if ( $input === '' ) {
1175 1175 
 			update_option( 'yikes-mc-api-validation', 'invalid_api_key' );

@@ -1201,20 +1201,20 @@  discard block
 
 block discarded – undo
1201 1201 
 	}
1202 1202
1203 1203 
 	/**
1204 
-	* Generate Us Easy Forms for Mailchimp Options Page
1205 
-	*
1206 
-	* @since    1.0.0
1207 
-	*/
1204 
+	 * Generate Us Easy Forms for Mailchimp Options Page
1205 
+	 *
1206 
+	 * @since    1.0.0
1207 
+	 */
1208 1208 
 	function generatePageOptions() {
1209 1209 
 		require_once YIKES_MC_PATH . 'admin/partials/menu/options.php'; // include our options page
1210 1210 
 	}
1211 1211
1212 1212 
 	/**
1213 
-	*	Check if users API key is valid, if not
1214 
-	*	this function will apply a disabled attribute
1215 
-	*	to form fields. (input, dropdowns, buttons etc.)
1216 
-	* 	@since v5.5 re-write
1217 
-	**/
1213 
+	 *	Check if users API key is valid, if not
1214 
+	 *	this function will apply a disabled attribute
1215 
+	 *	to form fields. (input, dropdowns, buttons etc.)
1216 
+	 * 	@since v5.5 re-write
1217 
+	 **/
1218 1218 
 	public function is_user_mc_api_valid_form( $echo = true ) {
1219 1219 
 		if ( $echo == true ) {
1220 1220 
 			if ( get_option( 'yikes-mc-api-validation', 'invalid_api_key' ) == 'invalid_api_key' ) {

@@ -1240,12 +1240,12 @@  discard block
 
 block discarded – undo
1240 1240 
 		*	- http://stackoverflow.com/questions/6661530/php-multi-dimensional-array-search
1241 1241 
 		*/
1242 1242 
 		function findMCListID($id, $array) {
1243 
-		   foreach ($array as $key => $val) {
1244 
-			   if ($val['id'] === $id) {
1245 
-				   return $key;
1246 
-			   }
1247 
-		   }
1248 
-		   return null;
1243 
+			foreach ($array as $key => $val) {
1244 
+				if ($val['id'] === $id) {
1245 
+					return $key;
1246 
+				}
1247 
+			}
1248 
+			return null;
1249 1249 
 		} // end
1250 1250
1251 1251 
 		/*

@@ -1420,13 +1420,13 @@  discard block
 
 block discarded – undo
1420 1420 
 				<?php
1421 1421
1422 1422 
 					/**
1423 
-					*	yikes-mailchimp-excluded-redirect-post-types
1424 
-					*
1425 
-					*	Filter the post types that will not show on the redirect list dropdown.
1426 
-					*
1427 
-					* 	@param array | $excluded_post_types | The array of default excluded post types
1428 
-					*	@return array| $excluded_post_types | The array of user-defined excluded post types
1429 
-					*/
1423 
+					 *	yikes-mailchimp-excluded-redirect-post-types
1424 
+					 *
1425 
+					 *	Filter the post types that will not show on the redirect list dropdown.
1426 
+					 *
1427 
+					 * 	@param array | $excluded_post_types | The array of default excluded post types
1428 
+					 *	@return array| $excluded_post_types | The array of user-defined excluded post types
1429 
+					 */
1430 1430 
 					$excluded_post_types = array( 'attachment', 'revision', 'nav_menu_item', 'shop_order', 'shop_order_refund', 'custom_css', 'customize_changeset', 'forum', 'topic', 'reply' );
1431 1431 
 					$excluded_post_types = apply_filters( 'yikes-mailchimp-excluded-redirect-post-types', $excluded_post_types );
1432 1432 
 

@@ -1556,9 +1556,9 @@  discard block
 
 block discarded – undo
1556 1556 
 			}
1557 1557
1558 1558 
 			/**
1559 
-			*	Custom action hook for our extensions to hook into
1560 
-			*	@parameter	get_current_screen()	current screen information
1561 
-			*/
1559 
+			 *	Custom action hook for our extensions to hook into
1560 
+			 *	@parameter	get_current_screen()	current screen information
1561 
+			 */
1562 1562 
 			do_action( 'yikes-mailchimp-admin-sidebar', get_current_screen() );
1563 1563
1564 1564 
 		}

@@ -2508,13 +2508,13 @@  discard block
 
 block discarded – undo
2508 2508 
 			$result = $this->form_interface->create_form( $form_data );
2509 2509
2510 2510 
 			/**
2511 
-			* `yikes-mailchimp-after-duplicating-form`
2512 
-			*
2513 
-			* @param $post_id_to_clone | int   | ID of the original form
2514 
-			* @param $result           | mixed | ID of the new form OR false if the operation failed
2515 
-			* @param $form_data        | array | Array of the form data
2516 
-			*
2517 
-			*/
2511 
+			 * `yikes-mailchimp-after-duplicating-form`
2512 
+			 *
2513 
+			 * @param $post_id_to_clone | int   | ID of the original form
2514 
+			 * @param $result           | mixed | ID of the new form OR false if the operation failed
2515 
+			 * @param $form_data        | array | Array of the form data
2516 
+			 *
2517 
+			 */
2518 2518 
 			do_action( 'yikes-mailchimp-after-duplicating-form', $post_id_to_clone, $result, $form_data );
2519 2519
2520 2520 
 			if ( false === $result ) {
Please login to merge, or discard this patch.
Spacing   +346 added lines, -346 removed lines patch added patch discarded remove patch 
@@ -92,7 +92,7 @@  discard block
 
 block discarded – undo
92 92 
 		/***********************/
93 93 
 		/** Create A Form **/
94 94 
 		/**********************/
95 
-		if ( isset( $_REQUEST['action'] ) && $_REQUEST['action'] == 'yikes-easy-mc-create-form' ) {
95 
+		if ( isset( $_REQUEST[ 'action' ] ) && $_REQUEST[ 'action' ] == 'yikes-easy-mc-create-form' ) {
96 96
97 97 
 			add_action( 'init', array( $this, 'yikes_easy_mailchimp_create_form' ) );
98 98 
 

@@ -101,7 +101,7 @@  discard block
 
 block discarded – undo
101 101 
 		/***********************/
102 102 
 		/** Delete A Form **/
103 103 
 		/**********************/
104 
-		if ( isset( $_REQUEST['action'] ) && $_REQUEST['action'] == 'yikes-easy-mc-delete-form' ) {
104 
+		if ( isset( $_REQUEST[ 'action' ] ) && $_REQUEST[ 'action' ] == 'yikes-easy-mc-delete-form' ) {
105 105
106 106 
 			add_action( 'init', array( $this, 'yikes_easy_mailchimp_delete_form' ) );
107 107 
 

@@ -110,7 +110,7 @@  discard block
 
 block discarded – undo
110 110 
 		/**********************************/
111 111 
 		/** Duplicate/Clone A Form    **/
112 112 
 		/********************************/
113 
-		if ( isset( $_REQUEST['action'] ) && $_REQUEST['action'] == 'yikes-easy-mc-duplicate-form' ) {
113 
+		if ( isset( $_REQUEST[ 'action' ] ) && $_REQUEST[ 'action' ] == 'yikes-easy-mc-duplicate-form' ) {
114 114
115 115 
 			add_action( 'init', array( $this, 'yikes_easy_mailchimp_duplicate_form' ) );
116 116 
 

@@ -119,7 +119,7 @@  discard block
 
 block discarded – undo
119 119 
 		/*************************************/
120 120 
 		/**  Reset Form Impression Stats **/
121 121 
 		/***********************************/
122 
-		if ( isset( $_REQUEST['action'] ) && $_REQUEST['action'] == 'yikes-easy-mc-reset-stats' ) {
122 
+		if ( isset( $_REQUEST[ 'action' ] ) && $_REQUEST[ 'action' ] == 'yikes-easy-mc-reset-stats' ) {
123 123
124 124 
 			add_action( 'init', array( $this, 'yikes_easy_mailchimp_reset_impression_stats' ) );
125 125 
 

@@ -128,7 +128,7 @@  discard block
 
 block discarded – undo
128 128 
 		/**********************************/
129 129 
 		/**         Update A Form        **/
130 130 
 		/********************************/
131 
-		if ( isset( $_REQUEST['action'] ) && $_REQUEST['action'] == 'yikes-easy-mc-update-form' ) {
131 
+		if ( isset( $_REQUEST[ 'action' ] ) && $_REQUEST[ 'action' ] == 'yikes-easy-mc-update-form' ) {
132 132
133 133 
 			add_action( 'init', array( $this, 'yikes_easy_mailchimp_update_form' ) );
134 134 
 

@@ -137,7 +137,7 @@  discard block
 
 block discarded – undo
137 137 
 		/**************************************************/
138 138 
 		/**     Clear Store Mailchimp Transient Data   **/
139 139 
 		/*************************************************/
140 
-		if ( isset( $_REQUEST['action'] ) && $_REQUEST['action'] == 'yikes-easy-mc-clear-transient-data' ) {
140 
+		if ( isset( $_REQUEST[ 'action' ] ) && $_REQUEST[ 'action' ] == 'yikes-easy-mc-clear-transient-data' ) {
141 141
142 142 
 			add_action( 'init', array( $this, 'yikes_easy_mailchimp_clear_transient_data' ) );
143 143 
 

@@ -146,7 +146,7 @@  discard block
 
 block discarded – undo
146 146 
 		/*******************************************/
147 147 
 		/** Remove a user from a mailing list     **/
148 148 
 		/*****************************************/
149 
-		if ( isset( $_REQUEST['action'] ) && $_REQUEST['action'] == 'yikes-easy-mc-unsubscribe-user' ) {
149 
+		if ( isset( $_REQUEST[ 'action' ] ) && $_REQUEST[ 'action' ] == 'yikes-easy-mc-unsubscribe-user' ) {
150 150
151 151 
 			add_action( 'init', array( $this, 'yikes_easy_mailchimp_unsubscribe_user' ) );
152 152 
 

@@ -155,7 +155,7 @@  discard block
 
 block discarded – undo
155 155 
 		/*******************************************/
156 156 
 		/**    Create misisng error log file  **/
157 157 
 		/*****************************************/
158 
-		if ( isset( $_REQUEST['action'] ) && $_REQUEST['action'] == 'yikes-easy-mc-create-error-log' ) {
158 
+		if ( isset( $_REQUEST[ 'action' ] ) && $_REQUEST[ 'action' ] == 'yikes-easy-mc-create-error-log' ) {
159 159
160 160 
 			add_action( 'init', array( $this, 'yikes_easy_mailchimp_create_missing_error_log' ) );
161 161 
 

@@ -187,7 +187,7 @@  discard block
 
 block discarded – undo
187 187 
 		/**************************************************/
188 188 
 		/**        Clear Mailchimp Error Log Data        **/
189 189 
 		/*************************************************/
190 
-		if ( isset( $_REQUEST['action'] ) && $_REQUEST['action'] == 'yikes-easy-mc-clear-error-log' ) {
190 
+		if ( isset( $_REQUEST[ 'action' ] ) && $_REQUEST[ 'action' ] == 'yikes-easy-mc-clear-error-log' ) {
191 191
192 192 
 			add_action( 'init', array( $this, 'yikes_easy_mailchimp_clear_error_log' ) );
193 193 
 

@@ -196,7 +196,7 @@  discard block
 
 block discarded – undo
196 196 
 		/*********************************************/
197 197 
 		/**        Export Mailchimp Opt-in Forms   **/
198 198 
 		/*******************************************/
199 
-		if ( isset( $_REQUEST['action'] ) && $_REQUEST['action'] == 'yikes-easy-mc-export-forms' ) {
199 
+		if ( isset( $_REQUEST[ 'action' ] ) && $_REQUEST[ 'action' ] == 'yikes-easy-mc-export-forms' ) {
200 200
201 201 
 			add_action( 'init', array( $this, 'yikes_easy_mailchimp_export_forms' ) );
202 202 
 

@@ -205,7 +205,7 @@  discard block
 
 block discarded – undo
205 205 
 		/*********************************************/
206 206 
 		/**                Export Plugin Settings           **/
207 207 
 		/*******************************************/
208 
-		if ( isset( $_REQUEST['action'] ) && $_REQUEST['action'] == 'yikes-easy-mc-export-settings' ) {
208 
+		if ( isset( $_REQUEST[ 'action' ] ) && $_REQUEST[ 'action' ] == 'yikes-easy-mc-export-settings' ) {
209 209
210 210 
 			add_action( 'init', array( $this, 'yikes_easy_mailchimp_export_plugin_settings' ) );
211 211 
 

@@ -214,7 +214,7 @@  discard block
 
 block discarded – undo
214 214 
 		/*******************************************/
215 215 
 		/**        Import Class Inclusion       **/
216 216 
 		/*****************************************/
217 
-		if ( isset( $_REQUEST['action'] ) && $_REQUEST['action'] == 'yikes-easy-mc-import-forms' ) {
217 
+		if ( isset( $_REQUEST[ 'action' ] ) && $_REQUEST[ 'action' ] == 'yikes-easy-mc-import-forms' ) {
218 218
219 219 
 			add_action( 'init', array( $this, 'yikes_easy_mailchimp_import_forms' ) );
220 220 
 

@@ -223,7 +223,7 @@  discard block
 
 block discarded – undo
223 223 
 		/*******************************************/
224 224 
 		/**    Premium Support Request     **/
225 225 
 		/*****************************************/
226 
-		if ( isset( $_POST['submit-premium-support-request'] ) ) {
226 
+		if ( isset( $_POST[ 'submit-premium-support-request' ] ) ) {
227 227
228 228 
 			add_action( 'init', array( $this, 'yikes_easy_mailchimp_premium_support_request' ) );
229 229 
 

@@ -256,8 +256,8 @@  discard block
 
 block discarded – undo
256 256 
 		 * @ return array  $links  New array of plugin actions
257 257 
 		 */
258 258 
 		public function easy_forms_plugin_action_links( $links ) {
259 
-			$links[] = '<a href="'. esc_url( get_admin_url(null, 'admin.php?page=yikes-inc-easy-mailchimp-settings') ) .'">' . __( 'Settings', 'yikes-inc-easy-mailchimp-extender' ) . '</a>';
260 
-			$links[] = '<a href="' . esc_url( 'http://www.yikesplugins.com?utm_source=plugins-page&utm_medium=plugin-row&utm_campaign=admin' ) . '" target="_blank">' . __( 'More plugins by YIKES, Inc.', 'yikes-inc-easy-mailchimp-extender' ) . '</a>';
259 
+			$links[ ] = '<a href="' . esc_url( get_admin_url( null, 'admin.php?page=yikes-inc-easy-mailchimp-settings' ) ) . '">' . __( 'Settings', 'yikes-inc-easy-mailchimp-extender' ) . '</a>';
260 
+			$links[ ] = '<a href="' . esc_url( 'http://www.yikesplugins.com?utm_source=plugins-page&utm_medium=plugin-row&utm_campaign=admin' ) . '" target="_blank">' . __( 'More plugins by YIKES, Inc.', 'yikes-inc-easy-mailchimp-extender' ) . '</a>';
261 261 
 			return $links;
262 262 
 		}
263 263 
 

@@ -358,17 +358,17 @@  discard block
 
 block discarded – undo
358 358 
 		*/
359 359 
 		public function yikes_easy_mailchimp_export_forms() {
360 360 
 			// grab our nonce.
361 
-			$nonce = $_REQUEST['nonce'];
361 
+			$nonce = $_REQUEST[ 'nonce' ];
362 362 
 			// grab the forms.
363 
-			$forms = isset( $_REQUEST['yikes_export_forms'] ) ? $_REQUEST['yikes_export_forms'] : array();
363 
+			$forms = isset( $_REQUEST[ 'yikes_export_forms' ] ) ? $_REQUEST[ 'yikes_export_forms' ] : array();
364 364 
 			// validate nonce.
365 365 
 			if ( ! wp_verify_nonce( $nonce, 'export-forms' ) ) {
366 
-				wp_die( __( "We've run into an error. The security check didn't pass. Please try again." , 'yikes-inc-easy-mailchimp-extender' ) , __( "Failed nonce validation" , 'yikes-inc-easy-mailchimp-extender' ) , array( 'response' => 500 , 'back_link' => true ) );
366 
+				wp_die( __( "We've run into an error. The security check didn't pass. Please try again.", 'yikes-inc-easy-mailchimp-extender' ), __( "Failed nonce validation", 'yikes-inc-easy-mailchimp-extender' ), array( 'response' => 500, 'back_link' => true ) );
367 367 
 			}
368 368
369 369 
 			// run the export function.
370 370 
 			// parameters: ( $table_name, $form_ids, $file_name ).
371 
-			Yikes_Inc_Easy_Mailchimp_Export_Class::yikes_mailchimp_form_export('Yikes-Inc-Easy-Mailchimp-Forms-Export', $forms );
371 
+			Yikes_Inc_Easy_Mailchimp_Export_Class::yikes_mailchimp_form_export( 'Yikes-Inc-Easy-Mailchimp-Forms-Export', $forms );
372 372 
 			// re-direct the user back to the page.
373 373 
 			wp_redirect( esc_url_raw( admin_url( 'admin.php?page=yikes-inc-easy-mailchimp-settings&section=import-export-forms' ) ) );
374 374 
 			die();

@@ -382,10 +382,10 @@  discard block
 
 block discarded – undo
382 382 
 		*/
383 383 
 		public function yikes_easy_mailchimp_export_plugin_settings() {
384 384 
 			// grab our nonce
385 
-			$nonce = $_REQUEST['nonce'];
385 
+			$nonce = $_REQUEST[ 'nonce' ];
386 386 
 			// validate nonce.
387 387 
 			if ( ! wp_verify_nonce( $nonce, 'export-settings' ) ) {
388 
-				wp_die( __( "We've run into an error. The security check didn't pass. Please try again." , 'yikes-inc-easy-mailchimp-extender' ) , __( "Failed nonce validation" , 'yikes-inc-easy-mailchimp-extender' ) , array( 'response' => 500 , 'back_link' => true ) );
388 
+				wp_die( __( "We've run into an error. The security check didn't pass. Please try again.", 'yikes-inc-easy-mailchimp-extender' ), __( "Failed nonce validation", 'yikes-inc-easy-mailchimp-extender' ), array( 'response' => 500, 'back_link' => true ) );
389 389 
 			}
390 390
391 391 
 			// run the export function.

@@ -402,10 +402,10 @@  discard block
 
 block discarded – undo
402 402 
 		*/
403 403 
 		public function yikes_easy_mailchimp_import_forms() {
404 404 
 			// grab our nonce.
405 
-			$nonce = $_REQUEST['nonce'];
405 
+			$nonce = $_REQUEST[ 'nonce' ];
406 406 
 			// validate nonce.
407 407 
 			if ( ! wp_verify_nonce( $nonce, 'import-forms' ) ) {
408 
-				wp_die( __( "We've run into an error. The security check didn't pass. Please try again." , 'yikes-inc-easy-mailchimp-extender' ) , __( "Failed nonce validation" , 'yikes-inc-easy-mailchimp-extender' ) , array( 'response' => 500 , 'back_link' => true ) );
408 
+				wp_die( __( "We've run into an error. The security check didn't pass. Please try again.", 'yikes-inc-easy-mailchimp-extender' ), __( "Failed nonce validation", 'yikes-inc-easy-mailchimp-extender' ), array( 'response' => 500, 'back_link' => true ) );
409 409 
 			}
410 410 
 			// include the export class.
411 411 
 			if ( ! class_exists( 'Yikes_Inc_Easy_Mailchimp_Import_Class' ) ) {

@@ -426,18 +426,18 @@  discard block
 
 block discarded – undo
426 426 
 		*/
427 427 
 		public function yikes_easy_mailchimp_premium_support_request() {
428 428
429 
-			if ( isset( $_POST['action'] ) && $_POST['action'] != 'yikes-support-request' ) {
429 
+			if ( isset( $_POST[ 'action' ] ) && $_POST[ 'action' ] != 'yikes-support-request' ) {
430 430 
 				return __( 'We encountered an error. Please contact the YIKES Inc. support team.', 'yikes-inc-easy-mailchimp-extender' );
431 431 
 			}
432 432
433 
-			$email       = isset( $_POST['user-email'] ) ? $_POST['user-email'] : '';
434 
-			$topic       = isset( $_POST['support-topic'] ) ? $_POST['support-topic'] : '';
435 
-			$issue       = isset( $_POST['support-content'] ) ? $_POST['support-content'] : '';
436 
-			$priority    = isset( $_POST['support-priority'] ) ? $_POST['support-priority'] : 1;
437 
-			$license     = isset( $_POST['license_key'] ) ? $_POST['license_key'] : '';
438 
-			$plugin_name = isset( $_POST['plugin-name'] ) ? $_POST['plugin-name'] : '';
439 
-			$plugin_slug = isset( $_POST['plugin-slug'] ) ? $_POST['plugin-slug'] : '';
440 
-			$name        = isset( $_POST['user-name'] ) ? $_POST['user-name'] : 'Mailchimp Support';
433 
+			$email       = isset( $_POST[ 'user-email' ] ) ? $_POST[ 'user-email' ] : '';
434 
+			$topic       = isset( $_POST[ 'support-topic' ] ) ? $_POST[ 'support-topic' ] : '';
435 
+			$issue       = isset( $_POST[ 'support-content' ] ) ? $_POST[ 'support-content' ] : '';
436 
+			$priority    = isset( $_POST[ 'support-priority' ] ) ? $_POST[ 'support-priority' ] : 1;
437 
+			$license     = isset( $_POST[ 'license_key' ] ) ? $_POST[ 'license_key' ] : '';
438 
+			$plugin_name = isset( $_POST[ 'plugin-name' ] ) ? $_POST[ 'plugin-name' ] : '';
439 
+			$plugin_slug = isset( $_POST[ 'plugin-slug' ] ) ? $_POST[ 'plugin-slug' ] : '';
440 
+			$name        = isset( $_POST[ 'user-name' ] ) ? $_POST[ 'user-name' ] : 'Mailchimp Support';
441 441
442 442 
 			$edd_item_id = $this->get_premium_license( $plugin_slug );
443 443 
 

@@ -472,7 +472,7 @@  discard block
 
 block discarded – undo
472 472
473 473 
 		public function get_premium_license( $plugin_slug ) {
474 474
475 
-			switch( $plugin_slug ) {
475 
+			switch ( $plugin_slug ) {
476 476
477 477 
 				case 'form-customizer':
478 478 
 					return defined( 'YIKES_CUSTOMIZER_EDD_ITEM_ID' ) ? YIKES_CUSTOMIZER_EDD_ITEM_ID : '';

@@ -516,7 +516,7 @@  discard block
 
 block discarded – undo
516 516 
 			// add a new option to store the plugin activation date/time.
517 517 
 			// @since v6.0.0.
518 518 
 			// this is used to notify the user that they should review after 2 weeks.
519 
-			if ( !get_option( 'yikes_easy_mailchimp_activation_date' ) ) {
519 
+			if ( ! get_option( 'yikes_easy_mailchimp_activation_date' ) ) {
520 520 
 				add_option( 'yikes_easy_mailchimp_activation_date', strtotime( "now" ) );
521 521 
 			}
522 522 
 

@@ -526,7 +526,7 @@  discard block
 
 block discarded – undo
526 526 
 				$install_date = get_option( 'yikes_easy_mailchimp_activation_date' );
527 527 
 				$past_date = strtotime( '-14 days' );
528 528 
 				if ( $past_date >= $install_date && current_user_can( 'install_plugins' ) ) {
529 
-					add_action( 'admin_notices', array( $this , 'yikes_easy_mailchimp_display_review_us_notice' ) );
529 
+					add_action( 'admin_notices', array( $this, 'yikes_easy_mailchimp_display_review_us_notice' ) );
530 530 
 				}
531 531 
 			}
532 532 
 

@@ -539,13 +539,13 @@  discard block
 
 block discarded – undo
539 539 
 		*/
540 540 
 		public function yikes_easy_mailchimp_display_review_us_notice() {
541 541 
 			/* Lets only display our admin notice on YT4WP pages to not annoy the hell out of people :) */
542 
-			if ( in_array( get_current_screen()->base , array( 'dashboard', 'post', 'edit' ) ) || strpos( get_current_screen()->base ,'yikes-inc-easy-mailchimp') !== false ) {
542 
+			if ( in_array( get_current_screen()->base, array( 'dashboard', 'post', 'edit' ) ) || strpos( get_current_screen()->base, 'yikes-inc-easy-mailchimp' ) !== false ) {
543 543
544 544 
 				// The URL of the page the user is currently on
545 
-				$current_uri  	  = isset( $_SERVER['REQUEST_URI'] ) && ! empty( $_SERVER['REQUEST_URI'] ) ? $_SERVER['REQUEST_URI'] : false;
546 
-				$current_host	  = isset( $_SERVER['HTTP_HOST'] ) && ! empty( $_SERVER['HTTP_HOST'] ) ? $_SERVER['HTTP_HOST'] : false;
545 
+				$current_uri = isset( $_SERVER[ 'REQUEST_URI' ] ) && ! empty( $_SERVER[ 'REQUEST_URI' ] ) ? $_SERVER[ 'REQUEST_URI' ] : false;
546 
+				$current_host = isset( $_SERVER[ 'HTTP_HOST' ] ) && ! empty( $_SERVER[ 'HTTP_HOST' ] ) ? $_SERVER[ 'HTTP_HOST' ] : false;
547 547 
 				$current_protocol = is_ssl() === true ? 'https://' : 'http://';
548 
-				$current_url	  = ( $current_uri !== false && $current_host !== false ) ? $current_protocol . $current_host . $current_uri : admin_url();
548 
+				$current_url = ( $current_uri !== false && $current_host !== false ) ? $current_protocol . $current_host . $current_uri : admin_url();
549 549
550 550 
 				$plugin_name = '<strong>Easy Forms for Mailchimp</strong>';
551 551 
 				// Review URL - Change to the URL of your plugin on WordPress.org.

@@ -556,17 +556,17 @@  discard block
 
 block discarded – undo
556 556 
 				// Make sure all of our variables have values.
557 557 
 				$reviewurl  = ( ! empty( $reviewurl ) ) ? $reviewurl : '';
558 558 
 				$addons_url = ( ! empty( $addons_url ) ) ? $addons_url : '';
559 
-				$nobugurl	= ( ! empty( $nobugurl ) ) ? $nobugurl : '';
559 
+				$nobugurl = ( ! empty( $nobugurl ) ) ? $nobugurl : '';
560 560
561 561 
 				$review_message = '<div id="yikes-mailchimp-logo"></div>';
562 562 
 				$review_message .= sprintf(
563 563 
 					__( 'It looks like you\'ve been using %1$s for 2 weeks now. We hope you\'re enjoying the features included with the free version. If so, please consider leaving us a review. Reviews only help to catch other users attention as well as provide us with feedback to grow and improve upon. If you\'re really enjoying the plugin, consider buying an add-on or developer license for some really awesome features and premium support.', 'yikes-inc-easy-mailchimp-extender' )
564 564 
 					. '<span class="button-container"> <a href="%2$s" target="_blank" class="button-secondary"><span class="dashicons dashicons-star-filled"></span>'
565 
-						. __( "Leave A Review" , 'yikes-inc-easy-mailchimp-extender' )
565 
+						. __( "Leave A Review", 'yikes-inc-easy-mailchimp-extender' )
566 566 
 					. '</a> <a href="%3$s" class="button-secondary"><span class="dashicons dashicons-upload"></span>'
567 
-						. __( "View Addons" , 'yikes-inc-easy-mailchimp-extender' )
567 
+						. __( "View Addons", 'yikes-inc-easy-mailchimp-extender' )
568 568 
 					. '</a> <a href="%4$s" class="button-secondary"><span class="dashicons dashicons-no-alt"></span>'
569 
-						. __( "Dismiss" , 'yikes-inc-easy-mailchimp-extender' )
569 
+						. __( "Dismiss", 'yikes-inc-easy-mailchimp-extender' )
570 570 
 					. "</a> </span>",
571 571 
 				$plugin_name, $reviewurl, $addons_url, $nobugurl );
572 572 
 				?>

@@ -583,7 +583,7 @@  discard block
 
 block discarded – undo
583 583 
 			@since v3.1.1
584 584 
 		*/
585 585 
 		public function yikes_easy_mailchimp_stop_bugging_me() {
586 
-			if ( isset( $_GET['yikes_easy_mc_icons_nobug'] ) && (int) filter_var( $_GET['yikes_easy_mc_icons_nobug'], FILTER_SANITIZE_NUMBER_INT ) === 1 ) {
586 
+			if ( isset( $_GET[ 'yikes_easy_mc_icons_nobug' ] ) && (int) filter_var( $_GET[ 'yikes_easy_mc_icons_nobug' ], FILTER_SANITIZE_NUMBER_INT ) === 1 ) {
587 587 
 				add_option( 'yikes_easy_mailchimp_review_stop_bugging_me', true );
588 588 
 			}
589 589 
 		}

@@ -621,7 +621,7 @@  discard block
 
 block discarded – undo
621 621 
 	// inlcude the js for tinymce.
622 622 
 	public function yks_mc_add_tinymce_plugin( $plugin_array ) {
623 623
624 
-		$plugin_array['yks_mc_tinymce_button'] = plugins_url( '/js/min/yikes-inc-easy-mailchimp-tinymce-button.min.js', __FILE__ );
624 
+		$plugin_array[ 'yks_mc_tinymce_button' ] = plugins_url( '/js/min/yikes-inc-easy-mailchimp-tinymce-button.min.js', __FILE__ );
625 625
626 626 
 		return $plugin_array;
627 627 
 	}

@@ -642,13 +642,13 @@  discard block
 
 block discarded – undo
642 642 
 		if ( ! empty( $list_data ) ) {
643 643 
 			// build an array to pass to our javascript.
644 644 
 			foreach ( $list_data as $id => $form ) {
645 
-				$lists[] = array(
646 
-					'text'  => urlencode( $form['form_name'] ),
645 
+				$lists[ ] = array(
646 
+					'text'  => urlencode( $form[ 'form_name' ] ),
647 647 
 					'value' => $id,
648 648 
 				);
649 649 
 			}
650 650 
 		} else {
651 
-			$lists[0] = array(
651 
+			$lists[ 0 ] = array(
652 652 
 				'text'  => __( 'Please Import Some Mailchimp Lists', 'yikes-inc-easy-mailchimp-extender' ),
653 653 
 				'value' => '-',
654 654 
 			);

@@ -729,8 +729,8 @@  discard block
 
 block discarded – undo
729 729
730 730 
 		wp_enqueue_style( 'wp-color-picker' );
731 731 
 		wp_enqueue_script( 'wp-color-picker' );
732 
-		wp_enqueue_script( 'jquery.timepicker.js',YIKES_MC_URL . 'admin/js/jquery.timepicker.min.js', array( 'jquery' ) , $this->version, false );
733 
-		wp_enqueue_script( 'edit-form-js', YIKES_MC_URL . 'admin/js/min/yikes-inc-easy-mailchimp-extender-edit-form.min.js', array( 'jquery.timepicker.js', 'jquery-ui-datepicker' ) , $this->version, false );
732 
+		wp_enqueue_script( 'jquery.timepicker.js', YIKES_MC_URL . 'admin/js/jquery.timepicker.min.js', array( 'jquery' ), $this->version, false );
733 
+		wp_enqueue_script( 'edit-form-js', YIKES_MC_URL . 'admin/js/min/yikes-inc-easy-mailchimp-extender-edit-form.min.js', array( 'jquery.timepicker.js', 'jquery-ui-datepicker' ), $this->version, false );
734 734
735 735 
 		$localized_data = array(
736 736 
 			'add_tag_nonce'                     => wp_create_nonce( 'add-tag' ),

@@ -826,7 +826,7 @@  discard block
 
 block discarded – undo
826 826 
 	 * Convert the php date format string to a js date format
827 827 
 	 */
828 828 
 	public function yikes_jQuery_datepicker_date_format( $site_option ) {
829 
-		switch( $site_option ) {
829 
+		switch ( $site_option ) {
830 830 
 			//Predefined WP date formats
831 831 
 			default:
832 832 
 			case 'F j, Y':

@@ -1028,7 +1028,7 @@  discard block
 
 block discarded – undo
1028 1028
1029 1029 
 		/* Register General Settings Section */
1030 1030
1031 
-		register_setting( 'yikes_inc_easy_mc_general_settings_page', 'yikes-mc-api-key', array( $this , 'yikes_mc_validate_api_key' ) );
1031 
+		register_setting( 'yikes_inc_easy_mc_general_settings_page', 'yikes-mc-api-key', array( $this, 'yikes_mc_validate_api_key' ) );
1032 1032
1033 1033 
 		register_setting( 'yikes_inc_easy_mc_general_settings_page', 'yikes-mailchimp-use-nonce' );
1034 1034 
 

@@ -1073,7 +1073,7 @@  discard block
 
 block discarded – undo
1073 1073 
 		add_settings_field(
1074 1074 
 			'optin-checkbox-init',
1075 1075 
 			__( 'Select Checkboxes to Generate', 'yikes-inc-easy-mailchimp-extender' ),
1076 
-			'',  // callback + validation inside of admin/partials/menu/options.php
1076 
+			'', // callback + validation inside of admin/partials/menu/options.php
1077 1077 
 			'yikes_inc_easy_mc_checkbox_settings'
1078 1078 
 		);
1079 1079 
 		/* End Checkbox Settings */

@@ -1100,42 +1100,42 @@  discard block
 
 block discarded – undo
1100 1100 
 			add_settings_field(
1101 1101 
 				'yikes-mc-recaptcha-site-key',
1102 1102 
 				__( 'Enter reCAPTCHA V2 Site Key', 'yikes-inc-easy-mailchimp-extender' ),
1103 
-				'',  // callback + validation inside of admin/partials/menu/options.php
1103 
+				'', // callback + validation inside of admin/partials/menu/options.php
1104 1104 
 				'yikes_easy_mc_settings_recpatcha_section'
1105 1105 
 			);
1106 1106
1107 1107 
 			add_settings_field(
1108 1108 
 				'yikes-mc-recaptcha-secret-key',
1109 1109 
 				__( 'Enter reCAPTCHA V2 Secret Key', 'yikes-inc-easy-mailchimp-extender' ),
1110 
-				'',  // callback + validation inside of admin/partials/menu/options.php
1110 
+				'', // callback + validation inside of admin/partials/menu/options.php
1111 1111 
 				'yikes_easy_mc_settings_recpatcha_section'
1112 1112 
 			);
1113 1113
1114 1114 
 			add_settings_field(
1115 1115 
 				'yikes-mc-recaptcha-status',
1116 1116 
 				__( 'Enable ReCaptcha', 'yikes-inc-easy-mailchimp-extender' ),
1117 
-				'',  // callback + validation inside of admin/partials/menu/options.php
1117 
+				'', // callback + validation inside of admin/partials/menu/options.php
1118 1118 
 				'yikes_easy_mc_settings_recpatcha_section'
1119 1119 
 			);
1120 1120
1121 1121 
 			add_settings_field(
1122 1122 
 				'yikes-mc-recaptcha-version-three',
1123 1123 
 				__( 'Enable Version 3', 'yikes-inc-easy-mailchimp-extender' ),
1124 
-				'',  // callback + validation inside of admin/partials/menu/options.php
1124 
+				'', // callback + validation inside of admin/partials/menu/options.php
1125 1125 
 				'yikes_easy_mc_settings_recpatcha_section'
1126 1126 
 			);
1127 1127
1128 1128 
 			add_settings_field(
1129 1129 
 				'yikes-mc-recaptcha-site-key-three',
1130 1130 
 				__( 'Enter reCAPTCHA V3 Site Key', 'yikes-inc-easy-mailchimp-extender' ),
1131 
-				'',  // callback + validation inside of admin/partials/menu/options.php
1131 
+				'', // callback + validation inside of admin/partials/menu/options.php
1132 1132 
 				'yikes_easy_mc_settings_recpatcha_section'
1133 1133 
 			);
1134 1134
1135 1135 
 			add_settings_field(
1136 1136 
 				'yikes-mc-recaptcha-secret-key-three',
1137 1137 
 				__( 'Enter reCAPTCHA V3 Secret Key', 'yikes-inc-easy-mailchimp-extender' ),
1138 
-				'',  // callback + validation inside of admin/partials/menu/options.php
1138 
+				'', // callback + validation inside of admin/partials/menu/options.php
1139 1139 
 				'yikes_easy_mc_settings_recpatcha_section'
1140 1140 
 			);
1141 1141 
 

@@ -1155,7 +1155,7 @@  discard block
 
 block discarded – undo
1155 1155 
 			add_settings_field(
1156 1156 
 				'yikes-mailchimp-debug-status',
1157 1157 
 				__( 'Enable Debugging', 'yikes-inc-easy-mailchimp-extender' ),
1158 
-				'',  // callback + validation inside of admin/partials/menu/options.php
1158 
+				'', // callback + validation inside of admin/partials/menu/options.php
1159 1159 
 				'yikes_easy_mc_settings_debug_section'
1160 1160 
 			);
1161 1161 
 

@@ -1175,7 +1175,7 @@  discard block
 
 block discarded – undo
1175 1175 
 			update_option( 'yikes-mc-api-validation', 'invalid_api_key' );
1176 1176 
 			return '';
1177 1177 
 		}
1178 
-		$api_key = strip_tags ( trim( $input ) );
1178 
+		$api_key = strip_tags( trim( $input ) );
1179 1179 
 		$dash_position = strpos( trim( $input ), '-' );
1180 1180 
 		if ( $dash_position !== false ) {
1181 1181 
 			$manager = new Yikes_Inc_Easy_Mailchimp_API_Manager( $api_key );

@@ -1190,9 +1190,9 @@  discard block
 
 block discarded – undo
1190 1190 
 			update_option( 'yikes-mc-api-validation', 'valid_api_key' );
1191 1191 
 				// Clear the API key transient data
1192 1192 
 			$this->delete_yikes_mailchimp_transients();
1193 
-		}  else {
1193 
+		} else {
1194 1194 
 			$error_logging = new Yikes_Inc_Easy_Mailchimp_Error_Logging();
1195 
-			$error_logging->yikes_easy_mailchimp_write_to_error_log( $response->get_error_message() , __( "Connecting to Mailchimp" , 'yikes-inc-easy-mailchimp-extender' ) , __( "Settings Page/General Settings" , 'yikes-inc-easy-mailchimp-extender' ) );
1195 
+			$error_logging->yikes_easy_mailchimp_write_to_error_log( $response->get_error_message(), __( "Connecting to Mailchimp", 'yikes-inc-easy-mailchimp-extender' ), __( "Settings Page/General Settings", 'yikes-inc-easy-mailchimp-extender' ) );
1196 1196 
 			update_option( 'yikes-mc-api-invalid-key-response', $response->get_error_message() );
1197 1197 
 			update_option( 'yikes-mc-api-validation', 'invalid_api_key' );
1198 1198 
 		}

@@ -1239,9 +1239,9 @@  discard block
 
 block discarded – undo
1239 1239 
 		*	and return the index ( used to find the list name assigned to a form )
1240 1240 
 		*	- http://stackoverflow.com/questions/6661530/php-multi-dimensional-array-search
1241 1241 
 		*/
1242 
-		function findMCListID($id, $array) {
1243 
-		   foreach ($array as $key => $val) {
1244 
-			   if ($val['id'] === $id) {
1242 
+		function findMCListID( $id, $array ) {
1243 
+		   foreach ( $array as $key => $val ) {
1244 
+			   if ( $val[ 'id' ] === $id ) {
1245 1245 
 				   return $key;
1246 1246 
 			   }
1247 1247 
 		   }

@@ -1254,8 +1254,8 @@  discard block
 
 block discarded – undo
1254 1254 
 		*	@since v5.6 - complete re-write
1255 1255 
 		*/
1256 1256 
 		public function generate_options_pages_sidebar_menu() {
1257 
-			if ( isset( $_REQUEST['section'] ) ) {
1258 
-				$selected = $_REQUEST['section'];
1257 
+			if ( isset( $_REQUEST[ 'section' ] ) ) {
1258 
+				$selected = $_REQUEST[ 'section' ];
1259 1259 
 			}
1260 1260 
 			$installed_addons = get_option( 'yikes-easy-mc-active-addons', array() );
1261 1261 
 

@@ -1272,25 +1272,25 @@  discard block
 
 block discarded – undo
1272 1272 
 				<h3><span><?php _e( 'Additional Settings', 'yikes-inc-easy-mailchimp-extender' ); ?></span></h3>
1273 1273 
 				<div class="inside">
1274 1274 
 					<ul id="settings-nav">
1275 
-						<li><?php if ( isset( $_REQUEST['section'] ) && $_REQUEST['section'] == 'general-settings' || !isset( $_REQUEST['section'] ) ) { ?><div class="option-menu-selected-arrow"></div><?php } ?><a href="<?php echo esc_url_raw( add_query_arg( array( 'section' => 'general-settings' ) , admin_url( 'admin.php?page=yikes-inc-easy-mailchimp-settings&section=general-settings' ) ) ); ?>"><?php _e( 'General Settings', 'yikes-inc-easy-mailchimp-extender' ); ?></a></li>
1276 
-						<li><?php if ( isset( $_REQUEST['section'] ) && $_REQUEST['section'] == 'integration-settings' ) { ?><div class="option-menu-selected-arrow"></div><?php } ?><a href="<?php echo esc_url_raw( add_query_arg( array( 'section' => 'integration-settings' ) , admin_url( 'admin.php?page=yikes-inc-easy-mailchimp-settings&section=integration-settings' ) ) ); ?>"><?php _e( 'Integration Settings', 'yikes-inc-easy-mailchimp-extender' ); ?></a></li>
1277 
-						<li><?php if ( isset( $_REQUEST['section'] ) && $_REQUEST['section'] == 'recaptcha-settings' ) { ?><div class="option-menu-selected-arrow"></div><?php } ?><a href="<?php echo esc_url_raw( add_query_arg( array( 'section' => 'recaptcha-settings' ) , admin_url( 'admin.php?page=yikes-inc-easy-mailchimp-settings&section=recaptcha-settings' ) ) ); ?>"><?php _e( 'ReCaptcha Settings', 'yikes-inc-easy-mailchimp-extender' ); ?></a></li>
1278 
-						<li><?php if ( isset( $_REQUEST['section'] ) && $_REQUEST['section'] == 'api-cache-settings' ) { ?><div class="option-menu-selected-arrow"></div><?php } ?><a href="<?php echo esc_url_raw( add_query_arg( array( 'section' => 'api-cache-settings' ) , admin_url( 'admin.php?page=yikes-inc-easy-mailchimp-settings&section=api-cache-settings' ) ) ); ?>"><?php _e( 'API Cache Settings', 'yikes-inc-easy-mailchimp-extender' ); ?></a></li>
1279 
-						<li><?php if ( isset( $_REQUEST['section'] ) && $_REQUEST['section'] ==  'debug-settings' ) { ?><div class="option-menu-selected-arrow"></div><?php } ?><a href="<?php echo esc_url_raw( add_query_arg( array( 'section' => 'debug-settings' ) , admin_url( 'admin.php?page=yikes-inc-easy-mailchimp-settings&section=debug-settings' ) ) ); ?>"><?php _e( 'Debug Settings', 'yikes-inc-easy-mailchimp-extender' ); ?></a></li>
1280 
-						<li><?php if ( isset( $_REQUEST['section'] ) && $_REQUEST['section'] ==  'import-export-forms' ) { ?><div class="option-menu-selected-arrow"></div><?php } ?><a href="<?php echo esc_url_raw( add_query_arg( array( 'section' => 'import-export-forms' ) , admin_url( 'admin.php?page=yikes-inc-easy-mailchimp-settings&section=import-export-forms' ) ) ); ?>"><?php _e( 'Import/Export', 'yikes-inc-easy-mailchimp-extender' ); ?></a></li>
1275 
+						<li><?php if ( isset( $_REQUEST[ 'section' ] ) && $_REQUEST[ 'section' ] == 'general-settings' || ! isset( $_REQUEST[ 'section' ] ) ) { ?><div class="option-menu-selected-arrow"></div><?php } ?><a href="<?php echo esc_url_raw( add_query_arg( array( 'section' => 'general-settings' ), admin_url( 'admin.php?page=yikes-inc-easy-mailchimp-settings&section=general-settings' ) ) ); ?>"><?php _e( 'General Settings', 'yikes-inc-easy-mailchimp-extender' ); ?></a></li>
1276 
+						<li><?php if ( isset( $_REQUEST[ 'section' ] ) && $_REQUEST[ 'section' ] == 'integration-settings' ) { ?><div class="option-menu-selected-arrow"></div><?php } ?><a href="<?php echo esc_url_raw( add_query_arg( array( 'section' => 'integration-settings' ), admin_url( 'admin.php?page=yikes-inc-easy-mailchimp-settings&section=integration-settings' ) ) ); ?>"><?php _e( 'Integration Settings', 'yikes-inc-easy-mailchimp-extender' ); ?></a></li>
1277 
+						<li><?php if ( isset( $_REQUEST[ 'section' ] ) && $_REQUEST[ 'section' ] == 'recaptcha-settings' ) { ?><div class="option-menu-selected-arrow"></div><?php } ?><a href="<?php echo esc_url_raw( add_query_arg( array( 'section' => 'recaptcha-settings' ), admin_url( 'admin.php?page=yikes-inc-easy-mailchimp-settings&section=recaptcha-settings' ) ) ); ?>"><?php _e( 'ReCaptcha Settings', 'yikes-inc-easy-mailchimp-extender' ); ?></a></li>
1278 
+						<li><?php if ( isset( $_REQUEST[ 'section' ] ) && $_REQUEST[ 'section' ] == 'api-cache-settings' ) { ?><div class="option-menu-selected-arrow"></div><?php } ?><a href="<?php echo esc_url_raw( add_query_arg( array( 'section' => 'api-cache-settings' ), admin_url( 'admin.php?page=yikes-inc-easy-mailchimp-settings&section=api-cache-settings' ) ) ); ?>"><?php _e( 'API Cache Settings', 'yikes-inc-easy-mailchimp-extender' ); ?></a></li>
1279 
+						<li><?php if ( isset( $_REQUEST[ 'section' ] ) && $_REQUEST[ 'section' ] == 'debug-settings' ) { ?><div class="option-menu-selected-arrow"></div><?php } ?><a href="<?php echo esc_url_raw( add_query_arg( array( 'section' => 'debug-settings' ), admin_url( 'admin.php?page=yikes-inc-easy-mailchimp-settings&section=debug-settings' ) ) ); ?>"><?php _e( 'Debug Settings', 'yikes-inc-easy-mailchimp-extender' ); ?></a></li>
1280 
+						<li><?php if ( isset( $_REQUEST[ 'section' ] ) && $_REQUEST[ 'section' ] == 'import-export-forms' ) { ?><div class="option-menu-selected-arrow"></div><?php } ?><a href="<?php echo esc_url_raw( add_query_arg( array( 'section' => 'import-export-forms' ), admin_url( 'admin.php?page=yikes-inc-easy-mailchimp-settings&section=import-export-forms' ) ) ); ?>"><?php _e( 'Import/Export', 'yikes-inc-easy-mailchimp-extender' ); ?></a></li>
1281 1281 
 					</ul>
1282 1282 
 					<?php
1283 1283 
 						// create our add-on settings pages
1284 
-						if ( !empty( $installed_addons ) ) {
1284 
+						if ( ! empty( $installed_addons ) ) {
1285 1285 
 							?>
1286 1286 
 							<hr class="add-on-settings-divider" />
1287 1287 
 							<strong><?php _e( 'Addon Settings', 'yikes-inc-easy-mailchimp-extender' ); ?></strong>
1288 1288 
 							<ul id="addon-settings-nav">
1289 1289 
 							<?php
1290 
-							foreach( $installed_addons as $addon_name ) {
1290 
+							foreach ( $installed_addons as $addon_name ) {
1291 1291 
 								?>
1292 1292 
 									<li>
1293 
-										<?php if ( isset( $_REQUEST['section'] ) && $_REQUEST['section'] ==  $addon_name ) { ?><div class="option-menu-selected-arrow"></div><?php } ?><a href="<?php echo esc_url_raw( add_query_arg( array( 'section' => $addon_name, 'addon' => 'true' ) , admin_url( 'admin.php?page=yikes-inc-easy-mailchimp-settings&section='.$addon_name ) ) ); ?>"><?php echo ucwords( str_replace( '-', ' ', $addon_name ) ); ?></a></li>
1293 
+										<?php if ( isset( $_REQUEST[ 'section' ] ) && $_REQUEST[ 'section' ] == $addon_name ) { ?><div class="option-menu-selected-arrow"></div><?php } ?><a href="<?php echo esc_url_raw( add_query_arg( array( 'section' => $addon_name, 'addon' => 'true' ), admin_url( 'admin.php?page=yikes-inc-easy-mailchimp-settings&section=' . $addon_name ) ) ); ?>"><?php echo ucwords( str_replace( '-', ' ', $addon_name ) ); ?></a></li>
1294 1294 
 								<?php
1295 1295 
 							}
1296 1296 
 							?>

@@ -1339,19 +1339,19 @@  discard block
 
 block discarded – undo
1339 1339 
 						<select name="associated-list" id="associated-list" class=" input-field" <?php $this->is_user_mc_api_valid_form( true ); disabled( true, empty( $lists ) ); ?>>
1340 1340 
 							<?php
1341 1341 
 							if ( ! empty( $lists ) ) {
1342 
-								foreach( $lists as $mailing_list ) {
1342 
+								foreach ( $lists as $mailing_list ) {
1343 1343 
 									?>
1344 
-									<option value="<?php echo $mailing_list['id']; ?>"><?php echo stripslashes( $mailing_list['name'] ) . ' (' . $mailing_list['stats']['member_count'] . ') '; ?></option>
1344 
+									<option value="<?php echo $mailing_list[ 'id' ]; ?>"><?php echo stripslashes( $mailing_list[ 'name' ] ) . ' (' . $mailing_list[ 'stats' ][ 'member_count' ] . ') '; ?></option>
1345 1345 
 									<?php
1346 1346 
 								}
1347 1347 
 							} else {
1348 1348 
 								if ( get_option( 'yikes-mc-api-validation', 'invalid_api_key' ) == 'invalid_api_key' ) {
1349 1349 
 									?>
1350 
-									<option><?php echo __( "Please enter a valid API key." , 'yikes-inc-easy-mailchimp-extender' ); ?></option>
1350 
+									<option><?php echo __( "Please enter a valid API key.", 'yikes-inc-easy-mailchimp-extender' ); ?></option>
1351 1351 
 									<?php
1352 1352 
 								} else {
1353 1353 
 									?>
1354 
-									<option><?php echo __( "No lists were found on the account." , 'yikes-inc-easy-mailchimp-extender' ); ?></option>
1354 
+									<option><?php echo __( "No lists were found on the account.", 'yikes-inc-easy-mailchimp-extender' ); ?></option>
1355 1355 
 									<?php
1356 1356
1357 1357 
 								}

@@ -1360,8 +1360,8 @@  discard block
 
 block discarded – undo
1360 1360 
 						</select>
1361 1361
1362 1362 
 						<?php
1363 
-						if ( isset( $_GET['transient-cleared'] ) ) {
1364 
-							if ( 'true' === $_GET['transient-cleared'] ) {
1363 
+						if ( isset( $_GET[ 'transient-cleared' ] ) ) {
1364 
+							if ( 'true' === $_GET[ 'transient-cleared' ] ) {
1365 1365 
 								?>
1366 1366 
 								<div class="yikes-list-refreshed-notice">
1367 1367 
 									<p><?php esc_attr_e( 'Mailchimp list data has been succesfully refreshed.', 'yikes-inc-easy-mailchimp-extender' ); ?></p>

@@ -1374,7 +1374,7 @@  discard block
 
 block discarded – undo
1374 1374 
 							if ( get_option( 'yikes-mc-api-validation', 'invalid_api_key' ) != 'invalid_api_key' ) {
1375 1375 
 								?>
1376 1376 
 									<p class="description">
1377 
-										<?php printf( __( 'Head over to <a href="http://www.Mailchimp.com" title="%s">Mailchimp</a> to create a new list.', 'yikes-inc-easy-mailchimp-extender' ) , __( 'Create a list', 'yikes-inc-easy-mailchimp-extender' ) ); ?>
1377 
+										<?php printf( __( 'Head over to <a href="http://www.Mailchimp.com" title="%s">Mailchimp</a> to create a new list.', 'yikes-inc-easy-mailchimp-extender' ), __( 'Create a list', 'yikes-inc-easy-mailchimp-extender' ) ); ?>
1378 1378 
 									</p>
1379 1379 
 								<?php
1380 1380 
 							}

@@ -1383,9 +1383,9 @@  discard block
 
 block discarded – undo
1383 1383 
 					</label>
1384 1384 
 					<?php
1385 1385 
 						if ( $this->is_user_mc_api_valid_form( false ) ) {
1386 
-							echo submit_button( __( 'Create', 'yikes-inc-easy-mailchimp-extender' ) , 'primary', '', false , array( 'style' => 'margin:.75em 0 .5em 0;' ) );
1386 
+							echo submit_button( __( 'Create', 'yikes-inc-easy-mailchimp-extender' ), 'primary', '', false, array( 'style' => 'margin:.75em 0 .5em 0;' ) );
1387 1387 
 						} else {
1388 
-							echo '<p class="description">' . __( "Please enter a valid Mailchimp API key to get started." , 'yikes-inc-easy-mailchimp-extender' ) . '</p>';
1388 
+							echo '<p class="description">' . __( "Please enter a valid Mailchimp API key to get started.", 'yikes-inc-easy-mailchimp-extender' ) . '</p>';
1389 1389 
 							?>
1390 1390 
 								<a href="<?php echo esc_url_raw( admin_url( 'admin.php?page=yikes-inc-easy-mailchimp-settings&settings-updated=true' ) ); ?>"><?php _e( 'general settings', 'yikes-inc-easy-mailchimp-extender' ); ?></a>
1391 1391 
 							<?php

@@ -1415,7 +1415,7 @@  discard block
 
 block discarded – undo
1415 1415 
 				$post_types = get_post_types();
1416 1416 
 				?>
1417 1417 
 				<label id="redirect-user-to-selection-label" for="redirect-user-to-selection" class="<?php if ( $redirect == '0' ) { echo 'yikes-easy-mc-hidden'; } ?>">
1418 
-					<?php _e( "Select A Page or Post" , 'yikes-inc-easy-mailchimp-extender' ); ?>
1418 
+					<?php _e( "Select A Page or Post", 'yikes-inc-easy-mailchimp-extender' ); ?>
1419 1419 
 					<select id="redirect-user-to-selection" name="redirect-user-to-selection" onchange="shouldWeDisplayCustomURL( this );return;">
1420 1420 
 				<?php
1421 1421 
 

@@ -1431,7 +1431,7 @@  discard block
 
 block discarded – undo
1431 1431 
 					$excluded_post_types = apply_filters( 'yikes-mailchimp-excluded-redirect-post-types', $excluded_post_types );
1432 1432
1433 1433 
 						// loop over registered post types, and query!
1434 
-						foreach( $post_types as $registered_post_type ) {
1434 
+						foreach ( $post_types as $registered_post_type ) {
1435 1435
1436 1436 
 							// exclude a few built in custom post types and any defined by the filter
1437 1437 
 							if ( ! in_array( $registered_post_type, $excluded_post_types ) ) {

@@ -1453,8 +1453,8 @@  discard block
 
 block discarded – undo
1453 1453 
 									?>
1454 1454 
 										<optgroup label="<?php echo ucwords( str_replace( '_', ' ', $registered_post_type ) ); ?>">
1455 1455 
 									<?php
1456 
-											foreach( $post_ids as $post_id ) {
1457 
-												?><option <?php selected( $redirect_page , $post_id ); ?> value="<?php echo $post_id; ?>"><?php echo get_the_title( $post_id ) ?></option><?php
1456 
+											foreach ( $post_ids as $post_id ) {
1457 
+												?><option <?php selected( $redirect_page, $post_id ); ?> value="<?php echo $post_id; ?>"><?php echo get_the_title( $post_id ) ?></option><?php
1458 1458 
 											}
1459 1459 
 									?>
1460 1460 
 										</optgroup>

@@ -1470,7 +1470,7 @@  discard block
 
 block discarded – undo
1470 1470 
 					</select>
1471 1471
1472 1472 
 					<label name="custom-redirect-url" class="custom_redirect_url_label" <?php if ( ! isset( $redirect_page ) || $redirect_page != 'custom_url' ) { echo 'style="display:none;"'; } ?>>
1473 
-						<?php _e( "Enter Custom URL" , 'yikes-inc-easy-mailchimp-extender' ); ?>
1473 
+						<?php _e( "Enter Custom URL", 'yikes-inc-easy-mailchimp-extender' ); ?>
1474 1474 
 						<input type="text" class="widefat custom-redirect-url" name="custom-redirect-url" value="<?php echo $custom_redirect_url; ?>" />
1475 1475 
 					</label>
1476 1476 
 

@@ -1529,7 +1529,7 @@  discard block
 
 block discarded – undo
1529 1529 
 							</p>
1530 1530 
 						</div>
1531 1531
1532 
-						<p class="description sidebar-footer-text"><?php printf( __( "This plugin made with %s by %s" , 'yikes-inc-easy-mailchimp-extender' ), '<span class="dashicons dashicons-heart yikes-love"></span>', '<a href="http://www.yikesinc.com" target="_blank" title="YIKES Inc.">YIKES Inc.</a>' ); ?> </p>
1532 
+						<p class="description sidebar-footer-text"><?php printf( __( "This plugin made with %s by %s", 'yikes-inc-easy-mailchimp-extender' ), '<span class="dashicons dashicons-heart yikes-love"></span>', '<a href="http://www.yikesinc.com" target="_blank" title="YIKES Inc.">YIKES Inc.</a>' ); ?> </p>
1533 1533
1534 1534 
 						<section id="about-yikes-inc" class="inside">
1535 1535 
 							<a href="https://www.yikesinc.com" target="_blank" title="YIKES Inc.">

@@ -1547,7 +1547,7 @@  discard block
 
 block discarded – undo
1547 1547 
 						<!-- review us container -->
1548 1548 
 						<h3><?php _e( 'Easy Forms for Mailchimp Add-Ons', 'yikes-inc-easy-mailchimp-extender' ); ?></h3>
1549 1549 
 						<div id="review-yikes-easy-mc" class="inside">
1550 
-							<p><?php _e( "Check out available add-ons for some seriously enhanced features." , 'yikes-inc-easy-mailchimp-extender' ); ?></p>
1550 
+							<p><?php _e( "Check out available add-ons for some seriously enhanced features.", 'yikes-inc-easy-mailchimp-extender' ); ?></p>
1551 1551 
 							<p><a class="button-secondary" href="<?php echo esc_url_raw( admin_url( 'admin.php?page=yikes-inc-easy-mailchimp-addons' ) ); ?>" title="<?php _e( 'View Add-Ons', 'yikes-inc-easy-mailchimp-extender' ); ?>"><?php _e( 'View Add-Ons', 'yikes-inc-easy-mailchimp-extender' ); ?></a></p>
1552 1552 
 						</div>
1553 1553 
 

@@ -1574,11 +1574,11 @@  discard block
 
 block discarded – undo
1574 1574
1575 1575 
 			// if no list id, die!
1576 1576 
 			if ( ! $list_id ) {
1577 
-				wp_die( __( "We've encountered an error. No list ID was sent." , 'yikes-inc-easy-mailchimp-extender' ) );
1577 
+				wp_die( __( "We've encountered an error. No list ID was sent.", 'yikes-inc-easy-mailchimp-extender' ) );
1578 1578 
 			}
1579 1579
1580 1580 
 			if ( ! $merge_variables ) {
1581 
-				wp_die( __( "We've encountered an error. Reload the page and try again. If the error persists, please reach out to support." , 'yikes-inc-easy-mailchimp-extender' ) );
1581 
+				wp_die( __( "We've encountered an error. Reload the page and try again. If the error persists, please reach out to support.", 'yikes-inc-easy-mailchimp-extender' ) );
1582 1582 
 			}
1583 1583
1584 1584 
 			if ( ! empty( $form_fields ) ) {

@@ -1589,17 +1589,17 @@  discard block
 
 block discarded – undo
1589 1589 
 				$available_interest_groups	= array();
1590 1590
1591 1591 
 				// Default variables as arrays - these are used for holding the Mailchimp merge field ID
1592 
-				$merge_field_ids			= array();
1593 
-				$mailchimp_merge_field_ids	= array();
1592 
+				$merge_field_ids = array();
1593 
+				$mailchimp_merge_field_ids = array();
1594 1594
1595 1595 
 				// loop over merge variables
1596 
-				if ( ! empty( $merge_variables['merge_fields'] ) ) {
1597 
-					$available_merge_variables = wp_list_pluck( $merge_variables['merge_fields'], 'tag' );
1598 
-					$mailchimp_merge_field_ids = wp_list_pluck( $merge_variables['merge_fields'], 'merge_id' );
1596 
+				if ( ! empty( $merge_variables[ 'merge_fields' ] ) ) {
1597 
+					$available_merge_variables = wp_list_pluck( $merge_variables[ 'merge_fields' ], 'tag' );
1598 
+					$mailchimp_merge_field_ids = wp_list_pluck( $merge_variables[ 'merge_fields' ], 'merge_id' );
1599 1599
1600 1600 
 					// Array will look like $merge_tag => $merge_id
1601 
-					foreach( $available_merge_variables as $index => $merge_tag ) {
1602 
-						$merge_field_ids[$merge_tag] = $mailchimp_merge_field_ids[$index];
1601 
+					foreach ( $available_merge_variables as $index => $merge_tag ) {
1602 
+						$merge_field_ids[ $merge_tag ] = $mailchimp_merge_field_ids[ $index ];
1603 1603 
 					}
1604 1604 
 				}
1605 1605 
 

@@ -1613,51 +1613,51 @@  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){
1617 
-					return isset($field['type']);
1616 
+				$form_fields = array_filter( $form_fields, function( $field ) {
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 
-						$excluded_field = in_array( $field['merge'], $excluded_fields, true );
1625 
+						$excluded_field = in_array( $field[ 'merge' ], $excluded_fields, true );
1626 1626 
 						?>
1627 
-						<section class="draggable" id="<?php echo $field['merge']; ?>">
1627 
+						<section class="draggable" id="<?php echo $field[ 'merge' ]; ?>">
1628 1628 
 							<!-- top -->
1629 1629 
 							<a class="expansion-section-title settings-sidebar">
1630 1630 
 								<span class="dashicons dashicons-plus yikes-mc-expansion-toggle"></span>
1631 
-								<span class="yikes-mc-expansion-section-field-label"> <?php echo stripslashes( $field['label'] ); ?> </span>
1631 
+								<span class="yikes-mc-expansion-section-field-label"> <?php echo stripslashes( $field[ 'label' ] ); ?> </span>
1632 1632 
 								<?php if ( $excluded_field ) { ?>
1633 1633 
 									<img src="<?php echo YIKES_MC_URL . 'includes/images/warning.svg'; ?>" class="field-doesnt-exist-notice" title="<?php _e( 'Field no longer exists.', 'yikes-inc-easy-mailchimp-extender' ); ?>" alt="<?php _e( 'Field no longer exists.', 'yikes-inc-easy-mailchimp-extender' ); ?>">
1634 1634 
 								<?php } ?>
1635 
-								<input maxlength="50" type="text" class="yikes-mc-edit-field-label-input" value="<?php echo stripslashes( $field['label'] ); ?>" />
1635 
+								<input maxlength="50" type="text" class="yikes-mc-edit-field-label-input" value="<?php echo stripslashes( $field[ 'label' ] ); ?>" />
1636 1636 
 								<span class="dashicons dashicons-yes yikes-mc-save-field-label-edits-icon" title="<?php _e( 'Click to save changes.', 'yikes-inc-easy-mailchimp-extender' ); ?>"></span>
1637 1637 
 								<span class="dashicons dashicons-edit yikes-mc-edit-field-label-icon" title="<?php _e( 'Click to edit the label', 'yikes-inc-easy-mailchimp-extender' ); ?>"></span>
1638 1638 
 								<span class="yikes-mc-edit-field-label-message"></span>
1639 
-								<span class="field-type-text"><small><?php echo __( 'type', 'yikes-inc-easy-mailchimp-extender' ) . ' : ' . $field['type']; ?></small></span>
1639 
+								<span class="field-type-text"><small><?php echo __( 'type', 'yikes-inc-easy-mailchimp-extender' ) . ' : ' . $field[ 'type' ]; ?></small></span>
1640 1640 
 							</a>
1641 1641 
 							<!-- expansion section -->
1642 1642 
 							<div class="yikes-mc-settings-expansion-section">
1643 1643
1644 1644 
 								<?php if ( $excluded_field ) { ?>
1645 
-									<p class="yikes-mc-warning-message"><?php _e( "This field no longer exists in this list. Delete this field from the form to prevent issues on your website." , 'yikes-inc-easy-mailchimp-extender' ); ?></p>
1645 
+									<p class="yikes-mc-warning-message"><?php _e( "This field no longer exists in this list. Delete this field from the form to prevent issues on your website.", 'yikes-inc-easy-mailchimp-extender' ); ?></p>
1646 1646 
 								<?php } ?>
1647 1647
1648 1648 
 								<!-- store field data -->
1649 
-								<input type="hidden" class="yikes-mc-merge-field-label" name="field[<?php echo $field['merge']; ?>][label]" value="<?php echo htmlspecialchars( $field['label'] ); ?>" />
1650 
-								<input type="hidden" class="yikes-mc-merge-field-type" name="field[<?php echo $field['merge']; ?>][type]" value="<?php echo $field['type']; ?>" />
1651 
-								<input type="hidden" class="yikes-mc-merge-field-tag" name="field[<?php echo $field['merge']; ?>][merge]" value="<?php echo $field['merge']; ?>" />
1652 
-								<input type="hidden" class="field-<?php echo $field['merge']; ?>-position position-input" name="field[<?php echo $field['merge']; ?>][position]" value="<?php echo $i++; ?>" />
1653 
-								<?php if ( isset( $merge_field_ids[ $field['merge'] ] ) && is_int( $merge_field_ids[ $field['merge'] ] ) ) { ?>
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'] ] ?>" />
1649 
+								<input type="hidden" class="yikes-mc-merge-field-label" name="field[<?php echo $field[ 'merge' ]; ?>][label]" value="<?php echo htmlspecialchars( $field[ 'label' ] ); ?>" />
1650 
+								<input type="hidden" class="yikes-mc-merge-field-type" name="field[<?php echo $field[ 'merge' ]; ?>][type]" value="<?php echo $field[ 'type' ]; ?>" />
1651 
+								<input type="hidden" class="yikes-mc-merge-field-tag" name="field[<?php echo $field[ 'merge' ]; ?>][merge]" value="<?php echo $field[ 'merge' ]; ?>" />
1652 
+								<input type="hidden" class="field-<?php echo $field[ 'merge' ]; ?>-position position-input" name="field[<?php echo $field[ 'merge' ]; ?>][position]" value="<?php echo $i++; ?>" />
1653 
+								<?php if ( isset( $merge_field_ids[ $field[ 'merge' ] ] ) && is_int( $merge_field_ids[ $field[ 'merge' ] ] ) ) { ?>
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' ) {
1658 
-									$choices = json_decode( $field['choices'], true );
1657 
+								<?php if ( $field[ 'type' ] == 'radio' || $field[ 'type' ] == 'dropdown' || $field[ 'type' ] == 'select' ) {
1658 
+									$choices = json_decode( $field[ 'choices' ], true );
1659 1659 
 								?>
1660 
-									<input type="hidden" name="field[<?php echo $field['merge']; ?>][choices]" value='<?php echo esc_attr( json_encode( $choices ) ); ?>' />
1660 
+									<input type="hidden" name="field[<?php echo $field[ 'merge' ]; ?>][choices]" value='<?php echo esc_attr( json_encode( $choices ) ); ?>' />
1661 1661 
 								<?php } ?>
1662 1662
1663 1663 
 								<!-- Single or Double Opt-in -->

@@ -1673,12 +1673,12 @@  discard block
 
 block discarded – undo
1673 1673 
 												</label>
1674 1674 
 											</td>
1675 1675 
 											<td>
1676 
-												<input class="widefat merge-tag-text" type="text" readonly value="<?php echo $field['merge']; ?>">
1676 
+												<input class="widefat merge-tag-text" type="text" readonly value="<?php echo $field[ 'merge' ]; ?>">
1677 1677 
 											</td>
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':

@@ -1692,13 +1692,13 @@  discard block
 
 block discarded – undo
1692 1692 
 										<!-- Placeholder -->
1693 1693 
 										<tr valign="top">
1694 1694 
 											<td scope="row">
1695 
-												<label for="placeholder_<?php echo esc_attr( $field['merge'] ); ?>">
1695 
+												<label for="placeholder_<?php echo esc_attr( $field[ 'merge' ] ); ?>">
1696 1696 
 													<?php _e( 'Placeholder', 'yikes-inc-easy-mailchimp-extender' ); ?>
1697 1697 
 												</label>
1698 1698 
 											</td>
1699 1699 
 											<td>
1700 
-												<input type="text" id="placeholder_<?php echo esc_attr( $field['merge'] ); ?>" class="widefat" name="field[<?php echo $field['merge']; ?>][placeholder]" value="<?php echo isset( $field['placeholder'] ) ? $field['placeholder'] : '' ; ?>" />
1701 
-												<p class="description"><small><?php _e( "Assign a placeholder value to this field.", 'yikes-inc-easy-mailchimp-extender' );?></small></p>
1700 
+												<input type="text" id="placeholder_<?php echo esc_attr( $field[ 'merge' ] ); ?>" class="widefat" name="field[<?php echo $field[ 'merge' ]; ?>][placeholder]" value="<?php echo isset( $field[ 'placeholder' ] ) ? $field[ 'placeholder' ] : ''; ?>" />
1701 
+												<p class="description"><small><?php _e( "Assign a placeholder value to this field.", 'yikes-inc-easy-mailchimp-extender' ); ?></small></p>
1702 1702 
 											</td>
1703 1703 
 										</tr>
1704 1704 
 										<?php

@@ -1709,13 +1709,13 @@  discard block
 
 block discarded – undo
1709 1709 
 											?>
1710 1710 
 												<tr valign="top">
1711 1711 
 													<td scope="row">
1712 
-														<label for="placeholder_<?php echo esc_attr( $field['merge'] ); ?>">
1712 
+														<label for="placeholder_<?php echo esc_attr( $field[ 'merge' ] ); ?>">
1713 1713 
 															<?php _e( 'Placeholder', 'yikes-inc-easy-mailchimp-extender' ); ?>
1714 1714 
 														</label>
1715 1715 
 													</td>
1716 1716 
 													<td>
1717 
-														<input type="checkbox" id="placeholder_<?php echo esc_attr( $field['merge'] ); ?>" class="widefat" name="field[<?php echo $field['merge']; ?>][placeholder]" value="1" <?php echo isset( $field['placeholder'] ) && ! empty( $field['placeholder'] ) ? 'checked="checked"' : '' ; ?> />
1718 
-														<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>
1717 
+														<input type="checkbox" id="placeholder_<?php echo esc_attr( $field[ 'merge' ] ); ?>" class="widefat" name="field[<?php echo $field[ 'merge' ]; ?>][placeholder]" value="1" <?php echo isset( $field[ 'placeholder' ] ) && ! empty( $field[ 'placeholder' ] ) ? 'checked="checked"' : ''; ?> />
1718 
+														<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>
1719 1719 
 													</td>
1720 1720 
 												</tr>
1721 1721 
 											<?php

@@ -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':

@@ -1733,15 +1733,15 @@  discard block
 
 block discarded – undo
1733 1733 
 										?>
1734 1734 
 											<tr valign="top">
1735 1735 
 												<td scope="row">
1736 
-													<label for="default_value_<?php echo esc_attr( $field['merge'] ); ?>">
1736 
+													<label for="default_value_<?php echo esc_attr( $field[ 'merge' ] ); ?>">
1737 1737 
 														<?php _e( 'Default Value', 'yikes-inc-easy-mailchimp-extender' ); ?>
1738 1738 
 													</label>
1739 1739 
 												</td>
1740 1740 
 												<td>
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 
-													<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>
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 
+													<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>

@@ -1763,28 +1763,28 @@  discard block
 
 block discarded – undo
1763 1763 
 													</td>
1764 1764 
 													<td>
1765 1765 
 														<?php
1766 
-															$field['default_choice'] = ! isset( $field['default_choice'] ) ? 'no-default' : $field['default_choice'];
1766 
+															$field[ 'default_choice' ] = ! isset( $field[ 'default_choice' ] ) ? 'no-default' : $field[ 'default_choice' ];
1767 1767 
 															$x = 0;
1768 1768 
 														?>
1769 
-														<label for="<?php echo $field['merge'] . '-no-default'; ?>">
1770 
-															<input id="<?php echo $field['merge'] . '-no-default'; ?>"
1769 
+														<label for="<?php echo $field[ 'merge' ] . '-no-default'; ?>">
1770 
+															<input id="<?php echo $field[ 'merge' ] . '-no-default'; ?>"
1771 1771 
 															       type="radio"
1772 
-															       name="field[<?php echo $field['merge']; ?>][default_choice]"
1773 
-															       value="no-default" <?php checked( $field['default_choice'], 'no-default' ); ?>
1772 
+															       name="field[<?php echo $field[ 'merge' ]; ?>][default_choice]"
1773 
+															       value="no-default" <?php checked( $field[ 'default_choice' ], 'no-default' ); ?>
1774 1774 
 															>
1775 1775 
 															No Default&nbsp;
1776 1776 
 														</label>
1777 1777 
 														<?php
1778 1778 
 														foreach ( $choices as $choice => $value ) { ?>
1779 
-															<label for="<?php echo $field['merge'].'-'.$x; ?>">
1780 
-																<input id="<?php echo $field['merge'].'-'.$x; ?>"
1779 
+															<label for="<?php echo $field[ 'merge' ] . '-' . $x; ?>">
1780 
+																<input id="<?php echo $field[ 'merge' ] . '-' . $x; ?>"
1781 1781 
 																       type="radio"
1782 
-																       name="field[<?php echo $field['merge']; ?>][default_choice]"
1783 
-																       value="<?php echo $x; ?>" <?php checked( $field['default_choice'], $x ); ?>>
1782 
+																       name="field[<?php echo $field[ 'merge' ]; ?>][default_choice]"
1783 
+																       value="<?php echo $x; ?>" <?php checked( $field[ 'default_choice' ], $x ); ?>>
1784 1784 
 																<?php echo $value; ?>&nbsp;
1785 1785 
 															</label>
1786 1786 
 														<?php $x++; } ?>
1787 
-														<p class="description"><small><?php _e( "Select the option that should be selected by default.", 'yikes-inc-easy-mailchimp-extender' );?></small></p>
1787 
+														<p class="description"><small><?php _e( "Select the option that should be selected by default.", 'yikes-inc-easy-mailchimp-extender' ); ?></small></p>
1788 1788 
 													</td>
1789 1789 
 												</tr>
1790 1790 
 

@@ -1796,13 +1796,13 @@  discard block
 
 block discarded – undo
1796 1796 
 												<!-- Placeholder -->
1797 1797 
 												<tr valign="top">
1798 1798 
 													<td scope="row">
1799 
-														<label for="placeholder_<?php echo esc_attr( $field['merge'] ); ?>">
1799 
+														<label for="placeholder_<?php echo esc_attr( $field[ 'merge' ] ); ?>">
1800 1800 
 															<?php _e( 'Placeholder', 'yikes-inc-easy-mailchimp-extender' ); ?>
1801 1801 
 														</label>
1802 1802 
 													</td>
1803 1803 
 													<td>
1804 
-														<input type="text" id="placeholder_<?php echo esc_attr( $field['merge'] ); ?>" class="widefat" name="field[<?php echo $field['merge']; ?>][placeholder]" value="<?php echo isset( $field['placeholder'] ) ? $field['placeholder'] : '' ; ?>" />
1805 
-														<p class="description"><small><?php _e( "Assign a placeholder value to this field.", 'yikes-inc-easy-mailchimp-extender' );?></small></p>
1804 
+														<input type="text" id="placeholder_<?php echo esc_attr( $field[ 'merge' ] ); ?>" class="widefat" name="field[<?php echo $field[ 'merge' ]; ?>][placeholder]" value="<?php echo isset( $field[ 'placeholder' ] ) ? $field[ 'placeholder' ] : ''; ?>" />
1805 
+														<p class="description"><small><?php _e( "Assign a placeholder value to this field.", 'yikes-inc-easy-mailchimp-extender' ); ?></small></p>
1806 1806 
 													</td>
1807 1807 
 												</tr>
1808 1808 
 												<tr valign="top">

@@ -1812,13 +1812,13 @@  discard block
 
 block discarded – undo
1812 1812 
 														</label>
1813 1813 
 													</td>
1814 1814 
 													<td>
1815 
-														<select type="default" name="field[<?php echo $field['merge']; ?>][default_choice]">
1816 
-															<option value="no-default" <?php selected( $field['default_choice'] , 'no-default' ); ?>>No Default</option>
1817 
-															<?php foreach( json_decode( $field['choices'], true ) as $choice => $value ) { ?>
1818 
-																<option value="<?php echo $choice; ?>" <?php selected( $field['default_choice'] , $choice ); ?>><?php echo $value; ?></option>
1815 
+														<select type="default" name="field[<?php echo $field[ 'merge' ]; ?>][default_choice]">
1816 
+															<option value="no-default" <?php selected( $field[ 'default_choice' ], 'no-default' ); ?>>No Default</option>
1817 
+															<?php foreach ( json_decode( $field[ 'choices' ], true ) as $choice => $value ) { ?>
1818 
+																<option value="<?php echo $choice; ?>" <?php selected( $field[ 'default_choice' ], $choice ); ?>><?php echo $value; ?></option>
1819 1819 
 															<?php } ?>
1820 1820 
 														</select>
1821 
-														<p class="description"><small><?php _e( "Which option should be selected by default?", 'yikes-inc-easy-mailchimp-extender' );?></small></p>
1821 
+														<p class="description"><small><?php _e( "Which option should be selected by default?", 'yikes-inc-easy-mailchimp-extender' ); ?></small></p>
1822 1822 
 													</td>
1823 1823 
 												</tr>
1824 1824 
 

@@ -1835,82 +1835,82 @@  discard block
 
 block discarded – undo
1835 1835 
 										<!-- Field Description -->
1836 1836 
 										<tr valign="top">
1837 1837 
 											<td scope="row">
1838 
-												<label for="description_<?php echo esc_attr( $field['merge'] ); ?>">
1838 
+												<label for="description_<?php echo esc_attr( $field[ 'merge' ] ); ?>">
1839 1839 
 													<?php _e( 'Description', 'yikes-inc-easy-mailchimp-extender' ); ?>
1840 1840 
 												</label>
1841 1841 
 											</td>
1842 1842 
 											<td>
1843 
-												<textarea class="widefat field-description-input" id="description_<?php echo esc_attr( $field['merge'] ); ?>" name="field[<?php echo $field['merge']; ?>][description]"><?php echo isset( $field['description'] ) ? stripslashes( esc_html( $field['description'] ) ) : '' ; ?></textarea>
1844 
-												<p class="description"><small><?php _e( "Enter the description for the form field. This will be displayed to the user and will provide some direction on how the field should be filled out or selected.", 'yikes-inc-easy-mailchimp-extender' );?></small></p>
1843 
+												<textarea class="widefat field-description-input" id="description_<?php echo esc_attr( $field[ 'merge' ] ); ?>" name="field[<?php echo $field[ 'merge' ]; ?>][description]"><?php echo isset( $field[ 'description' ] ) ? stripslashes( esc_html( $field[ 'description' ] ) ) : ''; ?></textarea>
1844 
+												<p class="description"><small><?php _e( "Enter the description for the form field. This will be displayed to the user and will provide some direction on how the field should be filled out or selected.", 'yikes-inc-easy-mailchimp-extender' ); ?></small></p>
1845 1845 
 											</td>
1846 1846 
 										</tr>
1847 1847 
 										<!-- Description Above Field -->
1848 1848 
 										<tr valign="top" class="yikes-checkbox-container">
1849 1849 
 											<td scope="row">
1850 
-												<label for="description_above_<?php echo esc_attr( $field['merge'] ); ?>">
1850 
+												<label for="description_above_<?php echo esc_attr( $field[ 'merge' ] ); ?>">
1851 1851 
 													<?php _e( 'Description Above Field', 'yikes-inc-easy-mailchimp-extender' ); ?>
1852 1852 
 												</label>
1853 1853 
 											</td>
1854 1854 
 											<td>
1855 
-												<input type="checkbox" id="description_above_<?php echo esc_attr( $field['merge'] ); ?>" class="widefat field-description-input" name="field[<?php echo $field['merge']; ?>][description_above]" value="1" <?php echo isset( $field['description_above'] ) && $field['description_above'] === '1' ? 'checked="checked"' : ''; ?> />
1856 
-												<p class="description"><small><?php _e( "By default the description will appear undearneath the field. Check this box if you'd like the description to appear above the field.", 'yikes-inc-easy-mailchimp-extender' );?></small></p>
1855 
+												<input type="checkbox" id="description_above_<?php echo esc_attr( $field[ 'merge' ] ); ?>" class="widefat field-description-input" name="field[<?php echo $field[ 'merge' ]; ?>][description_above]" value="1" <?php echo isset( $field[ 'description_above' ] ) && $field[ 'description_above' ] === '1' ? 'checked="checked"' : ''; ?> />
1856 
+												<p class="description"><small><?php _e( "By default the description will appear undearneath the field. Check this box if you'd like the description to appear above the field.", 'yikes-inc-easy-mailchimp-extender' ); ?></small></p>
1857 1857 
 											</td>
1858 1858 
 										</tr>
1859 1859 
 										<!-- Additional Classes -->
1860 1860 
 										<tr valign="top">
1861 1861 
 											<td scope="row">
1862 
-												<label for="classes_<?php echo esc_attr( $field['merge'] ); ?>">
1862 
+												<label for="classes_<?php echo esc_attr( $field[ 'merge' ] ); ?>">
1863 1863 
 													<?php _e( 'Additional Classes', 'yikes-inc-easy-mailchimp-extender' ); ?>
1864 1864 
 												</label>
1865 1865 
 											</td>
1866 1866 
 											<td>
1867 
-												<input type="text" id="classes_<?php echo esc_attr( $field['merge'] ); ?>" class="widefat" name="field[<?php echo $field['merge']; ?>][additional-classes]" value="<?php echo isset( $field['additional-classes'] ) ? stripslashes( wp_strip_all_tags( $field['additional-classes'] ) ) : '' ; ?>" />
1868 
-												<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>
1867 
+												<input type="text" id="classes_<?php echo esc_attr( $field[ 'merge' ] ); ?>" class="widefat" name="field[<?php echo $field[ 'merge' ]; ?>][additional-classes]" value="<?php echo isset( $field[ 'additional-classes' ] ) ? stripslashes( wp_strip_all_tags( $field[ 'additional-classes' ] ) ) : ''; ?>" />
1868 
+												<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>
1869 1869 
 											</td>
1870 1870 
 										</tr>
1871 1871 
 										<!-- Required Toggle -->
1872 1872 
 										<tr valign="top" class="yikes-checkbox-container yikes-checkbox-container-first">
1873 1873 
 											<td scope="row">
1874 
-												<label for="field-required-<?php echo esc_attr( $field['merge'] ); ?>">
1874 
+												<label for="field-required-<?php echo esc_attr( $field[ 'merge' ] ); ?>">
1875 1875 
 													<?php _e( 'Field Required?', 'yikes-inc-easy-mailchimp-extender' ); ?>
1876 1876 
 												</label>
1877 1877 
 											</td>
1878 1878 
 											<td>
1879 
-												<?php $checked = isset( $field['require'] ) ? $field['require'] : '0'; ?>
1880 
-												<input id="field-required-<?php echo esc_attr( $field['merge'] ); ?>" type="checkbox" class="widefat" value="1" name="field[<?php echo $field['merge']; ?>][require]" <?php checked( $checked , 1 ); ?> <?php if ( $field['merge'] == 'EMAIL' ) {  ?> disabled="disabled" checked="checked" title="<?php echo __( 'Email is a required field.', 'yikes-inc-easy-mailchimp-extender' ); } ?>">
1881 
-												<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>
1879 
+												<?php $checked = isset( $field[ 'require' ] ) ? $field[ 'require' ] : '0'; ?>
1880 
+												<input id="field-required-<?php echo esc_attr( $field[ 'merge' ] ); ?>" type="checkbox" class="widefat" value="1" name="field[<?php echo $field[ 'merge' ]; ?>][require]" <?php checked( $checked, 1 ); ?> <?php if ( $field[ 'merge' ] == 'EMAIL' ) {  ?> disabled="disabled" checked="checked" title="<?php echo __( 'Email is a required field.', 'yikes-inc-easy-mailchimp-extender' ); } ?>">
1881 
+												<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>
1882 1882 
 											</td>
1883 1883 
 										</tr>
1884 1884 
 										<!-- Visible Toggle -->
1885 1885 
 										<tr valign="top" class="yikes-checkbox-container">
1886 1886 
 											<td scope="row">
1887 
-												<label for="hide-field-<?php echo esc_attr( $field['merge'] ); ?>">
1887 
+												<label for="hide-field-<?php echo esc_attr( $field[ 'merge' ] ); ?>">
1888 1888 
 													<?php _e( 'Hide Field', 'yikes-inc-easy-mailchimp-extender' ); ?>
1889 1889 
 												</label>
1890 1890 
 											</td>
1891 1891 
 											<td>
1892 
-												<?php $hide = isset( $field['hide'] ) ? $field['hide'] : '0'; ?>
1893 
-												<input id="hide-field-<?php echo esc_attr( $field['merge'] ); ?>" type="checkbox" class="widefat" value="1" name="field[<?php echo $field['merge']; ?>][hide]" <?php checked( $hide , 1 ); ?> <?php if ( $field['merge'] == 'EMAIL' ) {  ?> disabled="disabled" title="<?php echo __( 'Cannot toggle email field visibility.', 'yikes-inc-easy-mailchimp-extender' ); } ?>">
1894 
-												<p class="description"><small><?php _e( "Hide this field from being displayed on the front end.", 'yikes-inc-easy-mailchimp-extender' );?></small></p>
1892 
+												<?php $hide = isset( $field[ 'hide' ] ) ? $field[ 'hide' ] : '0'; ?>
1893 
+												<input id="hide-field-<?php echo esc_attr( $field[ 'merge' ] ); ?>" type="checkbox" class="widefat" value="1" name="field[<?php echo $field[ 'merge' ]; ?>][hide]" <?php checked( $hide, 1 ); ?> <?php if ( $field[ 'merge' ] == 'EMAIL' ) {  ?> disabled="disabled" title="<?php echo __( 'Cannot toggle email field visibility.', 'yikes-inc-easy-mailchimp-extender' ); } ?>">
1894 
+												<p class="description"><small><?php _e( "Hide this field from being displayed on the front end.", 'yikes-inc-easy-mailchimp-extender' ); ?></small></p>
1895 1895 
 											</td>
1896 1896 
 										</tr>
1897 1897 
 										<!-- Toggle Field Label Visibility -->
1898 1898 
 										<tr valign="top" class="yikes-checkbox-container">
1899 1899 
 											<td scope="row">
1900 
-												<label for="hide-label-<?php echo esc_attr( $field['merge'] ); ?>">
1900 
+												<label for="hide-label-<?php echo esc_attr( $field[ 'merge' ] ); ?>">
1901 1901 
 													<?php _e( 'Hide Label', 'yikes-inc-easy-mailchimp-extender' ); ?>
1902 1902 
 												</label>
1903 1903 
 											</td>
1904 1904 
 											<td>
1905 
-												<?php $hide_label = isset( $field['hide-label'] ) ? $field['hide-label'] : '0'; ?>
1906 
-												<input id="hide-label-<?php echo esc_attr( $field['merge'] ); ?>" type="checkbox" name="field[<?php echo $field['merge']; ?>][hide-label]" value="1" <?php checked( $hide_label , 1 ); ?>/>
1907 
-												<p class="description"><small><?php _e( "Toggle field label visibility.", 'yikes-inc-easy-mailchimp-extender' );?></small></p>
1905 
+												<?php $hide_label = isset( $field[ 'hide-label' ] ) ? $field[ 'hide-label' ] : '0'; ?>
1906 
+												<input id="hide-label-<?php echo esc_attr( $field[ 'merge' ] ); ?>" type="checkbox" name="field[<?php echo $field[ 'merge' ]; ?>][hide-label]" value="1" <?php checked( $hide_label, 1 ); ?>/>
1907 
+												<p class="description"><small><?php _e( "Toggle field label visibility.", 'yikes-inc-easy-mailchimp-extender' ); ?></small></p>
1908 1908 
 											</td>
1909 1909 
 										</tr>
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,23 +1920,23 @@  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' );
1927 
-																				$format = ( isset( $field['date_format'] ) ) ? $field['date_format'] : 'MM/DD';
1927 
+																				$format = ( isset( $field[ 'date_format' ] ) ) ? $field[ 'date_format' ] : 'MM/DD';
1928 1928 
 																				$format_name = 'date_format';
1929 1929 
 																				break;
1930 1930
1931 1931 
 																			case 'date':
1932 1932 
 																				$type = __( 'Date Format', 'yikes-inc-easy-mailchimp-extender' );
1933 
-																				$format = ( isset( $field['date_format'] ) ) ? $field['date_format'] : 'MM/DD/YYYY';
1933 
+																				$format = ( isset( $field[ 'date_format' ] ) ) ? $field[ 'date_format' ] : 'MM/DD/YYYY';
1934 1934 
 																				$format_name = 'date_format';
1935 1935 
 																				break;
1936 1936
1937 1937 
 																			case 'phone':
1938 1938 
 																				$type = __( 'Phone Format', 'yikes-inc-easy-mailchimp-extender' );
1939 
-																				$format = isset( $field['phone_format'] ) && ! empty( $field['phone_format'] ) ? $field['phone_format'] : __( 'International', 'yikes-inc-easy-mailchimp-extender' );
1939 
+																				$format = isset( $field[ 'phone_format' ] ) && ! empty( $field[ 'phone_format' ] ) ? $field[ 'phone_format' ] : __( 'International', 'yikes-inc-easy-mailchimp-extender' );
1940 1940 
 																				$format_name = 'phone_format';
1941 1941 
 																				break;
1942 1942 
 																		}

@@ -1946,7 +1946,7 @@  discard block
 
 block discarded – undo
1946 1946 
 															</td>
1947 1947 
 															<td>
1948 1948 
 																<strong><?php echo $format; ?></strong>
1949 
-																<input type="hidden" name="field[<?php echo $field['merge']; ?>][<?php echo $format_name; ?>]" value="<?php echo $format; ?>" />
1949 
+																<input type="hidden" name="field[<?php echo $field[ 'merge' ]; ?>][<?php echo $format_name; ?>]" value="<?php echo $format; ?>" />
1950 1950 
 																<p class="description"><small>
1951 1951 
 																	<?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' ) ); ?>
1952 1952 
 																</small></p>

@@ -1967,8 +1967,8 @@  discard block
 
 block discarded – undo
1967 1967 
 											</td>
1968 1968 
 											<td>
1969 1969 
 												<span class="toggle-container">
1970 
-													<a href="#" class="close-form-expansion"><?php _e( "Close" , 'yikes-inc-easy-mailchimp-extender' ); ?></a> |
1971 
-													<a href="#" class="remove-field" alt="<?php echo $field['merge']; ?>"><?php _e( "Remove Field" , 'yikes-inc-easy-mailchimp-extender' ); ?></a>
1970 
+													<a href="#" class="close-form-expansion"><?php _e( "Close", 'yikes-inc-easy-mailchimp-extender' ); ?></a> |
1971 
+													<a href="#" class="remove-field" alt="<?php echo $field[ 'merge' ]; ?>"><?php _e( "Remove Field", 'yikes-inc-easy-mailchimp-extender' ); ?></a>
1972 1972 
 												</span>
1973 1973 
 											</td>
1974 1974 
 										</tr>

@@ -1986,35 +1986,35 @@  discard block
 
 block discarded – undo
1986 1986 
 						/**** Interest Group ****/
1987 1987
1988 1988 
 						?>
1989 
-						<section class="draggable" id="<?php echo $field['group_id']; ?>">
1989 
+						<section class="draggable" id="<?php echo $field[ 'group_id' ]; ?>">
1990 1990 
 							<!-- top -->
1991 1991 
 							<a href="#" class="expansion-section-title settings-sidebar">
1992 
-								<span class="dashicons dashicons-plus yikes-mc-expansion-toggle"></span><?php echo stripslashes( $field['label'] ); ?>
1993 
-								<?php if ( in_array( $field['group_id'] , $excluded_fields ) ) { ?>
1992 
+								<span class="dashicons dashicons-plus yikes-mc-expansion-toggle"></span><?php echo stripslashes( $field[ 'label' ] ); ?>
1993 
+								<?php if ( in_array( $field[ 'group_id' ], $excluded_fields ) ) { ?>
1994 1994 
 									<img src="<?php echo YIKES_MC_URL . 'includes/images/warning.svg'; ?>" class="field-no-longer-exists-warning" title="<?php _e( 'Field no longer exists.', 'yikes-inc-easy-mailchimp-extender' ); ?>" alt="<?php _e( 'Field no longer exists.', 'yikes-inc-easy-mailchimp-extender' ); ?>">
1995 1995 
 								<?php } ?>
1996 
-								<span class="field-type-text"><small><?php echo __( 'type', 'yikes-inc-easy-mailchimp-extender' ) . ' : ' . $field['type']; ?></small></span>
1996 
+								<span class="field-type-text"><small><?php echo __( 'type', 'yikes-inc-easy-mailchimp-extender' ) . ' : ' . $field[ 'type' ]; ?></small></span>
1997 1997 
 							</a>
1998 1998 
 							<!-- expansion section -->
1999 1999 
 							<div class="yikes-mc-settings-expansion-section">
2000 2000
2001 2001 
 								<!-- check if this field exists in the available interest group array -->
2002 
-								<?php if ( in_array( $field['group_id'] , $excluded_fields ) ) { ?>
2003 
-									<p class="yikes-mc-warning-message"><?php _e( "This field no longer exists in this list. Delete this field from the form to prevent issues on the front end." , 'yikes-inc-easy-mailchimp-extender' ); ?></p>
2002 
+								<?php if ( in_array( $field[ 'group_id' ], $excluded_fields ) ) { ?>
2003 
+									<p class="yikes-mc-warning-message"><?php _e( "This field no longer exists in this list. Delete this field from the form to prevent issues on the front end.", 'yikes-inc-easy-mailchimp-extender' ); ?></p>
2004 2004 
 								<?php } ?>
2005 2005
2006 2006 
 								<!-- store the label -->
2007 
-								<input type="hidden" name="field[<?php echo $field['group_id']; ?>][label]" value="<?php echo htmlspecialchars( $field['label'] ); ?>" />
2008 
-								<input type="hidden" name="field[<?php echo $field['group_id']; ?>][type]" value="<?php echo $field['type']; ?>" />
2009 
-								<input type="hidden" name="field[<?php echo $field['group_id']; ?>][group_id]" value="<?php echo $field['group_id']; ?>" />
2010 
-								<input type="hidden" name="field[<?php echo $field['group_id']; ?>][groups]" value='<?php echo esc_attr( json_encode( json_decode( $field['groups'], true ) ) ); ?>' />
2007 
+								<input type="hidden" name="field[<?php echo $field[ 'group_id' ]; ?>][label]" value="<?php echo htmlspecialchars( $field[ 'label' ] ); ?>" />
2008 
+								<input type="hidden" name="field[<?php echo $field[ 'group_id' ]; ?>][type]" value="<?php echo $field[ 'type' ]; ?>" />
2009 
+								<input type="hidden" name="field[<?php echo $field[ 'group_id' ]; ?>][group_id]" value="<?php echo $field[ 'group_id' ]; ?>" />
2010 
+								<input type="hidden" name="field[<?php echo $field[ 'group_id' ]; ?>][groups]" value='<?php echo esc_attr( json_encode( json_decode( $field[ 'groups' ], true ) ) ); ?>' />
2011 2011
2012 2012 
 								<!-- Single or Double Opt-in -->
2013 2013 
 								<p class="type-container"><!-- necessary to prevent skipping on slideToggle(); -->
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':

@@ -2027,15 +2027,15 @@  discard block
 
 block discarded – undo
2027 2027 
 													</td>
2028 2028 
 													<td>
2029 2029 
 														<?php
2030 
-														$field['default_choice'] = isset( $field['default_choice'] ) ? $field['default_choice'] : '';
2030 
+														$field[ 'default_choice' ] = isset( $field[ 'default_choice' ] ) ? $field[ 'default_choice' ] : '';
2031 2031
2032 2032 
 														$default_shown = false;
2033 2033
2034 
-														foreach ( json_decode( $field['groups'], true ) as $id => $group ) {
2035 
-															$field_id   = "{$field['group_id']}-{$id}";
2036 
-															$field_type = 'hidden' == $field['type'] ? 'checkbox' : $field['type'];
2034 
+														foreach ( json_decode( $field[ 'groups' ], true ) as $id => $group ) {
2035 
+															$field_id   = "{$field[ 'group_id' ]}-{$id}";
2036 
+															$field_type = 'hidden' == $field[ 'type' ] ? 'checkbox' : $field[ 'type' ];
2037 2037 
 															$field_type = 'checkboxes' == $field_type ? 'checkbox' : $field_type;
2038 
-															$field_name = "field[{$field['group_id']}][default_choice]";
2038 
+															$field_name = "field[{$field[ 'group_id' ]}][default_choice]";
2039 2039 
 															$field_name = 'checkbox' == $field_type ? $field_name . '[]' : $field_name;
2040 2040
2041 2041 
 															// Determine if the current group is checked.

@@ -2043,13 +2043,13 @@  discard block
 
 block discarded – undo
2043 2043 
 															switch ( $field_type ) {
2044 2044 
 																case 'radio':
2045 2045 
 																default:
2046 
-																	$default = is_array( $field['default_choice'] ) ? current( $field['default_choice'] ) : $field['default_choice'];
2047 
-																	$checked = is_array( $field['default_choice'] ) ? checked( current( $field['default_choice'] ), $id, false ) : checked( $field['default_choice'], $id, false );
2046 
+																	$default = is_array( $field[ 'default_choice' ] ) ? current( $field[ 'default_choice' ] ) : $field[ 'default_choice' ];
2047 
+																	$checked = is_array( $field[ 'default_choice' ] ) ? checked( current( $field[ 'default_choice' ] ), $id, false ) : checked( $field[ 'default_choice' ], $id, false );
2048 2048 
 																break;
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;

@@ -2064,7 +2064,7 @@  discard block
 
 block discarded – undo
2064 2064 
 																	    type="<?php echo $field_type; ?>"
2065 2065 
 																	    name="<?php echo $field_name; ?>"
2066 2066 
 																	    value="no-default"
2067 
-																	    <?php is_array( $field['default_choice'] ) ? checked( current( $field['default_choice'] ), 'no-default' ) : checked( $field['default_choice'], 'no-default' ); ?>>
2067 
+																	    <?php is_array( $field[ 'default_choice' ] ) ? checked( current( $field[ 'default_choice' ] ), 'no-default' ) : checked( $field[ 'default_choice' ], 'no-default' ); ?>>
2068 2068 
 																	No Default&nbsp;
2069 2069 
 																</label>
2070 2070 
 																<?php

@@ -2080,7 +2080,7 @@  discard block
 
 block discarded – undo
2080 2080 
 															</label>
2081 2081 
 															<?php
2082 2082 
 														} ?>
2083 
-														<p class="description"><small><?php _e( "Select the option that should be selected by default.", 'yikes-inc-easy-mailchimp-extender' );?></small></p>
2083 
+														<p class="description"><small><?php _e( "Select the option that should be selected by default.", 'yikes-inc-easy-mailchimp-extender' ); ?></small></p>
2084 2084 
 													</td>
2085 2085 
 												</tr>
2086 2086 
 

@@ -2092,13 +2092,13 @@  discard block
 
 block discarded – undo
2092 2092 
 												<!-- Placeholder -->
2093 2093 
 												<tr valign="top">
2094 2094 
 													<td scope="row">
2095 
-														<label for="placeholder_<?php echo esc_attr( $field['merge'] ); ?>">
2095 
+														<label for="placeholder_<?php echo esc_attr( $field[ 'merge' ] ); ?>">
2096 2096 
 															<?php _e( 'Placeholder', 'yikes-inc-easy-mailchimp-extender' ); ?>
2097 2097 
 														</label>
2098 2098 
 													</td>
2099 2099 
 													<td>
2100 
-														<input type="text" id="placeholder_<?php echo esc_attr( $field['merge'] ); ?>" class="widefat" name="field[<?php echo $field['merge']; ?>][placeholder]" value="<?php echo isset( $field['placeholder'] ) ? $field['placeholder'] : '' ; ?>" />
2101 
-														<p class="description"><small><?php _e( "Assign a placeholder value to this field.", 'yikes-inc-easy-mailchimp-extender' );?></small></p>
2100 
+														<input type="text" id="placeholder_<?php echo esc_attr( $field[ 'merge' ] ); ?>" class="widefat" name="field[<?php echo $field[ 'merge' ]; ?>][placeholder]" value="<?php echo isset( $field[ 'placeholder' ] ) ? $field[ 'placeholder' ] : ''; ?>" />
2101 
+														<p class="description"><small><?php _e( "Assign a placeholder value to this field.", 'yikes-inc-easy-mailchimp-extender' ); ?></small></p>
2102 2102 
 													</td>
2103 2103 
 												</tr>
2104 2104 
 												<tr valign="top">

@@ -2108,13 +2108,13 @@  discard block
 
 block discarded – undo
2108 2108 
 														</label>
2109 2109 
 													</td>
2110 2110 
 													<td>
2111 
-														<select type="default" name="field[<?php echo $field['group_id']; ?>][default_choice]">
2111 
+														<select type="default" name="field[<?php echo $field[ 'group_id' ]; ?>][default_choice]">
2112 2112 
 															<option value="no-default">No Default</option>
2113 
-															<?php foreach( json_decode( stripslashes_deep( $field['groups'] ) , true ) as $id => $group ) { ?>
2114 
-																<option value="<?php echo $id; ?>" <?php selected( $field['default_choice'] , $id ); ?>><?php echo stripslashes( $group ); ?></option>
2113 
+															<?php foreach ( json_decode( stripslashes_deep( $field[ 'groups' ] ), true ) as $id => $group ) { ?>
2114 
+																<option value="<?php echo $id; ?>" <?php selected( $field[ 'default_choice' ], $id ); ?>><?php echo stripslashes( $group ); ?></option>
2115 2115 
 															<?php } ?>
2116 2116 
 														</select>
2117 
-														<p class="description"><small><?php _e( "Which option should be selected by default?", 'yikes-inc-easy-mailchimp-extender' );?></small></p>
2117 
+														<p class="description"><small><?php _e( "Which option should be selected by default?", 'yikes-inc-easy-mailchimp-extender' ); ?></small></p>
2118 2118 
 													</td>
2119 2119 
 												</tr>
2120 2120 
 

@@ -2127,78 +2127,78 @@  discard block
 
 block discarded – undo
2127 2127 
 										<!-- Field Description -->
2128 2128 
 										<tr valign="top">
2129 2129 
 											<td scope="row">
2130 
-												<label for="description_<?php echo esc_attr( $field['group_id'] ); ?>">
2130 
+												<label for="description_<?php echo esc_attr( $field[ 'group_id' ] ); ?>">
2131 2131 
 													<?php _e( 'Description', 'yikes-inc-easy-mailchimp-extender' ); ?>
2132 2132 
 												</label>
2133 2133 
 											</td>
2134 2134 
 											<td>
2135 
-												<textarea id="description_<?php echo esc_attr( $field['group_id'] ); ?>" class="widefat field-description-input" name="field[<?php echo $field['group_id']; ?>][description]"><?php echo isset( $field['description'] ) ? stripslashes( esc_html( $field['description'] ) ) : '' ; ?></textarea>
2136 
-												<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>
2135 
+												<textarea id="description_<?php echo esc_attr( $field[ 'group_id' ] ); ?>" class="widefat field-description-input" name="field[<?php echo $field[ 'group_id' ]; ?>][description]"><?php echo isset( $field[ 'description' ] ) ? stripslashes( esc_html( $field[ 'description' ] ) ) : ''; ?></textarea>
2136 
+												<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>
2137 2137 
 											</td>
2138 2138 
 										</tr>
2139 2139
2140 2140 
 										<!-- Description Above Field -->
2141 2141 
 										<tr valign="top" class="yikes-checkbox-container">
2142 2142 
 											<td scope="row">
2143 
-												<label for="description_above_<?php echo $field['group_id']; ?>">
2143 
+												<label for="description_above_<?php echo $field[ 'group_id' ]; ?>">
2144 2144 
 													<?php _e( 'Description Above Field', 'yikes-inc-easy-mailchimp-extender' ); ?>
2145 2145 
 												</label>
2146 2146 
 											</td>
2147 2147 
 											<td>
2148 
-												<input type="checkbox" id="description_above_<?php echo $field['group_id']; ?>" class="widefat field-description-input" name="field[<?php echo $field['group_id']; ?>][description_above]" value="1" <?php echo isset( $field['description_above'] ) && $field['description_above'] === '1' ? 'checked="checked"' : ''; ?> />
2149 
-												<p class="description"><small><?php _e( "By default the description will appear undearneath the field. Check this box if you'd like the description to appear above the field.", 'yikes-inc-easy-mailchimp-extender' );?></small></p>
2148 
+												<input type="checkbox" id="description_above_<?php echo $field[ 'group_id' ]; ?>" class="widefat field-description-input" name="field[<?php echo $field[ 'group_id' ]; ?>][description_above]" value="1" <?php echo isset( $field[ 'description_above' ] ) && $field[ 'description_above' ] === '1' ? 'checked="checked"' : ''; ?> />
2149 
+												<p class="description"><small><?php _e( "By default the description will appear undearneath the field. Check this box if you'd like the description to appear above the field.", 'yikes-inc-easy-mailchimp-extender' ); ?></small></p>
2150 2150 
 											</td>
2151 2151 
 										</tr>
2152 2152
2153 2153 
 										<!-- Additional Classes -->
2154 2154 
 										<tr valign="top">
2155 2155 
 											<td scope="row">
2156 
-												<label for="classes_<?php echo esc_attr( $field['group_id'] ); ?>">
2156 
+												<label for="classes_<?php echo esc_attr( $field[ 'group_id' ] ); ?>">
2157 2157 
 													<?php _e( 'Additional Classes', 'yikes-inc-easy-mailchimp-extender' ); ?>
2158 2158 
 												</label>
2159 2159 
 											</td>
2160 2160 
 											<td>
2161 
-												<input type="text" id="classes_<?php echo esc_attr( $field['group_id'] ); ?>" class="widefat" name="field[<?php echo $field['group_id']; ?>][additional-classes]" value="<?php echo isset( $field['additional-classes'] ) ? stripslashes( wp_strip_all_tags( $field['additional-classes'] ) ) : '' ; ?>" />
2162 
-												<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>
2161 
+												<input type="text" id="classes_<?php echo esc_attr( $field[ 'group_id' ] ); ?>" class="widefat" name="field[<?php echo $field[ 'group_id' ]; ?>][additional-classes]" value="<?php echo isset( $field[ 'additional-classes' ] ) ? stripslashes( wp_strip_all_tags( $field[ 'additional-classes' ] ) ) : ''; ?>" />
2162 
+												<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>
2163 2163 
 											</td>
2164 2164 
 										</tr>
2165 2165 
 										<!-- Required Toggle -->
2166 2166 
 										<tr valign="top" class="yikes-checkbox-container">
2167 2167 
 											<td scope="row">
2168 
-												<label for="field-required-<?php echo esc_attr( $field['group_id'] ); ?>">
2168 
+												<label for="field-required-<?php echo esc_attr( $field[ 'group_id' ] ); ?>">
2169 2169 
 													<?php _e( 'Field Required?', 'yikes-inc-easy-mailchimp-extender' ); ?>
2170 2170 
 												</label>
2171 2171 
 											</td>
2172 2172 
 											<td>
2173 
-												<?php $checked = isset( $field['require'] ) ? $field['require'] : '0'; ?>
2174 
-												<input type="checkbox" id="field-required-<?php echo esc_attr( $field['group_id'] ); ?>" class="widefat" value="1" name="field[<?php echo $field['group_id']; ?>][require]" <?php checked( $checked , 1 ); ?>>
2175 
-												<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>
2173 
+												<?php $checked = isset( $field[ 'require' ] ) ? $field[ 'require' ] : '0'; ?>
2174 
+												<input type="checkbox" id="field-required-<?php echo esc_attr( $field[ 'group_id' ] ); ?>" class="widefat" value="1" name="field[<?php echo $field[ 'group_id' ]; ?>][require]" <?php checked( $checked, 1 ); ?>>
2175 
+												<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>
2176 2176 
 											</td>
2177 2177 
 										</tr>
2178 2178 
 										<!-- Visible Toggle -->
2179 2179 
 										<tr valign="top" class="yikes-checkbox-container">
2180 2180 
 											<td scope="row">
2181 
-												<label for="hide-field-<?php echo esc_attr( $field['group_id'] ); ?>">
2181 
+												<label for="hide-field-<?php echo esc_attr( $field[ 'group_id' ] ); ?>">
2182 2182 
 													<?php _e( 'Hide Field', 'yikes-inc-easy-mailchimp-extender' ); ?>
2183 2183 
 												</label>
2184 2184 
 											</td>
2185 2185 
 											<td>
2186 
-												<?php $hide = isset( $field['hide'] ) ? $field['hide'] : '0'; ?>
2187 
-												<input type="checkbox" id="hide-field-<?php echo esc_attr( $field['group_id'] ); ?>" class="widefat" value="1" name="field[<?php echo $field['group_id']; ?>][hide]" <?php checked( $hide , 1 ); ?>>
2188 
-												<p class="description"><small><?php _e( "Hide this field from being displayed on the front end.", 'yikes-inc-easy-mailchimp-extender' );?></small></p>
2186 
+												<?php $hide = isset( $field[ 'hide' ] ) ? $field[ 'hide' ] : '0'; ?>
2187 
+												<input type="checkbox" id="hide-field-<?php echo esc_attr( $field[ 'group_id' ] ); ?>" class="widefat" value="1" name="field[<?php echo $field[ 'group_id' ]; ?>][hide]" <?php checked( $hide, 1 ); ?>>
2188 
+												<p class="description"><small><?php _e( "Hide this field from being displayed on the front end.", 'yikes-inc-easy-mailchimp-extender' ); ?></small></p>
2189 2189 
 											</td>
2190 2190 
 										</tr>
2191 2191 
 										<!-- Toggle Field Label Visibility -->
2192 2192 
 										<tr valign="top" class="yikes-checkbox-container">
2193 2193 
 											<td scope="row">
2194 
-												<label for="hide-label-<?php echo esc_attr( $field['group_id'] ); ?>">
2194 
+												<label for="hide-label-<?php echo esc_attr( $field[ 'group_id' ] ); ?>">
2195 2195 
 													<?php _e( 'Hide Label', 'yikes-inc-easy-mailchimp-extender' ); ?>
2196 2196 
 												</label>
2197 2197 
 											</td>
2198 2198 
 											<td>
2199 
-												<?php $hide = isset( $field['hide-label'] ) ? $field['hide-label'] : '0'; ?>
2200 
-												<input type="checkbox" id="hide-label-<?php echo esc_attr( $field['group_id'] ); ?>" name="field[<?php echo $field['group_id']; ?>][hide-label]" value="1" <?php checked( $hide , 1 ); ?>/>
2201 
-												<p class="description"><small><?php _e( "Toggle field label visibility.", 'yikes-inc-easy-mailchimp-extender' );?></small></p>
2199 
+												<?php $hide = isset( $field[ 'hide-label' ] ) ? $field[ 'hide-label' ] : '0'; ?>
2200 
+												<input type="checkbox" id="hide-label-<?php echo esc_attr( $field[ 'group_id' ] ); ?>" name="field[<?php echo $field[ 'group_id' ]; ?>][hide-label]" value="1" <?php checked( $hide, 1 ); ?>/>
2201 
+												<p class="description"><small><?php _e( "Toggle field label visibility.", 'yikes-inc-easy-mailchimp-extender' ); ?></small></p>
2202 2202 
 											</td>
2203 2203 
 										</tr>
2204 2204 
 										<!-- Toggle Buttons -->

@@ -2208,8 +2208,8 @@  discard block
 
 block discarded – undo
2208 2208 
 											</td>
2209 2209 
 											<td>
2210 2210 
 												<span class="toggle-container">
2211 
-													<a href="#" class="close-form-expansion"><?php _e( "Close" , 'yikes-inc-easy-mailchimp-extender' ); ?></a> |
2212 
-													<a href="#" class="remove-field" alt="<?php echo $field['group_id']; ?>"><?php _e( "Remove Field" , 'yikes-inc-easy-mailchimp-extender' ); ?></a>
2211 
+													<a href="#" class="close-form-expansion"><?php _e( "Close", 'yikes-inc-easy-mailchimp-extender' ); ?></a> |
2212 
+													<a href="#" class="remove-field" alt="<?php echo $field[ 'group_id' ]; ?>"><?php _e( "Remove Field", 'yikes-inc-easy-mailchimp-extender' ); ?></a>
2213 2213 
 												</span>
2214 2214 
 											</td>
2215 2215 
 										</tr>

@@ -2230,7 +2230,7 @@  discard block
 
 block discarded – undo
2230 2230 
 				add_thickbox();
2231 2231 
 				// enqueue jquery qtip for our tooltip
2232 2232 
 				wp_enqueue_script( 'jquery-qtip-tooltip', YIKES_MC_URL . 'admin/js/min/jquery.qtip.min.js', array( 'jquery' ) );
2233 
-				wp_enqueue_style( 'jquery-qtip-style',  YIKES_MC_URL . 'admin/css/jquery.qtip.min.css' );
2233 
+				wp_enqueue_style( 'jquery-qtip-style', YIKES_MC_URL . 'admin/css/jquery.qtip.min.css' );
2234 2234 
 					$available_tags = array(
2235 2235 
 						array(
2236 2236 
 							'tag' => '{page_title}',

@@ -2285,14 +2285,14 @@  discard block
 
 block discarded – undo
2285 2285 
 						<h3><?php _e( 'Pre Defined Tags', 'yikes-inc-easy-mailchimp-extender' ); ?></h3>
2286 2286 
 						<p class="description"><?php _e( 'You can use any of the following tags to populate a Mailchimp text field with dynamic content. This can be used to determine which page the user signed up on, if the user was logged in and more.', 'yikes-inc-easy-mailchimp-extender' ); ?></p>
2287 2287 
 						<ul>
2288 
-							<?php foreach( apply_filters( 'yikes-mailchimp-custom-default-value-tags', $available_tags ) as $tag ) { ?>
2288 
+							<?php foreach ( apply_filters( 'yikes-mailchimp-custom-default-value-tags', $available_tags ) as $tag ) { ?>
2289 2289 
 								<li class="tooltop-tag">
2290 2290 
 									<!-- link/tag -->
2291 
-									<a href="#" onclick="populateDefaultValue( '<?php echo $tag['tag']; ?>' );return false;" data-attr-tag="<?php echo $tag['tag']; ?>" title="<?php echo $tag['title']; ?>"><?php echo $tag['title']; ?></a>
2291 
+									<a href="#" onclick="populateDefaultValue( '<?php echo $tag[ 'tag' ]; ?>' );return false;" data-attr-tag="<?php echo $tag[ 'tag' ]; ?>" title="<?php echo $tag[ 'title' ]; ?>"><?php echo $tag[ 'title' ]; ?></a>
2292 2292 
 									<!-- help icon -->
2293 2293 
 									<span class="dashicons dashicons-editor-help"></span>
2294 2294 
 									<!-- tooltip -->
2295 
-									<div class="tooltiptext qtip-bootstrap yikes-easy-mc-hidden"><?php echo $tag['description']; ?></div>
2295 
+									<div class="tooltiptext qtip-bootstrap yikes-easy-mc-hidden"><?php echo $tag[ 'description' ]; ?></div>
2296 2296 
 								</li>
2297 2297 
 							<?php } ?>
2298 2298 
 						</ul>

@@ -2311,32 +2311,32 @@  discard block
 
 block discarded – undo
2311 2311 
 		public function build_available_merge_vars( $form_fields, $available_merge_variables ) {
2312 2312 
 			$fields_assigned_to_form = array();
2313 2313 
 			foreach ( $form_fields as $field ) {
2314 
-				if ( isset( $field['merge'] ) ) {
2315 
-					$fields_assigned_to_form[ $field['merge'] ] = true;
2314 
+				if ( isset( $field[ 'merge' ] ) ) {
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 ) {
2323 
-					$not_available = isset( $fields_assigned_to_form[ $merge_var['tag'] ] );
2322 
+				foreach ( $available_merge_variables[ 'merge_fields' ] as $merge_var ) {
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' : ''; ?>"
2326 
-						alt="<?php echo esc_attr( $merge_var['tag'] ); ?>"
2327 
-						data-attr-field-type="<?php echo esc_attr( $merge_var['type'] ); ?>"
2328 
-						data-attr-field-name="<?php echo esc_attr( $merge_var['name'] ); ?>"
2329 
-						data-attr-form-id="<?php echo esc_attr( $available_merge_variables['list_id'] ); ?>"
2326 
+						alt="<?php echo esc_attr( $merge_var[ 'tag' ] ); ?>"
2327 
+						data-attr-field-type="<?php echo esc_attr( $merge_var[ 'type' ] ); ?>"
2328 
+						data-attr-field-name="<?php echo esc_attr( $merge_var[ 'name' ] ); ?>"
2329 
+						data-attr-form-id="<?php echo esc_attr( $available_merge_variables[ 'list_id' ] ); ?>"
2330 2330 
 						title="<?php echo $not_available ? esc_attr__( 'Already assigned to your form', 'yikes-inc-easy-mailchimp-extender' ) : ''; ?>"
2331 2331 
 						<?php echo $not_available ? 'disabled="disabled"' : ''; ?>
2332 2332 
 					>
2333 2333 
 						<?php
2334 
-							echo esc_html( stripslashes( $merge_var['name'] ) );
2335 
-							if ( $merge_var['required'] ) {
2334 
+							echo esc_html( stripslashes( $merge_var[ 'name' ] ) );
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 
 						?>
2339 
-						<small class="field-type-text"><?php echo esc_html( $merge_var['type'] ); ?></small>
2339 
+						<small class="field-type-text"><?php echo esc_html( $merge_var[ 'type' ] ); ?></small>
2340 2340 
 					</li>
2341 2341 
 					<?php
2342 2342 
 				}

@@ -2361,8 +2361,8 @@  discard block
 
 block discarded – undo
2361 2361 
 			$fields_assigned_to_form = array();
2362 2362 
 			if ( ! empty( $form_fields ) ) {
2363 2363 
 				foreach ( $form_fields as $field ) {
2364 
-					if ( isset( $field['group_id'] ) ) {
2365 
-						$fields_assigned_to_form[ $field['group_id'] ] = true;
2364 
+					if ( isset( $field[ 'group_id' ] ) ) {
2365 
+						$fields_assigned_to_form[ $field[ 'group_id' ] ] = true;
2366 2366 
 					}
2367 2367 
 				}
2368 2368 
 			}

@@ -2372,19 +2372,19 @@  discard block
 
 block discarded – undo
2372 2372 
 				<ul id="available-interest-groups">
2373 2373 
 				<?php
2374 2374 
 					foreach ( $available_interest_groups as $interest_group ) {
2375 
-						$not_available = isset( $fields_assigned_to_form[ $interest_group['id'] ] );
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' : ''; ?>"
2378 
-							alt="<?php echo esc_attr( $interest_group['id'] ); ?>"
2379 
-							data-group-id="<?php echo esc_attr( $interest_group['id'] ); ?>"
2380 
-							data-attr-field-name="<?php echo esc_attr( htmlspecialchars( $interest_group['title'] ) ); ?>"
2381 
-							data-attr-field-type="<?php echo esc_attr( $interest_group['type'] ); ?>"
2378 
+							alt="<?php echo esc_attr( $interest_group[ 'id' ] ); ?>"
2379 
+							data-group-id="<?php echo esc_attr( $interest_group[ 'id' ] ); ?>"
2380 
+							data-attr-field-name="<?php echo esc_attr( htmlspecialchars( $interest_group[ 'title' ] ) ); ?>"
2381 
+							data-attr-field-type="<?php echo esc_attr( $interest_group[ 'type' ] ); ?>"
2382 2382 
 							data-attr-form-id="<?php echo esc_attr( $list_id ); ?>"
2383 2383 
 							title="<?php echo $not_available ? __( 'Already assigned to your form', 'yikes-inc-easy-mailchimp-extender' ) : ''; ?>"
2384 2384 
 							<?php echo $not_available ? 'disabled="disabled"' : ''; ?>
2385 2385 
 						>
2386 
-							<?php echo esc_html( stripslashes( $interest_group['title'] ) ); ?>
2387 
-							<small class="field-type-text"><?php echo esc_html( $interest_group['type'] ); ?></small>
2386 
+							<?php echo esc_html( stripslashes( $interest_group[ 'title' ] ) ); ?>
2387 
+							<small class="field-type-text"><?php echo esc_html( $interest_group[ 'type' ] ); ?></small>
2388 2388 
 						</li>
2389 2389 
 						<?php
2390 2390 
 					}

@@ -2410,13 +2410,13 @@  discard block
 
 block discarded – undo
2410 2410 
 				$not_available = isset( $form_tags[ $tag_id ] );
2411 2411 
 				?>
2412 2412 
 				<li class="available-field <?php echo $not_available ? 'not-available' : ''; ?>"
2413 
-					id="tag-<?php echo esc_attr( $tag['id'] ); ?>"
2414 
-					data-tag-id="<?php echo esc_attr( $tag['id'] ); ?>"
2415 
-					data-tag-name="<?php echo esc_attr( $tag['name'] ); ?>"
2416 
-					title="<?php echo $not_available ? __( 'Already assigned to your form', 'yikes-inc-easy-mailchimp-extender' ) : esc_attr( $tag['name'] ); ?>"
2413 
+					id="tag-<?php echo esc_attr( $tag[ 'id' ] ); ?>"
2414 
+					data-tag-id="<?php echo esc_attr( $tag[ 'id' ] ); ?>"
2415 
+					data-tag-name="<?php echo esc_attr( $tag[ 'name' ] ); ?>"
2416 
+					title="<?php echo $not_available ? __( 'Already assigned to your form', 'yikes-inc-easy-mailchimp-extender' ) : esc_attr( $tag[ 'name' ] ); ?>"
2417 2417 
 					<?php echo $not_available ? 'disabled="disabled"' : ''; ?>
2418 2418 
 				>
2419 
-					<?php echo esc_html( $tag['name'] ); ?>
2419 
+					<?php echo esc_html( $tag[ 'name' ] ); ?>
2420 2420 
 				</li>
2421 2421 
 				<?php
2422 2422 
 			}

@@ -2437,15 +2437,15 @@  discard block
 
 block discarded – undo
2437 2437 
 		*	- must clean up db tables , ensure what data is going in and what is needed...
2438 2438 
 		*/
2439 2439 
 		public function yikes_easy_mailchimp_create_form() {
2440 
-			$nonce = $_REQUEST['nonce'];
2440 
+			$nonce = $_REQUEST[ 'nonce' ];
2441 2441 
 			if ( ! wp_verify_nonce( $nonce, 'create_mailchimp_form' ) ) {
2442 
-				wp_die( __( "We've run into an error. The security check didn't pass. Please try again." , 'yikes-inc-easy-mailchimp-extender' ) );
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
2445 2445 
 			$result = $this->form_interface->create_form( array(
2446 
-				'list_id'          => sanitize_key( $_POST['associated-list'] ),
2447 
-				'form_name'        => stripslashes( $_POST['form-name'] ),
2448 
-				'form_description' => stripslashes( $_POST['form-description'] ),
2446 
+				'list_id'          => sanitize_key( $_POST[ 'associated-list' ] ),
2447 
+				'form_name'        => stripslashes( $_POST[ 'form-name' ] ),
2448 
+				'form_description' => stripslashes( $_POST[ 'form-description' ] ),
2449 2449 
 			) );
2450 2450
2451 2451 
 			// if an error occurs during the form creation process

@@ -2453,11 +2453,11 @@  discard block
 
 block discarded – undo
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 
-				$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' ) );
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 2458 
 			} else {
2459 2459 
 				// redirect the user to the new form edit page
2460 
-				wp_redirect( esc_url_raw( admin_url( 'admin.php?page=yikes-mailchimp-edit-form&id=' . $result) ) );
2460 
+				wp_redirect( esc_url_raw( admin_url( 'admin.php?page=yikes-mailchimp-edit-form&id=' . $result ) ) );
2461 2461 
 			}
2462 2462 
 			exit();
2463 2463 
 		}

@@ -2470,11 +2470,11 @@  discard block
 
 block discarded – undo
2470 2470 
 		*/
2471 2471 
 		public function yikes_easy_mailchimp_delete_form() {
2472 2472 
 			// grab & store our variables ( associated list & form name )
2473 
-			$nonce = $_REQUEST['nonce'];
2474 
-			$post_id_to_delete = $_REQUEST['mailchimp-form'];
2473 
+			$nonce = $_REQUEST[ 'nonce' ];
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 ) ) {
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 ) );
2476 
+			if ( ! wp_verify_nonce( $nonce, 'delete-mailchimp-form-' . $post_id_to_delete ) ) {
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
2480 2480 
 			$this->form_interface->delete_form( $post_id_to_delete );

@@ -2490,19 +2490,19 @@  discard block
 
 block discarded – undo
2490 2490 
 		*/
2491 2491 
 		public function yikes_easy_mailchimp_duplicate_form() {
2492 2492 
 			// grab & store our variables ( associated list & form name )
2493 
-			$nonce = $_REQUEST['nonce'];
2494 
-			$post_id_to_clone = $_REQUEST['mailchimp-form'];
2493 
+			$nonce = $_REQUEST[ 'nonce' ];
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 ) ) {
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 ) );
2496 
+			if ( ! wp_verify_nonce( $nonce, 'duplicate-mailchimp-form-' . $post_id_to_clone ) ) {
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
2500 2500 
 			// Get the current form data.
2501 2501 
 			$form_data = $this->form_interface->get_form( $post_id_to_clone );
2502 2502
2503 2503 
 			// Update some of the data before duplication
2504 
-			$form_data['form_name'] .= ' - Copy';
2505 
-			$form_data['impressions'] = $form_data['submissions'] = 0;
2504 
+			$form_data[ 'form_name' ] .= ' - Copy';
2505 
+			$form_data[ 'impressions' ] = $form_data[ 'submissions' ] = 0;
2506 2506
2507 2507 
 			// Create the new form, and handle the result.
2508 2508 
 			$result = $this->form_interface->create_form( $form_data );

@@ -2533,11 +2533,11 @@  discard block
 
 block discarded – undo
2533 2533 
 		*/
2534 2534 
 		public function yikes_easy_mailchimp_reset_impression_stats() {
2535 2535 
 			// grab & store our variables ( associated list & form name )
2536 
-			$nonce = $_REQUEST['nonce'];
2537 
-			$form_id_to_reset = $_REQUEST['mailchimp-form'];
2536 
+			$nonce = $_REQUEST[ 'nonce' ];
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 ) ) {
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 ) );
2539 
+			if ( ! wp_verify_nonce( $nonce, 'reset-stats-mailchimp-form-' . $form_id_to_reset ) ) {
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
2543 2543 
 			$result = $this->form_interface->update_form(

@@ -2565,8 +2565,8 @@  discard block
 
 block discarded – undo
2565 2565 
 		*/
2566 2566 
 		public function yikes_easy_mailchimp_update_form() {
2567 2567
2568 
-			$nonce   = $_REQUEST['nonce'];
2569 
-			$form_id = $_REQUEST['id'];
2568 
+			$nonce   = $_REQUEST[ 'nonce' ];
2569 
+			$form_id = $_REQUEST[ 'id' ];
2570 2570
2571 2571 
 			// verify our nonce
2572 2572 
 			if ( ! wp_verify_nonce( $nonce, 'update-mailchimp-form-' . $form_id ) ) {

@@ -2580,70 +2580,70 @@  discard block
 
 block discarded – undo
2580 2580 
 			}
2581 2581
2582 2582 
 			// Store our values!
2583 
-			$list_id                 = $_POST['associated-list'];
2584 
-			$form_name               = stripslashes( $_POST['form-name'] );
2585 
-			$form_description        = sanitize_text_field( stripslashes( $_POST['form-description'] ) );
2586 
-			$redirect_user_on_submit = $_POST['redirect-user-on-submission'];
2587 
-			$redirect_page           = $_POST['redirect-user-to-selection'];
2583 
+			$list_id                 = $_POST[ 'associated-list' ];
2584 
+			$form_name               = stripslashes( $_POST[ 'form-name' ] );
2585 
+			$form_description        = sanitize_text_field( stripslashes( $_POST[ 'form-description' ] ) );
2586 
+			$redirect_user_on_submit = $_POST[ 'redirect-user-on-submission' ];
2587 
+			$redirect_page           = $_POST[ 'redirect-user-to-selection' ];
2588 2588
2589 2589 
 			// stripslashes_deep on save, to prevent foreign languages from added excessive backslashes
2590 
-			$assigned_fields = isset( $_POST['field'] ) ? stripslashes_deep( $_POST['field'] ): array();
2590 
+			$assigned_fields = isset( $_POST[ 'field' ] ) ? stripslashes_deep( $_POST[ 'field' ] ) : array();
2591 2591
2592 2592 
 			// setup our submission settings serialized array
2593 2593 
 			$submission_settings = array(
2594 
-				'ajax'                   => $_POST['form-ajax-submission'],
2595 
-				'redirect_on_submission' => $_POST['redirect-user-on-submission'],
2596 
-				'redirect_page'          => $_POST['redirect-user-to-selection'],
2597 
-				'custom_redirect_url'    => esc_url( $_POST['custom-redirect-url'] ),
2598 
-				'redirect_new_window'	 => $_POST['redirect_new_window'],
2599 
-				'hide_form_post_signup'  => $_POST['hide-form-post-signup'],
2600 
-				'replace_interests'      => $_POST['replace-interest-groups'],
2594 
+				'ajax'                   => $_POST[ 'form-ajax-submission' ],
2595 
+				'redirect_on_submission' => $_POST[ 'redirect-user-on-submission' ],
2596 
+				'redirect_page'          => $_POST[ 'redirect-user-to-selection' ],
2597 
+				'custom_redirect_url'    => esc_url( $_POST[ 'custom-redirect-url' ] ),
2598 
+				'redirect_new_window'	 => $_POST[ 'redirect_new_window' ],
2599 
+				'hide_form_post_signup'  => $_POST[ 'hide-form-post-signup' ],
2600 
+				'replace_interests'      => $_POST[ 'replace-interest-groups' ],
2601 2601 
 			);
2602 2602
2603 2603 
 			// setup our opt-in settings serialized array
2604 2604 
 			$optin_settings = array(
2605 
-				'optin'                => $_POST['single-double-optin'],
2606 
-				'update_existing_user' => $_POST['update-existing-user'],
2607 
-				'send_update_email'    => $_POST['update-existing-email'],
2605 
+				'optin'                => $_POST[ 'single-double-optin' ],
2606 
+				'update_existing_user' => $_POST[ 'update-existing-user' ],
2607 
+				'send_update_email'    => $_POST[ 'update-existing-email' ],
2608 2608 
 			);
2609 2609
2610 2610 
 			// Setup our error settings serialized array
2611 2611 
 			$error_settings = array(
2612 
-				'success'				=> trim( $_POST['yikes-easy-mc-success-message'] ) ? trim( stripslashes( $_POST['yikes-easy-mc-success-message'] ) ) : '',
2613 
-				'success-single-optin'	=> trim( $_POST['yikes-easy-mc-success-single-optin-message'] ) ? trim( stripslashes( $_POST['yikes-easy-mc-success-single-optin-message'] ) ) : '',
2614 
-				'success-resubscribed'	=> trim( $_POST['yikes-easy-mc-user-resubscribed-success-message'] ) ? trim( stripslashes( $_POST['yikes-easy-mc-user-resubscribed-success-message'] ) ) : '',
2615 
-				'general-error'			=> trim( $_POST['yikes-easy-mc-general-error-message'] ) ? trim( stripslashes( $_POST['yikes-easy-mc-general-error-message'] ) ) : '',
2616 
-				'already-subscribed'	=> trim( $_POST['yikes-easy-mc-user-subscribed-message'] ) ? trim( stripslashes( $_POST['yikes-easy-mc-user-subscribed-message'] ) ) : '',
2617 
-				'update-link'			=> trim( $_POST['yikes-easy-mc-user-update-link'] ) ? trim( stripslashes( $_POST['yikes-easy-mc-user-update-link'] ) ) : '',
2618 
-				'email-subject'			=> trim( $_POST['yikes-easy-mc-user-email-subject'] ) ? trim( stripslashes( $_POST['yikes-easy-mc-user-email-subject'] ) ) : '',
2619 
-				'email-body'			=> trim( $_POST['yikes-easy-mc-user-email-body'] ) ? trim( stripslashes( $_POST['yikes-easy-mc-user-email-body'] ) ) : '',
2620 
-				'update-email-success'  => trim( $_POST['yikes-easy-mc-update-email-successful'] ) ? trim( stripslashes( $_POST['yikes-easy-mc-update-email-successful'] ) ) : '',
2621 
-				'update-email-failure'  => trim( $_POST['yikes-easy-mc-update-email-failure'] ) ? trim( stripslashes( $_POST['yikes-easy-mc-update-email-failure'] ) ) : '',
2612 
+				'success'				=> trim( $_POST[ 'yikes-easy-mc-success-message' ] ) ? trim( stripslashes( $_POST[ 'yikes-easy-mc-success-message' ] ) ) : '',
2613 
+				'success-single-optin'	=> trim( $_POST[ 'yikes-easy-mc-success-single-optin-message' ] ) ? trim( stripslashes( $_POST[ 'yikes-easy-mc-success-single-optin-message' ] ) ) : '',
2614 
+				'success-resubscribed'	=> trim( $_POST[ 'yikes-easy-mc-user-resubscribed-success-message' ] ) ? trim( stripslashes( $_POST[ 'yikes-easy-mc-user-resubscribed-success-message' ] ) ) : '',
2615 
+				'general-error'			=> trim( $_POST[ 'yikes-easy-mc-general-error-message' ] ) ? trim( stripslashes( $_POST[ 'yikes-easy-mc-general-error-message' ] ) ) : '',
2616 
+				'already-subscribed'	=> trim( $_POST[ 'yikes-easy-mc-user-subscribed-message' ] ) ? trim( stripslashes( $_POST[ 'yikes-easy-mc-user-subscribed-message' ] ) ) : '',
2617 
+				'update-link'			=> trim( $_POST[ 'yikes-easy-mc-user-update-link' ] ) ? trim( stripslashes( $_POST[ 'yikes-easy-mc-user-update-link' ] ) ) : '',
2618 
+				'email-subject'			=> trim( $_POST[ 'yikes-easy-mc-user-email-subject' ] ) ? trim( stripslashes( $_POST[ 'yikes-easy-mc-user-email-subject' ] ) ) : '',
2619 
+				'email-body'			=> trim( $_POST[ 'yikes-easy-mc-user-email-body' ] ) ? trim( stripslashes( $_POST[ 'yikes-easy-mc-user-email-body' ] ) ) : '',
2620 
+				'update-email-success'  => trim( $_POST[ 'yikes-easy-mc-update-email-successful' ] ) ? trim( stripslashes( $_POST[ 'yikes-easy-mc-update-email-successful' ] ) ) : '',
2621 
+				'update-email-failure'  => trim( $_POST[ 'yikes-easy-mc-update-email-failure' ] ) ? trim( stripslashes( $_POST[ 'yikes-easy-mc-update-email-failure' ] ) ) : '',
2622 2622 
 			);
2623 2623
2624 2624 
 			// Setup the new form settings array
2625 2625 
 			// @since 6.0.3.8
2626 2626 
 			// To Do: Combine date & time so it's a single unix timestamp
2627 2627 
 			$form_settings = array(
2628 
-				'yikes-easy-mc-form-class-names'                 => trim( $_POST['yikes-easy-mc-form-class-names'] ),
2629 
-				'yikes-easy-mc-inline-form'                      => $_POST['yikes-easy-mc-inline-form'][0],
2630 
-				'yikes-easy-mc-submit-button-type'               => $_POST['yikes-easy-mc-submit-button-type'][0],
2631 
-				'yikes-easy-mc-submit-button-text'               => trim( $_POST['yikes-easy-mc-submit-button-text'] ),
2632 
-				'yikes-easy-mc-submit-button-image'              => esc_url( trim( $_POST['yikes-easy-mc-submit-button-image'] ) ),
2633 
-				'yikes-easy-mc-submit-button-classes'            => trim( $_POST['yikes-easy-mc-submit-button-classes'] ),
2634 
-				'yikes-easy-mc-form-schedule'                    => ( isset( $_POST['yikes-easy-mc-form-schedule'] ) ) ? '1' : '0',
2635 
-				'yikes-easy-mc-form-restriction-start'           => strtotime( $_POST['yikes-easy-mc-form-restriction-start-date'] . ' ' . $_POST['yikes-easy-mc-form-restriction-start-time'] ),
2636 
-				'yikes-easy-mc-form-restriction-end'             => strtotime( $_POST['yikes-easy-mc-form-restriction-end-date'] . ' ' . $_POST['yikes-easy-mc-form-restriction-end-time'] ),
2637 
-				'yikes-easy-mc-form-restriction-pending-message' => trim( $_POST['yikes-easy-mc-form-restriction-pending-message'] ),
2638 
-				'yikes-easy-mc-form-restriction-expired-message' => trim( $_POST['yikes-easy-mc-form-restriction-expired-message'] ),
2639 
-				'yikes-easy-mc-form-login-required'              => ( isset( $_POST['yikes-easy-mc-form-login-required'] ) ) ? '1' : '0',
2640 
-				'yikes-easy-mc-form-restriction-login-message'   => trim( $_POST['yikes-easy-mc-form-restriction-login-message'] ),
2628 
+				'yikes-easy-mc-form-class-names'                 => trim( $_POST[ 'yikes-easy-mc-form-class-names' ] ),
2629 
+				'yikes-easy-mc-inline-form'                      => $_POST[ 'yikes-easy-mc-inline-form' ][ 0 ],
2630 
+				'yikes-easy-mc-submit-button-type'               => $_POST[ 'yikes-easy-mc-submit-button-type' ][ 0 ],
2631 
+				'yikes-easy-mc-submit-button-text'               => trim( $_POST[ 'yikes-easy-mc-submit-button-text' ] ),
2632 
+				'yikes-easy-mc-submit-button-image'              => esc_url( trim( $_POST[ 'yikes-easy-mc-submit-button-image' ] ) ),
2633 
+				'yikes-easy-mc-submit-button-classes'            => trim( $_POST[ 'yikes-easy-mc-submit-button-classes' ] ),
2634 
+				'yikes-easy-mc-form-schedule'                    => ( isset( $_POST[ 'yikes-easy-mc-form-schedule' ] ) ) ? '1' : '0',
2635 
+				'yikes-easy-mc-form-restriction-start'           => strtotime( $_POST[ 'yikes-easy-mc-form-restriction-start-date' ] . ' ' . $_POST[ 'yikes-easy-mc-form-restriction-start-time' ] ),
2636 
+				'yikes-easy-mc-form-restriction-end'             => strtotime( $_POST[ 'yikes-easy-mc-form-restriction-end-date' ] . ' ' . $_POST[ 'yikes-easy-mc-form-restriction-end-time' ] ),
2637 
+				'yikes-easy-mc-form-restriction-pending-message' => trim( $_POST[ 'yikes-easy-mc-form-restriction-pending-message' ] ),
2638 
+				'yikes-easy-mc-form-restriction-expired-message' => trim( $_POST[ 'yikes-easy-mc-form-restriction-expired-message' ] ),
2639 
+				'yikes-easy-mc-form-login-required'              => ( isset( $_POST[ 'yikes-easy-mc-form-login-required' ] ) ) ? '1' : '0',
2640 
+				'yikes-easy-mc-form-restriction-login-message'   => trim( $_POST[ 'yikes-easy-mc-form-restriction-login-message' ] ),
2641 2641 
 			);
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 ) {
2645 
+			if ( isset( $_POST[ 'custom-field' ] ) ) {
2646 
+				foreach ( $_POST[ 'custom-field' ] as $custom_field => $custom_value ) {
2647 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 2649 
 					} else {

@@ -2675,7 +2675,7 @@  discard block
 
 block discarded – undo
2675 2675 
 			$this->form_interface->update_form( $form_id, $form_updates );
2676 2676
2677 2677 
 			/* Custom action hook which allows users to update specific options when a form is updated - used in add ons */
2678 
-			do_action( 'yikes-mailchimp-save-form', $form_id,  $custom_fields );
2678 
+			do_action( 'yikes-mailchimp-save-form', $form_id, $custom_fields );
2679 2679
2680 2680 
 			// redirect the user to the manage forms page, display confirmation
2681 2681 
 			wp_redirect( esc_url_raw( admin_url( 'admin.php?page=yikes-mailchimp-edit-form&id=' . $form_id . '&updated-form=true' ) ) );

@@ -2686,11 +2686,11 @@  discard block
 
 block discarded – undo
2686 2686 
 			$email_body  = '<p>' . __( 'Greetings,', 'yikes-inc-easy-mailchimp-extender' ) . '</p>';
2687 2687
2688 2688 
 			$email_body .= '<p>';
2689 
-			$email_body .= 	__( 'A request has been made to update your Mailchimp account profile information.', 'yikes-inc-easy-mailchimp-extender' );
2690 
-			$email_body .=	__( ' To do so please use the following link: ', 'yikes-inc-easy-mailchimp-extender' );
2691 
-			$email_body .=	'[link]';
2692 
-			$email_body .=		__( 'Update Mailchimp Profile Info', 'yikes-inc-easy-mailchimp-extender' );
2693 
-			$email_body .= 	'[/link]';
2689 
+			$email_body .= __( 'A request has been made to update your Mailchimp account profile information.', 'yikes-inc-easy-mailchimp-extender' );
2690 
+			$email_body .= __( ' To do so please use the following link: ', 'yikes-inc-easy-mailchimp-extender' );
2691 
+			$email_body .= '[link]';
2692 
+			$email_body .= __( 'Update Mailchimp Profile Info', 'yikes-inc-easy-mailchimp-extender' );
2693 
+			$email_body .= '[/link]';
2694 2694 
 			$email_body .= '</p>';
2695 2695
2696 2696 
 			$email_body .= '<p>' . __( 'If you did not request this update, please disregard this email.', 'yikes-inc-easy-mailchimp-extender' ) . '</p>';

@@ -2706,13 +2706,13 @@  discard block
 
 block discarded – undo
2706 2706
2707 2707 
 		/* Unsubscribe a given user from our list */
2708 2708 
 		public function yikes_easy_mailchimp_unsubscribe_user() {
2709 
-			$nonce    = $_REQUEST['nonce'];
2710 
-			$list_id  = $_REQUEST['mailchimp-list'];
2711 
-			$email_id = $_REQUEST['email_id'];
2709 
+			$nonce    = $_REQUEST[ 'nonce' ];
2710 
+			$list_id  = $_REQUEST[ 'mailchimp-list' ];
2711 
+			$email_id = $_REQUEST[ 'email_id' ];
2712 2712
2713 2713 
 			// verify our nonce
2714 2714 
 			if ( ! wp_verify_nonce( $nonce, 'unsubscribe-user-' . $email_id ) ) {
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 ) );
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 );

@@ -2731,21 +2731,21 @@  discard block
 
 block discarded – undo
2731 2731
2732 2732 
 		public function yikes_easy_mailchimp_create_missing_error_log() {
2733 2733 
 			// grab our nonnce
2734 
-			$nonce = $_REQUEST['nonce'];
2734 
+			$nonce = $_REQUEST[ 'nonce' ];
2735 2735 
 			// validate nonce
2736 
-			if ( !wp_verify_nonce( $nonce, 'create_error_log' ) ) {
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 ) );
2736 
+			if ( ! wp_verify_nonce( $nonce, 'create_error_log' ) ) {
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 2741 
 			try {
2742 2742 
 				// create the file
2743 
-				fwrite( $error_log , '' );
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 2747 
 			} catch ( Exception $e ) {
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() ) ) ) );
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 
 		}
2751 2751 
 

@@ -2756,9 +2756,9 @@  discard block
 
 block discarded – undo
2756 2756 
 		public function yikes_easy_mailchimp_clear_transient_data() {
2757 2757
2758 2758 
 			// verify our nonce
2759 
-			$nonce = $_REQUEST['nonce'];
2759 
+			$nonce = $_REQUEST[ 'nonce' ];
2760 2760 
 			if ( ! wp_verify_nonce( $nonce, 'clear-mc-transient-data' ) ) {
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 ) );
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
2764 2764 
 			$this->delete_yikes_mailchimp_transients();

@@ -2767,10 +2767,10 @@  discard block
 
 block discarded – undo
2767 2767 
 			$referer = wp_get_referer();
2768 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 
-				$id = filter_var( $_REQUEST['id'], FILTER_SANITIZE_NUMBER_INT );
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 2775 
 			} else {
2776 2776 
 				// else redirect to the manage forms page.

@@ -2814,7 +2814,7 @@  discard block
 
 block discarded – undo
2814 2814 
 		 */
2815 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 
 			}
Please login to merge, or discard this patch.
Braces   +220 added lines, -220 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,14 +687,14 @@  discard block
 
 block discarded – undo
687 687 
 	 *
688 688 
 	 * @since 6.8.2
689 689 
 	 */
690 
-	public function maybe_enqueue_assets( $hook_suffix ) {
690 
+	public function maybe_enqueue_assets( $hook_suffix ) {
691 691 
 		// Enqueue styles on dashboard
692 
-		if ( 'index.php' === $hook_suffix ) {
692 
+		if ( 'index.php' === $hook_suffix ) {
693 693 
 			$this->enqueue_styles();
694 694 
 		}
695 695
696 696 
 		// Enqueue styles and scripts on plugin admin pages
697 
-		if ( strpos( $hook_suffix, 'yikes' ) !== false && strpos( $hook_suffix, 'mailchimp' ) !== false ) {
697 
+		if ( strpos( $hook_suffix, 'yikes' ) !== false && strpos( $hook_suffix, 'mailchimp' ) !== false ) {
698 698 
 			$this->enqueue_scripts();
699 699 
 			$this->enqueue_styles();
700 700 
 		}

@@ -705,7 +705,7 @@  discard block
 
 block discarded – undo
705 705 
 	 *
706 706 
 	 * @since    6.0.0
707 707 
 	 */
708 
-	public function enqueue_styles() {
708 
+	public function enqueue_styles() {
709 709 
 		/**
710 710 
 		 *	Enqueue our global dashboard styles.
711 711 
 		 */

@@ -714,7 +714,7 @@  discard block
 
 block discarded – undo
714 714 
 		/*
715 715 
 		*	Enqueue Add-ons styles.
716 716 
 		*/
717 
-		if ( get_current_screen()->base == 'easy-forms_page_yikes-inc-easy-mailchimp-addons' ) {
717 
+		if ( get_current_screen()->base == 'easy-forms_page_yikes-inc-easy-mailchimp-addons' ) {
718 718 
 			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' );
719 719 
 		}
720 720 
 	}

@@ -723,7 +723,7 @@  discard block
 
 block discarded – undo
723 723 
 	 *
724 724 
 	 * @since    6.0.0
725 725 
 	 */
726 
-	public function enqueue_scripts() {
726 
+	public function enqueue_scripts() {
727 727 
 		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 );
728 728
729 729 
 		$localized_data = array(

@@ -738,7 +738,7 @@  discard block
 
 block discarded – undo
738 738
739 739 
 		// Enqueue required scripts for the form editor
740 740 
 		$screen = get_current_screen();
741 
-		if ( ! isset( $screen->base ) || 'admin_page_yikes-mailchimp-edit-form' !== $screen->base ) {
741 
+		if ( ! isset( $screen->base ) || 'admin_page_yikes-mailchimp-edit-form' !== $screen->base ) {
742 742 
 			return;
743 743 
 		}
744 744 
 

@@ -786,12 +786,12 @@  discard block
 
 block discarded – undo
786 786 
 	/**
787 787 
 	 * Convert the php date format string to a js date format
788 788 
 	 */
789 
-	public function yikes_jQuery_datepicker_date_format_php_to_js( $sFormat, $type ) {
790 
-		switch ( $type ) {
789 
+	public function yikes_jQuery_datepicker_date_format_php_to_js( $sFormat, $type ) {
790 
+		switch ( $type ) {
791 791 
 			default:
792 792 
 			case 'date':
793 793 
 				// Standard Date Fields
794 
-				switch ( $sFormat ) {
794 
+				switch ( $sFormat ) {
795 795 
 					//Predefined WP date formats
796 796 
 					case 'F j, Y':
797 797 
 					case 'j F Y':

@@ -814,7 +814,7 @@  discard block
 
 block discarded – undo
814 814 
 				break;
815 815 
 			// Birthday Fields
816 816 
 			case 'birthday':
817 
-				switch ( $sFormat ) {
817 
+				switch ( $sFormat ) {
818 818 
 					//Predefined WP date formats
819 819 
 					case 'F j, Y':
820 820 
 					case 'j F Y':

@@ -843,8 +843,8 @@  discard block
 
 block discarded – undo
843 843 
 	/**
844 844 
 	 * Convert the php date format string to a js date format
845 845 
 	 */
846 
-	public function yikes_jQuery_datepicker_date_format( $site_option ) {
847 
-		switch( $site_option ) {
846 
+	public function yikes_jQuery_datepicker_date_format( $site_option ) {
847 
+		switch( $site_option ) {
848 848 
 			//Predefined WP date formats
849 849 
 			default:
850 850 
 			case 'F j, Y':

@@ -864,7 +864,7 @@  discard block
 
 block discarded – undo
864 864 
 	*	Register our admin pages
865 865 
 	*	used to display data back to the user
866 866 
 	**/
867 
-	public function register_admin_pages() {
867 
+	public function register_admin_pages() {
868 868
869 869 
 		/* Top Level Menu 'Easy Mailchimp' */
870 870 
 		add_menu_page(

@@ -977,7 +977,7 @@  discard block
 
 block discarded – undo
977 977 
 	*	when they click 'Go Pro' in the admin menu
978 978 
 	*	to do: populate with sales URL
979 979 
 	*/
980 
-	public function generateAddOnsPage() {
980 
+	public function generateAddOnsPage() {
981 981 
 		require_once YIKES_MC_PATH . 'admin/partials/menu/add-ons.php'; // include our add-ons 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 generateManageFormsPage() {
989 
+	function generateManageFormsPage() {
990 990 
 		require_once YIKES_MC_PATH . 'admin/partials/menu/manage-forms.php'; // include our manage forms page
991 991 
 	}
992 992 
 

@@ -995,7 +995,7 @@  discard block
 
 block discarded – undo
995 995 
 	*
996 996 
 	* @since    1.0.0
997 997 
 	*/
998 
-	function generateManageListsPage() {
998 
+	function generateManageListsPage() {
999 999 
 		require_once YIKES_MC_PATH . 'admin/partials/menu/manage-lists.php'; // include our lists page
1000 1000 
 	}
1001 1001 
 

@@ -1004,7 +1004,7 @@  discard block
 
 block discarded – undo
1004 1004 
 	*
1005 1005 
 	* @since    1.0.0
1006 1006 
 	*/
1007 
-	function generateSupportPage() {
1007 
+	function generateSupportPage() {
1008 1008
1009 1009 
 		wp_enqueue_script( 'yikes-inc-easy-mailchimp-extender-support-scripts', plugin_dir_url( __FILE__ ) . 'js/support.js', array( 'jquery' ), $this->version, false );
1010 1010 
 		require_once YIKES_MC_PATH . 'admin/partials/menu/support.php';

@@ -1015,7 +1015,7 @@  discard block
 
 block discarded – undo
1015 1015 
 	*
1016 1016 
 	* @since    1.0.0
1017 1017 
 	*/
1018 
-	function generateEditFormPage() {
1018 
+	function generateEditFormPage() {
1019 1019 
 		require_once YIKES_MC_PATH . 'admin/partials/edit-form.php'; // include our options page
1020 1020 
 	}
1021 1021 
 

@@ -1024,7 +1024,7 @@  discard block
 
 block discarded – undo
1024 1024 
 	*
1025 1025 
 	* @since    1.0.0
1026 1026 
 	*/
1027 
-	function generateViewListPage() {
1027 
+	function generateViewListPage() {
1028 1028 
 		require_once YIKES_MC_PATH . 'admin/partials/view-list.php'; // include our options page
1029 1029 
 	}
1030 1030 
 

@@ -1033,7 +1033,7 @@  discard block
 
 block discarded – undo
1033 1033 
 	*
1034 1034 
 	* @since    1.0.0
1035 1035 
 	*/
1036 
-	function generateViewUserPage() {
1036 
+	function generateViewUserPage() {
1037 1037 
 		require_once YIKES_MC_PATH . 'admin/partials/view-user.php'; // include our options page
1038 1038 
 	}
1039 1039 
 

@@ -1042,7 +1042,7 @@  discard block
 
 block discarded – undo
1042 1042 
 	*
1043 1043 
 	* @since v.5.4
1044 1044 
 	**/
1045 
-	function yikes_easy_mc_settings_init() {
1045 
+	function yikes_easy_mc_settings_init() {
1046 1046
1047 1047 
 		/* Register General Settings Section */
1048 1048 
 

@@ -1188,27 +1188,27 @@  discard block
 
 block discarded – undo
1188 1188 
 	*	Options Sanitization & Validation
1189 1189 
 	*	@since complete re-write
1190 1190 
 	**/
1191 
-	function yikes_mc_validate_api_key( $input ) {
1192 
-		if ( $input === '' ) {
1191 
+	function yikes_mc_validate_api_key( $input ) {
1192 
+		if ( $input === '' ) {
1193 1193 
 			update_option( 'yikes-mc-api-validation', 'invalid_api_key' );
1194 1194 
 			return '';
1195 1195 
 		}
1196 1196 
 		$api_key = strip_tags ( trim( $input ) );
1197 1197 
 		$dash_position = strpos( trim( $input ), '-' );
1198 
-		if ( $dash_position !== false ) {
1198 
+		if ( $dash_position !== false ) {
1199 1199 
 			$manager = new Yikes_Inc_Easy_Mailchimp_API_Manager( $api_key );
1200 
-		} else {
1200 
+		} else {
1201 1201 
 			update_option( 'yikes-mc-api-invalid-key-response', __( 'Your API key appears to be invalid.', 'yikes-inc-easy-mailchimp-extender' ) );
1202 1202 
 			update_option( 'yikes-mc-api-validation', 'invalid_api_key' );
1203 1203 
 			return $api_key;
1204 1204 
 		}
1205 1205
1206 1206 
 		$response = $manager->get_account_handler()->get_account( false );
1207 
-		if ( ! is_wp_error( $response ) ) {
1207 
+		if ( ! is_wp_error( $response ) ) {
1208 1208 
 			update_option( 'yikes-mc-api-validation', 'valid_api_key' );
1209 1209 
 				// Clear the API key transient data
1210 1210 
 			$this->delete_yikes_mailchimp_transients();
1211 
-		}  else {
1211 
+		} else {
1212 1212 
 			$error_logging = new Yikes_Inc_Easy_Mailchimp_Error_Logging();
1213 1213 
 			$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' ) );
1214 1214 
 			update_option( 'yikes-mc-api-invalid-key-response', $response->get_error_message() );

@@ -1223,7 +1223,7 @@  discard block
 
 block discarded – undo
1223 1223 
 	*
1224 1224 
 	* @since    1.0.0
1225 1225 
 	*/
1226 
-	function generatePageOptions() {
1226 
+	function generatePageOptions() {
1227 1227 
 		require_once YIKES_MC_PATH . 'admin/partials/menu/options.php'; // include our options page
1228 1228 
 	}
1229 1229 
 

@@ -1233,15 +1233,15 @@  discard block
 
 block discarded – undo
1233 1233 
 	*	to form fields. (input, dropdowns, buttons etc.)
1234 1234 
 	* 	@since v5.5 re-write
1235 1235 
 	**/
1236 
-	public function is_user_mc_api_valid_form( $echo = true ) {
1237 
-		if ( $echo == true ) {
1238 
-			if ( get_option( 'yikes-mc-api-validation', 'invalid_api_key' ) == 'invalid_api_key' ) {
1236 
+	public function is_user_mc_api_valid_form( $echo = true ) {
1237 
+		if ( $echo == true ) {
1238 
+			if ( get_option( 'yikes-mc-api-validation', 'invalid_api_key' ) == 'invalid_api_key' ) {
1239 1239 
 				echo 'disabled="disabled"';
1240 1240 
 			}
1241 
-		} else {
1242 
-			if ( get_option( 'yikes-mc-api-validation', 'invalid_api_key' ) == 'invalid_api_key' ) {
1241 
+		} else {
1242 
+			if ( get_option( 'yikes-mc-api-validation', 'invalid_api_key' ) == 'invalid_api_key' ) {
1243 1243 
 				return false;
1244 
-			} else {
1244 
+			} else {
1245 1245 
 				return true;
1246 1246 
 			}
1247 1247 
 		}

@@ -1257,9 +1257,9 @@  discard block
 
 block discarded – undo
1257 1257 
 		*	and return the index ( used to find the list name assigned to a form )
1258 1258 
 		*	- http://stackoverflow.com/questions/6661530/php-multi-dimensional-array-search
1259 1259 
 		*/
1260 
-		function findMCListID($id, $array) {
1261 
-		   foreach ($array as $key => $val) {
1262 
-			   if ($val['id'] === $id) {
1260 
+		function findMCListID($id, $array) {
1261 
+		   foreach ($array as $key => $val) {
1262 
+			   if ($val['id'] === $id) {
1263 1263 
 				   return $key;
1264 1264 
 			   }
1265 1265 
 		   }

@@ -1271,8 +1271,8 @@  discard block
 
 block discarded – undo
1271 1271 
 		*	Render our sidebar menu on all of the setings pages (general, form, checkbox, recaptcha, popup, debug etc. )
1272 1272 
 		*	@since v5.6 - complete re-write
1273 1273 
 		*/
1274 
-		public function generate_options_pages_sidebar_menu() {
1275 
-			if ( isset( $_REQUEST['section'] ) ) {
1274 
+		public function generate_options_pages_sidebar_menu() {
1275 
+			if ( isset( $_REQUEST['section'] ) ) {
1276 1276 
 				$selected = $_REQUEST['section'];
1277 1277 
 			}
1278 1278 
 			$installed_addons = get_option( 'yikes-easy-mc-active-addons', array() );

@@ -1299,13 +1299,13 @@  discard block
 
 block discarded – undo
1299 1299 
 					</ul>
1300 1300 
 					<?php
1301 1301 
 						// create our add-on settings pages
1302 
-						if ( !empty( $installed_addons ) ) {
1302 
+						if ( !empty( $installed_addons ) ) {
1303 1303 
 							?>
1304 1304 
 							<hr class="add-on-settings-divider" />
1305 1305 
 							<strong><?php _e( 'Addon Settings', 'yikes-inc-easy-mailchimp-extender' ); ?></strong>
1306 1306 
 							<ul id="addon-settings-nav">
1307 1307 
 							<?php
1308 
-							foreach( $installed_addons as $addon_name ) {
1308 
+							foreach( $installed_addons as $addon_name ) {
1309 1309 
 								?>
1310 1310 
 									<li>
1311 1311 
 										<?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>

@@ -1325,7 +1325,7 @@  discard block
 
 block discarded – undo
1325 1325 
 		*	Render our sidebar menu on all of the setings pages (general, form, checkbox, recaptcha, popup, debug etc. )
1326 1326 
 		*	@since v5.6 - complete re-write
1327 1327 
 		*/
1328 
-		public function generate_manage_forms_sidebar( $lists ) {
1328 
+		public function generate_manage_forms_sidebar( $lists ) {
1329 1329 
 			// create a custom URL to allow for creating fields
1330 1330 
 			$url = esc_url_raw(
1331 1331 
 				add_query_arg(

@@ -1356,18 +1356,18 @@  discard block
 
 block discarded – undo
1356 1356 
 					<label for="associated-list"><strong><?php _e( 'Associated List', 'yikes-inc-easy-mailchimp-extender' ); ?></strong>
1357 1357 
 						<select name="associated-list" id="associated-list" class=" input-field" <?php $this->is_user_mc_api_valid_form( true ); disabled( true, empty( $lists ) ); ?>>
1358 1358 
 							<?php
1359 
-							if ( ! empty( $lists ) ) {
1360 
-								foreach( $lists as $mailing_list ) {
1359 
+							if ( ! empty( $lists ) ) {
1360 
+								foreach( $lists as $mailing_list ) {
1361 1361 
 									?>
1362 1362 
 									<option value="<?php echo $mailing_list['id']; ?>"><?php echo stripslashes( $mailing_list['name'] ) . ' (' . $mailing_list['stats']['member_count'] . ') '; ?></option>
1363 1363 
 									<?php
1364 1364 
 								}
1365 
-							} else {
1366 
-								if ( get_option( 'yikes-mc-api-validation', 'invalid_api_key' ) == 'invalid_api_key' ) {
1365 
+							} else {
1366 
+								if ( get_option( 'yikes-mc-api-validation', 'invalid_api_key' ) == 'invalid_api_key' ) {
1367 1367 
 									?>
1368 1368 
 									<option><?php echo __( "Please enter a valid API key." , 'yikes-inc-easy-mailchimp-extender' ); ?></option>
1369 1369 
 									<?php
1370 
-								} else {
1370 
+								} else {
1371 1371 
 									?>
1372 1372 
 									<option><?php echo __( "No lists were found on the account." , 'yikes-inc-easy-mailchimp-extender' ); ?></option>
1373 1373 
 									<?php

@@ -1378,8 +1378,8 @@  discard block
 
 block discarded – undo
1378 1378 
 						</select>
1379 1379
1380 1380 
 						<?php
1381 
-						if ( isset( $_GET['transient-cleared'] ) ) {
1382 
-							if ( 'true' === $_GET['transient-cleared'] ) {
1381 
+						if ( isset( $_GET['transient-cleared'] ) ) {
1382 
+							if ( 'true' === $_GET['transient-cleared'] ) {
1383 1383 
 								?>
1384 1384 
 								<div class="yikes-list-refreshed-notice">
1385 1385 
 									<p><?php esc_attr_e( 'Mailchimp list data has been succesfully refreshed.', 'yikes-inc-easy-mailchimp-extender' ); ?></p>

@@ -1388,8 +1388,8 @@  discard block
 
 block discarded – undo
1388 1388 
 							}
1389 1389 
 						}
1390 1390
1391 
-						if ( isset( $lists ) && empty( $lists ) ) {
1392 
-							if ( get_option( 'yikes-mc-api-validation', 'invalid_api_key' ) != 'invalid_api_key' ) {
1391 
+						if ( isset( $lists ) && empty( $lists ) ) {
1392 
+							if ( get_option( 'yikes-mc-api-validation', 'invalid_api_key' ) != 'invalid_api_key' ) {
1393 1393 
 								?>
1394 1394 
 									<p class="description">
1395 1395 
 										<?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' ) ); ?>

@@ -1400,9 +1400,9 @@  discard block
 
 block discarded – undo
1400 1400 
 						?>
1401 1401 
 					</label>
1402 1402 
 					<?php
1403 
-						if ( $this->is_user_mc_api_valid_form( false ) ) {
1403 
+						if ( $this->is_user_mc_api_valid_form( false ) ) {
1404 1404 
 							echo submit_button( __( 'Create', 'yikes-inc-easy-mailchimp-extender' ) , 'primary', '', false , array( 'style' => 'margin:.75em 0 .5em 0;' ) );
1405 
-						} else {
1405 
+						} else {
1406 1406 
 							echo '<p class="description">' . __( "Please enter a valid Mailchimp API key to get started." , 'yikes-inc-easy-mailchimp-extender' ) . '</p>';
1407 1407 
 							?>
1408 1408 
 								<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>

@@ -1413,7 +1413,7 @@  discard block
 
 block discarded – undo
1413 1413
1414 1414 
 				<!-- Clear API CACHE -->
1415 1415 
 				<?php
1416 
-				if ( isset( $lists ) && ! empty( $lists ) ) {
1416 
+				if ( isset( $lists ) && ! empty( $lists ) ) {
1417 1417 
 					if ( false !== get_transient( 'yikes-easy-mailchimp-list-data' ) ) { ?>
1418 1418 
 						<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">
1419 1419 
 							<input type="submit" class="button-secondary clear-mailchimp-api-cache" value="<?php _e( 'Refresh Lists', 'yikes-inc-easy-mailchimp-extender' ); ?>" />

@@ -1429,7 +1429,7 @@  discard block
 
 block discarded – undo
1429 1429 
 		*	Generate a dropdown of post and pages
1430 1430 
 		*	so the user can send the user to on form submission
1431 1431 
 		*/
1432 
-		public function generate_page_redirect_dropdown( $redirect, $redirect_page, $custom_redirect_url ) {
1432 
+		public function generate_page_redirect_dropdown( $redirect, $redirect_page, $custom_redirect_url ) {
1433 1433 
 				$post_types = get_post_types();
1434 1434 
 				?>
1435 1435 
 				<label id="redirect-user-to-selection-label" for="redirect-user-to-selection" class="<?php if ( $redirect == '0' ) { echo 'yikes-easy-mc-hidden'; } ?>">

@@ -1449,10 +1449,10 @@  discard block
 
 block discarded – undo
1449 1449 
 					$excluded_post_types = apply_filters( 'yikes-mailchimp-excluded-redirect-post-types', $excluded_post_types );
1450 1450
1451 1451 
 						// loop over registered post types, and query!
1452 
-						foreach( $post_types as $registered_post_type ) {
1452 
+						foreach( $post_types as $registered_post_type ) {
1453 1453
1454 1454 
 							// exclude a few built in custom post types and any defined by the filter
1455 
-							if ( ! in_array( $registered_post_type, $excluded_post_types ) ) {
1455 
+							if ( ! in_array( $registered_post_type, $excluded_post_types ) ) {
1456 1456
1457 1457 
 								// Grab only the post IDs - in the past we've created timeout issues on some servers with lots of posts
1458 1458 
 								$wp_query_args = array(

@@ -1467,11 +1467,11 @@  discard block
 
 block discarded – undo
1467 1467
1468 1468 
 								$post_ids = ! empty( $wp_query_result->posts ) ? $wp_query_result->posts : array();
1469 1469
1470 
-								if ( ! empty ( $post_ids ) ) {
1470 
+								if ( ! empty ( $post_ids ) ) {
1471 1471 
 									?>
1472 1472 
 										<optgroup label="<?php echo ucwords( str_replace( '_', ' ', $registered_post_type ) ); ?>">
1473 1473 
 									<?php
1474 
-											foreach( $post_ids as $post_id ) {
1474 
+											foreach( $post_ids as $post_id ) {
1475 1475 
 												?><option <?php selected( $redirect_page , $post_id ); ?> value="<?php echo $post_id; ?>"><?php echo get_the_title( $post_id ) ?></option><?php
1476 1476 
 											}
1477 1477 
 									?>

@@ -1502,15 +1502,15 @@  discard block
 
 block discarded – undo
1502 1502 
 		*
1503 1503 
 		* 	Displayed in sidebars
1504 1504 
 		*/
1505 
-		public function generate_show_some_love_container() {
1505 
+		public function generate_show_some_love_container() {
1506 1506 
 			// if no active add-ons are installed,
1507 1507 
 			// lets display our branding and add-on sidebar
1508 1508 
 			$options = get_option( 'yikes-easy-mc-active-addons', array() );
1509 
-			if ( empty( $options ) ) {
1509 
+			if ( empty( $options ) ) {
1510 1510
1511 1511 
 				/* On Edit Forms Page Display Upsell to Customizer */
1512 1512 
 				$screen = get_current_screen();
1513 
-				if ( isset( $screen ) && $screen->base == 'admin_page_yikes-mailchimp-edit-form' ) {
1513 
+				if ( isset( $screen ) && $screen->base == 'admin_page_yikes-mailchimp-edit-form' ) {
1514 1514 
 				?>
1515 1515
1516 1516 
 					<div class="postbox yikes-easy-mc-postbox show-some-love-container">

@@ -1588,18 +1588,18 @@  discard block
 
 block discarded – undo
1588 1588 
 		*	-
1589 1589 
 		* @parameters - $list_id - pass in the list ID to retreive merge variables from
1590 1590 
 		*/
1591 
-		public function generate_form_editor( $form_fields, $list_id, $merge_variables, $interest_groups ) {
1591 
+		public function generate_form_editor( $form_fields, $list_id, $merge_variables, $interest_groups ) {
1592 1592
1593 1593 
 			// if no list id, die!
1594 
-			if ( ! $list_id ) {
1594 
+			if ( ! $list_id ) {
1595 1595 
 				wp_die( __( "We've encountered an error. No list ID was sent." , 'yikes-inc-easy-mailchimp-extender' ) );
1596 1596 
 			}
1597 1597
1598 
-			if ( ! $merge_variables ) {
1598 
+			if ( ! $merge_variables ) {
1599 1599 
 				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' ) );
1600 1600 
 			}
1601 1601
1602 
-			if ( ! empty( $form_fields ) ) {
1602 
+			if ( ! empty( $form_fields ) ) {
1603 1603
1604 1604 
 				// find any fields that are assigned to this form, that don't exist in Mailchimp
1605 1605 
 				// or else were going to run into issues when we submit the form

@@ -1611,18 +1611,18 @@  discard block
 
 block discarded – undo
1611 1611 
 				$mailchimp_merge_field_ids	= array();
1612 1612
1613 1613 
 				// loop over merge variables
1614 
-				if ( ! empty( $merge_variables['merge_fields'] ) ) {
1614 
+				if ( ! empty( $merge_variables['merge_fields'] ) ) {
1615 1615 
 					$available_merge_variables = wp_list_pluck( $merge_variables['merge_fields'], 'tag' );
1616 1616 
 					$mailchimp_merge_field_ids = wp_list_pluck( $merge_variables['merge_fields'], 'merge_id' );
1617 1617
1618 1618 
 					// Array will look like $merge_tag => $merge_id
1619 
-					foreach( $available_merge_variables as $index => $merge_tag ) {
1619 
+					foreach( $available_merge_variables as $index => $merge_tag ) {
1620 1620 
 						$merge_field_ids[$merge_tag] = $mailchimp_merge_field_ids[$index];
1621 1621 
 					}
1622 1622 
 				}
1623 1623
1624 1624 
 				// loop over interest groups
1625 
-				if ( ! empty( $interest_groups ) ) {
1625 
+				if ( ! empty( $interest_groups ) ) {
1626 1626 
 					$available_interest_groups = array_keys( $interest_groups );
1627 1627 
 				}
1628 1628 
 

@@ -1631,14 +1631,14 @@  discard block
 
 block discarded – undo
1631 1631 
 				$merged_fields   = array_merge( $available_merge_variables, $available_interest_groups );
1632 1632 
 				$excluded_fields = array_diff( $assigned_fields, $merged_fields );
1633 1633
1634 
-				$form_fields = array_filter($form_fields, function($field){
1634 
+				$form_fields = array_filter($form_fields, function($field) {
1635 1635 
 					return isset($field['type']);
1636 1636 
 				});
1637 1637
1638 1638 
 				$i = 1;
1639 
-				foreach( $form_fields as $field ) {
1639 
+				foreach( $form_fields as $field ) {
1640 1640
1641 
-					if ( isset( $field['merge'] ) ) {
1641 
+					if ( isset( $field['merge'] ) ) {
1642 1642 
 						// @todo: don't use in_array()
1643 1643 
 						$excluded_field = in_array( $field['merge'], $excluded_fields, true );
1644 1644 
 						?>

@@ -1672,7 +1672,7 @@  discard block
 
 block discarded – undo
1672 1672 
 									<input type="hidden" class="yikes-mc-merge-field-id" name="field[<?php echo $field['merge']; ?>][id]" value="<?php echo $merge_field_ids[ $field['merge'] ] ?>" />
1673 1673 
 								<?php } ?>
1674 1674
1675 
-								<?php if ( $field['type'] == 'radio' || $field['type'] == 'dropdown' || $field['type'] == 'select' ) {
1675 
+								<?php if ( $field['type'] == 'radio' || $field['type'] == 'dropdown' || $field['type'] == 'select' ) {
1676 1676 
 									$choices = json_decode( $field['choices'], true );
1677 1677 
 								?>
1678 1678 
 									<input type="hidden" name="field[<?php echo $field['merge']; ?>][choices]" value='<?php echo esc_attr( json_encode( $choices ) ); ?>' />

@@ -1696,7 +1696,7 @@  discard block
 
 block discarded – undo
1696 1696 
 										</tr>
1697 1697
1698 1698 
 										<!-- Placeholder Value -->
1699 
-										<?php switch( $field['type'] ) {
1699 
+										<?php switch( $field['type'] ) {
1700 1700
1701 1701 
 											case 'text':
1702 1702 
 											case 'email':

@@ -1743,7 +1743,7 @@  discard block
 
 block discarded – undo
1743 1743 
 										?>
1744 1744
1745 1745 
 										<!-- Default Value -->
1746 
-										<?php switch( $field['type'] ) {
1746 
+										<?php switch( $field['type'] ) {
1747 1747 
 											default:
1748 1748 
 											case 'text':
1749 1749 
 											case 'number':

@@ -1759,7 +1759,7 @@  discard block
 
 block discarded – undo
1759 1759 
 													<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 } ?> />
1760 1760 
 													<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>
1761 1761 
 													<?php
1762 
-													switch( $field['type'] ) {
1762 
+													switch( $field['type'] ) {
1763 1763 
 														case 'text':
1764 1764 
 															?>
1765 1765 
 																<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>

@@ -1928,7 +1928,7 @@  discard block
 
 block discarded – undo
1928 1928 
 										<!-- Display Phone/Date Formats back to the user -->
1929 1929 
 										<!-- Phone Format Initial Load -->
1930 1930 
 										<?php
1931 
-											switch( $field['type'] ) {
1931 
+											switch( $field['type'] ) {
1932 1932 
 												/* Store the phone format, for properly regex pattern */
1933 1933 
 												case 'phone':
1934 1934 
 												case 'birthday':

@@ -1938,7 +1938,7 @@  discard block
 
 block discarded – undo
1938 1938 
 															<td scope="row">
1939 1939 
 																<label for="placeholder">
1940 1940 
 																	<?php
1941 
-																		switch( $field['type'] ) {
1941 
+																		switch( $field['type'] ) {
1942 1942 
 																			default:
1943 1943 
 																			case 'birthday':
1944 1944 
 																				$type = __( 'Date Format', 'yikes-inc-easy-mailchimp-extender' );

@@ -1999,7 +1999,7 @@  discard block
 
 block discarded – undo
1999 1999
2000 2000
2001 2001
2002 
-					} else {
2002 
+					} else {
2003 2003
2004 2004 
 						/**** Interest Group ****/
2005 2005 
 

@@ -2032,7 +2032,7 @@  discard block
 
 block discarded – undo
2032 2032
2033 2033 
 									<table class="form-table form-field-container">
2034 2034 
 										<!-- Default Value -->
2035 
-										<?php switch( $field['type'] ) {
2035 
+										<?php switch( $field['type'] ) {
2036 2036 
 											default:
2037 2037 
 											case 'radio':
2038 2038 
 											case 'checkboxes':

@@ -2049,7 +2049,7 @@  discard block
 
 block discarded – undo
2049 2049
2050 2050 
 														$default_shown = false;
2051 2051
2052 
-														foreach ( json_decode( $field['groups'], true ) as $id => $group ) {
2052 
+														foreach ( json_decode( $field['groups'], true ) as $id => $group ) {
2053 2053 
 															$field_id   = "{$field['group_id']}-{$id}";
2054 2054 
 															$field_type = 'hidden' == $field['type'] ? 'checkbox' : $field['type'];
2055 2055 
 															$field_type = 'checkboxes' == $field_type ? 'checkbox' : $field_type;

@@ -2058,7 +2058,7 @@  discard block
 
 block discarded – undo
2058 2058
2059 2059 
 															// Determine if the current group is checked.
2060 2060 
 															$checked = '';
2061 
-															switch ( $field_type ) {
2061 
+															switch ( $field_type ) {
2062 2062 
 																case 'radio':
2063 2063 
 																default:
2064 2064 
 																	$default = is_array( $field['default_choice'] ) ? current( $field['default_choice'] ) : $field['default_choice'];

@@ -2067,14 +2067,14 @@  discard block
 
 block discarded – undo
2067 2067
2068 2068 
 																case 'checkbox':
2069 2069 
 																case 'hidden':
2070 
-																	if ( is_array( $field['default_choice'] ) && in_array( $id, $field['default_choice'] ) ) {
2070 
+																	if ( is_array( $field['default_choice'] ) && in_array( $id, $field['default_choice'] ) ) {
2071 2071 
 																		$checked = checked( true, true, false );
2072 2072 
 																	}
2073 2073 
 																break;
2074 2074 
 															}
2075 2075
2076 2076 
 															// Allow users to not set a default choice for radio buttons.
2077 
-															if ( $field_type === 'radio' && $default_shown === false ) {
2077 
+															if ( $field_type === 'radio' && $default_shown === false ) {
2078 2078 
 																$default_shown = true;
2079 2079 
 																?>
2080 2080 
 																<label for="<?php echo $field_id . 'no-default'; ?>">

@@ -2239,7 +2239,7 @@  discard block
 
 block discarded – undo
2239 2239 
 						<?php
2240 2240 
 					}
2241 2241 
 				}
2242 
-			} else {
2242 
+			} else {
2243 2243 
 				?>
2244 2244 
 					<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>
2245 2245 
 				<?php

@@ -2326,18 +2326,18 @@  discard block
 
 block discarded – undo
2326 2326 
 		 *	-
2327 2327 
 		 * @parameters - $list_id - pass in the list ID to retreive merge variables from
2328 2328 
 		 */
2329 
-		public function build_available_merge_vars( $form_fields, $available_merge_variables ) {
2329 
+		public function build_available_merge_vars( $form_fields, $available_merge_variables ) {
2330 2330 
 			$fields_assigned_to_form = array();
2331 
-			foreach ( $form_fields as $field ) {
2332 
-				if ( isset( $field['merge'] ) ) {
2331 
+			foreach ( $form_fields as $field ) {
2332 
+				if ( isset( $field['merge'] ) ) {
2333 2333 
 					$fields_assigned_to_form[ $field['merge'] ] = true;
2334 2334 
 				}
2335 2335 
 			}
2336 2336
2337 
-			if ( ! empty( $available_merge_variables['merge_fields'] ) ) {
2337 
+			if ( ! empty( $available_merge_variables['merge_fields'] ) ) {
2338 2338 
 				?>
2339 2339 
 				<ul id="available-fields"><?php
2340 
-				foreach ( $available_merge_variables['merge_fields'] as $merge_var ) {
2340 
+				foreach ( $available_merge_variables['merge_fields'] as $merge_var ) {
2341 2341 
 					$not_available = isset( $fields_assigned_to_form[ $merge_var['tag'] ] );
2342 2342 
 					?>
2343 2343 
 					<li class="available-field <?php echo $not_available ? 'not-available' : ''; ?>"

@@ -2350,7 +2350,7 @@  discard block
 
 block discarded – undo
2350 2350 
 					>
2351 2351 
 						<?php
2352 2352 
 							echo esc_html( stripslashes( $merge_var['name'] ) );
2353 
-							if ( $merge_var['required'] ) {
2353 
+							if ( $merge_var['required'] ) {
2354 2354 
 								echo ' <span class="field-required" title="' . __( 'required field', 'yikes-inc-easy-mailchimp-extender' ) . '">*</span>';
2355 2355 
 							}
2356 2356 
 						?>

@@ -2375,21 +2375,21 @@  discard block
 
 block discarded – undo
2375 2375 
 		 *	-
2376 2376 
 		 * @parameters - $list_id - pass in the list ID to retreive merge variables from
2377 2377 
 		 */
2378 
-		public function build_available_interest_groups( $form_fields, $available_interest_groups, $list_id ) {
2378 
+		public function build_available_interest_groups( $form_fields, $available_interest_groups, $list_id ) {
2379 2379 
 			$fields_assigned_to_form = array();
2380 
-			if ( ! empty( $form_fields ) ) {
2381 
-				foreach ( $form_fields as $field ) {
2382 
-					if ( isset( $field['group_id'] ) ) {
2380 
+			if ( ! empty( $form_fields ) ) {
2381 
+				foreach ( $form_fields as $field ) {
2382 
+					if ( isset( $field['group_id'] ) ) {
2383 2383 
 						$fields_assigned_to_form[ $field['group_id'] ] = true;
2384 2384 
 					}
2385 2385 
 				}
2386 2386 
 			}
2387 2387
2388 
-			if ( ! empty( $available_interest_groups ) ) {
2388 
+			if ( ! empty( $available_interest_groups ) ) {
2389 2389 
 			?>
2390 2390 
 				<ul id="available-interest-groups">
2391 2391 
 				<?php
2392 
-					foreach ( $available_interest_groups as $interest_group ) {
2392 
+					foreach ( $available_interest_groups as $interest_group ) {
2393 2393 
 						$not_available = isset( $fields_assigned_to_form[ $interest_group['id'] ] );
2394 2394 
 						?>
2395 2395 
 						<li class="available-field <?php echo $not_available ? 'not-available' : ''; ?>"

@@ -2420,11 +2420,11 @@  discard block
 
 block discarded – undo
2420 2420 
 		/**
2421 2421 
 		 * Smt.
2422 2422 
 		 */
2423 
-		public function build_available_tags( $form_tags, $tags, $list_id ) {
2423 
+		public function build_available_tags( $form_tags, $tags, $list_id ) {
2424 2424 
 			?>
2425 2425 
 			<ul id="available-tags">
2426 2426 
 			<?php
2427 
-			foreach ( $tags as $tag_id => $tag ) {
2427 
+			foreach ( $tags as $tag_id => $tag ) {
2428 2428 
 				$not_available = isset( $form_tags[ $tag_id ] );
2429 2429 
 				?>
2430 2430 
 				<li class="available-field <?php echo $not_available ? 'not-available' : ''; ?>"

@@ -2454,9 +2454,9 @@  discard block
 
 block discarded – undo
2454 2454 
 		*	and include it here for easy maintenance
2455 2455 
 		*	- must clean up db tables , ensure what data is going in and what is needed...
2456 2456 
 		*/
2457 
-		public function yikes_easy_mailchimp_create_form() {
2457 
+		public function yikes_easy_mailchimp_create_form() {
2458 2458 
 			$nonce = $_REQUEST['nonce'];
2459 
-			if ( ! wp_verify_nonce( $nonce, 'create_mailchimp_form' ) ) {
2459 
+			if ( ! wp_verify_nonce( $nonce, 'create_mailchimp_form' ) ) {
2460 2460 
 				wp_die( __( "We've run into an error. The security check didn't pass. Please try again." , 'yikes-inc-easy-mailchimp-extender' ) );
2461 2461 
 			}
2462 2462 
 

@@ -2467,13 +2467,13 @@  discard block
 
 block discarded – undo
2467 2467 
 			) );
2468 2468
2469 2469 
 			// if an error occurs during the form creation process
2470 
-			if ( false == $result ) {
2470 
+			if ( false == $result ) {
2471 2471 
 				// write it to the error log
2472 2472 
 				// if the form was not created successfully
2473 2473 
 				$error_logging = new Yikes_Inc_Easy_Mailchimp_Error_Logging();
2474 2474 
 				$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' ) );
2475 2475 
 				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' ) ) ) ) );
2476 
-			} else {
2476 
+			} else {
2477 2477 
 				// redirect the user to the new form edit page
2478 2478 
 				wp_redirect( esc_url_raw( admin_url( 'admin.php?page=yikes-mailchimp-edit-form&id=' . $result) ) );
2479 2479 
 			}

@@ -2486,12 +2486,12 @@  discard block
 
 block discarded – undo
2486 2486 
 		*	and include it here for easy maintenance
2487 2487 
 		*	- must clean up db tables , ensure what data is going in and what is needed...
2488 2488 
 		*/
2489 
-		public function yikes_easy_mailchimp_delete_form() {
2489 
+		public function yikes_easy_mailchimp_delete_form() {
2490 2490 
 			// grab & store our variables ( associated list & form name )
2491 2491 
 			$nonce = $_REQUEST['nonce'];
2492 2492 
 			$post_id_to_delete = $_REQUEST['mailchimp-form'];
2493 2493 
 			// verify our nonce
2494 
-			if ( ! wp_verify_nonce( $nonce, 'delete-mailchimp-form-'.$post_id_to_delete ) ) {
2494 
+			if ( ! wp_verify_nonce( $nonce, 'delete-mailchimp-form-'.$post_id_to_delete ) ) {
2495 2495 
 				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 ) );
2496 2496 
 			}
2497 2497 
 

@@ -2506,12 +2506,12 @@  discard block
 
 block discarded – undo
2506 2506 
 		*	Duplicate an entire form !
2507 2507 
 		*	Probably Move these to its own file,
2508 2508 
 		*/
2509 
-		public function yikes_easy_mailchimp_duplicate_form() {
2509 
+		public function yikes_easy_mailchimp_duplicate_form() {
2510 2510 
 			// grab & store our variables ( associated list & form name )
2511 2511 
 			$nonce = $_REQUEST['nonce'];
2512 2512 
 			$post_id_to_clone = $_REQUEST['mailchimp-form'];
2513 2513 
 			// verify our nonce
2514 
-			if ( ! wp_verify_nonce( $nonce, 'duplicate-mailchimp-form-'.$post_id_to_clone ) ) {
2514 
+			if ( ! wp_verify_nonce( $nonce, 'duplicate-mailchimp-form-'.$post_id_to_clone ) ) {
2515 2515 
 				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 ) );
2516 2516 
 			}
2517 2517 
 

@@ -2535,10 +2535,10 @@  discard block
 
 block discarded – undo
2535 2535 
 			*/
2536 2536 
 			do_action( 'yikes-mailchimp-after-duplicating-form', $post_id_to_clone, $result, $form_data );
2537 2537
2538 
-			if ( false === $result ) {
2538 
+			if ( false === $result ) {
2539 2539 
 				// redirect the user to the manage forms page, display error
2540 2540 
 				wp_redirect( esc_url_raw( admin_url( 'admin.php?page=yikes-inc-easy-mailchimp&duplicated-form=false' ) ) );
2541 
-			} else {
2541 
+			} else {
2542 2542 
 				// redirect the user to the manage forms page, display confirmation
2543 2543 
 				wp_redirect( esc_url_raw( admin_url( 'admin.php?page=yikes-inc-easy-mailchimp&duplicated-form=true' ) ) );
2544 2544 
 			}

@@ -2549,12 +2549,12 @@  discard block
 
 block discarded – undo
2549 2549 
 		/*
2550 2550 
 		*	Reset a forms impression stats
2551 2551 
 		*/
2552 
-		public function yikes_easy_mailchimp_reset_impression_stats() {
2552 
+		public function yikes_easy_mailchimp_reset_impression_stats() {
2553 2553 
 			// grab & store our variables ( associated list & form name )
2554 2554 
 			$nonce = $_REQUEST['nonce'];
2555 2555 
 			$form_id_to_reset = $_REQUEST['mailchimp-form'];
2556 2556 
 			// verify our nonce
2557 
-			if ( ! wp_verify_nonce( $nonce, 'reset-stats-mailchimp-form-'.$form_id_to_reset ) ) {
2557 
+			if ( ! wp_verify_nonce( $nonce, 'reset-stats-mailchimp-form-'.$form_id_to_reset ) ) {
2558 2558 
 				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 ) );
2559 2559 
 			}
2560 2560 
 

@@ -2566,10 +2566,10 @@  discard block
 
 block discarded – undo
2566 2566 
 				)
2567 2567 
 			);
2568 2568
2569 
-			if ( false === $result ) {
2569 
+			if ( false === $result ) {
2570 2570 
 				// redirect the user to the manage forms page, display error
2571 2571 
 				wp_redirect( esc_url_raw( admin_url( 'admin.php?page=yikes-inc-easy-mailchimp&reset-stats=false' ) ) );
2572 
-			} else {
2572 
+			} else {
2573 2573 
 				// redirect the user to the manage forms page, display confirmation
2574 2574 
 				wp_redirect( esc_url_raw( admin_url( 'admin.php?page=yikes-inc-easy-mailchimp&reset-stats=true' ) ) );
2575 2575 
 			}

@@ -2581,13 +2581,13 @@  discard block
 
 block discarded – undo
2581 2581 
 		*	Update an entire form !
2582 2582 
 		*	Probably Move these to its own file,
2583 2583 
 		*/
2584 
-		public function yikes_easy_mailchimp_update_form() {
2584 
+		public function yikes_easy_mailchimp_update_form() {
2585 2585
2586 2586 
 			$nonce   = $_REQUEST['nonce'];
2587 2587 
 			$form_id = $_REQUEST['id'];
2588 2588
2589 2589 
 			// verify our nonce
2590 
-			if ( ! wp_verify_nonce( $nonce, 'update-mailchimp-form-' . $form_id ) ) {
2590 
+			if ( ! wp_verify_nonce( $nonce, 'update-mailchimp-form-' . $form_id ) ) {
2591 2591 
 				wp_die(
2592 2592 
 					__( "We've run into an error. The security check didn't pass. Please try again.", 'yikes-inc-easy-mailchimp-extender' ),
2593 2593 
 					__( "Failed nonce validation", 'yikes-inc-easy-mailchimp-extender' ),

@@ -2660,11 +2660,11 @@  discard block
 
 block discarded – undo
2660 2660
2661 2661 
 			// additional custom fields (extensions / user defined fields)
2662 2662 
 			$custom_fields = array();
2663 
-			if ( isset( $_POST['custom-field'] ) ) {
2664 
-				foreach ( $_POST['custom-field'] as $custom_field => $custom_value ) {
2665 
-					if ( is_array( $custom_value ) ) {
2663 
+			if ( isset( $_POST['custom-field'] ) ) {
2664 
+				foreach ( $_POST['custom-field'] as $custom_field => $custom_value ) {
2665 
+					if ( is_array( $custom_value ) ) {
2666 2666 
 						$custom_fields[ $custom_field ] = array_filter( stripslashes_deep( $custom_value ) ); // array_filters to remove empty items (don't save them!)
2667 
-					} else {
2667 
+					} else {
2668 2668 
 						$custom_fields[ $custom_field ] = stripslashes( $custom_value );
2669 2669 
 					}
2670 2670 
 				}

@@ -2700,7 +2700,7 @@  discard block
 
 block discarded – undo
2700 2700 
 			exit();
2701 2701 
 		}
2702 2702
2703 
-		public static function generate_default_email_body() {
2703 
+		public static function generate_default_email_body() {
2704 2704 
 			$email_body  = '<p>' . __( 'Greetings,', 'yikes-inc-easy-mailchimp-extender' ) . '</p>';
2705 2705
2706 2706 
 			$email_body .= '<p>';

@@ -2723,18 +2723,18 @@  discard block
 
 block discarded – undo
2723 2723 
 		}
2724 2724
2725 2725 
 		/* Unsubscribe a given user from our list */
2726 
-		public function yikes_easy_mailchimp_unsubscribe_user() {
2726 
+		public function yikes_easy_mailchimp_unsubscribe_user() {
2727 2727 
 			$nonce    = $_REQUEST['nonce'];
2728 2728 
 			$list_id  = $_REQUEST['mailchimp-list'];
2729 2729 
 			$email_id = $_REQUEST['email_id'];
2730 2730
2731 2731 
 			// verify our nonce
2732 
-			if ( ! wp_verify_nonce( $nonce, 'unsubscribe-user-' . $email_id ) ) {
2732 
+			if ( ! wp_verify_nonce( $nonce, 'unsubscribe-user-' . $email_id ) ) {
2733 2733 
 				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 ) );
2734 2734 
 			}
2735 2735
2736 2736 
 			$response = yikes_get_mc_api_manager()->get_list_handler()->member_unsubscribe( $list_id, $email_id );
2737 
-			if ( is_wp_error( $response ) ) {
2737 
+			if ( is_wp_error( $response ) ) {
2738 2738 
 				$error_logging = new Yikes_Inc_Easy_Mailchimp_Error_Logging();
2739 2739 
 				$error_logging->maybe_write_to_log(
2740 2740 
 					$response->get_error_code(),

@@ -2747,22 +2747,22 @@  discard block
 
 block discarded – undo
2747 2747 
 			exit;
2748 2748 
 		}
2749 2749
2750 
-		public function yikes_easy_mailchimp_create_missing_error_log() {
2750 
+		public function yikes_easy_mailchimp_create_missing_error_log() {
2751 2751 
 			// grab our nonnce
2752 2752 
 			$nonce = $_REQUEST['nonce'];
2753 2753 
 			// validate nonce
2754 
-			if ( !wp_verify_nonce( $nonce, 'create_error_log' ) ) {
2754 
+			if ( !wp_verify_nonce( $nonce, 'create_error_log' ) ) {
2755 2755 
 				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 ) );
2756 2756 
 			}
2757 2757 
 			// setup the path to the error log
2758 2758 
 			$error_log = fopen( plugin_dir_path( __FILE__ ) . '../includes/error_log/yikes-easy-mailchimp-error-log.php', 'w' );
2759 
-			try {
2759 
+			try {
2760 2760 
 				// create the file
2761 2761 
 				fwrite( $error_log , '' );
2762 2762 
 				// close out
2763 2763 
 				fclose( $error_log );
2764 2764 
 				wp_redirect( esc_url_raw( admin_url( 'admin.php?page=yikes-inc-easy-mailchimp-settings&section=debug-settings&error_log_created=true' ) ) );
2765 
-			} catch ( Exception $e ) {
2765 
+			} catch ( Exception $e ) {
2766 2766 
 				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() ) ) ) );
2767 2767 
 			}
2768 2768 
 		}

@@ -2771,11 +2771,11 @@  discard block
 
 block discarded – undo
2771 2771 
 		*	Clear Transient Data !
2772 2772 
 		*	Probably Move these to its own file,
2773 2773 
 		*/
2774 
-		public function yikes_easy_mailchimp_clear_transient_data() {
2774 
+		public function yikes_easy_mailchimp_clear_transient_data() {
2775 2775
2776 2776 
 			// verify our nonce
2777 2777 
 			$nonce = $_REQUEST['nonce'];
2778 
-			if ( ! wp_verify_nonce( $nonce, 'clear-mc-transient-data' ) ) {
2778 
+			if ( ! wp_verify_nonce( $nonce, 'clear-mc-transient-data' ) ) {
2779 2779 
 				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 ) );
2780 2780 
 			}
2781 2781 
 

@@ -2783,14 +2783,14 @@  discard block
 
 block discarded – undo
2783 2783
2784 2784 
 			// if the request came from the settings page, redirect to the settings page.
2785 2785 
 			$referer = wp_get_referer();
2786 
-			if ( $referer && ( strpos( $referer, 'yikes-inc-easy-mailchimp-settings' ) > 0 ) ) {
2786 
+			if ( $referer && ( strpos( $referer, 'yikes-inc-easy-mailchimp-settings' ) > 0 ) ) {
2787 2787 
 				wp_redirect( esc_url_raw( admin_url( 'admin.php?page=yikes-inc-easy-mailchimp-settings&section=api-cache-settings&transient-cleared=true' ) ) );
2788 
-			} elseif ( isset( $_REQUEST['page'] ) && $_REQUEST['page'] === 'yikes-mailchimp-edit-form' && isset( $_REQUEST['id'] ) && ! empty( $_REQUEST['id'] ) ) {
2788 
+			} elseif ( isset( $_REQUEST['page'] ) && $_REQUEST['page'] === 'yikes-mailchimp-edit-form' && isset( $_REQUEST['id'] ) && ! empty( $_REQUEST['id'] ) ) {
2789 2789
2790 2790 
 				// else check if we were editing a form.
2791 2791 
 				$id = filter_var( $_REQUEST['id'], FILTER_SANITIZE_NUMBER_INT );
2792 2792 
 				wp_redirect( esc_url_raw( admin_url( 'admin.php?page=yikes-mailchimp-edit-form&id=' . $id ) ) );
2793 
-			} else {
2793 
+			} else {
2794 2794 
 				// else redirect to the manage forms page.
2795 2795 
 				wp_redirect( esc_url_raw( admin_url( 'admin.php?page=yikes-inc-easy-mailchimp&transient-cleared=true' ) ) );
2796 2796 
 			}

@@ -2806,17 +2806,17 @@  discard block
 
 block discarded – undo
2806 2806 
 		 * @since 6.0.2
2807 2807 
 		 * @return $list_id_array - array of list id's to loop over
2808 2808 
 		 */
2809 
-		public function get_mailchimp_list_ids_on_account() {
2809 
+		public function get_mailchimp_list_ids_on_account() {
2810 2810 
 			$api_key = yikes_get_mc_api_key();
2811 
-			if ( ! $api_key ) {
2811 
+			if ( ! $api_key ) {
2812 2812 
 				// if no api key is set/site is not connected, return an empty array.
2813 2813 
 				return array();
2814 2814 
 			}
2815 2815
2816 2816 
 			$lists = get_transient( 'yikesinc_eme_list_ids' );
2817 
-			if ( false === $lists ) {
2817 
+			if ( false === $lists ) {
2818 2818 
 				$lists = yikes_get_mc_api_manager()->get_list_handler()->get_list_ids();
2819 
-				if ( is_wp_error( $lists ) ) {
2819 
+				if ( is_wp_error( $lists ) ) {
2820 2820 
 					return array();
2821 2821 
 				}
2822 2822 
 				set_transient( 'yikesinc_eme_list_ids', $lists, HOUR_IN_SECONDS );

@@ -2830,9 +2830,9 @@  discard block
 
 block discarded – undo
2830 2830 
 		 *
2831 2831 
 		 *	@since 6.0
2832 2832 
 		 */
2833 
-		public function yikes_mailchimp_load_helper_class() {
2833 
+		public function yikes_mailchimp_load_helper_class() {
2834 2834 
 			// check to see if it's already loaded up.
2835 
-			if ( !class_exists( 'Yikes_Inc_Easy_Mailchimp_Forms_Helper' ) ) {
2835 
+			if ( !class_exists( 'Yikes_Inc_Easy_Mailchimp_Forms_Helper' ) ) {
2836 2836 
 				// Include our main helper class file
2837 2837 
 				include_once( YIKES_MC_PATH . 'admin/partials/helpers/init.php' );
2838 2838 
 			}

@@ -2845,11 +2845,11 @@  discard block
 
 block discarded – undo
2845 2845 
 		 * @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)
2846 2846 
 		 * @return print out custom styles to the admin header to alter the default blue color
2847 2847 
 		 */
2848 
-		public function alter_yikes_easy_mc_color_scheme() {
2848 
+		public function alter_yikes_easy_mc_color_scheme() {
2849 2849 
 			// get the current set color scheme for the logged in user
2850 2850 
 			$current_color_scheme = get_user_option( 'admin_color' );
2851 2851 
 			// switch over each color scheme, and set our variable
2852 
-			switch ( $current_color_scheme ) {
2852 
+			switch ( $current_color_scheme ) {
2853 2853 
 				default:
2854 2854 
 				case 'fresh': // default blue (defined by this plugin)
2855 2855 
 					$main_color = '#00a0d2';

@@ -2897,16 +2897,16 @@  discard block
 
 block discarded – undo
2897 2897 
 		/**
2898 2898 
 		 *	Display premium support page if any add-ons are installed, otherwise display free support page
2899 2899 
 		 */
2900 
-		public function display_support_page_content() {
2900 
+		public function display_support_page_content() {
2901 2901
2902 2902 
 			$addons = get_option( 'yikes-easy-mc-active-addons', array() );
2903 2903
2904 2904 
 			// If we have premium add-ons...
2905 
-			if ( ! empty( $addons ) ) {
2905 
+			if ( ! empty( $addons ) ) {
2906 2906
2907 2907 
 				// Add our premium support partial.
2908 2908 
 				include_once( YIKES_MC_PATH . 'admin/partials/helpers/premium-support.php' );
2909 
-			} else {
2909 
+			} else {
2910 2910
2911 2911 
 				// Otherwise add our free support partial.
2912 2912 
 				include_once( YIKES_MC_PATH . 'admin/partials/helpers/free-support.php' );

@@ -2918,8 +2918,8 @@  discard block
 
 block discarded – undo
2918 2918 
 		 *
2919 2919 
 		 * @since 6.0.4
2920 2920 
 		 */
2921 
-		public function check_yikes_mc_table_version() {
2922 
-			if ( get_option( 'yikes_mc_database_version', '0.00' ) < '1.0' ) {
2921 
+		public function check_yikes_mc_table_version() {
2922 
+			if ( get_option( 'yikes_mc_database_version', '0.00' ) < '1.0' ) {
2923 2923 
 				require_once YIKES_MC_PATH . 'includes/class-yikes-inc-easy-mailchimp-extender-activator.php';
2924 2924 
 				global $wpdb;
2925 2925 
 				Yikes_Inc_Easy_Mailchimp_Extender_Activator::_activate_yikes_easy_mailchimp( $wpdb );

@@ -2933,7 +2933,7 @@  discard block
 
 block discarded – undo
2933 2933 
 		 *
2934 2934 
 		 * @since 6.0.4.4
2935 2935 
 		 */
2936 
-		public function process_subscriber_count_shortcode_in_form_descriptions( $form_description, $form_id ) {
2936 
+		public function process_subscriber_count_shortcode_in_form_descriptions( $form_description, $form_id ) {
2937 2937 
 			$form_description = str_replace( '[yikes-mailchimp-subscriber-count]', do_shortcode( '[yikes-mailchimp-subscriber-count form="' . $form_id . '"]' ), $form_description );
2938 2938 
 			return $form_description;
2939 2939 
 		}

@@ -2943,9 +2943,9 @@  discard block
 
 block discarded – undo
2943 2943 
 		 *
2944 2944 
 		 * @since 6.0.3
2945 2945 
 		 */
2946 
-		public function generate_edit_forms_upsell_ad() {
2946 
+		public function generate_edit_forms_upsell_ad() {
2947 2947 
 		$upsell_ads = glob( YIKES_MC_PATH . 'includes/upsells/*.php' );
2948 
-		if ( $upsell_ads && ! empty( $upsell_ads ) ) {
2948 
+		if ( $upsell_ads && ! empty( $upsell_ads ) ) {
2949 2949 
 			$ad_count = absint( count( $upsell_ads ) - 1 );
2950 2950 
 			$ad       = $upsell_ads[ mt_rand( 0, $ad_count ) ];
2951 2951 
 			ob_start();

@@ -2962,11 +2962,11 @@  discard block
 
 block discarded – undo
2962 2962 
 		 * Mainly used when the API key is altered, changed or removed.
2963 2963 
 		 * @since 6.1.3
2964 2964 
 		 */
2965 
-		public function delete_yikes_mailchimp_transients() {
2965 
+		public function delete_yikes_mailchimp_transients() {
2966 2966
2967 2967 
 		// delete all of the list_id transients.
2968 2968 
 		$list_ids = $this->get_mailchimp_list_ids_on_account();
2969 
-		foreach ( $list_ids as $id ) {
2969 
+		foreach ( $list_ids as $id ) {
2970 2970 
 			delete_transient( "yikes_eme_list_{$id}" );
2971 2971 
 			delete_transient( "yikes_eme_merge_variables_{$id}" );
2972 2972 
 			delete_transient( "yikes_eme_interest_categories_{$id}" );

@@ -2988,7 +2988,7 @@  discard block
 
 block discarded – undo
2988 2988 
 	 *
2989 2989 
 	 * @author Jeremy Pry
2990 2990 
 	 */
2991 
-	public function register_optin_widget() {
2991 
+	public function register_optin_widget() {
2992 2992 
 		register_widget( 'Yikes_Inc_Easy_Mailchimp_Extender_Widget' );
2993 2993 
 	}
2994 2994 
 }
Please login to merge, or discard this patch.
admin/partials/menu/manage-forms.php 1 patch
Spacing   +50 added lines, -50 removed lines patch added patch discarded remove patch 
@@ -6,13 +6,13 @@  discard block
 
 block discarded – undo
6 6 
 $all_forms = $form_interface->get_all_forms();
7 7
8 8 
 /* Store Data if User is Authorized */
9 
-if( $this->is_user_mc_api_valid_form( false ) == 'valid' ) {
9 
+if ( $this->is_user_mc_api_valid_form( false ) == 'valid' ) {
10 10 
 	$list_data = yikes_get_mc_api_manager()->get_list_handler()->get_lists();
11 11 
 	if ( is_wp_error( $list_data ) ) {
12 12 
 		$error_logging = new Yikes_Inc_Easy_Mailchimp_Error_Logging();
13 13 
 		$error_logging->maybe_write_to_log(
14 14 
 			$list_data->get_error_code(),
15 
-			__( "Get Account Lists" , 'yikes-inc-easy-mailchimp-extender' ),
15 
+			__( "Get Account Lists", 'yikes-inc-easy-mailchimp-extender' ),
16 16 
 			"Manage Forms Page"
17 17 
 		);
18 18 
 		$list_data = array();
 
@@ -23,24 +23,24 @@  discard block
 
 block discarded – undo
23 23 
 ?>
24 24 
 <div class="wrap yikes-easy-mc-wrap">
25 25 
 	<!-- Freddie Logo -->
26 
-	<img src="<?php echo YIKES_MC_URL . 'includes/images/Mailchimp_Assets/Freddie_60px.png'; ?>" alt="<?php _e( 'Freddie - Mailchimp Mascot' , 'yikes-inc-easy-mailchimp-extender' ); ?>" class="yikes-mc-freddie-logo" />
26 
+	<img src="<?php echo YIKES_MC_URL . 'includes/images/Mailchimp_Assets/Freddie_60px.png'; ?>" alt="<?php _e( 'Freddie - Mailchimp Mascot', 'yikes-inc-easy-mailchimp-extender' ); ?>" class="yikes-mc-freddie-logo" />
27 27
28 
-	<h1>Easy Forms for Mailchimp | <?php _e( 'Manage Forms' , 'yikes-inc-easy-mailchimp-extender' ) ?></h1>
28 
+	<h1>Easy Forms for Mailchimp | <?php _e( 'Manage Forms', 'yikes-inc-easy-mailchimp-extender' ) ?></h1>
29 29
30 30 
 	<!-- Settings Page Description -->
31 
-	<p class="yikes-easy-mc-about-text about-text"><?php _e( 'Create and manage your Mailchimp forms.' , 'yikes-inc-easy-mailchimp-extender' ); ?></p>
31 
+	<p class="yikes-easy-mc-about-text about-text"><?php _e( 'Create and manage your Mailchimp forms.', 'yikes-inc-easy-mailchimp-extender' ); ?></p>
32 32
33 33 
 	<!-- Action Notices -->
34 34 
 	<?php
35 35
36 36 
 	/* If the user hasn't authenticated yet, lets kill off */
37 
-	if( get_option( 'yikes-mc-api-validation' , 'invalid_api_key' ) != 'valid_api_key' ) {
38 
-		wp_die( '<div class="error"><p>' . sprintf( __( 'You need to connect to Mailchimp before you can start creating forms. Head over to the <a href="%s" title="Settings Page">Settings Page</a> and enter your API key.' , 'yikes-inc-easy-mailchimp-extender' ), esc_url_raw( admin_url( 'admin.php?page=yikes-inc-easy-mailchimp-settings' ) ) ) . '</p></div>' , 500 );
37 
+	if ( get_option( 'yikes-mc-api-validation', 'invalid_api_key' ) != 'valid_api_key' ) {
38 
+		wp_die( '<div class="error"><p>' . sprintf( __( 'You need to connect to Mailchimp before you can start creating forms. Head over to the <a href="%s" title="Settings Page">Settings Page</a> and enter your API key.', 'yikes-inc-easy-mailchimp-extender' ), esc_url_raw( admin_url( 'admin.php?page=yikes-inc-easy-mailchimp-settings' ) ) ) . '</p></div>', 500 );
39 39 
 	}
40 40
41 41 
 	/* Display our admin notices here */
42 42 
 	// delete form success
43 
-	if( isset( $_REQUEST['deleted-form'] ) && $_REQUEST['deleted-form'] == 'true' ) {
43 
+	if ( isset( $_REQUEST[ 'deleted-form' ] ) && $_REQUEST[ 'deleted-form' ] == 'true' ) {
44 44 
 		?>
45 45 
 		<div class="updated manage-form-admin-notice">
46 46 
 			<p><?php _e( 'Opt-in form successfully deleted.', 'yikes-inc-easy-mailchimp-extender' ); ?></p>
 
@@ -48,7 +48,7 @@  discard block
 
 block discarded – undo
48 48 
 		<?php
49 49 
 	}
50 50 
 	// duplicate form success
51 
-	if( isset( $_REQUEST['duplicated-form'] ) && $_REQUEST['duplicated-form'] == 'true' ) {
51 
+	if ( isset( $_REQUEST[ 'duplicated-form' ] ) && $_REQUEST[ 'duplicated-form' ] == 'true' ) {
52 52 
 		?>
53 53 
 		<div class="updated manage-form-admin-notice">
54 54 
 			<p><?php _e( 'Mailchimp Form successfully cloned.', 'yikes-inc-easy-mailchimp-extender' ); ?></p>
 
@@ -56,7 +56,7 @@  discard block
 
 block discarded – undo
56 56 
 		<?php
57 57 
 	}
58 58 
 	// duplicate form error
59 
-	if( isset( $_REQUEST['duplicated-form'] ) && $_REQUEST['duplicated-form'] == 'false' ) {
59 
+	if ( isset( $_REQUEST[ 'duplicated-form' ] ) && $_REQUEST[ 'duplicated-form' ] == 'false' ) {
60 60 
 		?>
61 61 
 		<div class="error manage-form-admin-notice">
62 62 
 			<p><?php _e( 'There was an error trying to clone your form. Please try again. If this error persists, please contact the YIKES Inc. support team.', 'yikes-inc-easy-mailchimp-extender' ); ?></p>
 
@@ -64,7 +64,7 @@  discard block
 
 block discarded – undo
64 64 
 		<?php
65 65 
 	}
66 66 
 	// reset form submission stats success
67 
-	if( isset( $_REQUEST['reset-stats'] ) && $_REQUEST['reset-stats'] == 'true' ) {
67 
+	if ( isset( $_REQUEST[ 'reset-stats' ] ) && $_REQUEST[ 'reset-stats' ] == 'true' ) {
68 68 
 		?>
69 69 
 		<div class="updated manage-form-admin-notice">
70 70 
 			<p><?php _e( 'Form submission stats/rates successfully reset.', 'yikes-inc-easy-mailchimp-extender' ); ?></p>
 
@@ -72,7 +72,7 @@  discard block
 
 block discarded – undo
72 72 
 		<?php
73 73 
 	}
74 74 
 	// reset form submission stats error
75 
-	if( isset( $_REQUEST['reset-stats'] ) && $_REQUEST['reset-stats'] == 'false' ) {
75 
+	if ( isset( $_REQUEST[ 'reset-stats' ] ) && $_REQUEST[ 'reset-stats' ] == 'false' ) {
76 76 
 		?>
77 77 
 		<div class="error manage-form-admin-notice">
78 78 
 			<p><?php _e( 'There was an error trying to reset the form submission stats/rates. Please try again. If this error persists, please contact the YIKES Inc. support team.', 'yikes-inc-easy-mailchimp-extender' ); ?></p>
 
@@ -99,13 +99,13 @@  discard block
 
 block discarded – undo
99 99 
 								<thead>
100 100 
 									<tr>
101 101 
 										<th id="cb" class="manage-column column-cb check-column num" scope="col"><input type="checkbox" /></th>
102 
-										<th id="columnname" class="manage-column column-columnname num yikes-form-id-number" scope="col"><?php _e( 'ID' , 'yikes-inc-easy-mailchimp-extender' ); ?></th>
103 
-										<th id="columnname" class="manage-column column-columnname" scope="col"><?php _e( 'Form Name' , 'yikes-inc-easy-mailchimp-extender' ); ?></th>
104 
-										<th id="columnname" class="manage-column column-columnname" scope="col"><?php _e( 'Form Description' , 'yikes-inc-easy-mailchimp-extender' ); ?></th>
105 
-										<th id="columnname" class="manage-column column-columnname" scope="col"><?php _e( 'List' , 'yikes-inc-easy-mailchimp-extender' ); ?></th>
106 
-										<th id="columnname" class="manage-column column-columnname num" scope="col"><?php _e( 'Impressions' , 'yikes-inc-easy-mailchimp-extender' ); ?></th>
107 
-										<th id="columnname" class="manage-column column-columnname num" scope="col" ><?php _e( 'Submissions' , 'yikes-inc-easy-mailchimp-extender' ); ?></th>
108 
-										<th id="columnname" class="manage-column column-columnname num" scope="col"><?php _e( 'Conversion Rate' , 'yikes-inc-easy-mailchimp-extender' ); ?></th>
102 
+										<th id="columnname" class="manage-column column-columnname num yikes-form-id-number" scope="col"><?php _e( 'ID', 'yikes-inc-easy-mailchimp-extender' ); ?></th>
103 
+										<th id="columnname" class="manage-column column-columnname" scope="col"><?php _e( 'Form Name', 'yikes-inc-easy-mailchimp-extender' ); ?></th>
104 
+										<th id="columnname" class="manage-column column-columnname" scope="col"><?php _e( 'Form Description', 'yikes-inc-easy-mailchimp-extender' ); ?></th>
105 
+										<th id="columnname" class="manage-column column-columnname" scope="col"><?php _e( 'List', 'yikes-inc-easy-mailchimp-extender' ); ?></th>
106 
+										<th id="columnname" class="manage-column column-columnname num" scope="col"><?php _e( 'Impressions', 'yikes-inc-easy-mailchimp-extender' ); ?></th>
107 
+										<th id="columnname" class="manage-column column-columnname num" scope="col" ><?php _e( 'Submissions', 'yikes-inc-easy-mailchimp-extender' ); ?></th>
108 
+										<th id="columnname" class="manage-column column-columnname num" scope="col"><?php _e( 'Conversion Rate', 'yikes-inc-easy-mailchimp-extender' ); ?></th>
109 109 
 									</tr>
110 110 
 								</thead>
111 111 
 								<!-- end header -->
 
@@ -114,13 +114,13 @@  discard block
 
 block discarded – undo
114 114 
 								<tfoot>
115 115 
 									<tr>
116 116 
 										<th class="manage-column column-cb check-column num" scope="col"><input type="checkbox" /></th>
117 
-										<th id="columnname" class="manage-column column-columnname num yikes-form-id-number" scope="col"><?php _e( 'ID' , 'yikes-inc-easy-mailchimp-extender' ); ?></th>
118 
-										<th id="columnname" class="manage-column column-columnname" scope="col"><?php _e( 'Form Name' , 'yikes-inc-easy-mailchimp-extender' ); ?></th>
119 
-										<th id="columnname" class="manage-column column-columnname" scope="col"><?php _e( 'Form Description' , 'yikes-inc-easy-mailchimp-extender' ); ?></th>
120 
-										<th class="manage-column column-columnname" scope="col"><?php _e( 'List' , 'yikes-inc-easy-mailchimp-extender' ); ?></th>
121 
-										<th id="columnname" class="manage-column column-columnname num" scope="col"><?php _e( 'Impressions' , 'yikes-inc-easy-mailchimp-extender' ); ?></th>
122 
-										<th id="columnname" class="manage-column column-columnname num" scope="col"><?php _e( 'Submissions' , 'yikes-inc-easy-mailchimp-extender' ); ?></th>
123 
-										<th id="columnname" class="manage-column column-columnname num" scope="col"><?php _e( 'Conversion Rate' , 'yikes-inc-easy-mailchimp-extender' ); ?></th>
117 
+										<th id="columnname" class="manage-column column-columnname num yikes-form-id-number" scope="col"><?php _e( 'ID', 'yikes-inc-easy-mailchimp-extender' ); ?></th>
118 
+										<th id="columnname" class="manage-column column-columnname" scope="col"><?php _e( 'Form Name', 'yikes-inc-easy-mailchimp-extender' ); ?></th>
119 
+										<th id="columnname" class="manage-column column-columnname" scope="col"><?php _e( 'Form Description', 'yikes-inc-easy-mailchimp-extender' ); ?></th>
120 
+										<th class="manage-column column-columnname" scope="col"><?php _e( 'List', 'yikes-inc-easy-mailchimp-extender' ); ?></th>
121 
+										<th id="columnname" class="manage-column column-columnname num" scope="col"><?php _e( 'Impressions', 'yikes-inc-easy-mailchimp-extender' ); ?></th>
122 
+										<th id="columnname" class="manage-column column-columnname num" scope="col"><?php _e( 'Submissions', 'yikes-inc-easy-mailchimp-extender' ); ?></th>
123 
+										<th id="columnname" class="manage-column column-columnname num" scope="col"><?php _e( 'Conversion Rate', 'yikes-inc-easy-mailchimp-extender' ); ?></th>
124 124 
 									</tr>
125 125 
 								</tfoot>
126 126 
 								<!-- end footer -->
 
@@ -130,40 +130,40 @@  discard block
 
 block discarded – undo
130 130 
 									<?php
131 131 
 									if ( count( $all_forms ) > 0 ) {
132 132 
 										$i = 1;
133 
-										foreach( $all_forms as $id => $form ) {
133 
+										foreach ( $all_forms as $id => $form ) {
134 134 
 										?>
135 
-										<tr class="<?php if( $i % 2 == 0 ) { echo 'alternate'; } ?>">
135 
+										<tr class="<?php if ( $i % 2 == 0 ) { echo 'alternate'; } ?>">
136 136 
 											<th class="check-column num" scope="row"><input type="checkbox" /></th>
137 137 
 											<td class="column-columnname num"><span class="form-id-container"><?php echo intval( $id ); ?></span></td>
138 138 
 											<td class="column-columnname">
139 139 
 												<!-- row title/link -->
140 
-												<a href="<?php echo esc_url_raw( add_query_arg( array( 'id' => $id ) , admin_url( 'admin.php?page=yikes-mailchimp-edit-form' ) ) ); ?>" class="row-title">
141 
-													<?php echo stripslashes( $form['form_name'] ); ?>
140 
+												<a href="<?php echo esc_url_raw( add_query_arg( array( 'id' => $id ), admin_url( 'admin.php?page=yikes-mailchimp-edit-form' ) ) ); ?>" class="row-title">
141 
+													<?php echo stripslashes( $form[ 'form_name' ] ); ?>
142 142 
 												</a>
143 143 
 												<div class="row-actions">
144 
-													<span><a href="<?php echo esc_url_raw( add_query_arg( array( 'id' => $id ) , admin_url( 'admin.php?page=yikes-mailchimp-edit-form' ) ) ); ?>"><?php _e( "Edit" , 'yikes-inc-easy-mailchimp-extender' ); ?></a> |</span>
145 
-													<span><a href="<?php echo esc_url_raw( add_query_arg( array( 'action' => 'yikes-easy-mc-duplicate-form', 'mailchimp-form' => $id , 'nonce' => wp_create_nonce( 'duplicate-mailchimp-form-'.$id ) ) , admin_url( 'admin.php?page=yikes-inc-easy-mailchimp' ) ) ); ?>"><?php _e( "Duplicate" , 'yikes-inc-easy-mailchimp-extender' ); ?></a> |</span>
146 
-													<span><a href="<?php echo esc_url_raw( add_query_arg( array( 'action' => 'yikes-easy-mc-reset-stats', 'mailchimp-form' => $id , 'nonce' => wp_create_nonce( 'reset-stats-mailchimp-form-'.$id ) ) , admin_url( 'admin.php?page=yikes-inc-easy-mailchimp' ) ) ); ?>"><?php _e( "Reset Stats" , 'yikes-inc-easy-mailchimp-extender' ); ?></a> |</span>
147 
-													<span><a href="#" class="view-yikes-mc-form-shortcode" data-alt-text="<?php _e( 'Stats' , 'yikes-inc-easy-mailchimp-extender' ); ?>"><?php _e( "Shortcode" , 'yikes-inc-easy-mailchimp-extender' ); ?></a> |</span>
144 
+													<span><a href="<?php echo esc_url_raw( add_query_arg( array( 'id' => $id ), admin_url( 'admin.php?page=yikes-mailchimp-edit-form' ) ) ); ?>"><?php _e( "Edit", 'yikes-inc-easy-mailchimp-extender' ); ?></a> |</span>
145 
+													<span><a href="<?php echo esc_url_raw( add_query_arg( array( 'action' => 'yikes-easy-mc-duplicate-form', 'mailchimp-form' => $id, 'nonce' => wp_create_nonce( 'duplicate-mailchimp-form-' . $id ) ), admin_url( 'admin.php?page=yikes-inc-easy-mailchimp' ) ) ); ?>"><?php _e( "Duplicate", 'yikes-inc-easy-mailchimp-extender' ); ?></a> |</span>
146 
+													<span><a href="<?php echo esc_url_raw( add_query_arg( array( 'action' => 'yikes-easy-mc-reset-stats', 'mailchimp-form' => $id, 'nonce' => wp_create_nonce( 'reset-stats-mailchimp-form-' . $id ) ), admin_url( 'admin.php?page=yikes-inc-easy-mailchimp' ) ) ); ?>"><?php _e( "Reset Stats", 'yikes-inc-easy-mailchimp-extender' ); ?></a> |</span>
147 
+													<span><a href="#" class="view-yikes-mc-form-shortcode" data-alt-text="<?php _e( 'Stats', 'yikes-inc-easy-mailchimp-extender' ); ?>"><?php _e( "Shortcode", 'yikes-inc-easy-mailchimp-extender' ); ?></a> |</span>
148 148 
 													<?php
149 149 
 														/*
150 150 
 														*	Custom action to allow users to add additional action links
151 151 
 														*	to each form. We use this in our add-ons.
152 152 
 														*	- Delete should remain last
153 153 
 														*/
154 
-														do_action( 'yikes-mailchimp-custom-form-actions' , $id );
154 
+														do_action( 'yikes-mailchimp-custom-form-actions', $id );
155 155 
 													?>
156 
-													<span><a href="<?php echo esc_url_raw( add_query_arg( array( 'action' => 'yikes-easy-mc-delete-form', 'mailchimp-form' => $id , 'nonce' => wp_create_nonce( 'delete-mailchimp-form-'.$id ) ) , admin_url( 'admin.php?page=yikes-inc-easy-mailchimp' ) ) ); ?>" class="yikes-delete-mailchimp-form" onclick="return confirm('<?php printf( __( 'Are you sure you want to delete the %s form? This cannot be undone.' , 'yikes-inc-easy-mailchimp-extender' ), stripslashes( $form['form_name'] ) ); ?>');"><?php _e( "Delete" , 'yikes-inc-easy-mailchimp-extender' ); ?></a></span>
156 
+													<span><a href="<?php echo esc_url_raw( add_query_arg( array( 'action' => 'yikes-easy-mc-delete-form', 'mailchimp-form' => $id, 'nonce' => wp_create_nonce( 'delete-mailchimp-form-' . $id ) ), admin_url( 'admin.php?page=yikes-inc-easy-mailchimp' ) ) ); ?>" class="yikes-delete-mailchimp-form" onclick="return confirm('<?php printf( __( 'Are you sure you want to delete the %s form? This cannot be undone.', 'yikes-inc-easy-mailchimp-extender' ), stripslashes( $form[ 'form_name' ] ) ); ?>');"><?php _e( "Delete", 'yikes-inc-easy-mailchimp-extender' ); ?></a></span>
157 157 
 												</div>
158 158 
 											</td>
159 159
160 
-											<td class="column-columnname"><?php echo isset( $form['form_description'] ) ? str_replace( '[yikes-mailchimp-subscriber-count]', do_shortcode( '[yikes-mailchimp-subscriber-count form="' . $id . '"]' ), $form['form_description'] ) : ''; ?></td>
160 
+											<td class="column-columnname"><?php echo isset( $form[ 'form_description' ] ) ? str_replace( '[yikes-mailchimp-subscriber-count]', do_shortcode( '[yikes-mailchimp-subscriber-count form="' . $id . '"]' ), $form[ 'form_description' ] ) : ''; ?></td>
161 161 
 											<td class="column-columnname">
162 162 
 												<?php
163 163 
 												if ( $list_data && count( $list_data ) > 0 ) {
164 164 
 													$parsed = wp_list_pluck( $list_data, 'name', 'id' );
165 
-													if ( isset( $parsed[ $form['list_id'] ] ) ) {
166 
-														echo esc_textarea( $parsed[ $form['list_id'] ] );
165 
+													if ( isset( $parsed[ $form[ 'list_id' ] ] ) ) {
166 
+														echo esc_textarea( $parsed[ $form[ 'list_id' ] ] );
167 167 
 													} else {
168 168 
 														echo '<strong>' . __( 'List Not Found', 'yikes-inc-easy-mailchimp-extender' ) . '</strong>';
169 169 
 													}
 
@@ -172,25 +172,25 @@  discard block
 
 block discarded – undo
172 172
173 173 
 											<td class="column-columnname num stat-container">
174 174 
 												<?php
175 
-													$impressions = number_format( $form['impressions'] );
176 
-													echo '<span title="' . __( 'Impressions' , 'yikes-inc-easy-mailchimp-extender' ) . '">' . $impressions . '</span>';
175 
+													$impressions = number_format( $form[ 'impressions' ] );
176 
+													echo '<span title="' . __( 'Impressions', 'yikes-inc-easy-mailchimp-extender' ) . '">' . $impressions . '</span>';
177 177 
 												?>
178 178 
 											</td>
179 179 
 											<td class="column-columnname num stat-container">
180 180 
 												<?php
181 
-													$submissions = number_format( $form['submissions'] );
182 
-													echo '<span title="' . __( 'Submissions' , 'yikes-inc-easy-mailchimp-extender' ) . '">' . $submissions . '</span>';
181 
+													$submissions = number_format( $form[ 'submissions' ] );
182 
+													echo '<span title="' . __( 'Submissions', 'yikes-inc-easy-mailchimp-extender' ) . '">' . $submissions . '</span>';
183 183 
 												?>
184 184 
 											</td>
185 185 
 											<td class="column-columnname num stat-container">
186 186 
 												<?php
187 
-													if( $impressions != 0 ) {
188 
-														$conversion_rate = ( round( 100 * $form['submissions'] / $form['impressions'] , 3 ) );
189 
-														if( $conversion_rate >= '15' ) {
187 
+													if ( $impressions != 0 ) {
188 
+														$conversion_rate = ( round( 100 * $form[ 'submissions' ] / $form[ 'impressions' ], 3 ) );
189 
+														if ( $conversion_rate >= '15' ) {
190 190 
 															$conversion_color = '#00cc00'; // green (unicorn!)
191 
-														} else if( $conversion_rate < '15' && $conversion_rate >= '10' ) {
191 
+														} else if ( $conversion_rate < '15' && $conversion_rate >= '10' ) {
192 192 
 															$conversion_color = '#0080FF'; // light blue (good)
193 
-														} else if( $conversion_rate < '10' && $conversion_rate >= '5' ) {
193 
+														} else if ( $conversion_rate < '10' && $conversion_rate >= '5' ) {
194 194 
 															$conversion_color = '#FFFF32'; // yellow (ok)
195 195 
 														} else {
196 196 
 															$conversion_color = '#FF0000'; // red (no bueno)
 
@@ -199,7 +199,7 @@  discard block
 
 block discarded – undo
199 199 
 														$conversion_rate = '0';
200 200 
 														$conversion_color = '#333333';
201 201 
 													}
202 
-													echo '<span style="color:' . esc_attr( $conversion_color ) . ';" title="' . esc_attr__( 'Conversion Rate' , 'yikes-inc-easy-mailchimp-extender' ) . '">' . $conversion_rate . '%</span>';
202 
+													echo '<span style="color:' . esc_attr( $conversion_color ) . ';" title="' . esc_attr__( 'Conversion Rate', 'yikes-inc-easy-mailchimp-extender' ) . '">' . $conversion_rate . '%</span>';
203 203 
 												?>
204 204 
 											</td>
205 205 
 											<!-- shortcode -->
 
@@ -212,7 +212,7 @@  discard block
 
 block discarded – undo
212 212 
 											}
213 213 
 										} else { ?>
214 214 
 										<tr class="no-items">
215 
-											<td class="colspanchange no-mailchimp-forms-found" colspan="8"><em><?php _e( 'No Mailchimp forms found. Use the form to the right to create a new one.' , 'yikes-inc-easy-mailchimp-extender' ); ?></em></td>
215 
+											<td class="colspanchange no-mailchimp-forms-found" colspan="8"><em><?php _e( 'No Mailchimp forms found. Use the form to the right to create a new one.', 'yikes-inc-easy-mailchimp-extender' ); ?></em></td>
216 216 
 										</tr>
217 217 
 									<?php } ?>
218 218 
 								</tbody>
Please login to merge, or discard this patch.
admin/partials/menu/support.php 1 patch
Spacing   +9 added lines, -9 removed lines patch added patch discarded remove patch 
@@ -9,21 +9,21 @@
 
 block discarded – undo
9 9 
 <div class="wrap yikes-easy-mc-support-wrap yikes-easy-mc-wrap">
10 10
11 11 
 	<!-- Freddie Logo -->
12 
-	<img src="<?php echo YIKES_MC_URL . 'includes/images/Mailchimp_Assets/Freddie_60px.png'; ?>" alt="<?php _e( 'Freddie - Mailchimp Mascot' , 'yikes-inc-easy-mailchimp-extender' ); ?>" class="yikes-mc-freddie-logo" />
12 
+	<img src="<?php echo YIKES_MC_URL . 'includes/images/Mailchimp_Assets/Freddie_60px.png'; ?>" alt="<?php _e( 'Freddie - Mailchimp Mascot', 'yikes-inc-easy-mailchimp-extender' ); ?>" class="yikes-mc-freddie-logo" />
13 13
14 
-	<h1>Easy Forms for Mailchimp | <?php _e( 'Support' , 'yikes-inc-easy-mailchimp-extender' ); ?></h1>
14 
+	<h1>Easy Forms for Mailchimp | <?php _e( 'Support', 'yikes-inc-easy-mailchimp-extender' ); ?></h1>
15 15 
 		<!-- Support Page Description -->
16 
-	<p class="yikes-easy-mc-about-text about-text"><?php _e( 'If you have questions, we have answers!' , 'yikes-inc-easy-mailchimp-extender' ); ?></p>
16 
+	<p class="yikes-easy-mc-about-text about-text"><?php _e( 'If you have questions, we have answers!', 'yikes-inc-easy-mailchimp-extender' ); ?></p>
17 17
18 
-	<?php if( get_option( 'yikes-easy-mc-active-addons' , array() ) == array() ) { ?>
19 
-		<p><?php _e( 'Users of the free version of Easy Forms for Mailchimp can post questions to our support forum on the WordPress Plugin Directory. We aim to respond to support requests for the free version of the plugin within a week.' , 'yikes-inc-easy-mailchimp-extender' ); ?></p>
20 
-		<p><?php printf( __( 'Purchasers of our paid add-ons qualify for premium support. <a href="%s" target="_blank" title="' . __( 'Check out our paid add-ons', 'yikes-inc-easy-mailchimp-extender' ) . '">' . __( 'Check out our paid add-ons', 'yikes-inc-easy-mailchimp-extender' ) . '</a>!' , 'yikes-inc-easy-mailchimp-extender' ), esc_url( 'https://yikesplugins.com/' ) ); ?></p>
18 
+	<?php if ( get_option( 'yikes-easy-mc-active-addons', array() ) == array() ) { ?>
19 
+		<p><?php _e( 'Users of the free version of Easy Forms for Mailchimp can post questions to our support forum on the WordPress Plugin Directory. We aim to respond to support requests for the free version of the plugin within a week.', 'yikes-inc-easy-mailchimp-extender' ); ?></p>
20 
+		<p><?php printf( __( 'Purchasers of our paid add-ons qualify for premium support. <a href="%s" target="_blank" title="' . __( 'Check out our paid add-ons', 'yikes-inc-easy-mailchimp-extender' ) . '">' . __( 'Check out our paid add-ons', 'yikes-inc-easy-mailchimp-extender' ) . '</a>!', 'yikes-inc-easy-mailchimp-extender' ), esc_url( 'https://yikesplugins.com/' ) ); ?></p>
21 21 
 	<?php } else { ?>
22 
-		<p><?php _e( "It looks like you are one of our premium users! Fill out the form below to submit a priority support request." , 'yikes-inc-easy-mailchimp-extender' ); ?></p>
23 
-		<p><?php _e( "If you have any problems with the form, send an email to <a href='mailto:[email protected]'>[email protected]</a> and a ticket will be created." , 'yikes-inc-easy-mailchimp-extender' ); ?></p>
22 
+		<p><?php _e( "It looks like you are one of our premium users! Fill out the form below to submit a priority support request.", 'yikes-inc-easy-mailchimp-extender' ); ?></p>
23 
+		<p><?php _e( "If you have any problems with the form, send an email to <a href='mailto:[email protected]'>[email protected]</a> and a ticket will be created.", 'yikes-inc-easy-mailchimp-extender' ); ?></p>
24 24 
 	<?php } ?>
25 25
26 
-		<p><?php printf( __( 'Before submitting a support request, please visit our %s.' , 'yikes-inc-easy-mailchimp-extender' ), '<a target="_blank" href="' . esc_url( 'https://yikesplugins.com/support/knowledge-base/product/easy-forms-for-mailchimp/' ) . '" title="' . __( 'Knowledge Base', 'yikes-inc-easy-mailchimp-extender' ) . '">' . __( 'knowledge base', 'yikes-inc-easy-mailchimp-extender' ) . '</a> where we have step-by-step guides and troubleshooting help' ); ?></p>
26 
+		<p><?php printf( __( 'Before submitting a support request, please visit our %s.', 'yikes-inc-easy-mailchimp-extender' ), '<a target="_blank" href="' . esc_url( 'https://yikesplugins.com/support/knowledge-base/product/easy-forms-for-mailchimp/' ) . '" title="' . __( 'Knowledge Base', 'yikes-inc-easy-mailchimp-extender' ) . '">' . __( 'knowledge base', 'yikes-inc-easy-mailchimp-extender' ) . '</a> where we have step-by-step guides and troubleshooting help' ); ?></p>
27 27
28 28 
 	<hr />
29 29
Please login to merge, or discard this patch.
admin/partials/menu/add-ons.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch 
@@ -7,12 +7,12 @@
 
 block discarded – undo
7 7 
 <div class="wrap yikes-easy-mc-wrap">
8 8
9 9 
 	<!-- Freddie Logo -->
10 
-	<img src="<?php echo esc_url( YIKES_MC_URL . 'includes/images/Mailchimp_Assets/Freddie_60px.png' ); ?>" alt="<?php esc_attr_e( 'Freddie - Mailchimp Mascot' , 'yikes-inc-easy-mailchimp-extender' ); ?>" class="yikes-mc-freddie-logo" />
10 
+	<img src="<?php echo esc_url( YIKES_MC_URL . 'includes/images/Mailchimp_Assets/Freddie_60px.png' ); ?>" alt="<?php esc_attr_e( 'Freddie - Mailchimp Mascot', 'yikes-inc-easy-mailchimp-extender' ); ?>" class="yikes-mc-freddie-logo" />
11 11
12 
-	<h1>Easy Forms for Mailchimp | <?php echo esc_attr__( 'Add-Ons' , 'yikes-inc-easy-mailchimp-extender' ); ?> &nbsp; <a href="https://yikesplugins.com/plugins/?plugins=Mailchimp" target="_blank" class="button-primary coming-soon-button" title="<?php esc_attr_e( 'View All Add-Ons' , 'yikes-inc-easy-mailchimp-extender' ); ?>"><?php esc_attr_e( 'View All Add-Ons' , 'yikes-inc-easy-mailchimp-extender' ); ?> <span class="dashicons dashicons-external"></span></a></h1>
12 
+	<h1>Easy Forms for Mailchimp | <?php echo esc_attr__( 'Add-Ons', 'yikes-inc-easy-mailchimp-extender' ); ?> &nbsp; <a href="https://yikesplugins.com/plugins/?plugins=Mailchimp" target="_blank" class="button-primary coming-soon-button" title="<?php esc_attr_e( 'View All Add-Ons', 'yikes-inc-easy-mailchimp-extender' ); ?>"><?php esc_attr_e( 'View All Add-Ons', 'yikes-inc-easy-mailchimp-extender' ); ?> <span class="dashicons dashicons-external"></span></a></h1>
13 13
14 14 
 	<!-- Addons Page Description -->
15 
-	<p class="yikes-easy-mc-about-text about-text"><?php esc_attr_e( "Below you'll find all free and paid add-ons available for Easy Forms for Mailchimp. Each add-on extends the functionality of the free plugin." , 'yikes-inc-easy-mailchimp-extender' ); ?></p>
15 
+	<p class="yikes-easy-mc-about-text about-text"><?php esc_attr_e( "Below you'll find all free and paid add-ons available for Easy Forms for Mailchimp. Each add-on extends the functionality of the free plugin.", 'yikes-inc-easy-mailchimp-extender' ); ?></p>
16 16
17 17 
 	<!-- Add-On Container -->
18 18 
 	<section id="add-ons">
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 
@@ -36,16 +36,16 @@  discard block
 
 block discarded – undo
36 36 
 ?>
37 37 
 <div class="wrap yikes-easy-mc-wrap">
38 38 
 	<!-- Freddie Logo -->
39 
-	<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" />
39 
+	<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" />
40 40
41 
-	<h1>Easy Forms for Mailchimp | <?php _e( 'Manage Mailing Lists' , 'yikes-inc-easy-mailchimp-extender' ); ?></h1>
41 
+	<h1>Easy Forms for Mailchimp | <?php _e( 'Manage Mailing Lists', 'yikes-inc-easy-mailchimp-extender' ); ?></h1>
42 42
43 43 
 	<!-- Settings Page Description -->
44 
-	<p class="yikes-easy-mc-about-text about-text"><?php _e( 'Make edits to your Mailchimp lists.' , 'yikes-inc-easy-mailchimp-extender' ); ?></p>
44 
+	<p class="yikes-easy-mc-about-text about-text"><?php _e( 'Make edits to your Mailchimp lists.', 'yikes-inc-easy-mailchimp-extender' ); ?></p>
45 45
46 46 
 	<?php
47 47 
 		/* If the user hasn't authenticated yet, lets kill off */
48 
-		if( get_option( 'yikes-mc-api-validation' , 'invalid_api_key' ) != 'valid_api_key' ) {
48 
+		if ( get_option( 'yikes-mc-api-validation', 'invalid_api_key' ) != 'valid_api_key' ) {
49 49
50 50 
 			$error_string = sprintf(
51 51 
 				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' ),
 
@@ -81,8 +81,8 @@  discard block
 
 block discarded – undo
81 81 
 									<!-- TABLE HEAD -->
82 82 
 									<thead>
83 83 
 										<tr>
84 
-											<th id="columnname" class="manage-column column-columnname" scope="col"><?php _e( 'List Name' , 'yikes-inc-easy-mailchimp-extender' ); ?></th>
85 
-											<th id="columnname" class="manage-column column-columnname num" scope="col"><?php _e( 'Subscriber Count' , 'yikes-inc-easy-mailchimp-extender' ); ?></th>
84 
+											<th id="columnname" class="manage-column column-columnname" scope="col"><?php _e( 'List Name', 'yikes-inc-easy-mailchimp-extender' ); ?></th>
85 
+											<th id="columnname" class="manage-column column-columnname num" scope="col"><?php _e( 'Subscriber Count', 'yikes-inc-easy-mailchimp-extender' ); ?></th>
86 86 
 										</tr>
87 87 
 									</thead>
88 88 
 									<!-- end header -->
 
@@ -90,25 +90,25 @@  discard block
 
 block discarded – undo
90 90 
 									<!-- FOOTER -->
91 91 
 									<tfoot>
92 92 
 										<tr>
93 
-											<th class="manage-column column-columnname" scope="col"><?php _e( 'List Name' , 'yikes-inc-easy-mailchimp-extender' ); ?></th>
94 
-											<th class="manage-column column-columnname num" scope="col"><?php _e( 'Subscriber Count' , 'yikes-inc-easy-mailchimp-extender' ); ?></th>
93 
+											<th class="manage-column column-columnname" scope="col"><?php _e( 'List Name', 'yikes-inc-easy-mailchimp-extender' ); ?></th>
94 
+											<th class="manage-column column-columnname num" scope="col"><?php _e( 'Subscriber Count', 'yikes-inc-easy-mailchimp-extender' ); ?></th>
95 95 
 										</tr>
96 96 
 									</tfoot>
97 97 
 									<!-- end footer -->
98 98
99 99 
 									<!-- TABLE BODY -->
100 100 
 									<tbody>
101 
-										<?php if( count( $list_data ) > 0 ) {
101 
+										<?php if ( count( $list_data ) > 0 ) {
102 102 
 											$i = 1;
103 
-											foreach( $list_data as $list ) {
103 
+											foreach ( $list_data as $list ) {
104 104 
 												?>
105 
-												<tr class="<?php if( $i % 2 == 0 ) { echo 'alternate'; } ?>">
105 
+												<tr class="<?php if ( $i % 2 == 0 ) { echo 'alternate'; } ?>">
106 106 
 													<td class="column-columnname">
107 
-														<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">
108 
-															<?php echo stripslashes( $list['name'] ); ?>
107 
+														<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">
108 
+															<?php echo stripslashes( $list[ 'name' ] ); ?>
109 109 
 														</a>
110 110 
 														<div class="row-actions">
111 
-															<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>
111 
+															<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>
112 112 
 															<?php
113 113 
 																/*
114 114 
 																*	Custom action to allow users to add additional action links
 
@@ -118,7 +118,7 @@  discard block
 
 block discarded – undo
118 118 
 															?>
119 119 
 														</div>
120 120 
 													</td>
121 
-													<td class="column-columnname num"><?php echo $list['stats']['member_count']; ?></td>
121 
+													<td class="column-columnname num"><?php echo $list[ 'stats' ][ 'member_count' ]; ?></td>
122 122 
 												</tr>
123 123 
 												<?php
124 124 
 												$i++;
 
@@ -126,7 +126,7 @@  discard block
 
 block discarded – undo
126 126 
 											} else {
127 127 
 											?>
128 128 
 											<tr class="no-items">
129 
-												<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>
129 
+												<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>
130 130 
 											</tr>
131 131 
 										<?php } ?>
132 132 
 									</tbody>
 
@@ -146,8 +146,8 @@  discard block
 
 block discarded – undo
146 146 
 					<div class="postbox yikes-easy-mc-postbox">
147 147 
 						<div class="inside">
148 148
149 
-							<a href="https://us3.admin.mailchimp.com/" title="<?php _e( 'Mailchimp Site' , 'yikes-inc-easy-mailchimp-extender' ); ?>" target="_blank">
150 
-								<img src="<?php echo YIKES_MC_URL . 'includes/images/Mailchimp_Assets/mailchimp-logo.png'; ?>" title="<?php _e( 'Mailchimp Site' , 'yikes-inc-easy-mailchimp-extender' ); ?>" class="list-page-mailchimp-logo">
149 
+							<a href="https://us3.admin.mailchimp.com/" title="<?php _e( 'Mailchimp Site', 'yikes-inc-easy-mailchimp-extender' ); ?>" target="_blank">
150 
+								<img src="<?php echo YIKES_MC_URL . 'includes/images/Mailchimp_Assets/mailchimp-logo.png'; ?>" title="<?php _e( 'Mailchimp Site', 'yikes-inc-easy-mailchimp-extender' ); ?>" class="list-page-mailchimp-logo">
151 151 
 							</a>
152 152
153 153 
 						</div>
 
@@ -157,42 +157,42 @@  discard block
 
 block discarded – undo
157 157 
 					<div class="postbox yikes-easy-mc-postbox list-page-sidebar">
158 158 
 						<div class="inside">
159 159
160 
-							<h2 class="account-status"><?php echo $account_details['username']; ?> <small>(<?php echo $account_details['role']; ?>)</small></h2>
160 
+							<h2 class="account-status"><?php echo $account_details[ 'username' ]; ?> <small>(<?php echo $account_details[ 'role' ]; ?>)</small></h2>
161 161
162 
-							<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' ); ?>">
162 
+							<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' ); ?>">
163 163
164 164 
 							<table class="form-table" id="account-details-table">
165 165 
 								<tr valign="top">
166 166 
 									<td scope="row">
167 167 
 										<label for="tablecell">
168 
-											<strong><?php _e( 'Company' , 'yikes-inc-easy-mailchimp-extender' ); ?></strong>
168 
+											<strong><?php _e( 'Company', 'yikes-inc-easy-mailchimp-extender' ); ?></strong>
169 169 
 										</label>
170 170 
 									</td>
171 
-									<td><?php echo $account_details['contact']['company']; ?><br /><?php echo $account_details['contact']['city'] . ', ' . $account_details['contact']['state']; ?></td>
171 
+									<td><?php echo $account_details[ 'contact' ][ 'company' ]; ?><br /><?php echo $account_details[ 'contact' ][ 'city' ] . ', ' . $account_details[ 'contact' ][ 'state' ]; ?></td>
172 172 
 								</tr>
173 173 
 								<tr valign="top">
174 174 
 									<td scope="row">
175 175 
 										<label for="tablecell">
176 
-											<strong><?php _e( 'Industry' , 'yikes-inc-easy-mailchimp-extender' ); ?></strong>
176 
+											<strong><?php _e( 'Industry', 'yikes-inc-easy-mailchimp-extender' ); ?></strong>
177 177 
 										</label>
178 178 
 									</td>
179 
-									<td><?php echo $account_details['account_industry']; ?></td>
179 
+									<td><?php echo $account_details[ 'account_industry' ]; ?></td>
180 180 
 								</tr>
181 181 
 								<tr valign="top">
182 182 
 									<td scope="row">
183 183 
 										<label for="tablecell">
184 
-											<strong><?php _e( 'Member Since' , 'yikes-inc-easy-mailchimp-extender' ); ?></strong>
184 
+											<strong><?php _e( 'Member Since', 'yikes-inc-easy-mailchimp-extender' ); ?></strong>
185 185 
 										</label>
186 186 
 									</td>
187 
-									<td><?php echo date( get_option('date_format') , strtotime( $account_details['member_since'] ) ); ?></td>
187 
+									<td><?php echo date( get_option( 'date_format' ), strtotime( $account_details[ 'member_since' ] ) ); ?></td>
188 188 
 								</tr>
189 189 
 								<tr valign="top">
190 190 
 									<td scope="row">
191 191 
 										<label for="tablecell">
192 
-											<strong><?php _e( 'Plan Type' , 'yikes-inc-easy-mailchimp-extender' ); ?></strong>
192 
+											<strong><?php _e( 'Plan Type', 'yikes-inc-easy-mailchimp-extender' ); ?></strong>
193 193 
 										</label>
194 194 
 									</td>
195 
-									<td><?php echo ucwords( $account_details['pricing_plan_type'] ); ?></td>
195 
+									<td><?php echo ucwords( $account_details[ 'pricing_plan_type' ] ); ?></td>
196 196 
 								</tr>
197 197 
 							</table>
198 198
Please login to merge, or discard this patch.
admin/partials/menu/options.php 1 patch
Spacing   +24 added lines, -24 removed lines patch added patch discarded remove patch 
@@ -5,13 +5,13 @@  discard block
 
 block discarded – undo
5 5 
 */
6 6
7 7 
 	/* Get and Store Option Values */
8 
-	if( get_option( 'yikes-mc-api-validation' , 'invalid_api_key' ) === 'valid_api_key' ) {
9 
-		$api_connection = '<span id="connection-container" class="api-connected" title="' . __( "Your site is currently connected to the Mailchimp API" , "yikes-inc-easy-mailchimp-extender" ) . '"><span class="dashicons dashicons-yes yikes-mc-api-connected"></span> ' . __( "Connected" , 'yikes-inc-easy-mailchimp-extender' ) . '</span>';
8 
+	if ( get_option( 'yikes-mc-api-validation', 'invalid_api_key' ) === 'valid_api_key' ) {
9 
+		$api_connection = '<span id="connection-container" class="api-connected" title="' . __( "Your site is currently connected to the Mailchimp API", "yikes-inc-easy-mailchimp-extender" ) . '"><span class="dashicons dashicons-yes yikes-mc-api-connected"></span> ' . __( "Connected", 'yikes-inc-easy-mailchimp-extender' ) . '</span>';
10 10 
 		$api_error_response = '';
11 11 
 	} else {
12 
-		$api_connection = '<span id="connection-container" class="api-not-connected"><span class="dashicons dashicons-no-alt yikes-mc-api-not-connected"></span>  ' . __( "Not Connected" , 'yikes-inc-easy-mailchimp-extender' ) . '</span>';
13 
-		if( get_option( 'yikes-mc-api-invalid-key-response' , '' ) != '' ) {
14 
-			$api_error_response = '<p><small><i class="dashicons dashicons-no-alt"></i> ' . get_option( 'yikes-mc-api-invalid-key-response' , '' ) . '</small></p>';
12 
+		$api_connection = '<span id="connection-container" class="api-not-connected"><span class="dashicons dashicons-no-alt yikes-mc-api-not-connected"></span>  ' . __( "Not Connected", 'yikes-inc-easy-mailchimp-extender' ) . '</span>';
13 
+		if ( get_option( 'yikes-mc-api-invalid-key-response', '' ) != '' ) {
14 
+			$api_error_response = '<p><small><i class="dashicons dashicons-no-alt"></i> ' . get_option( 'yikes-mc-api-invalid-key-response', '' ) . '</small></p>';
15 15 
 		} else {
16 16 
 			$api_error_response = '';
17 17 
 		}
 
@@ -23,23 +23,23 @@  discard block
 
 block discarded – undo
23 23 
 	* @since 6.2.2
24 24 
 	*
25 25 
 	*/
26 
-	if ( isset( $_REQUEST['section'] ) ) {
27 
-		$_REQUEST['section'] = preg_replace('/[^\w-]/', '', strip_tags ( $_REQUEST['section'] ) );
26 
+	if ( isset( $_REQUEST[ 'section' ] ) ) {
27 
+		$_REQUEST[ 'section' ] = preg_replace( '/[^\w-]/', '', strip_tags( $_REQUEST[ 'section' ] ) );
28 28 
 	}
29 29 
 ?>
30 30 
 	<!-- Actual Settings Form -->
31 31 
 	<div class="wrap yikes-easy-mc-wrap">
32 32
33 33 
 		<!-- Freddie Logo -->
34 
-		<img src="<?php echo YIKES_MC_URL . 'includes/images/Mailchimp_Assets/Freddie_60px.png'; ?>" alt="<?php _e( 'Freddie - Mailchimp Mascot' , 'yikes-inc-easy-mailchimp-extender' ); ?>" class="yikes-mc-freddie-logo" />
34 
+		<img src="<?php echo YIKES_MC_URL . 'includes/images/Mailchimp_Assets/Freddie_60px.png'; ?>" alt="<?php _e( 'Freddie - Mailchimp Mascot', 'yikes-inc-easy-mailchimp-extender' ); ?>" class="yikes-mc-freddie-logo" />
35 35
36 
-		<h1>Easy Forms for Mailchimp | <?php if ( isset( $_REQUEST['section'] ) ) { echo ucwords( str_replace( '-', ' ', $_REQUEST['section'] ) ); } else { echo __( 'General Settings' , 'yikes-inc-easy-mailchimp-extender' ); } ?></h1>
36 
+		<h1>Easy Forms for Mailchimp | <?php if ( isset( $_REQUEST[ 'section' ] ) ) { echo ucwords( str_replace( '-', ' ', $_REQUEST[ 'section' ] ) ); } else { echo __( 'General Settings', 'yikes-inc-easy-mailchimp-extender' ); } ?></h1>
37 37
38 38 
 		<!-- Settings Page Description -->
39 
-		<p class="yikes-easy-mc-about-text about-text"><?php _e( 'Manage the overall settings for Easy forms for Mailchimp.' , 'yikes-inc-easy-mailchimp-extender' ); ?></p>
39 
+		<p class="yikes-easy-mc-about-text about-text"><?php _e( 'Manage the overall settings for Easy forms for Mailchimp.', 'yikes-inc-easy-mailchimp-extender' ); ?></p>
40 40 
 		<?php
41 41 
 			/* Success Messages on Options Updated */
42 
-			if( isset( $_REQUEST['settings-updated'] ) && $_REQUEST['settings-updated'] == 'true' ) {
42 
+			if ( isset( $_REQUEST[ 'settings-updated' ] ) && $_REQUEST[ 'settings-updated' ] == 'true' ) {
43 43 
 				?>
44 44 
 				<div class="updated manage-form-admin-notice">
45 45 
 					<p><?php _e( 'Settings successfully updated.', 'yikes-inc-easy-mailchimp-extender' ); ?></p>
 
@@ -47,7 +47,7 @@  discard block
 
 block discarded – undo
47 47 
 				<?php
48 48 
 			}
49 49 
 			/* Mailchimp API Cleared Successfully message */
50 
-			if( isset( $_REQUEST['transient-cleared'] ) && $_REQUEST['transient-cleared'] == 'true' ) {
50 
+			if ( isset( $_REQUEST[ 'transient-cleared' ] ) && $_REQUEST[ 'transient-cleared' ] == 'true' ) {
51 51 
 				?>
52 52 
 				<div class="updated manage-form-admin-notice">
53 53 
 					<p><?php _e( 'Mailchimp API Cache successfully cleared.', 'yikes-inc-easy-mailchimp-extender' ); ?></p>
 
@@ -56,7 +56,7 @@  discard block
 
 block discarded – undo
56 56 
 			}
57 57 
 			/* Error Log Clear Messages */
58 58 
 				/* Success Messages on Options Updated */
59 
-				if( isset( $_REQUEST['error-log-cleared'] ) && $_REQUEST['error-log-cleared'] == 'true' ) {
59 
+				if ( isset( $_REQUEST[ 'error-log-cleared' ] ) && $_REQUEST[ 'error-log-cleared' ] == 'true' ) {
60 60 
 					?>
61 61 
 					<div class="updated manage-form-admin-notice">
62 62 
 						<p><?php _e( 'Error log successfully cleared.', 'yikes-inc-easy-mailchimp-extender' ); ?></p>
 
@@ -64,7 +64,7 @@  discard block
 
 block discarded – undo
64 64 
 					<?php
65 65 
 				}
66 66 
 				/* Mailchimp API Cleared Successfully message */
67 
-				if( isset( $_REQUEST['error-log-cleared'] ) && $_REQUEST['error-log-cleared'] == 'false' ) {
67 
+				if ( isset( $_REQUEST[ 'error-log-cleared' ] ) && $_REQUEST[ 'error-log-cleared' ] == 'false' ) {
68 68 
 					?>
69 69 
 					<div class="error manage-form-admin-notice">
70 70 
 						<p><?php _e( "Whoops! We've encountered an error while trying to clear the error log. Please refresh the page and try again. If the error persists please get in touch with the YIKES Inc. support team.", 'yikes-inc-easy-mailchimp-extender' ); ?></p>
 
@@ -73,28 +73,28 @@  discard block
 
 block discarded – undo
73 73 
 				}
74 74
75 75 
 				/* Display a success message if our error log was sucessfully created, or display an error if not */
76 
-				if( isset( $_GET['error_log_created'] ) && $_GET['error_log_created'] == 'true' ) {
76 
+				if ( isset( $_GET[ 'error_log_created' ] ) && $_GET[ 'error_log_created' ] == 'true' ) {
77 77 
 					?>
78 78 
 					<div class="updated">
79 79 
 						<p><?php _e( 'Error log successfully created. You may now start logging errors.', 'yikes-inc-easy-mailchimp-extender' ); ?></p>
80 80 
 					</div>
81 81 
 					<?php
82 
-				} else if( isset( $_GET['error_log_created'] ) && $_GET['error_log_created'] == 'false' ) {
82 
+				} else if ( isset( $_GET[ 'error_log_created' ] ) && $_GET[ 'error_log_created' ] == 'false' ) {
83 83 
 					?>
84 84 
 					<div class="error">
85 
-						<p><?php echo esc_attr( urldecode( $_GET['error_message'] ) , 'yikes-inc-easy-mailchimp-extender' ); ?></p>
85 
+						<p><?php echo esc_attr( urldecode( $_GET[ 'error_message' ] ), 'yikes-inc-easy-mailchimp-extender' ); ?></p>
86 86 
 					</div>
87 87 
 					<?php
88 88 
 				}
89 89
90 90 
 				/* Display a success message if the user successfully imported some forms */
91 
-				if( isset( $_GET['section'] ) && $_GET['section'] == 'import-export-forms' && isset( $_GET['import-forms'] ) && $_GET['import-forms'] == 'true' ) {
91 
+				if ( isset( $_GET[ 'section' ] ) && $_GET[ 'section' ] == 'import-export-forms' && isset( $_GET[ 'import-forms' ] ) && $_GET[ 'import-forms' ] == 'true' ) {
92 92 
 					?>
93 93 
 					<div class="updated">
94 94 
 						<p><?php printf( __( 'Opt-in forms successfully imported. <a href="%s" title="View Forms">View Forms</a>', 'yikes-inc-easy-mailchimp-extender' ), esc_url_raw( admin_url( 'admin.php?page=yikes-inc-easy-mailchimp' ) ) ); ?></p>
95 95 
 					</div>
96 96 
 					<?php
97 
-				} elseif( isset( $_GET['section'] ) && $_GET['section'] == 'import-export-forms' && isset( $_GET['import-settings'] ) && $_GET['import-settings'] == 'true' ) {
97 
+				} elseif ( isset( $_GET[ 'section' ] ) && $_GET[ 'section' ] == 'import-export-forms' && isset( $_GET[ 'import-settings' ] ) && $_GET[ 'import-settings' ] == 'true' ) {
98 98 
 					?>
99 99 
 					<div class="updated">
100 100 
 						<p><?php printf( __( 'YIKES Easy Forms for Mailchimp settings successfully imported.', 'yikes-inc-easy-mailchimp-extender' ), esc_url_raw( admin_url( 'admin.php?page=yikes-inc-easy-mailchimp' ) ) ); ?></p>
 
@@ -115,11 +115,11 @@  discard block
 
 block discarded – undo
115 115
116 116 
 						<div class="postbox yikes-easy-mc-postbox">
117 117
118 
-							<?php if( !isset( $_REQUEST['section'] ) || $_REQUEST['section'] == '' ) {
118 
+							<?php if ( ! isset( $_REQUEST[ 'section' ] ) || $_REQUEST[ 'section' ] == '' ) {
119 119 
 								include YIKES_MC_PATH . 'admin/partials/menu/options-sections/general-settings.php';
120 120 
 							} else {
121 
-								if( isset( $_REQUEST['addon'] ) && $_REQUEST['addon'] == 'true' ) {
122 
-									include apply_filters( 'yikes-mailchimp-'.$_REQUEST['section'].'-options-path' , '' );
121 
+								if ( isset( $_REQUEST[ 'addon' ] ) && $_REQUEST[ 'addon' ] == 'true' ) {
122 
+									include apply_filters( 'yikes-mailchimp-' . $_REQUEST[ 'section' ] . '-options-path', '' );
123 123 
 								} else {
124 124 
 									// White list a set of files that are allowed to be included here
125 125 
 									$file_base = 'admin/partials/menu/options-sections/';
 
@@ -132,8 +132,8 @@  discard block
 
 block discarded – undo
132 132 
 										$file_base . 'recaptcha-settings.php',
133 133 
 									);
134 134 
 									// Ensure the included file is allowed and whitelisted above, before including it
135 
-									if ( 0 === validate_file( 'admin/partials/menu/options-sections/' . $_REQUEST['section'] . '.php', $acceptable_files ) ) {
136 
-										include YIKES_MC_PATH . 'admin/partials/menu/options-sections/' . $_REQUEST['section'] . '.php';
135 
+									if ( 0 === validate_file( 'admin/partials/menu/options-sections/' . $_REQUEST[ 'section' ] . '.php', $acceptable_files ) ) {
136 
+										include YIKES_MC_PATH . 'admin/partials/menu/options-sections/' . $_REQUEST[ 'section' ] . '.php';
137 137 
 									} else {
138 138 
 										wp_die( esc_attr__( 'Invalid file. If this error persists, please contact support.', 'yikes-inc-easy-mailchimp' ) );
139 139 
 									}
Please login to merge, or discard this patch.
includes/class-yikes-inc-easy-mailchimp-extender.php 1 patch
Braces   +9 added lines, -9 removed lines patch added patch discarded remove patch 
@@ -25,7 +25,7 @@  discard block
 
 block discarded – undo
25 25 
  * @subpackage Yikes_Inc_Easy_Mailchimp_Extender/includes
26 26 
  * @author     YIKES Inc. <[email protected]>
27 27 
  */
28 
-class Yikes_Inc_Easy_Mailchimp_Extender {
28 
+class Yikes_Inc_Easy_Mailchimp_Extender {
29 29 
 	/**
30 30 
 	 * The loader that's responsible for maintaining and registering all hooks that power
31 31 
 	 * the plugin.

@@ -70,7 +70,7 @@  discard block
 
 block discarded – undo
70 70 
 	 *
71 71 
 	 * @param Yikes_Inc_Easy_Mailchimp_Extender_Form_Interface $form_interface
72 72 
 	 */
73 
-	public function __construct( Yikes_Inc_Easy_Mailchimp_Extender_Form_Interface $form_interface ) {
73 
+	public function __construct( Yikes_Inc_Easy_Mailchimp_Extender_Form_Interface $form_interface ) {
74 74 
 		$this->version = YIKES_MC_VERSION;
75 75 
 		$this->form_interface = $form_interface;
76 76 
 		$this->load_dependencies();

@@ -93,7 +93,7 @@  discard block
 
 block discarded – undo
93 93 
 	 * @since    1.0.0
94 94 
 	 * @access   private
95 95 
 	 */
96 
-	private function load_dependencies() {
96 
+	private function load_dependencies() {
97 97 
 		/**
98 98 
 		 * The class responsible for orchestrating the actions and filters of the
99 99 
 		 * core plugin.

@@ -121,7 +121,7 @@  discard block
 
 block discarded – undo
121 121 
 	 * @since    1.0.0
122 122 
 	 * @access   private
123 123 
 	 */
124 
-	private function define_admin_hooks() {
124 
+	private function define_admin_hooks() {
125 125 
 		$plugin_admin = new Yikes_Inc_Easy_Mailchimp_Forms_Admin( $this->get_yikes_inc_easy_mailchimp_extender(), $this->get_version(), $this->form_interface );
126 126 
 		$plugin_admin->hooks();
127 127 
 		$this->loader->add_action( 'admin_enqueue_scripts', $plugin_admin, 'maybe_enqueue_assets' );

@@ -133,7 +133,7 @@  discard block
 
 block discarded – undo
133 133 
 	 * @since    1.0.0
134 134 
 	 * @access   private
135 135 
 	 */
136 
-	private function define_public_hooks() {
136 
+	private function define_public_hooks() {
137 137 
 		$plugin_public = new Yikes_Inc_Easy_Mailchimp_Extender_Public( $this->get_yikes_inc_easy_mailchimp_extender(), $this->get_version() );
138 138 
 	}
139 139 
 	/**

@@ -141,7 +141,7 @@  discard block
 
 block discarded – undo
141 141 
 	 *
142 142 
 	 * @since    1.0.0
143 143 
 	 */
144 
-	public function run() {
144 
+	public function run() {
145 145 
 		$this->loader->run();
146 146 
 	}
147 147 
 	/**

@@ -151,7 +151,7 @@  discard block
 
 block discarded – undo
151 151 
 	 * @since     1.0.0
152 152 
 	 * @return    string    The name of the plugin.
153 153 
 	 */
154 
-	public function get_yikes_inc_easy_mailchimp_extender() {
154 
+	public function get_yikes_inc_easy_mailchimp_extender() {
155 155 
 		return $this->yikes_inc_easy_mailchimp_extender;
156 156 
 	}
157 157 
 	/**

@@ -160,7 +160,7 @@  discard block
 
 block discarded – undo
160 160 
 	 * @since     1.0.0
161 161 
 	 * @return    Yikes_Inc_Easy_Mailchimp_Extender_Loader    Orchestrates the hooks of the plugin.
162 162 
 	 */
163 
-	public function get_loader() {
163 
+	public function get_loader() {
164 164 
 		return $this->loader;
165 165 
 	}
166 166 
 	/**

@@ -169,7 +169,7 @@  discard block
 
 block discarded – undo
169 169 
 	 * @since     1.0.0
170 170 
 	 * @return    string    The version number of the plugin.
171 171 
 	 */
172 
-	public function get_version() {
172 
+	public function get_version() {
173 173 
 		return $this->version;
174 174 
 	}
175 175 
 }
Please login to merge, or discard this patch.
blocks/blocks.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch 
@@ -15,7 +15,7 @@
 
 block discarded – undo
15 15 
 		add_action( 'init', array( $this, 'register_blocks' ), 11 );
16 16
17 17 
 		// The 'block_categories' filter has been deprecated in WordPress 5.8 and replaced by 'block_categories_all'.
18 
-		if ( !class_exists( 'WP_Block_Editor_Context' ) ) {
18 
+		if ( ! class_exists( 'WP_Block_Editor_Context' ) ) {
19 19 
 			add_filter( 'block_categories', array( $this, 'easy_forms_register_category' ), 10, 2 );
20 20 
 		} else {
21 21 
 			add_filter( 'block_categories_all', array( $this, 'easy_forms_register_category' ), 10, 2 );
Please login to merge, or discard this patch.